multimedia/makemkv: Updated for version 1.10.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 21 insertions, 48 deletions

diff --git a/multimedia/makemkv/inttypes.patch b/multimedia/makemkv/inttypes.patch
deleted file mode 100644
index cd99f0e9e4d5c..0000000000000
--- a/multimedia/makemkv/inttypes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur a/libmakemkv/src/libmkv.cpp b/libmakemkv/src/libmkv.cpp
---- a/libmakemkv/src/libmkv.cpp	2016-01-15 06:39:10.000000000 -0500
-+++ b/libmakemkv/src/libmkv.cpp	2016-01-31 17:14:32.761225345 -0500
-@@ -18,6 +18,9 @@
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- 
- */
-+#ifndef __STDC_FORMAT_MACROS
-+#define __STDC_FORMAT_MACROS 1
-+#endif
- #include <libmkv/libmkv.h>
- #include <libmkv/internal.h>
- #include <libmkv/ebmlwrite.h>
-@@ -27,9 +30,6 @@
- #include <lgpl/world.h>
- #include <vector>
- 
--#ifndef __STDC_FORMAT_MACROS
--#define __STDC_FORMAT_MACROS 1
--#endif
- #include <inttypes.h>
- 
- #define TIMECODE_SCALE              1000000
diff --git a/multimedia/makemkv/makemkv.SlackBuild b/multimedia/makemkv/makemkv.SlackBuild
index beb63c0168aad..e82d9224f6359 100644
--- a/multimedia/makemkv/makemkv.SlackBuild
+++ b/multimedia/makemkv/makemkv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for MakeMKV
 
-# Written by T3slider <t3slider@gmail.com>
+# Copyright 2016 T3slider <t3slider@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,25 +11,25 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=makemkv
-VERSION=${VERSION:-1.9.9}
+VERSION=${VERSION:-1.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   ARCHDIR=i386
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -49,6 +49,7 @@ elif [ "$ARCH" = "i686" ]; then
   ARCHDIR=i386
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
+  # -fPIC was causing segfaults...
   SLKCFLAGS="-O2"
   ARCHDIR=amd64
   LIBDIRSUFFIX="64"
@@ -86,11 +87,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# inttypes.h gets included (by libebml, I think) before
-# __STDC_FORMAT_MACROS is set. Make sure this gets set before inttypes.h
-# gets loaded
-patch -p1 < $CWD/inttypes.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/multimedia/makemkv/makemkv.info b/multimedia/makemkv/makemkv.info
index ac61c7c402230..a35bf37941e8b 100644
--- a/multimedia/makemkv/makemkv.info
+++ b/multimedia/makemkv/makemkv.info
@@ -1,10 +1,10 @@
 PRGNAM="makemkv"
-VERSION="1.9.9"
+VERSION="1.10.2"
 HOMEPAGE="http://www.makemkv.com/"
-DOWNLOAD="http://www.makemkv.com/download/makemkv-oss-1.9.9.tar.gz \
-          http://www.makemkv.com/download/makemkv-bin-1.9.9.tar.gz"
-MD5SUM="5bdfdb4fd5e5136787ecfa8856f485c8 \
-        22ae44280ad88d87d9150743d167f4e5"
+DOWNLOAD="http://www.makemkv.com/download/makemkv-oss-1.10.2.tar.gz \
+          http://www.makemkv.com/download/makemkv-bin-1.10.2.tar.gz"
+MD5SUM="7cb500c4f36cda229e16adca20e22de7 \
+        903880708e7aa3d331e63938f52d3234"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"