diff options
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/Manifest.gz | bin | 67056 -> 67051 bytes | |||
-rw-r--r-- | media-libs/libavif/Manifest | 4 | ||||
-rw-r--r-- | media-libs/libavif/libavif-0.11.1.ebuild | 107 | ||||
-rw-r--r-- | media-libs/libavif/libavif-9999.ebuild | 9 | ||||
-rw-r--r-- | media-libs/sdl-sound/Manifest | 3 | ||||
-rw-r--r-- | media-libs/sdl-sound/files/sdl-sound-1.0.3_p20220525-underlinking.patch | 45 | ||||
-rw-r--r-- | media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild | 13 |
7 files changed, 175 insertions, 6 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 1152a9400ef3..a369cc15eaea 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest index efb787229c7c..b3cd5c2fe559 100644 --- a/media-libs/libavif/Manifest +++ b/media-libs/libavif/Manifest @@ -1,4 +1,6 @@ DIST libavif-0.10.1.tar.gz 2085698 BLAKE2B 5be3f9adf7e0a5747e42c90ce2768eba90053c821805cc8e39915d6cbc4cd42554b1473118b41eb25010d20a2b5a3c141b9cbd6ff55c46abd79eb97cdee6b0e5 SHA512 2f6f248c56c983761149d3c201fc2a2ea5072a32516578a7fdb2c66e3cd22491540f400e23581f873b15454250eeec8d433924ae2c1de9371b7924a5d82bef6b +DIST libavif-0.11.1.tar.gz 5826813 BLAKE2B 8fcbc9e1655546b7f4e62882b44d07b8bcfceef599e0feb5658c475cbc35cbb27bae0ad58475c2657351a890ccb957fa8a0e28328bbb5664cd8a57cedfb58019 SHA512 4a9e2711fccddf35c477db6e2fa2f76c0648aafaa98b4e3f34df62c0fbd02ddcd57762f1f8149822da4f1bc3757ee75ec1d9ced5e56a54dbe9d0b43265aacd4c EBUILD libavif-0.10.1.ebuild 2721 BLAKE2B 25a3e3e1f51f322a4c2caa239869a1edbe9096c3ef24fd3df36c3bff0758e0b4daa91606f2f71af3aa85c03a12b91fe8fefc42630c765faaeedd36357b13fd7b SHA512 abf588f95ff289955357179bc2b6bc03f4294a6294fd476011af95fe2668d86b543c5aefcf3dd6a9f91bfb18dfa5f236ddc731e3deb0e45263fffa33ceaffff3 -EBUILD libavif-9999.ebuild 2662 BLAKE2B 68435d43e38208d1e9a836c7da8c6aa1545da5d7da271b2d422bd93e41df8298262a6f85629cd8d4327f84efb376648bd6af10f6a5af7452d58439a0fcbff9c4 SHA512 a21ba858eab8456af19751fb00d3776f849d32da8d51f98fb70708e1efdf90fb09191a53c6eb2c4253a66a2f22882d4994790116e87d1297501cb541de619210 +EBUILD libavif-0.11.1.ebuild 2837 BLAKE2B 311aa3ce056dc38f630e615a2f1b018ade67bfd6e1ccf504a02cfa63ac31102edb0119db0ae315ef4e2856c9e23cd61a2950478a530cb802ba7718a3259e8966 SHA512 b27f79b8c6faa999f2be8b63d2069e67780249f261a345655f6a4e65f4cd9027ce7bfce3a40bff5f8591f4d015551e9bb709c92acbc553b543f0408f4f0c4bd4 +EBUILD libavif-9999.ebuild 2773 BLAKE2B c333ff449cb423cb892430681cac5cbdfb5c6c2ecd52a197f6d59e79f0b379ed6cd612dbf18a3efeea073ce341551c1df7eb6558a8cc7ab2e8884eba11143204 SHA512 061baa76df4c5b5632f1985fcf2a60d487cd57bd52d7f7d1f9cff6e3d8ef8980fa34e3572dcffa0393302a52ac0c84c8d66266ec2e4184955c1d94c739a8514d MISC metadata.xml 874 BLAKE2B dff9e32442e51d4a3ef60fc1059cb2303b3f0a8c0d026ee8703086509fbed4205e28f4bf043b90af2f57ccbaf7dc861dcefb633b1f306bea1d3f32a5373a5643 SHA512 9f5c37e9ebe71fe47512a7ccc493559bc46132874dc00f16b0b60ad108fee9eda6c2a2c87b21309505e46cce46776a9917ec587874906d1d62b1c2e28b0ea31f diff --git a/media-libs/libavif/libavif-0.11.1.ebuild b/media-libs/libavif/libavif-0.11.1.ebuild new file mode 100644 index 000000000000..fa2b62da179c --- /dev/null +++ b/media-libs/libavif/libavif-0.11.1.ebuild @@ -0,0 +1,107 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +# See bug #822336 re subslot +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1" + +REQUIRED_USE="|| ( aom dav1d )" + +DEPEND="media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] + media-libs/libpng[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + aom? ( >=media-libs/libaom-3.3.0:=[${MULTILIB_USEDEP}] ) + dav1d? ( >=media-libs/dav1d-1.0.0:=[${MULTILIB_USEDEP}] ) + extras? ( dev-cpp/gtest ) + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] ) + rav1e? ( >=media-video/rav1e-0.5.1[capi] ) + svt-av1? ( >=media-libs/svt-av1-0.9.1 )" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +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) + -DAVIF_ENABLE_GTEST=$(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 + -DAVIF_ENABLE_GTEST=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-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild index 4dab63b81130..23f729dccf74 100644 --- a/media-libs/libavif/libavif-9999.ebuild +++ b/media-libs/libavif/libavif-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2020-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake-multilib git-r3 gnome2-utils @@ -17,11 +17,12 @@ IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1" REQUIRED_USE="|| ( aom dav1d )" -DEPEND="media-libs/libpng[${MULTILIB_USEDEP}] +DEPEND="media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] + media-libs/libpng[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg[${MULTILIB_USEDEP}] aom? ( >=media-libs/libaom-3.3.0:=[${MULTILIB_USEDEP}] ) dav1d? ( >=media-libs/dav1d-1.0.0:=[${MULTILIB_USEDEP}] ) + extras? ( dev-cpp/gtest ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] ) rav1e? ( >=media-video/rav1e-0.5.1[capi] ) svt-av1? ( >=media-libs/svt-av1-0.9.1 )" @@ -52,6 +53,7 @@ multilib_src_configure() { -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF) -DAVIF_BUILD_APPS=$(usex extras ON OFF) -DAVIF_BUILD_TESTS=$(usex extras ON OFF) + -DAVIF_ENABLE_GTEST=$(usex extras ON OFF) ) else mycmakeargs+=( @@ -61,6 +63,7 @@ multilib_src_configure() { -DAVIF_BUILD_EXAMPLES=OFF -DAVIF_BUILD_APPS=OFF -DAVIF_BUILD_TESTS=OFF + -DAVIF_ENABLE_GTEST=OFF ) if ! use aom ; then diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest index e102a533c395..ca2ab564e4ad 100644 --- a/media-libs/sdl-sound/Manifest +++ b/media-libs/sdl-sound/Manifest @@ -1,8 +1,9 @@ AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d497c0f895d883692508a3ce366a6742533bf4d29b8eff4f09df1753b77819b71dec119950e3ff8a2059e3fb960bb63848be1 SHA512 aba96ba3d3027604d6fcb2f184db37c7ffd2e6204236cf114393e9f5e26acf4040856eb7e4354981f650875d5f991b3cf59c42ff723d75cf7a7e1dd5649f0845 AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c +AUX sdl-sound-1.0.3_p20220525-underlinking.patch 1476 BLAKE2B b9abb706fe79cb6c9a6a22a43bbd9a4f7f45babc37db6acd090901b74e766e54bb3a9ba602b4f3a1a1f5c59e598656c0d5f18c0865ea93898ceb8570eca30307 SHA512 6a6d3aff706a4b0aae3a3dd3e5a72a0e124f70f6c1a418c282ba49b454f9a210e74f223a4de0c34de3d5dfef1d1b4fbf72f642730b436f7bdffa4fcb0edb9126 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824 DIST sdl-sound-1.0.3_p20220525.tar.gz 1044804 BLAKE2B f82f7649bd411290d12ec6b6a4879e0f6a5a155b764b307b087ce2cad5b81dc0ac6fed674c666f470201e5aab5182d9e0c4b6f0d9fc94e9d4bc61d7dacd61cdd SHA512 0f4923e8234334c65697c1d9453a66b05aafd859b1586d9ed26005d93f4a27175b06a77616f09e450b586d0f21c7a1d76761de0fe5f1b144d444e6a2379055b5 EBUILD sdl-sound-1.0.3-r3.ebuild 2134 BLAKE2B f1f5429dfb243da26936fa89ee47e50cd171defc1b470b75af1ad3666071ceba5ee1bf580d75c425370984d87a6e36507332bb8d6b6712ff72d8c8dbb506fa04 SHA512 05794ef14e799d102fc2354c4f3e02106b66c5ee8dee1c5a6a30f28a95a6294e7bc0b61b0e859d9c286b9f885a043dd361767fbbc8e532459d930c347b064d70 -EBUILD sdl-sound-1.0.3_p20220525.ebuild 1852 BLAKE2B 2a6c90c2a6e6f7696f52cac86af51f150e606509d2b31bd81f9332d299397b84b160694234daf13f2ab826616dc5e4ae774c021e42dcaf80fd5502c2a88a33f9 SHA512 a1a7ffdc683c4bc025e0a99c26f44d212b76fa7c3a95c8cff55544be09d4d8d94658b7cc974f193815b378723f57a64916603628fe07839519ed0dd7fb6766a5 +EBUILD sdl-sound-1.0.3_p20220525.ebuild 2043 BLAKE2B 6a54d1c0cc1f4096a62b278bc78bb9dda66c353da05e433a4290febe7142b4effb4add1eaf32627bc48327fbaba470a86e9cd7931f802348557dd7d9c19a4351 SHA512 fb7001efe5cda2437d21c29d830b4e13c26400c67fb309dfbaeeadb23ce62479477d924912a82f9ff298599382e0d77ba9a664376a68340702e9f199f40ce9ee MISC metadata.xml 530 BLAKE2B 1927045e4dd57e0b2ac63cc6ef1165009aafe2a981c2d8bc0ff9ea3e3b9473fdca4945b8b7227a285a425bfd97fa4a65809e7ebe6477ac95bfa0952ea5a6190d SHA512 cc8d087914c0ab7689a7cc9ce230de1d531c4e424bed3b73c21a215a8b681314c9e0fad95039cbf4ec2e4e93911ac876821505ac7f0872c251240121d8e77b77 diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3_p20220525-underlinking.patch b/media-libs/sdl-sound/files/sdl-sound-1.0.3_p20220525-underlinking.patch new file mode 100644 index 000000000000..cbf96a66320e --- /dev/null +++ b/media-libs/sdl-sound/files/sdl-sound-1.0.3_p20220525-underlinking.patch @@ -0,0 +1,45 @@ +https://github.com/icculus/SDL_sound/pull/80 + +From 83f33e04125517197520e26452d06b81c2d7b429 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 12 Nov 2022 02:49:21 +0000 +Subject: [PATCH] Fix underlinking with lld (missing -lm) + +We need to explicitly search for and link with -lm if needed by +libc for math libraries like `log` and `sin`: +``` +ld.lld: error: undefined reference due to --no-allow-shlib-undefined: sin +>>> referenced by ../.libs/libSDL_sound.so + +ld.lld: error: undefined reference due to --no-allow-shlib-undefined: log +>>> referenced by ../.libs/libSDL_sound.so +``` + +It turns out Gentoo has actually had a patch for this since 2012 (mea +culpa!) but it never made its way upstream. + +We're already using libtool, so just use the macro it provides for +this purpose. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,7 +12,7 @@ endif + SDLSOUND_HDRS = SDL_sound.h + SDLSOUND_SRCS = SDL_sound.c SDL_sound_internal.h alt_audio_convert.c alt_audio_convert.h audio_convert.c + SDLSOUND_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +-SDLSOUND_LIBADD = decoders/libdecoders.la $(TIMIDITY_LIB) ++SDLSOUND_LIBADD = decoders/libdecoders.la $(TIMIDITY_LIB) $(LIBM) + + if USE_SDL2 + lib_LTLIBRARIES = libSDL2_sound.la +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,7 @@ AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_LN_S + LT_INIT([win32-dll]) ++LT_LIB_M + PKG_PROG_PKG_CONFIG + + diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild index 59d4ac776545..f4f1d4c6bc7c 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild +++ b/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Check stable-1.0 branch for possible backports/new snapshots -inherit multilib-minimal +inherit autotools multilib-minimal SDL_SOUND_COMMIT="2076a4f555f95ed28dead5e28ee8e57cc74e425f" @@ -36,6 +36,17 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-1.0.3_p20220525-underlinking.patch +) + +src_prepare() { + default + + # Drop this once sdl-sound-1.0.3_p20220525-underlinking.patch merged + eautoreconf +} + multilib_src_configure() { local myeconfargs=( # TODO: make this optional or switch unconditionally? |