[gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/

[gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/

[James Le Cuirot]

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

[gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/

[James Le Cuirot]

commit:     63385fa5058e0dd87eedf325ab329ba7a939ebaa
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 12:36:45 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 12:36:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63385fa5

media-video/makemkv: Respect LDFLAGS when building mmgplsrv

Closes: https://bugs.gentoo.org/856772
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-video/makemkv/files/makemkv-flags.patch | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
index d7a2f1be16c5..0f05aa7a751b 100644
--- a/media-video/makemkv/files/makemkv-flags.patch
+++ b/media-video/makemkv/files/makemkv-flags.patch
@@ -1,11 +1,17 @@
---- a/Makefile.in	2021-03-19 13:06:50.000000000 +0000
-+++ b/Makefile.in	2021-03-30 23:28:42.720480399 +0100
-@@ -112,7 +112,7 @@
- 
+diff -Naur a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2022-06-26 20:14:12.000000000 +0100
++++ b/Makefile.in	2022-07-07 13:28:27.481730073 +0100
+@@ -113,12 +113,12 @@
+
  out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h
  	mkdir -p out
 -	$(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \
 +	$(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \
  	-ffunction-sections -Wl,--gc-sections -Wl,-z,defs
- 
- tmp/gen_buildinfo.h:
+
+ out/mmgplsrv.full: $(MMGPL_SRC)
+ 	mkdir -p out
+-	$(GCC) $(CFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \
++	$(GCC) $(CFLAGS) $(LDFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \
+ 	$(INCF)$(LIBDRIVEIO_INC) $(INCF)$(LIBABI_INC) $(MMGPL_DEF) -D_GNU_SOURCE -Dstl=std -o$@ $(MMGPL_SRC) $(MMGPL_SRC_LINUX) -lc -lstdc++ \
+ 	-ffunction-sections -Wl,--gc-sections -Wl,-z,defs