4 files changed, 31 insertions, 16 deletions
diff --git a/multimedia/mkvtoolnix/README b/multimedia/mkvtoolnix/README
index 60902210ec..5203128db5 100644
--- a/multimedia/mkvtoolnix/README
+++ b/multimedia/mkvtoolnix/README
@@ -1,10 +1,14 @@
 MKVToolnix is a set of tools to create, alter and inspect Matroska
 (and WebM) files. With these tools one can:
 
-* Get information about Matroska files (mkvinfo)
-* Extract tracks/data from Matroska files (mkvextract)
-* Create Matroska files from other media files (mkvmerge)
-* Modify properties of existing Matroska files (mkvpropedit)
+* Get information about Matroska files (mkvinfo) * Extract tracks/data
+from Matroska files (mkvextract) * Create Matroska files from other
+media files (mkvmerge) * Modify properties of existing Matroska files
+(mkvpropedit)
 
-MKVToolnix requires libebml, libmatroska and wxGTK/wxPython all of which
-are available on Slackbuilds.org.
+This requires wxGTK or wxPython.
+
+It comes with internal versions of libembl and libmatroska, which will
+be used if system-wide installations of them are not present.
+
+Interested parties can build a QT GUI by passing QTGUI=yes
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
index 94409ef4a7..65d051ef47 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
+++ b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
@@ -4,7 +4,6 @@
 
 # Copyright 2008,2009,2010. Andrew Strong (http://www.andrews-corner.org)
 # All rights reserved.
-# Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com
 # 
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -23,11 +22,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com
+
 PRGNAM=mkvtoolnix
-VERSION=4.4.0
+VERSION=4.6.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+QTGUI=${QTGUI:-no}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -63,7 +66,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -71,6 +73,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ "$QTGUI" = "yes" ]; then
+  do_qt_config="enable-qt"
+else
+  do_qt_config="disable-qt"
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -80,8 +88,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --localstatedir=/var \
   --enable-gui \
+  --${do_qt_config} \
   --enable-wxwidgets \
-  --with-boost
+  --with-boost \
+  --build=$ARCH-slackware-linux
 
 ./drake pkgdatadir=/usr/doc/$PRGNAM-$VERSION
 ./drake pkgdatadir=/usr/doc/$PRGNAM-$VERSION install DESTDIR=$PKG
@@ -92,6 +102,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog INSTALL COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.info b/multimedia/mkvtoolnix/mkvtoolnix.info
index ffcd954644..ff1ef1825d 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.info
+++ b/multimedia/mkvtoolnix/mkvtoolnix.info
@@ -1,10 +1,10 @@
 PRGNAM="mkvtoolnix"
-VERSION="4.4.0"
+VERSION="4.6.0"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-DOWNLOAD="http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-4.4.0.tar.bz2"
-MD5SUM="1f2ea5997066ebb65444198576e5ec4a"
+DOWNLOAD="http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-4.6.0.tar.bz2"
+MD5SUM="ca4e5b226175a6df2f9fdad206abf0a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Ozan Türkyılmaz"
 EMAIL="ozan.turkyilmaz@gmail.com"
-APPROVED="dsomero,Niels Horn"
+APPROVED="rworkman"
diff --git a/multimedia/mkvtoolnix/slack-desc b/multimedia/mkvtoolnix/slack-desc
index 3de0ccfe8a..c90312bb78 100644
--- a/multimedia/mkvtoolnix/slack-desc
+++ b/multimedia/mkvtoolnix/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----------------------------------------------------|
 mkvtoolnix: Mkvtoolnix (tools to create, alter and inspect Matroska files)
 mkvtoolnix:
 mkvtoolnix: MKVToolnix is a set of tools to create, alter and inspect Matroska
 mkvtoolnix: files. With these tools one can:
-mkvtoolnix:
 mkvtoolnix: * Get information about Matroska files (mkvinfo)
 mkvtoolnix: * Extract tracks/data from Matroska files (mkvextract)
 mkvtoolnix: * Create Matroska files from other media files (mkvmerge)
 mkvtoolnix: * Modify properties of existing Matroska files (mkvpropedit)
 mkvtoolnix:
 mkvtoolnix: Home Page: http://www.bunkus.org/videotools/mkvtoolnix
+mkvtoolnix: