From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- media-libs/libavif/Manifest | 5 +- .../libavif/files/libavif-0.9.0-pkg-config.patch | 28 ++++++ media-libs/libavif/libavif-0.9.0-r2.ebuild | 108 +++++++++++++++++++++ media-libs/libavif/libavif-0.9.0.ebuild | 77 --------------- media-libs/libavif/libavif-9999.ebuild | 59 ++++++++--- 5 files changed, 182 insertions(+), 95 deletions(-) create mode 100644 media-libs/libavif/files/libavif-0.9.0-pkg-config.patch create mode 100644 media-libs/libavif/libavif-0.9.0-r2.ebuild delete mode 100644 media-libs/libavif/libavif-0.9.0.ebuild (limited to 'media-libs/libavif') diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest index 5aa2f3bf7aec..1b534b66a081 100644 --- a/media-libs/libavif/Manifest +++ b/media-libs/libavif/Manifest @@ -1,6 +1,7 @@ +AUX libavif-0.9.0-pkg-config.patch 800 BLAKE2B 401bc92fc4ed0c6f224b1ff23d22b6da909527e5f3ea7b6f225695e35251f4fa442a640326d4e1d8cf8fe233a923fe6e171dc8b8ca8e103d22a648d3a00f4616 SHA512 fd7e9c333ce3184431af0bab84f0987094d970af1e557b16238eac06db86fe625b8d696810f14ab4940494bed96994586374c1dd501154b537a1c037b78cfb89 DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d9f82e1b7ca5876cb9859b96ac5b60ad86c2345654f85e97cb6d920f286b683d0bb588ce7db04f50322b158678c SHA512 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba DIST libavif-0.9.0.tar.gz 2961252 BLAKE2B 75a3d9c0f9ada1934fdafb8208571c6a863ffe04210d84b26207952028280d4e5c4efe42a6d4bc1fe417e3bbc06e8b93c416472c79ccd08d760ab65a663e16d9 SHA512 220ef27edf716af4ffc5b035c63f84e2848f165a3fe9c1b74dc0ba29f0de65147610fd4266f1b2419f60cfbb72159368da840fcb574c7a07364a60548d3db179 EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6 -EBUILD libavif-0.9.0.ebuild 1806 BLAKE2B 873f6d96b022b31edb2d01d20601c1318fcc89e86f512cf06a1b33fc004cdf6d4a2af0b098dd986e4405f7d550b8ff25f72fef45b7a5f6d3065a94f4f705087e SHA512 2428c8cbb7d57b707683be62328feb6fd9831afc0676c067bfd5983e2f8e5ccec1d9afaa669f8615d2550437ceba2cb3e68e4656fd9942d99c22bb3507ac27a5 -EBUILD libavif-9999.ebuild 1728 BLAKE2B b05566cc98406688badc4551f3fb8be04649b768d0a03ce093d3cdc94dae7df6909fd4b030ac8d7cae557a32e630bcf8eeae0e02a8ca470d4b0cf23ab83f81f0 SHA512 82e73423d625c76c7199d6e6afce22c99f4bf82485da39e148448493a8cdfbd4fc6ce6c0af98ccca374b80e2452eb44ba748e47bcd0a921bfc67770c6448581d +EBUILD libavif-0.9.0-r2.ebuild 2726 BLAKE2B 4032da82246d4a3abf95dea3a731386f956c8cd99e0efa654703b03d50bded33fb7885bb8db77407dca9d35e412d868d13bfeeb35a590031f041404226ad012c SHA512 f35d29f062547d27b1943d3425a7dfbcefac3f6e55cceccdf075d5a5bd4a62aac256602b4b96071891cd66241c40bf6e34500388177c9fda98e7ddedb4379998 +EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961 MISC metadata.xml 843 BLAKE2B f95582a72acc4b86d02f246fca2a8c080ee96be8e649008f4b684cbf616c8201c3f6df1e258beb2e402add6da06fb3203254c902cf3613c4fd8d867f7f62b3e9 SHA512 80a0962deb24701c3b920c287875f26f4cdd8d282f0dc1af60039190833097bcdb78dabc0f82283035746a85a9a7b2d95241819fe6e0d36f3194bb2c62ea98e3 diff --git a/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch b/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch new file mode 100644 index 000000000000..b1238b321770 --- /dev/null +++ b/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch @@ -0,0 +1,28 @@ +https://github.com/AOMediaCodec/libavif/pull/532 + +From 4ce461df9109f0b05a05aa01e1e1538663b2bc9b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 4 Mar 2021 21:20:33 -0500 +Subject: [PATCH] libavif.pc: respect libdir setting + +Do not hardcode "lib" as that is often the wrong path with multilib. +On an x86_64 system for example, it should actually be "lib64". +--- + libavif.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavif.pc.cmake b/libavif.pc.cmake +index 006539b14782..4ef2c8a97b57 100644 +--- a/libavif.pc.cmake ++++ b/libavif.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=${prefix}/lib ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: @PROJECT_NAME@ +-- +2.30.0 + diff --git a/media-libs/libavif/libavif-0.9.0-r2.ebuild b/media-libs/libavif/libavif-0.9.0-r2.ebuild new file mode 100644 index 000000000000..87d63556573d --- /dev/null +++ b/media-libs/libavif/libavif-0.9.0-r2.ebuild @@ -0,0 +1,108 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib gnome2-utils + +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" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1" + +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}" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE="|| ( aom dav1d )" + +PATCHES=( + "${FILESDIR}/${P}-pkg-config.patch" +) + +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 + + # Use system libraries. + -DAVIF_LOCAL_ZLIBPNG=OFF + -DAVIF_LOCAL_JPEG=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 +} + +pkg_preinst() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_savelist + fi +} + +pkg_postinst() { + if ! use aom && ! use rav1e && ! use svt-av1 ; then + ewarn "No AV1 encoder is set," + ewarn "libavif will work in read-only mode." + ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files." + fi + + if use gdk-pixbuf ; then + # 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 + # 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-0.9.0.ebuild b/media-libs/libavif/libavif-0.9.0.ebuild deleted file mode 100644 index c00246430f4a..000000000000 --- a/media-libs/libavif/libavif-0.9.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake gnome2-utils - -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" - -LICENSE="BSD-2" -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 ) - rav1e? ( media-video/rav1e[capi] ) - svt-av1? ( >=media-libs/svt-av1-0.8.6 )" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -REQUIRED_USE="|| ( aom dav1d )" - -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 - ) - - cmake_src_configure -} - -pkg_preinst() { - if use gdk-pixbuf ; then - gnome2_gdk_pixbuf_savelist - fi -} - -pkg_postinst() { - if ! use aom && ! use rav1e && ! use svt-av1 ; then - ewarn "No AV1 encoder is set," - ewarn "libavif will work in read-only mode." - ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files." - fi - - if use gdk-pixbuf ; then - gnome2_gdk_pixbuf_update - fi -} - -pkg_postrm() { - if use gdk-pixbuf ; then - gnome2_gdk_pixbuf_update - fi -} diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild index f4756e028039..1cb15d73dc44 100644 --- a/media-libs/libavif/libavif-9999.ebuild +++ b/media-libs/libavif/libavif-9999.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit cmake git-r3 gnome2-utils +CMAKE_ECLASS=cmake +inherit cmake-multilib git-r3 gnome2-utils DESCRIPTION="Library for encoding and decoding .avif files" HOMEPAGE="https://github.com/AOMediaCodec/libavif" @@ -14,12 +15,12 @@ SLOT="0" KEYWORDS="" 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}" @@ -27,26 +28,48 @@ BDEPEND="virtual/pkgconfig" REQUIRED_USE="|| ( aom dav1d )" -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) ) + 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 } @@ -64,12 +87,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 } -- cgit v1.2.3