[gentoo-commits] repo/proj/guru:master commit in: media-libs/libbpg/files/, media-libs/libbpg/

["Florian Schmaus" <flow@gentoo.org>]

commit:     f764b3ff11e2b43601748b6e55a880fbf419b4df
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun Sep 17 21:41:31 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 22:39:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f764b3ff

media-libs/libbpg: respect LD, CXX and CFLAGS from the user enviroment

Closes: https://bugs.gentoo.org/787683
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 .../files/libbpg-0.9.8-respect-user-flags.patch    | 42 ++++++++++++++++++++++
 media-libs/libbpg/libbpg-0.9.8-r1.ebuild           |  1 +
 2 files changed, 43 insertions(+)

diff --git a/media-libs/libbpg/files/libbpg-0.9.8-respect-user-flags.patch b/media-libs/libbpg/files/libbpg-0.9.8-respect-user-flags.patch
new file mode 100644
index 0000000000..4eaf8be30c
--- /dev/null
+++ b/media-libs/libbpg/files/libbpg-0.9.8-respect-user-flags.patch
@@ -0,0 +1,42 @@
+Honor {C{,XX},LD}FLAGS from the user environment. Strip debugging flag -g
+preemtively to avoid "... adds uncommon flags" bugs such as
+https://bugs.gentoo.org/914187
+Author: Lucio Sauer <watermanpaint@posteo.net>
+--- a/Makefile
++++ b/Makefile
+@@ -38,6 +38,9 @@ EMCC=emcc
+ 
+ PWD:=$(shell pwd)
+ 
++GENTOO_CFLAGS:=${CFLAGS}
++GENTOO_CXXFLAGS:=${CXXFLAGS}
++
+ CFLAGS:=-Os -Wall -MMD -fno-asynchronous-unwind-tables -fdata-sections -ffunction-sections -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -fomit-frame-pointer
+ CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT
+ CFLAGS+=-I.
+@@ -54,14 +57,12 @@ EMLDFLAGS+=-s NO_FILESYSTEM=1 -s NO_BROWSER=1
+ EMLDFLAGS+=-O3 --memory-init-file 0 --closure 0 --pre-js pre.js --post-js post.js
+ EMCFLAGS:=$(CFLAGS)
+ 
+-LDFLAGS=-g
+ ifdef CONFIG_APPLE
+ LDFLAGS+=-Wl,-dead_strip
+ else
+-LDFLAGS+=-Wl,--gc-sections
++LDFLAGS:=-Wl,--gc-sections ${LDFLAGS}
+ endif
+-CFLAGS+=-g
+-CXXFLAGS=$(CFLAGS)
++CXXFLAGS=$(CFLAGS) ${GENTOO_CXXFLAGS}
+ 
+ PROGS=bpgdec$(EXE) bpgenc$(EXE)
+ ifdef USE_BPGVIEW
+@@ -225,7 +226,7 @@ clean: x265_clean
+           $(addsuffix /*.a, $(CLEAN_DIRS))
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) ${GENTOO_CFLAGS} -c -o $@ $<
+ 
+ %.o: %.cpp
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<

diff --git a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
index bba7f2fb63..484760e6fe 100644
--- a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
+++ b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-dont-strip-bins.patch
 	"${FILESDIR}"/${P}-remove-forced-options.patch
 	"${FILESDIR}"/${P}-remove-unused-cmake-var.patch
+	"${FILESDIR}"/${P}-respect-user-flags.patch
 )
 
 # Libnuma is a dependency of the default (x265) encoder.