From 4431ef5a699795fbbe0cc26148e545b1cacdb04c Mon Sep 17 00:00:00 2001
From: Ozan Türkyılmaz <ozan.turkyilmaz@gmail.com>
Date: Fri, 27 May 2011 14:53:54 -0300
Subject: libraries/libmatroska: Updated for version 1.1.0.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 libraries/libmatroska/README                 |  3 +++
 libraries/libmatroska/libmatroska.SlackBuild | 12 +++++++++---
 libraries/libmatroska/libmatroska.info       | 10 +++++-----
 libraries/libmatroska/slack-desc             |  8 ++++----
 4 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'libraries/libmatroska')

diff --git a/libraries/libmatroska/README b/libraries/libmatroska/README
index 96462f4e48..026aae9a33 100644
--- a/libraries/libmatroska/README
+++ b/libraries/libmatroska/README
@@ -2,3 +2,6 @@ libmatroska is a C++ libary to parse Matroska files (.mkv and .mka).
 Matroska is an audio/video container based on EBML.
 
 Requires libebml available at slackbuilds.org
+
+Interested parties can build the library with staticlibs by passing
+STATICLIB=yes to the script.
diff --git a/libraries/libmatroska/libmatroska.SlackBuild b/libraries/libmatroska/libmatroska.SlackBuild
index 8e2ef8067f..77387acb6c 100644
--- a/libraries/libmatroska/libmatroska.SlackBuild
+++ b/libraries/libmatroska/libmatroska.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libmatroska
-VERSION=1.0.0
+VERSION=1.1.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,6 +40,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+STATICLIB=${STATICLIB:-no}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -57,6 +58,11 @@ fi
 
 set -e
 
+if [ "$STATICLIB" = "yes" ]; then
+	MAKESTATICLIB="staticlib"
+	MAKESTATICLIBINSTALL="install_staticlib"
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -73,9 +79,9 @@ find . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-make -C make/linux sharedlib \
+make -C make/linux $MAKESTATICLIB sharedlib \
      prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX}
-make -C make/linux install_sharedlib install_headers \
+make -C make/linux $MAKESTATICLIBINSTALL install_sharedlib install_headers \
      prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX}
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/libraries/libmatroska/libmatroska.info b/libraries/libmatroska/libmatroska.info
index fde0b4747d..e81a46fc10 100644
--- a/libraries/libmatroska/libmatroska.info
+++ b/libraries/libmatroska/libmatroska.info
@@ -1,10 +1,10 @@
 PRGNAM="libmatroska"
-VERSION="1.0.0"
+VERSION="1.1.0"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix/source.html"
-DOWNLOAD="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.0.0.tar.bz2"
-MD5SUM="4efcf3945b17a6f0320cf1aaa326a4de"
+DOWNLOAD="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.1.0.tar.bz2"
+MD5SUM="21e5ee3e2573f0ae99db195348bdfb98"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Ozan Türkyılmaz"
-EMAIL="Ozan Türkyılmaz"
-APPROVED="Michiel van Wessem"
+EMAIL="ozan.turkyilmaz@gmail.com"
+APPROVED="Niels Horn"
diff --git a/libraries/libmatroska/slack-desc b/libraries/libmatroska/slack-desc
index e7d9ec1410..fc24baa0fa 100644
--- a/libraries/libmatroska/slack-desc
+++ b/libraries/libmatroska/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-           |-----handy-ruler---------------------------------------------------|
+           |-----handy-ruler------------------------------------------------------|
 libmatroska: libmatroska (A C++ library to parse Matroska files)
 libmatroska:
-libmatroska: libmatroska is a C++ libary to parse Matroska files (.mkv  
-libmatroska: and .mka).
+libmatroska: libmatroska is a C++ libary to parse Matroska files (.mkv and 
+libmatroska: .mka).
 libmatroska:
 libmatroska:
 libmatroska:
 libmatroska:
-libmatroska: http://www.bunkus.org/videotools/mkvtoolnix/source.html
+libmatroska:   http://www.bunkus.org/videotools/mkvtoolnix/source.html
 libmatroska:
 libmatroska:
-- 
cgit v1.2.3-65-gdbad