diff options
| author |   Daniel Novomesky <dnovomesky@gmail.com> | 2021-03-11 16:55:24 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-03-11 17:25:54 +0000 |
| commit | 958317d35f6a0b38db5132e9b73095a0cf934217 (patch) | |
| tree | 62ae005030af87093ce4d90428b242b2748e2daa /media-libs | |
| parent | sys-libs/liburing: Removed old (diff) | |
| download | gentoo-958317d35f6a0b38db5132e9b73095a0cf934217.tar.gz gentoo-958317d35f6a0b38db5132e9b73095a0cf934217.tar.bz2 gentoo-958317d35f6a0b38db5132e9b73095a0cf934217.zip | |
media-libs/libavif: revbump to 0.9.0-r2 with multilib support
Closes: https://bugs.gentoo.org/774537
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Daniel Novomesky <dnovomesky@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19881
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libavif/libavif-0.9.0-r2.ebuild (renamed from media-libs/libavif/libavif-0.9.0-r1.ebuild) | 59 | ||||
| -rw-r--r-- | media-libs/libavif/libavif-9999.ebuild | 6 |
2 files changed, 46 insertions, 19 deletions
diff --git a/media-libs/libavif/libavif-0.9.0-r1.ebuild b/media-libs/libavif/libavif-0.9.0-r2.ebuild index f2801c49a9c0..87d63556573d 100644 --- a/media-libs/libavif/libavif-0.9.0-r1.ebuild +++ b/media-libs/libavif/libavif-0.9.0-r2.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit cmake gnome2-utils +CMAKE_ECLASS=cmake +inherit cmake-multilib gnome2-utils DESCRIPTION="Library for encoding and decoding .avif files" HOMEPAGE="https://github.com/AOMediaCodec/libavif" @@ -14,12 +15,12 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1" -DEPEND="media-libs/libpng - sys-libs/zlib - virtual/jpeg - aom? ( >=media-libs/libaom-2.0.0 ) - dav1d? ( media-libs/dav1d ) - gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) +DEPEND="media-libs/libpng[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/jpeg[${MULTILIB_USEDEP}] + aom? ( >=media-libs/libaom-2.0.0[${MULTILIB_USEDEP}] ) + dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] ) + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] ) rav1e? ( media-video/rav1e[capi] ) svt-av1? ( >=media-libs/svt-av1-0.8.6 )" RDEPEND="${DEPEND}" @@ -31,28 +32,50 @@ PATCHES=( "${FILESDIR}/${P}-pkg-config.patch" ) -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DAVIF_CODEC_AOM=$(usex aom ON OFF) -DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF) -DAVIF_CODEC_LIBGAV1=OFF - -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) - -DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF) # Use system libraries. -DAVIF_LOCAL_ZLIBPNG=OFF -DAVIF_LOCAL_JPEG=OFF - -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF) - -DAVIF_BUILD_APPS=$(usex extras ON OFF) - -DAVIF_BUILD_TESTS=$(usex extras ON OFF) - -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF) -DAVIF_ENABLE_WERROR=OFF ) + if multilib_is_native_abi; then + mycmakeargs+=( + -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) + -DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF) + + -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF) + -DAVIF_BUILD_APPS=$(usex extras ON OFF) + -DAVIF_BUILD_TESTS=$(usex extras ON OFF) + ) + else + mycmakeargs+=( + -DAVIF_CODEC_RAV1E=OFF + -DAVIF_CODEC_SVT=OFF + + -DAVIF_BUILD_EXAMPLES=OFF + -DAVIF_BUILD_APPS=OFF + -DAVIF_BUILD_TESTS=OFF + ) + + if ! use aom ; then + if use rav1e || use svt-av1 ; then + ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode." + ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}" + ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}" + fi + fi + fi + cmake_src_configure } @@ -70,12 +93,16 @@ pkg_postinst() { fi if use gdk-pixbuf ; then - gnome2_gdk_pixbuf_update + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + multilib_foreach_abi gnome2_gdk_pixbuf_update fi } pkg_postrm() { if use gdk-pixbuf ; then - gnome2_gdk_pixbuf_update + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + multilib_foreach_abi gnome2_gdk_pixbuf_update fi } diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild index 511e58cb03d9..1cb15d73dc44 100644 --- a/media-libs/libavif/libavif-9999.ebuild +++ b/media-libs/libavif/libavif-9999.ebuild @@ -63,9 +63,9 @@ multilib_src_configure() { if ! use aom ; then if use rav1e || use svt-av1 ; then - ewarn "libavif on $MULTILIB_ABI_FLAG will work in read-only mode." - ewarn "Support for rav1e and/or svt-av1 is is not available on $MULTILIB_ABI_FLAG" - ewarn "Enable aom flag for full support on $MULTILIB_ABI_FLAG" + ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode." + ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}" + ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}" fi fi fi |