commit: 3ce567c4fec904f50c03d3ef7020d4e13106c206
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 23:26:17 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 23:26:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce567c4
media-video/makemkv: multilib-strict fix, closes #603428
Package-Manager: portage-2.3.3
media-video/makemkv/files/makemkv-makefile.patch | 25 ++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/media-video/makemkv/files/makemkv-makefile.patch
b/media-video/makemkv/files/makemkv-makefile.patch
index 224273a..bc057ca 100644
--- a/media-video/makemkv/files/makemkv-makefile.patch
+++ b/media-video/makemkv/files/makemkv-makefile.patch
@@ -1,6 +1,23 @@
---- makemkv-oss-1.9.3/Makefile.in.orig 2015-06-02 13:34:00.000000000 +0200
-+++ makemkv-oss-1.9.3/Makefile.in 2015-06-04 12:32:29.752291023 +0200
-@@ -47,7 +47,7 @@
+--- makemkv-oss-1.10.3/Makefile.in.orig 2016-12-11 16:14:27.000000000
+0000
++++ makemkv-oss-1.10.3/Makefile.in 2016-12-22 23:11:24.248995344 +0000
+@@ -6,11 +6,12 @@
+
+ CFLAGS=@CFLAGS_OPT@ -D_linux_ -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS
-D__STDC_LIMIT_MACROS
+ DESTDIR=@DESTDIR@
+-PREFIX=@prefix@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
+ ENABLE_GUI=@ENABLE_GUI@
+-LIBDIR=$(PREFIX)/lib
+-BINDIR=$(PREFIX)/bin
+-DATADIR=$(PREFIX)/share
++LIBDIR=@libdir@
++BINDIR=@bindir@
++DATADIR=@datadir@
+ FFMPEG_CFLAGS=@ffmpeg_CFLAGS@
+ FFMPEG_LIBS=@ffmpeg_LIBS@
+ INSTALL=@INSTALL@
+@@ -47,7 +46,7 @@
endif
out/%: out/%.full
@@ -9,7 +26,7 @@
out/libdriveio.so.0.full:
mkdir -p out
-@@ -91,5 +91,5 @@
+@@ -91,5 +90,5 @@
tmp/image_data.o : makemkvgui/bin/image_data.bin
mkdir -p tmp
