summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/mkvtoolnix/README4
-rw-r--r--multimedia/mkvtoolnix/doinst.sh3
-rw-r--r--multimedia/mkvtoolnix/mkvinfo.desktop2
-rw-r--r--multimedia/mkvtoolnix/mkvtoolnix.SlackBuild47
-rw-r--r--multimedia/mkvtoolnix/mkvtoolnix.info8
-rw-r--r--multimedia/mkvtoolnix/mmg.desktop2
-rw-r--r--multimedia/mkvtoolnix/slack-desc8
7 files changed, 36 insertions, 38 deletions
diff --git a/multimedia/mkvtoolnix/README b/multimedia/mkvtoolnix/README
index 2cb5bec4db..c03f86b4c6 100644
--- a/multimedia/mkvtoolnix/README
+++ b/multimedia/mkvtoolnix/README
@@ -5,6 +5,4 @@ files and create (mkvmerge) Matroska files from other media files.
Matroska is a new multimedia file format aiming to become THE new
container format for the future.
-Beyond dependencies already satisfied under Slackware MKVToolnix
-requires libebml, libmatroska, wxGTK and the Boost regex library.
-All of these are available on Slackbuilds.org.
+This requires libebml, libmatroska, wxGTK, and Boost.
diff --git a/multimedia/mkvtoolnix/doinst.sh b/multimedia/mkvtoolnix/doinst.sh
index 3857649f50..4e8ba7071d 100644
--- a/multimedia/mkvtoolnix/doinst.sh
+++ b/multimedia/mkvtoolnix/doinst.sh
@@ -1,3 +1,4 @@
if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
diff --git a/multimedia/mkvtoolnix/mkvinfo.desktop b/multimedia/mkvtoolnix/mkvinfo.desktop
index f00277e34d..2f2749ddd9 100644
--- a/multimedia/mkvtoolnix/mkvinfo.desktop
+++ b/multimedia/mkvtoolnix/mkvinfo.desktop
@@ -2,7 +2,7 @@
Name=MKVInfo Gui
Comment=Show information about Matroska files
Exec=mkvinfo -g
+Icon=matroska
Terminal=false
Type=Application
Categories=GTK;AudioVideo;
-Icon=matroska
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
index 571da8ab4c..16e48ee813 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
+++ b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
@@ -22,9 +22,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
PRGNAM=mkvtoolnix
-VERSION=2.4.0
+VERSION=2.9.5
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -36,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -62,6 +64,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--mandir=/usr/man \
--localstatedir=/var \
@@ -69,40 +72,36 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-wxwidgets \
--with-boost
-make
-make install DESTDIR=$PKG
+make pkgdatadir=/usr/doc/$PRGNAM-$VERSION
+make pkgdatadir=/usr/doc/$PRGNAM-$VERSION install DESTDIR=$PKG
+
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null
+)
-# The gui 'mmg' does not come with a desktop file so we add one:
+( cd $PKG/usr/man
+ find . -type f -exec gzip -9 {} \;
+ for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+# ---> Create 'Desktop' files for mmg and mkvinfo:
mkdir -p $PKG/usr/share/applications
cat $CWD/mmg.desktop > $PKG/usr/share/applications/mmg.desktop
+cat $CWD/mkvinfo.desktop > $PKG/usr/share/applications/mkvinfo.desktop
+
mkdir -p $PKG/usr/share/pixmaps
cp src/mmg/matroskalogo.xpm $PKG/usr/share/pixmaps/
-
-# The gui 'mkvinfo' does not come with a desktop file so we add one:
-
-cat $CWD/mkvinfo.desktop > $PKG/usr/share/applications/mkvinfo.desktop
cp src/info/matroska.xpm $PKG/usr/share/pixmaps/
-# Placing the documentation:
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README doc/mkvmerge-gui.html $PKG/usr/doc/$PRGNAM-$VERSION
-
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $CWD/doinst.sh > $PKG/install/doinst.sh
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.info b/multimedia/mkvtoolnix/mkvtoolnix.info
index 6df40d2ae0..434db9eab7 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.info
+++ b/multimedia/mkvtoolnix/mkvtoolnix.info
@@ -1,8 +1,8 @@
PRGNAM="mkvtoolnix"
-VERSION="2.4.0"
+VERSION="2.9.5"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-DOWNLOAD="http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-2.4.0.tar.bz2"
-MD5SUM="125a6305de16236754d7554fa5b597cf"
+DOWNLOAD="http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-2.9.5.tar.bz2"
+MD5SUM="13f639048bd829214b2472703c495e4c"
MAINTAINER="Andrew Strong"
EMAIL="andrew.david.45@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/multimedia/mkvtoolnix/mmg.desktop b/multimedia/mkvtoolnix/mmg.desktop
index ff6fb827ee..4b2ee785a4 100644
--- a/multimedia/mkvtoolnix/mmg.desktop
+++ b/multimedia/mkvtoolnix/mmg.desktop
@@ -2,7 +2,7 @@
Name=MKVMerge Gui
Comment=Merge multiple media streams into a Matroska file
Exec=mmg
+Icon=matroskalogo
Terminal=false
Type=Application
Categories=GTK;AudioVideo;
-Icon=matroskalogo
diff --git a/multimedia/mkvtoolnix/slack-desc b/multimedia/mkvtoolnix/slack-desc
index 6236add011..ede0541852 100644
--- a/multimedia/mkvtoolnix/slack-desc
+++ b/multimedia/mkvtoolnix/slack-desc
@@ -12,8 +12,8 @@ mkvtoolnix: MKVToolnix is a set of tools to create, alter and inspect Matroska
mkvtoolnix: files. With these tools one can get information about (mkvinfo)
mkvtoolnix: Matroska files, extract tracks/data from (mkvextract) Matroska
mkvtoolnix: files and create (mkvmerge) Matroska files from other media files.
-mkvtoolnix: Matroska is a new multimedia file format aiming to become THE new
+mkvtoolnix: Matroska is a new multimedia file format aiming to become THE new
mkvtoolnix: container format for the future.
-mkvtoolnix:
-mkvtoolnix: Home Page: http://www.bunkus.org/videotools/mkvtoolnix
-mkvtoolnix:
+mkvtoolnix:
+mkvtoolnix: Home Page: http://www.bunkus.org/videotools/mkvtoolnix
+mkvtoolnix: