From a7fa57da739aee2cb587abbd4fcefa4aec2079dd Mon Sep 17 00:00:00 2001 From: T3slider Date: Mon, 1 Feb 2016 18:30:20 +0700 Subject: multimedia/makemkv: Updated for version 1.9.9. Signed-off-by: Willy Sudiarto Raharjo --- multimedia/makemkv/inttypes.patch | 23 +++++++++++++++++++++++ multimedia/makemkv/makemkv.SlackBuild | 7 ++++++- multimedia/makemkv/makemkv.info | 10 +++++----- 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 multimedia/makemkv/inttypes.patch (limited to 'multimedia/makemkv') diff --git a/multimedia/makemkv/inttypes.patch b/multimedia/makemkv/inttypes.patch new file mode 100644 index 0000000000..cd99f0e9e4 --- /dev/null +++ b/multimedia/makemkv/inttypes.patch @@ -0,0 +1,23 @@ +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 + #include + #include +@@ -27,9 +30,6 @@ + #include + #include + +-#ifndef __STDC_FORMAT_MACROS +-#define __STDC_FORMAT_MACROS 1 +-#endif + #include + + #define TIMECODE_SCALE 1000000 diff --git a/multimedia/makemkv/makemkv.SlackBuild b/multimedia/makemkv/makemkv.SlackBuild index c679d96317..beb63c0168 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.9.7} +VERSION=${VERSION:-1.9.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -86,6 +86,11 @@ 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 50370754c0..ac61c7c402 100644 --- a/multimedia/makemkv/makemkv.info +++ b/multimedia/makemkv/makemkv.info @@ -1,10 +1,10 @@ PRGNAM="makemkv" -VERSION="1.9.7" +VERSION="1.9.9" HOMEPAGE="http://www.makemkv.com/" -DOWNLOAD="http://www.makemkv.com/download/makemkv-oss-1.9.7.tar.gz \ - http://www.makemkv.com/download/makemkv-bin-1.9.7.tar.gz" -MD5SUM="2c0b0d31d1e1fb8576db024c7f02399c \ - 52bd49e4667284ce27cbec6a5d8b8877" +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_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg" -- cgit v1.2.3