summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author T3slider <t3slider@gmail.com>2011-10-30 17:10:24 -0500
committer Niels Horn <niels.horn@slackbuilds.org>2011-11-04 22:02:24 -0200
commit501e67ce3fed30978979cb03c56ff6550b81a401 (patch)
tree3fd94814bdda61bc9b9d5a156751cd02e2ed2655
parent71ca65a0248297783b0c70b5e9521ed07e4c928f (diff)
downloadslackbuilds-501e67ce3fed30978979cb03c56ff6550b81a401.tar.gz
slackbuilds-501e67ce3fed30978979cb03c56ff6550b81a401.tar.xz
multimedia/makemkv: Updated for version 1.6.16.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
-rw-r--r--multimedia/makemkv/makemkv.SlackBuild31
-rw-r--r--multimedia/makemkv/makemkv.info6
2 files changed, 16 insertions, 21 deletions
diff --git a/multimedia/makemkv/makemkv.SlackBuild b/multimedia/makemkv/makemkv.SlackBuild
index 37db8a924c..43a4e05b51 100644
--- a/multimedia/makemkv/makemkv.SlackBuild
+++ b/multimedia/makemkv/makemkv.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=makemkv
-VERSION=${VERSION:-1.6.15}
+VERSION=${VERSION:-1.6.16}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,13 +70,12 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix up the makefile...
+sed -i "s|/usr/lib|&${LIBDIRSUFFIX}|g" makefile.linux
+# The makefile now supports DESTDIR but they forgot to create the lib[64] dir...
+install -d $PKG/usr/lib${LIBDIRSUFFIX}
make -f makefile.linux
-# The makefile is very simple and patching it would end up wasting more code
-# then doing it manually, so...
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-mkdir -p $PKG/usr/bin
-install -t $PKG/usr/lib${LIBDIRSUFFIX} out/libdriveio.so.0 out/libmakemkv.so.1
-install -t $PKG/usr/bin out/makemkv
+make -f makefile.linux install DESTDIR=$PKG
for i in 16 22 32 64 128
do
install -D -m 0644 makemkvgui/src/img/${i}/mkv_icon.png $PKG/usr/share/icons/hicolor/${i}x${i}/apps/makemkv.png
@@ -94,17 +93,13 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# The makefile is very simple and patching it would end up wasting more code
-# then doing it manually. Additionally, nothing is actually compiled. So...
-mkdir -p $PKG/usr/share/MakeMKV
-install -m 644 -t $PKG/usr/share/MakeMKV src/share/makemkv_deu.mo.gz
-install -m 644 -t $PKG/usr/share/MakeMKV src/share/makemkv_jpn.mo.gz
-install -m 644 -t $PKG/usr/share/MakeMKV src/share/makemkv_spa.mo.gz
-install -m 644 -t $PKG/usr/share/MakeMKV src/share/makemkv_ptb.mo.gz
-install -m 644 -t $PKG/usr/share/MakeMKV src/share/makemkv_dut.mo.gz
-install -m 644 -t $PKG/usr/share/MakeMKV src/share/makemkv_swe.mo.gz
-mkdir -p $PKG/usr/bin
-install -t $PKG/usr/bin bin/$ARCHDIR/makemkvcon
+# The makefile now supports DESTDIR so it's easier to use it. This is just
+# removing the mandatory interactive EULA agreement which might confuse
+# SlackBuild users (check the README which tells you to read the EULA anyway...)
+sed -i "s/^\(install:\).*/\1/" makefile.linux
+
+# We will not leave CPU detection up to the makefile here just in case...
+make -f makefile.linux install ARCH=$ARCHDIR ARCH_OK=1 DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/multimedia/makemkv/makemkv.info b/multimedia/makemkv/makemkv.info
index f1c3b782e3..353b711f1c 100644
--- a/multimedia/makemkv/makemkv.info
+++ b/multimedia/makemkv/makemkv.info
@@ -1,8 +1,8 @@
PRGNAM="makemkv"
-VERSION="1.6.15"
+VERSION="1.6.16"
HOMEPAGE="http://www.makemkv.com/"
-DOWNLOAD="http://www.makemkv.com/download/makemkv_v1.6.15_oss.tar.gz http://www.makemkv.com/download/makemkv_v1.6.15_bin.tar.gz"
-MD5SUM="bf1d955c2b85c9dedb6aae201151df45 25a22e52fe07d6ff628e8407c47a4bb9"
+DOWNLOAD="http://www.makemkv.com/download/makemkv_v1.6.16_oss.tar.gz http://www.makemkv.com/download/makemkv_v1.6.16_bin.tar.gz"
+MD5SUM="eb763e9b045923d424da2fb4f393a69a 3831945a4530a91ca2bce45f24c59c41"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="T3slider"