mkvtoolnix: updated to 6.4.1 for Slackware 14.0.

1 files changed, 23 insertions, 15 deletions

diff --git a/mkvtoolnix/build/mkvtoolnix.SlackBuild b/mkvtoolnix/build/mkvtoolnix.SlackBuild
index 2fb0203b..0921d20c 100755
--- a/mkvtoolnix/build/mkvtoolnix.SlackBuild
+++ b/mkvtoolnix/build/mkvtoolnix.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2009, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright (c) 2009, 2011, 2015  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -39,9 +39,11 @@
 #               libmatroska now, to minimize the dependency list.
 # 4.9.1-1:    10/aug/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 6.4.1-1:    31/may/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update for Slackware 14.0.
 # 
 # Run 'sh mkvtoolnix.SlackBuild' to build a Slackware package.
-# The package (.tgz) and .txt file as well as build logs are created in /tmp .
+# The package (.txz) and .txt file as well as build logs are created in /tmp .
 # Install it using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
@@ -49,7 +51,7 @@
 # Set initial variables:
 
 PRGNAM=mkvtoolnix
-VERSION=${VERSION:-4.9.1}
+VERSION=${VERSION:-6.4.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -64,8 +66,8 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
-SRCURL="http://www.bunkus.org/videotools/${PRGNAM}/sources/${PRGNAM}-${VERSION}.tar.bz2"
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz"
+SRCURL="http://www.bunkus.org/videotools/${PRGNAM}/sources/${PRGNAM}-${VERSION}.tar.xz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -88,11 +90,16 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  *)         SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+  *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
              ;;
 esac
 
+case "$ARCH" in
+    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)       TARGET=$ARCH-slackware-linux ;;
+esac
+
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -165,16 +172,20 @@ CFLAGS="$SLKCFLAGS" \
   --enable-gui \
   --enable-wxwidgets \
   --enable-qt \
+  --with-boost \
+  --without-curl \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
 # Use mkvtoolnix's internal version of rake so we don't have to depend on ruby:
-./drake ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+./drake pkgdatadir=/usr/doc/$PRGNAM-$VERSION ${NUMJOBS} \
+  2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 # Install the lot:
-./drake DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+./drake pkgdatadir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG install \
+  2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
 # Add this to the doinst.sh:
 ! [ -d $PKG/install ] && mkdir -p $PKG/install
@@ -203,9 +214,6 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
-## Move the GUI documentation into our documentation directory::
-#mv $PKG/usr/share/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION/html
-#ln -s /usr/doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
@@ -225,9 +233,9 @@ cat $SRCDIR/slack-required > $PKG/install/slack-required
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep