commit: 507345efe594f73390078dbf4a1f21bf4953463d Author: NRK <nrk <AT> disroot <DOT> org> AuthorDate: Fri Mar 21 09:07:38 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 21 10:21:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=507345ef
media-libs/libavif: fix build with USE=extras needs a bundled libargparse when building extra tools. Closes: https://bugs.gentoo.org/951614 Signed-off-by: NRK <nrk <AT> disroot.org> Closes: https://github.com/gentoo/gentoo/pull/41205 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/libavif/Manifest | 1 + media-libs/libavif/libavif-1.2.0.ebuild | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest index fc1789bca102..2fc863bee70a 100644 --- a/media-libs/libavif/Manifest +++ b/media-libs/libavif/Manifest @@ -1,2 +1,3 @@ +DIST libargparse-ee74d1b53bd680748af14e737378de57e2a0a954.tar.gz 22394 BLAKE2B 18b08d8d8723e0b9c4b018ff318c1f45c3903996621be123508cfab7c193d7311fd0349bd0855202498f26c40287b9af3eb582fb53ca8efd0107ee1bc154385b SHA512 6d6e47f4c1a63f085a90bc4d9f6dca7462f5e72d2a4a3b7a6d6df54632edbd4a9deb8f9b8c08517031b0c9ca89e0a1b48bb35261b3e660e4601e28a39f8e7ef1 DIST libavif-1.1.1.tar.gz 13644189 BLAKE2B c0a473b172206ea32358c28e7b94d8038b24030e4845611341076518cd82fd2bea78eb8e22e5481062b893ffb70789619ce4f85129a94a0db70a667c000f4fd0 SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21 DIST libavif-1.2.0.tar.gz 13939380 BLAKE2B 272d855bec6568dc15f2a953fdf79ec1df190e151c2f265ea00f680f2c828780e0875580d72000fb56a0252c7ae06ef115f2b609db23ec3afc9e8a1c4bac4197 SHA512 f88eda1c699910a20e63a0aa0bcf782fb67b477c4d99aa88723628a53b0d849f35f73ff6a2e8bb53e170dc77662bde4a5c5c38b655f5adcfb73ddcf7ec264805 diff --git a/media-libs/libavif/libavif-1.2.0.ebuild b/media-libs/libavif/libavif-1.2.0.ebuild index eab0d45afb4f..c66e8a353453 100644 --- a/media-libs/libavif/libavif-1.2.0.ebuild +++ b/media-libs/libavif/libavif-1.2.0.ebuild @@ -5,14 +5,22 @@ EAPI=8 inherit cmake-multilib gnome2-utils +ARGPARSE_COMMIT="ee74d1b53bd680748af14e737378de57e2a0a954" DESCRIPTION="Library for encoding and decoding .avif files" HOMEPAGE="https://github.com/AOMediaCodec/libavif"; SRC_URI=" https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz + extras? ( + https://github.com/kmurray/libargparse/archive/${ARGPARSE_COMMIT}.tar.gz + -> libargparse-${ARGPARSE_COMMIT}.tar.gz + ) " -LICENSE="BSD-2" +LICENSE=" + BSD-2 + extras? ( MIT ) +" # See bug #822336 re subslot SLOT="0/16.1.1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv ~sparc ~x86" @@ -46,6 +54,16 @@ BDEPEND=" virtual/pkgconfig " +src_prepare() { + cmake_src_prepare + + # Bug: https://bugs.gentoo.org/951614 + if use extras; then + mv "${WORKDIR}/libargparse-${ARGPARSE_COMMIT}" "${S}/ext/libargparse" || + die "mv failed" + fi +} + multilib_src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON
