public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/
Date: Thu,  7 Jul 2022 12:36:58 +0000 (UTC)	[thread overview]
Message-ID: <1657197405.63385fa5058e0dd87eedf325ab329ba7a939ebaa.chewi@gentoo> (raw)

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


             reply	other threads:[~2022-07-07 12:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-07 12:36 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-12-22 23:27 [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/ James Le Cuirot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1657197405.63385fa5058e0dd87eedf325ab329ba7a939ebaa.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox