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

[Florian Schmaus]

commit:     bcf3a6ade170ced961261d2886d11e5e5f353517
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun Sep 17 20:44:58 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 22:39:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bcf3a6ad

media-libs/libbpg: remove USE flags emcc, static-libs, x265

- Emscripten is neither packaged in ::gentoo nor in ::guru.
- The build system unconditionally builds a static library.
  Upstream argues that the BPG decoding library API is not stable yet
  and does not provide a shared library (yet).
  Let's ship the already available static library then.
- Enable fast x265 as a sensible default for the BPG encoder instead
  of setting REQUIRED_USE="|| ( x265 jctcv )".

Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 media-libs/libbpg/libbpg-0.9.8-r1.ebuild | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild 
b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
index 14cf564803..e434918187 100644
--- a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
+++ b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bellard.org/bpg/${P}.tar.gz";
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+x265 bpgview jctvc emcc static-libs"
+IUSE="bpgview jctvc"
 
 PATCHES=(
        "${FILESDIR}"/${P}-remove-forced-options.patch
@@ -20,21 +20,23 @@ PATCHES=(
        "${FILESDIR}"/${P}-add-chost.patch
        "${FILESDIR}"/${P}-add-fpic.patch
 )
+
+# Libnuma is a dependency of the default (x265) encoder.
 DEPEND="
        media-libs/libjpeg-turbo:=
        media-libs/libpng:=
-       x265? ( sys-process/numactl )
+       sys-process/numactl
        bpgview? (
                                media-libs/sdl-image
                                media-libs/libsdl
                         )
 "
 RDEPEND="${DEPEND}"
+# Strictly speaking, these are the default (x265) encoder's build time
+# dependencies.
 BDEPEND="
-       x265? (
-                       dev-lang/yasm
-                       dev-util/cmake
-                 )
+       dev-lang/yasm
+       dev-util/cmake
 "
 
 src_prepare() {
@@ -58,10 +60,9 @@ EOF
 
 src_compile() {
        emake \
-               $(usex x265 USE_X265=y '') \
+               USE_X265=y \
                $(usex bpgview USE_BPGVIEW=y '') \
                $(usex jctvc USE_JCTVC=y '') \
-               $(usex emcc USE_EMCC=y '') \
                CXX="$(tc-getCXX)" \
                CC="$(tc-getCC)"
 }
@@ -74,12 +75,10 @@ src_install() {
                dobin bpgview
        fi
 
-       if use static-libs; then
-               dolib.a libbpg.a
-               doheader libbpg.h
-               doheader bpgenc.h
+       dolib.a libbpg.a
+       doheader libbpg.h
+       doheader bpgenc.h
 
-               insinto /usr/$(get_libdir)/pkgconfig
-               doins ${PN}.pc
-       fi
+       insinto /usr/$(get_libdir)/pkgconfig
+       doins ${PN}.pc
 }