* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libbpg/files/, media-libs/libbpg/
@ 2021-03-16 10:49 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2021-03-16 10:49 UTC (permalink / raw
To: gentoo-commits
commit: b55c5a7e8f100a6d7a095753525a0e3bb6f122b2
Author: Michele Santullo <m.santullo <AT> posteo <DOT> net>
AuthorDate: Mon Mar 15 20:13:56 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Mar 15 20:13:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b55c5a7e
media-libs/libbpg: add fPIC or lib doesn't link to other libs
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Michele Santullo <m.santullo <AT> posteo.net>
media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch | 13 +++++++++++++
media-libs/libbpg/libbpg-0.9.8.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch b/media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch
new file mode 100644
index 00000000..2cc64766
--- /dev/null
+++ b/media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 3a8db4c..eaccfd8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -86,7 +86,7 @@ LIBBPG_JS8_OBJS:=$(patsubst %.o, %.js8.o, $(LIBBPG_OBJS)) tmalloc.js8.o
+
+ LIBBPG_JS8A_OBJS:=$(patsubst %.o, %.js8a.o, $(LIBBPG_OBJS)) tmalloc.js8a.o
+
+-$(LIBBPG_OBJS): CFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH -DUSE_PRED
++$(LIBBPG_OBJS): CFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH -DUSE_PRED -fPIC
+
+ $(LIBBPG_JS_OBJS): EMCFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH
+
diff --git a/media-libs/libbpg/libbpg-0.9.8.ebuild b/media-libs/libbpg/libbpg-0.9.8.ebuild
index e55afb24..6092cdf7 100644
--- a/media-libs/libbpg/libbpg-0.9.8.ebuild
+++ b/media-libs/libbpg/libbpg-0.9.8.ebuild
@@ -16,6 +16,7 @@ PATCHES=(
"${FILESDIR}"/${P}-remove-forced-options.patch
"${FILESDIR}"/${P}-dont-strip-bins.patch
"${FILESDIR}"/${P}-add-chost.patch
+ "${FILESDIR}"/${P}-add-fpic.patch
)
DEPEND=""
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libbpg/files/, media-libs/libbpg/
@ 2023-09-18 12:37 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2023-09-18 12:37 UTC (permalink / raw
To: gentoo-commits
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.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libbpg/files/, media-libs/libbpg/
@ 2023-09-18 12:37 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2023-09-18 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 1c99f90388ef5e47055c6a3bf400b4a0c96065b1
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun Sep 17 21:09:44 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 22:39:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1c99f903
media-libs/libbpg: add noexec .note.GNU-stack sections for elf32 and elf64
Closes: https://bugs.gentoo.org/787686
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
.../libbpg-0.9.8-backport-GNU-stack-note-fix.patch | 24 ++++++++++++++++++++++
media-libs/libbpg/libbpg-0.9.8-r1.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/media-libs/libbpg/files/libbpg-0.9.8-backport-GNU-stack-note-fix.patch b/media-libs/libbpg/files/libbpg-0.9.8-backport-GNU-stack-note-fix.patch
new file mode 100644
index 0000000000..a09aada159
--- /dev/null
+++ b/media-libs/libbpg/files/libbpg-0.9.8-backport-GNU-stack-note-fix.patch
@@ -0,0 +1,24 @@
+Excerpt of a commit in media-libs/x265. If the GNU stack note is not added the
+GNU linker assumes the stack is executable by default.
+commit 3b49d65f07ce07c68c88fa2ddfbaab295a28ca0b
+Author: Vignesh Vijayakumar <vignesh@multicorewareinc.com>
+Date: Thu Nov 2 09:40:41 2017 +0530
+
+ x86: Change assembler from YASM to NASM
+
+ Supports NASM versions 2.13 and greater
+--- a/x265/source/common/x86/x86inc.asm
++++ b/x265/source/common/x86/x86inc.asm
+@@ -724,6 +724,12 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
+ %ifidn __OUTPUT_FORMAT__,elf
+ SECTION .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf64
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+
+ ; cpuflags
+
diff --git a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
index f26e4d095b..bba7f2fb63 100644
--- a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
+++ b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
@@ -36,6 +36,7 @@ IUSE="bpgview jctvc"
PATCHES=(
"${FILESDIR}"/${P}-add-chost.patch
"${FILESDIR}"/${P}-add-fpic.patch
+ "${FILESDIR}"/${P}-backport-GNU-stack-note-fix.patch
"${FILESDIR}"/${P}-dont-strip-bins.patch
"${FILESDIR}"/${P}-remove-forced-options.patch
"${FILESDIR}"/${P}-remove-unused-cmake-var.patch
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libbpg/files/, media-libs/libbpg/
@ 2023-09-18 12:37 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2023-09-18 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 3cc06aa1e8216e51a52e52f780fb5903a7f8278c
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun Sep 17 20:58:00 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 22:39:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3cc06aa1
media-libs/libbpg: remove unused CMake variable
MAIN12 is the compile time switch to toggle between bit depths of 12 and
10 bits. MAIN10 was unused.
Closes: https://bugs.gentoo.org/840377
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
.../files/libbpg-0.9.8-remove-unused-cmake-var.patch | 14 ++++++++++++++
media-libs/libbpg/libbpg-0.9.8-r1.ebuild | 5 +++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/media-libs/libbpg/files/libbpg-0.9.8-remove-unused-cmake-var.patch b/media-libs/libbpg/files/libbpg-0.9.8-remove-unused-cmake-var.patch
new file mode 100644
index 0000000000..1f84061665
--- /dev/null
+++ b/media-libs/libbpg/files/libbpg-0.9.8-remove-unused-cmake-var.patch
@@ -0,0 +1,14 @@
+MAIN12 (now) acts as a compile time switch between the bit depths of 12 and 10 bits.
+Not yet upstreamed as of 2023-09-17.
+Author: Lucio Sauer <watermanpaint@posteo.net>
+--- a/Makefile
++++ b/Makefile
+@@ -115,7 +115,7 @@ endif
+ x265.out:
+ mkdir -p x265.out/8bit x265.out/10bit x265.out/12bit
+ cd x265.out/12bit && cmake ../../x265/source $(CMAKE_OPTS) -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON
+- cd x265.out/10bit && cmake ../../x265/source $(CMAKE_OPTS) -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN10=ON
++ cd x265.out/10bit && cmake ../../x265/source $(CMAKE_OPTS) -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
+ cd x265.out/8bit && cmake ../../x265/source $(CMAKE_OPTS) -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
+
+ # use this target to manually rebuild x265
diff --git a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
index cd838d7e28..f26e4d095b 100644
--- a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
+++ b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
@@ -34,10 +34,11 @@ KEYWORDS="~amd64 ~x86"
IUSE="bpgview jctvc"
PATCHES=(
- "${FILESDIR}"/${P}-remove-forced-options.patch
- "${FILESDIR}"/${P}-dont-strip-bins.patch
"${FILESDIR}"/${P}-add-chost.patch
"${FILESDIR}"/${P}-add-fpic.patch
+ "${FILESDIR}"/${P}-dont-strip-bins.patch
+ "${FILESDIR}"/${P}-remove-forced-options.patch
+ "${FILESDIR}"/${P}-remove-unused-cmake-var.patch
)
# Libnuma is a dependency of the default (x265) encoder.
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-18 12:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-18 12:37 [gentoo-commits] repo/proj/guru:master commit in: media-libs/libbpg/files/, media-libs/libbpg/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2023-09-18 12:37 Florian Schmaus
2023-09-18 12:37 Florian Schmaus
2021-03-16 10:49 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox