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 <watermanpa...@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.
