diff options
Diffstat (limited to 'media-libs')
364 files changed, 5623 insertions, 9635 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex b53bede6f7c0..0940e0787835 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest index 32a8aad8c871..463562bee33d 100644 --- a/media-libs/alsa-lib/Manifest +++ b/media-libs/alsa-lib/Manifest @@ -1,15 +1,7 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90 -AUX alsa-lib-1.2.10-lld-17.patch 1695 BLAKE2B 657fdeb94cadeac71e4a966f8efe79d68a55c911472bcd3bb9bf6949b4cfc0a91a5781e62e973b65b34d77bb65be1791c6b83fc81550c81c18f3ba5498e18791 SHA512 0d746485c7be793830cbfa7c33447b2c20b81c3b9ce4cd0aa35013829a45886e1a546c34a5e26ecdd9e48168b317a2459c09795538f3315e7381747f86d07f1f -AUX alsa-lib-1.2.10-musl-string.patch 1435 BLAKE2B ad0e72c63652a2ba1c92f05a0b4154a35aa6fdd010cb3f095855345d99a4f2467fbdc1db79cb9970bada5b2f61fe07277ff179dcb912fedca634ed142d06e3b0 SHA512 6651379f50d72c06fbd8cdc298e3a31f6da2df4011faa00dcd8e0206e4858876f6a2ac50154dff70c2dc33676ee35306c0d85182aacbd136e3e5df311fa1adae -AUX alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch 2319 BLAKE2B f56f6117f4513451de67ca91a00561891a979543bfe5d596a58d5a485e7a64bbb2a0e3100b83fd2a40a91dcc5f1f2465dbe9618bb195a870f25592957fefe357 SHA512 b0536d567bde218a989f1ab64129cd1967e0b0003490277233d299bcb751e3a4aa305dce7ac72ded354eae351e606b43718e62ca096611eb088e26910fc309d5 -AUX alsa-lib-1.2.10-reshuffle-included-files-config-h.patch 3874 BLAKE2B 87bd7a55d90e2186115bbc176562f3b69dd7db8984ef077a979c5a30ed772b4da0b6d7df4cf988d0be4655112ee42e9a79e8956e4ab97196098350247b8a9ae3 SHA512 940f012a5d3657cca9de20f4c27422143903fb5ed6bffa45dcbd32973d77d9c3e29488716c924ff3f4bb110498b4ccdd8302ecb516c453d8b762b901376532ef -AUX alsa-lib-1.2.10-ump-header-detection.patch 1624 BLAKE2B da7a512d1e389d8dbf004ee3924a079f337e83fe7006dd8ed92bb838968c4550ac3474083e8ccef817e2f701a62c02c2890b2a384686fda9bd91622f41fad9d8 SHA512 98a22f53368265bed1918235adc12e9a2b7910e79d2151d48846837a7941cf8ecf7e1fe86b9def72c2b3facd6567e7c8d24051374e686353cb526762234a4528 AUX alsa-lib-1.2.11-topology-correct-version-script-path.patch 1167 BLAKE2B 0540456e96eb47279d952b888d7c7ada54b7850e0a2a091b98bafc7969e97cdd829ecf7572a03eaa8b5da3d8e548b3c787eda66502673954bd583809b98a5f3d SHA512 a8ed806a9a98a0c351a76f043bb8344746f5258c13d8d08be547556e0f9c1c65472398d9d6cdeb87c22fb1340b8cc23c10bb1aee42063544c31f4afbcf8fa84e -DIST alsa-lib-1.2.10.tar.bz2 1107007 BLAKE2B b2e4f8431e61f5bb56b2b5d124e67d5a68bbca3c647bebfa93f5e5ff092ec9ef3f6cb6315801fcd93e21151784814ff238d357313b8b44f32d4e7c9ee565388f SHA512 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939 DIST alsa-lib-1.2.11.tar.bz2 1107150 BLAKE2B 7fb245ffbfb841bdd5cb9da08fb2ec0a4ce8d340d4d1461999aca558c67c16e7c596cd0bffab761b7b4549025b0fb25462fb352e6d3900fb42f00b47de58d34c SHA512 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d DIST alsa-lib-1.2.12.tar.bz2 1108712 BLAKE2B bcb48ad2c8687454b312e789c650136fee0db8cccf58e997b9d619aac5c74288b69220589efdcd3917eb1d781ef71be5fcd16d997c59c069fe20788d1a479068 SHA512 053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d -EBUILD alsa-lib-1.2.10-r2.ebuild 2857 BLAKE2B 0738b7a27c255344b9bc3e7be225aea953fdaa8948c6070c4854c545e7a6f82887e7e9b1e25ec54c64d9b1d691077e46339a7be31b74e527c70fd14a81fccea6 SHA512 f30a2f2d326493744be71935abb160ab239f3f8b35eba84987fdd5e48ae398adfc5b1952a1c79b1211a73198ac4b74f876131b0d0c5cc20df45c8ebad71bc5d9 -EBUILD alsa-lib-1.2.10-r3.ebuild 2914 BLAKE2B 696439fc26b94f27fc9c9513299beb21ae15082ef65a44c4a546327bce02a2c6b8475eededae83860fabd79680a54dbc383ff89b8d8361278d75ce2fe1fad93a SHA512 4a7044dad75f82d65ac9301665882ec0fcc87fb08d2c0b747b9b9b2f38eb104584291ec8d532a72646245fc9d694ae60fd51bf2b661d49ceb367faebd67b6ae4 EBUILD alsa-lib-1.2.11.ebuild 2659 BLAKE2B 53310377ed59b845962bc6e77e69ef010a58c006f47692a755c44bf7fd3e539cef531fa692b43254a26a54071b77e55c7722b54dab9d73a71fff9ddd9bc39b55 SHA512 120e70af3e0cd5bdd66c40e18cc88caf9453cca6bdf9dabfc989dc1b9175ec6726983616548a87873a3bc2569e06592aba40810261195e4653fa7d9985a6ab5e -EBUILD alsa-lib-1.2.12.ebuild 2589 BLAKE2B a75e9067f2864dc1b938ff864db33b7e20636bd4c5ea4ab94cbb5c4d0f30fd84b4a05fe7fd28842f1e55aa6621467037103ef599e47fcf999ceb19dede1f2407 SHA512 00caaf6aa43024452d5e5b02f30aad071d96139ff006402054e71b2c0c0737c74c63d191dff46a66fb93cc58c117d298c53000191c72acd6d54ccb01d9426f9b +EBUILD alsa-lib-1.2.12.ebuild 2589 BLAKE2B b3ad782b31515af4e21fc59b805bc95a1033844af33d94475fc889a23a199442cf03361fff7273fd4fc6875d37a8ebba554d5c9d1f70dbeddda6bb086831c55d SHA512 a17bf77c10a814a1d8150cc14a3c0d1a9341e80132fde5a3bd736be302d5ad650c84ab7ce57380171f9eab79d6278dc3423be623699894dd7a0e12fc2e62706c MISC metadata.xml 508 BLAKE2B 5d7cb196ffea7d75c228f28cfbc88b7c3ca7e18b4f8f790dd51718bce508679fb61073f0df0a192028c57bf3c8f99e3838c7c061dc408ae915b84213fd14b383 SHA512 4b682f9fa77d3287e0e56e39c6aa97b06129f85cc1dd898efac0682dd33f6b22ca20e08dcb95423ac953eafde7d2850db9c5a363156eaefa2c1752dd72011a4c diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild deleted file mode 100644 index 47f51c323a5e..000000000000 --- a/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit autotools multilib-minimal flag-o-matic python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -if [[ ${PV} == *_p* ]] ; then - # Please set correct commit ID for a snapshot release! - COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd" - SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${COMMIT:0:7} -else - # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;) - SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="alisp debug doc python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - media-libs/alsa-topology-conf - media-libs/alsa-ucm-conf - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 - "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport - "${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport - "${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport - "${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die - # bug #545950 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - # Broken upstream. Could in theory work with -flto-partitions=none - # but it's a hack to workaround the real problem and not strictly safe. - # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6. - # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it. - # Let us know if you can identify one.) - filter-lto - - local myeconfargs=( - --disable-maintainer-mode - --disable-resmgr - --enable-aload - --enable-rawmidi - --enable-seq - --enable-shared - --enable-thread-safety - - $(multilib_native_use_enable python) - $(use_enable alisp) - $(use_with debug) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && use doc; then - emake doc - grep -FZrl "${S}" doc/doxygen/html | \ - xargs -0 sed -i -e "s:${S}::" || die - fi -} - -multilib_src_install() { - multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) - - default -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - - dodoc ChangeLog doc/asoundrc.txt NOTES TODO -} diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild deleted file mode 100644 index b2b07f72acaf..000000000000 --- a/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit autotools multilib-minimal flag-o-matic python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -if [[ ${PV} == *_p* ]] ; then - # Please set correct commit ID for a snapshot release! - COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd" - SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${COMMIT:0:7} -else - # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;) - SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="alisp debug doc python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - media-libs/alsa-topology-conf - media-libs/alsa-ucm-conf - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 - "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport - "${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport - "${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport - "${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport - "${FILESDIR}/${P}-lld-17.patch" # bug #914511, backport -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die - # bug #545950 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - # Broken upstream. Could in theory work with -flto-partitions=none - # but it's a hack to workaround the real problem and not strictly safe. - # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6. - # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it. - # Let us know if you can identify one.) - filter-lto - - local myeconfargs=( - --disable-maintainer-mode - --disable-resmgr - --enable-aload - --enable-rawmidi - --enable-seq - --enable-shared - --enable-thread-safety - - $(multilib_native_use_enable python) - $(use_enable alisp) - $(use_with debug) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && use doc; then - emake doc - grep -FZrl "${S}" doc/doxygen/html | \ - xargs -0 sed -i -e "s:${S}::" || die - fi -} - -multilib_src_install() { - multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) - - default -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - - dodoc ChangeLog doc/asoundrc.txt NOTES TODO -} diff --git a/media-libs/alsa-lib/alsa-lib-1.2.12.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.12.ebuild index e6b5e1471035..e2d95ace169a 100644 --- a/media-libs/alsa-lib/alsa-lib-1.2.12.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.2.12.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools multilib-minimal flag-o-matic python-single-r1 DESCRIPTION="Advanced Linux Sound Architecture Library" diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch deleted file mode 100644 index cba1e2e2d507..000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/914511 -https://github.com/alsa-project/alsa-lib/issues/356 -https://github.com/alsa-project/alsa-lib/commit/96f60d829f2c9dc9ad9eda46410adaa41b4b0da0 - -From 96f60d829f2c9dc9ad9eda46410adaa41b4b0da0 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Tue, 10 Oct 2023 08:20:15 +0200 -Subject: [PATCH] seq: Fix typos in symbol version definitions - -There were obvious typos in src/Versions.in that resulted in the -undefined symbols. Correct those entries. - -Fixes: 2aefb5c41cc0 ("seq: Add UMP support") -Closes: https://github.com/alsa-project/alsa-lib/issues/356 -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- a/src/Versions.in -+++ b/src/Versions.in -@@ -158,13 +158,13 @@ ALSA_1.2.10 { - @SYMBOL_PREFIX@snd_ctl_ump_block_info; - @SYMBOL_PREFIX@snd_seq_ump_*; - @SYMBOL_PREFIX@snd_seq_client_info_get_midi_version; -- @SYMBOL_PREFIX@snd_seq_seq_client_info_get_ump_group_enabled; -+ @SYMBOL_PREFIX@snd_seq_client_info_get_ump_group_enabled; - @SYMBOL_PREFIX@snd_seq_client_info_get_ump_groupless_enabled; -- @SYMBOL_PREFIX@snd_seq_seq_client_get_ump_conversion; -+ @SYMBOL_PREFIX@snd_seq_client_info_get_ump_conversion; - @SYMBOL_PREFIX@snd_seq_client_info_set_midi_version; -- @SYMBOL_PREFIX@snd_seq_seq_client_info_set_ump_group_enabled; -+ @SYMBOL_PREFIX@snd_seq_client_info_set_ump_group_enabled; - @SYMBOL_PREFIX@snd_seq_client_info_set_ump_groupless_enabled; -- @SYMBOL_PREFIX@snd_seq_seq_client_set_ump_conversion; -+ @SYMBOL_PREFIX@snd_seq_client_info_set_ump_conversion; - @SYMBOL_PREFIX@snd_seq_get_ump_endpoint_info; - @SYMBOL_PREFIX@snd_seq_get_ump_block_info; - @SYMBOL_PREFIX@snd_seq_set_ump_endpoint_info; diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch deleted file mode 100644 index 49747dcfecbe..000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch +++ /dev/null @@ -1,40 +0,0 @@ -From https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Wed, 6 Sep 2023 15:16:44 +0200 -Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block - -It solves the musl libc compilation issue. - -control.c: In function 'snd_ctl_open_conf': -../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio] - 98 | #define SND_DLSYM_VERSION(version) __STRING(version) - | ^~~~~~~~ - -Fixes: https://github.com/alsa-project/alsa-lib/issues/350 -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- a/include/global.h -+++ b/include/global.h -@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void); - #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) - #endif - -+#ifndef __STRING -+/** \brief Return 'x' argument as string */ -+#define __STRING(x) #x -+#endif -+ - #ifdef PIC /* dynamic build */ - - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ -@@ -71,11 +76,6 @@ struct snd_dlsym_link { - - extern struct snd_dlsym_link *snd_dlsym_start; - --#ifndef __STRING --/** \brief Return 'x' argument as string */ --#define __STRING(x) #x --#endif -- - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ - #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version - /** diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch deleted file mode 100644 index 4cd3614ee943..000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch +++ /dev/null @@ -1,91 +0,0 @@ -https://github.com/alsa-project/alsa-lib/commit/0e3dfb9f705ca78be34cd70fd59d67c431e29cc7 - -From 0e3dfb9f705ca78be34cd70fd59d67c431e29cc7 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Sat, 9 Sep 2023 17:42:03 +0200 -Subject: [PATCH] pcm: Fix segfault with 32bit libs - -The recent rearrangement of header inclusion order caused a regression -showing segfaults on 32bit Arm. The primary reason is the -inconsistent compile condition depending on the inclusion of config.h; -while most of other code include pcm_local.h (that implicitly includes -config.h) at first, pcm_direct.c doesn't do it, hence the access with -direct plugins crashes. - -For fixing it, we need to include config.h at the beginning. But, -it's better to include pcm_local.h for all relevant code for -consistency. The patch does it, and also it adds the guard in -pcm_local.h for double inclusions. - -Fixes: ad3a8b8b314e ("reshuffle included files to include config.h as first") -Link: https://github.com/alsa-project/alsa-lib/issues/352 -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- a/src/pcm/pcm_direct.c -+++ b/src/pcm/pcm_direct.c -@@ -19,6 +19,7 @@ - * - */ - -+#include "pcm_local.h" - #include <stdio.h> - #include <stdlib.h> - #include <stddef.h> ---- a/src/pcm/pcm_dmix.c -+++ b/src/pcm/pcm_dmix.c -@@ -26,7 +26,7 @@ - * - */ - --#include "config.h" -+#include "pcm_local.h" - #include <stdio.h> - #include <stdlib.h> - #include <stddef.h> ---- a/src/pcm/pcm_dshare.c -+++ b/src/pcm/pcm_dshare.c -@@ -26,6 +26,7 @@ - * - */ - -+#include "pcm_local.h" - #include <stdio.h> - #include <stdlib.h> - #include <stddef.h> ---- a/src/pcm/pcm_dsnoop.c -+++ b/src/pcm/pcm_dsnoop.c -@@ -26,6 +26,7 @@ - * - */ - -+#include "pcm_local.h" - #include <stdio.h> - #include <stdlib.h> - #include <stddef.h> ---- a/src/pcm/pcm_local.h -+++ b/src/pcm/pcm_local.h -@@ -20,6 +20,9 @@ - * - */ - -+#ifndef __PCM_LOCAL_H -+#define __PCM_LOCAL_H -+ - #include "config.h" - - #include <stdio.h> -@@ -1223,3 +1226,5 @@ static inline void snd_pcm_unlock(snd_pcm_t *pcm) - #define snd_pcm_lock(pcm) do {} while (0) - #define snd_pcm_unlock(pcm) do {} while (0) - #endif /* THREAD_SAFE_API */ -+ -+#endif /* __PCM_LOCAL_H */ ---- a/src/pcm/pcm_shm.c -+++ b/src/pcm/pcm_shm.c -@@ -26,6 +26,7 @@ - * - */ - -+#include "pcm_local.h" - #include <stdio.h> - #include <stdlib.h> - #include <stddef.h> diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch deleted file mode 100644 index 42493fef6af1..000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch +++ /dev/null @@ -1,174 +0,0 @@ -https://github.com/alsa-project/alsa-lib/commit/81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d - -From 81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Wed, 13 Sep 2023 12:27:21 +0200 -Subject: [PATCH] reshuffle included files to include config.h as first - v2 - -config.h may contain defines like _FILE_OFFSET_BITS which influence -the system wide include files (off_t types, open -> open64 function -usage etc.). - -Fixes: ad3a8b8b ("reshuffle included files to include config.h as first") -Related: https://github.com/alsa-project/alsa-lib/pull/333 -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- a/src/control/setup.c -+++ b/src/control/setup.c -@@ -29,13 +29,13 @@ - * - */ - -+#include "local.h" - #include <stdio.h> - #include <stdlib.h> - #include <stdarg.h> - #include <unistd.h> - #include <string.h> - #include <ctype.h> --#include "local.h" - - #ifndef DOC_HIDDEN - typedef struct { ---- a/src/rawmidi/rawmidi.c -+++ b/src/rawmidi/rawmidi.c -@@ -144,12 +144,12 @@ This example shows open and read/write rawmidi operations. - * Shows open and read/write rawmidi operations. - */ - -+#include "rawmidi_local.h" - #include <stdio.h> - #include <stdlib.h> - #include <stdarg.h> - #include <unistd.h> - #include <string.h> --#include "rawmidi_local.h" - - /** - * \brief setup the default parameters ---- a/src/rawmidi/rawmidi_local.h -+++ b/src/rawmidi/rawmidi_local.h -@@ -19,10 +19,10 @@ - * - */ - -+#include "local.h" - #include <stdio.h> - #include <stdlib.h> - #include <limits.h> --#include "local.h" - - typedef struct { - int (*close)(snd_rawmidi_t *rawmidi); ---- a/src/rawmidi/rawmidi_virt.c -+++ b/src/rawmidi/rawmidi_virt.c -@@ -19,13 +19,11 @@ - * - */ - --#include <stdio.h> --#include <stdlib.h> -+#include "rawmidi_local.h" - #include <unistd.h> - #include <string.h> - #include <fcntl.h> - #include <sys/ioctl.h> --#include "rawmidi_local.h" - #include "seq.h" - #include "seq_midi_event.h" - ---- a/src/rawmidi/ump.c -+++ b/src/rawmidi/ump.c -@@ -4,10 +4,6 @@ - * \brief Universal MIDI Protocol (UMP) Interface - */ - --#include <stdio.h> --#include <stdlib.h> --#include <limits.h> --#include "local.h" - #include "rawmidi_local.h" - #include "ump_local.h" - ---- a/src/seq/seq.c -+++ b/src/seq/seq.c -@@ -777,8 +777,8 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev) - - */ - --#include <poll.h> - #include "seq_local.h" -+#include <poll.h> - - /**************************************************************************** - * * ---- a/src/seq/seq_hw.c -+++ b/src/seq/seq_hw.c -@@ -20,9 +20,9 @@ - * - */ - -+#include "seq_local.h" - #include <fcntl.h> - #include <sys/ioctl.h> --#include "seq_local.h" - - #ifndef PIC - /* entry for static linking */ ---- a/src/seq/seq_local.h -+++ b/src/seq/seq_local.h -@@ -23,10 +23,10 @@ - #ifndef __SEQ_LOCAL_H - #define __SEQ_LOCAL_H - -+#include "local.h" - #include <stdio.h> - #include <stdlib.h> - #include <limits.h> --#include "local.h" - - #define SND_SEQ_OBUF_SIZE (16*1024) /* default size */ - #define SND_SEQ_IBUF_SIZE 500 /* in event_size aligned */ ---- a/src/seq/seq_midi_event.c -+++ b/src/seq/seq_midi_event.c -@@ -28,10 +28,10 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include "local.h" - #if HAVE_MALLOC_H - #include <malloc.h> - #endif --#include "local.h" - - #ifndef DOC_HIDDEN - ---- a/src/seq/seqmid.c -+++ b/src/seq/seqmid.c -@@ -20,14 +20,12 @@ - * - */ - --#include <stdio.h> --#include <stdlib.h> -+#include "seq_local.h" - #include <unistd.h> - #include <string.h> - #include <fcntl.h> - #include <ctype.h> - #include <sys/ioctl.h> --#include "seq_local.h" - - /** - * \brief queue controls - start/stop/continue ---- a/src/userfile.c -+++ b/src/userfile.c -@@ -18,7 +18,7 @@ - * - */ - --#include <config.h> -+#include "config.h" - #include <string.h> - #include <errno.h> - #include <assert.h> - diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch deleted file mode 100644 index a75aa3a85a06..000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch +++ /dev/null @@ -1,31 +0,0 @@ -From https://github.com/alsa-project/alsa-lib/commit/fcce13a6726c52882bd8b7131c61c4eba308792c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Mon, 4 Sep 2023 09:38:26 +0200 -Subject: [PATCH] control.h: Fix ump header file detection -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Apparently, the control.h is used from apps separately (outside -asoundlib.h). Avoid errors like: - -/usr/include/alsa/control.h:417:47: error: ‘snd_ump_endpoint_info_t’ has not been declared - 417 | int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info); - | ^~~~~~~~~~~~~~~~~~~~~~~ -/usr/include/alsa/control.h:418:44: error: ‘snd_ump_block_info_t’ has not been declared - 418 | int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info); - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: https://github.com/alsa-project/alsa-lib/issues/348 -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- a/include/control.h -+++ b/include/control.h -@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev); - int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device); - int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info); - int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev); -+#endif -+#ifdef __ALSA_UMP_H - int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device); - int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info); - int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info); diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest index 9f42ec41cd1b..2509219aa46e 100644 --- a/media-libs/alsa-ucm-conf/Manifest +++ b/media-libs/alsa-ucm-conf/Manifest @@ -1,8 +1,5 @@ -AUX alsa-ucm-conf-1.2.10-fix-splitpcm.patch 734 BLAKE2B 66264d2cf2e479d530233708c92964c931dd5fd6e9e9ff3fca4d2253fea5261c55ed675b283b54ac60bbd0a444eaed8b421a3a7c7babd6c95537c8f6551a44e8 SHA512 6492b18cfe1a14ed7b2306ca3b0221060144ecc7cbfd9da4d5b397c0cce243383f4c91ccf554127d63b42ccf39c2db47e42150e2c3d35eccd4b5691182f1a209 -DIST alsa-ucm-conf-1.2.10.tar.bz2 44749 BLAKE2B 215842f1f59c2dea5e3f3fe880dc49d6263998746a50c2591b8a9786ead3afae2c713e179ff6e8caa518b3a8516a1b031872c1fad2a17fbd3afbb0390a803693 SHA512 172956a2c127e9afa5be9c6ada43bfa9fda825823f8f6acbe252edef3381afe3adfa3299c1419f04375599be7721a551c6800be99db44b091611aeb824ffcd72 DIST alsa-ucm-conf-1.2.11.tar.bz2 49172 BLAKE2B 8b57ad990eac676ca8f5044a81a57a85951e425bd059679ac3dc7097e3c4a089cb73bbd01869335c4e94161d9f3f86aba7549b6a666e69ba76578d785e53fbb4 SHA512 b202e7410a579789be0005564b4868f70bca0fd8664c02add95fc9ff90ab64faebda978fbd3e83a3274c37242dccf8efbebd03f529e35ca3033daf55f425cb8d DIST alsa-ucm-conf-1.2.12.tar.bz2 52618 BLAKE2B 65f429afa6a9134f1896acac3827f6065ce9315f1920d27d5ea97244fe376f1f7780c9537cf33b8a91eeaebfde7489842bd603a7d60c0d20b6017f2e7e1eda4e SHA512 391dde123271172d899c04865d1d6e21b4ad0060ee9b2256dfbc6fc89ad48edcaa43c861893ab0e5c70d972e20d15c528defc19c00308e7465f13f954cce25d7 -EBUILD alsa-ucm-conf-1.2.10-r1.ebuild 555 BLAKE2B a1545f65e341332dfe1ecb15cebe4e3fe6ad4edb374820c4ea138b68d04016eff4a48f5542f0884534d7a871792c2d7925b98ef22b7813c34d030e37805bf983 SHA512 86ba8f25cf8a1d36060cdde5b5aeb124fa183255f5d3454bc42e668948720cc1aea39bb9aa4d2ba666f3225f16bd9fc1e8fa8b57a2a3c1eddff11430f4b69829 EBUILD alsa-ucm-conf-1.2.11.ebuild 503 BLAKE2B 8acbe87d7a55847e4848a6c975cdac618cd0c53cc9873eb21678864d0901f7da716226a5c7a0d729fdacda4f9adb63c186d2e4e196e74204d3aadda72a4d2c8f SHA512 910abd4c03c5eb5df31b6cda01735d23a266f5efa9fbd72bf0baa4cac09b6b1354cc4606101df4d572a3ffa8fb91557f0daacc7951336ad6340f951ba347e716 EBUILD alsa-ucm-conf-1.2.12.ebuild 504 BLAKE2B 72c959634a0185a37e085b18d79e236a83df0c4aa68ce405dbf03d1f4160a60685b3af0bcaf26a0684c33275a05c0916d340247cd7da86cc54e5d1ca34b2edcf SHA512 adeab2295534ef808940215f7c98b91a45c39afa7af8e9189aa0c148c95d023c7da9ac4d2817fcf1ee770880f2a99fe4a997c4818b81c625a760dfbd7a989900 MISC metadata.xml 403 BLAKE2B c1555457584c9ccfc55d8cf423c2980863a68e45a2993133c56f124996c33a8ca402f7611fb22c4f6fd87cd5ea70e417f1424d4df5bc5aebca6ccbd2b5efb3e6 SHA512 23290395834ba3d4b58cc79ec5fca79b1b2710b69504a49057f3d26bb5f3ae3b1b7f2c4957d8b3d13168f81795c25df4cb5007ec3c60bbe61c7f588ae2445d43 diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild deleted file mode 100644 index 69aaf86bc695..000000000000 --- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="ALSA ucm configuration files" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86" - -RDEPEND="!<media-libs/alsa-lib-1.2.1" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-splitpcm.patch -) - -src_install() { - insinto /usr/share/alsa - doins -r ucm{,2} -} diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch deleted file mode 100644 index 35202a4454b3..000000000000 --- a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/alsa-project/alsa-ucm-conf/commit/b68aa52acdd2763fedad5eec0f435fbf43e5ccc6 - -From b68aa52acdd2763fedad5eec0f435fbf43e5ccc6 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Mon, 4 Sep 2023 16:39:52 +0200 -Subject: [PATCH] SplitPCM: Device argument may not be set - -Link: https://github.com/alsa-project/alsa-ucm-conf/issues/346 -Fixes: 10967ea ("SplitPCM: Fix Device variable in SplitPCMDevice macro") -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- a/ucm2/common/pcm/split.conf -+++ b/ucm2/common/pcm/split.conf -@@ -326,7 +326,7 @@ DefineMacro.SplitPCMDevice { - If.0 { - Condition { - Type String -- Empty "${var:__Device}" -+ Empty "${var:-__Device}" - } - True.Define.__Device "0" - } diff --git a/media-libs/amdgpu-pro-vulkan/Manifest b/media-libs/amdgpu-pro-vulkan/Manifest index 6124c8b3252a..8c6761f7622a 100644 --- a/media-libs/amdgpu-pro-vulkan/Manifest +++ b/media-libs/amdgpu-pro-vulkan/Manifest @@ -2,13 +2,13 @@ AUX icd_amd64.patch 330 BLAKE2B 6911c451ee96d68e91f5ca8a8536b758f8ecf81bcc1b1968 AUX icd_x86.patch 322 BLAKE2B 823d90dadb6f4791937ebcd28cc2ce5045a1a713cc4b5b58201e9ee6b57be8568a1ff63724e1fc16c29446e85e8dd1d533248ccf41acbd1355fccbff62239285 SHA512 c39fa60fa116ee92bf613dd8cab08b464cd35b9e63cb0ccc568cc0024b93652ce556b8823edf987498d72309ba841085434481fffa4cabd5de1494851cbcd4d3 AUX vk_pro 121 BLAKE2B 833ed55d23b89a00641c3f685bfc06feec10ca352ec2ab4fc8ec6c78d977185cc92d22f8948998e8b00f7ba07fe97cfb2c39f6c6f5da8d484c43cc87768f35f8 SHA512 61ecc20ec40e0b72914399c77d793f5ca8739ac49addd851b0fd3af0490358a17b9ade8da183631e11c63a0ef061ec42a553af6b496167041d5fe0251b2be43e AUX vk_radv 127 BLAKE2B 3fb35e8b89b0baec70eb302abf9c6ccf67b2a04dc8b1dd68e8db7abd870510c72a8b759a8dda6d93e893c50e14b1776335c7abe9705274f3486277ff54356aa5 SHA512 0b7db271d8db8e26d39372d47cf715be7933ceeb474897af56614aae8ce413057f9e80631f7a0bee057ea0e88c68271e105808670c9d117dab57b2b31f0e2244 -DIST amdgpu-pro-vulkan-21.50.2.1384496-amd64.deb 8320356 BLAKE2B 1a5997ee983bf4729c429dae7d333fd49f8bb24a5022238299fd87e4ad8a7579c0535a8198fc3869db3b8079634b1e06e9bb90ff761239486cb4ffb7ea6ead4a SHA512 16299cb567d9573080d6e3b83124e931692392c5282a3be5f39638682b2c8d4aa9395787382e0145d61dc5a5df3f3e143d9f01b1710ad11e940f3e8ea5137c7a -DIST amdgpu-pro-vulkan-21.50.2.1384496-i386.deb 8124180 BLAKE2B 697899e40cedc584d8507c3c4c908c54db3676d47d720fb7b7fcab6e1f542e1d1e5efedb5b46231d4cd6974d3d03a19816d6ab4cc6d2f0279547058b5e4143e3 SHA512 8662efb65f14172f4261401115737f3c7eebbe071a9660f5146eaee9a1d4684c30174b18bea94d31686dbe679d66ab77f252192c1cda27ed57784cc9a57e5fdf DIST amdgpu-pro-vulkan-22.40.6.1580631-amd64.deb 26403020 BLAKE2B 9af314b75ec6af3ff1085f9eabf1f4d4c4c8e0bfdf2aea7ce64adf21fbc1e227784751861b1c42e7d66e458854be01e1b2f7da4bcd1c72cb5f74b12b02294de3 SHA512 2f097724b6063ef1a8e3dcb6a29884b580342e5a00ac59c2338f13f9162056dd4ab3e07d330805e48c81e7e8f42dc5cb927635c3c40f19bfe68c04ffbba41843 DIST amdgpu-pro-vulkan-22.40.6.1580631-i386.deb 28131372 BLAKE2B 4f92814a1f1aa3cecec5321252990c87548b94c633be2080fb4be9c9ef72772e45943b62c55e1424b03671540b599f13666d49599c7ef8e2a93a51a66cc17e92 SHA512 7ffd0cebb630cbf2a3845c0e673c408f56a046bf68d1c73a02b2a1d3a245d5fdc3cb00b461fe52dbd74abd15cdd3e75007539de584750fce22176e6994007d94 -DIST amdgpu-pro-vulkan-23.40.0.1718238-amd64.deb 23555536 BLAKE2B fc3aa3d0fe271bb9184999c6ba887cbd466ef41a61d1e35aaa0e94838322f8182e9c40393fa250fda7489ce5b04514b70f3b49274b6e58ce6db2a70223a11280 SHA512 6f6ca7cabc665fefbb8d2308cc3654baec726899ea1923885056bfa80e681c5f96eaba7e912bc73b7889dac322ffefec0cda061b7e0a1d099bca378e7afc5ae1 -DIST amdgpu-pro-vulkan-23.40.0.1718238-i386.deb 24907864 BLAKE2B 438cec19c1e96b872a81690b212b1693a048fab92cc67bab2aedaf917fa802760100631e408d70a5f3ff70bb88b8f888ee566926055770d318fbaa9a88a4490f SHA512 5f46fb6ab37ad596762f46fcd2ac2a0568a98023e97c92408d943e4a1033f4811450331f688da6f90a070d9cd0a56962284c71e645111c6c4f52e205fd41bf82 -EBUILD amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild 3270 BLAKE2B e36c39386c36d8f179a2a62b020ffac69a43a7cade3b2619b8ba6755e9c5a42e66c1bb5e560fca5b319eb5cc77d3d7ea489acd1aa2a71410e3efeec393101490 SHA512 77d275f8281bc2f73918879bcfa0f33f83c490188ad6bb11f05e21eaa9b3d00d9db6e00ac598723e247fdafdb32369b6f96838556c01e3863cf34a1ed688b9de +DIST amdgpu-pro-vulkan-23.40.0.1741713-amd64.deb 23818448 BLAKE2B 7772466630e2435b0c37ddcb7f6e377afb69f698c61752b03f6be9962bf9cc30265b29e4629d6c61d1760c20a6df2ed4da629e302c43195124d71358c3774f4c SHA512 bb5af1c1b547d6bb19fc4c4c5525acf14cc8eb7f9b6f3c1a480156aad476d1ec5f7530b4a3c8f474195a2c81af6d55f7bed793b17c82b0ded9f6a6d077b527db +DIST amdgpu-pro-vulkan-23.40.0.1741713-i386.deb 25236404 BLAKE2B 936761b0489950e20b3cc1dbf9dad3aaecc394bb79dc3d9f761afbafb005385edbcb6e32fc966e5f5d9a4b414d5e17b83b88b6926157f7beca450c5cba955bbb SHA512 fcf6995af686d205e9cddbb44d8bb57c0eb98985cd5579a806435cd40300fa6baa2c97e7087855ba3a09390cec6a91176156932f84e271a8c5a3b210c177bc0d +DIST amdgpu-pro-vulkan-24.10.0.1787253-amd64.deb 24104776 BLAKE2B 716f21242a7509abd7be7472dd6933f2e991818dd501cbb30002914589e82f74f389e95c4a921f17cb435279618b3cfeec7c691fb608d44e93c6acca52d458cb SHA512 8837965d33cdf8756bbb114d25a9e31d3e3572103b79a410521edd452372ec58d548f0b9e351f1d965bc4deb8d7a58cd4db77dd0f26957d54badd416ad430953 +DIST amdgpu-pro-vulkan-24.10.0.1787253-i386.deb 25584368 BLAKE2B 926196eea01f54b4274caa1c808cc948bcdb6bb2543622832f709175b7481d96ff34acd230b604c3e3adbdcdb1fb9c561b56560a9cb3516a8129da963b95fd5c SHA512 a48cdc9174290956c3eb77d7f2308696203cd2514374a87eb55a3b4ce13fec23aac670d9baff91e84e0ef4aeccc2397905af930b25c46c3586a49dd0fbc5a4c1 EBUILD amdgpu-pro-vulkan-22.40.6.1580631-r1.ebuild 3818 BLAKE2B e1f8338c6b4c0a7db5a3c8d512ea0c45b1af7fc7d5a6f62dc46a812dce123b6a70b68d89c3701a52bd63745ef7b90163d4e5eaa226976256f01fcc8e217bb44d SHA512 b361a9cd23f6b398fa0a45b3de6bd5d987ae74a721826c0f6a6275f215b52c0cb8b55c3c30f79cf1f6090a43ded0655bc6154d9aa6a2dbdbc991685ea4f3355b -EBUILD amdgpu-pro-vulkan-23.40.0.1718238.ebuild 3733 BLAKE2B 7748316e646a671f1ea6406ab1cecaa5c5df53952147dc391d998425283019a3960eb54b25f53bbb8e668a86b48a8676647e41edf6ec9f05b5129399c25f04ec SHA512 e93c9d1b9168489153f0eda7a4e1bb646096a105a36fd18427bbd53f63dffd25882cbe35d182147e37c6932643e2c61bee46d9bc19b06810400b4bea5100d789 +EBUILD amdgpu-pro-vulkan-23.40.0.1741713.ebuild 3221 BLAKE2B 3f7aeea8320413a779a81bfb563ed3a8ab913036a47caac30866c44c745eb4c7559ae2fa65aa6297591c3c3b61bc538afc77f93697849e473b22fc3834f54c2f SHA512 59779d6f2860fb9cb8394c7169425c8c542a645e92be206634150f69f0f8087b5ee7dd9d243de131ca0c0e7289f70527d277fab3e81935562b2e3b5d290e8064 +EBUILD amdgpu-pro-vulkan-24.10.0.1787253.ebuild 3221 BLAKE2B 13874a4f3b5df63255ffa312725af5532af1b2729724b3280b7d1ddad8ff940814befe85024a52e47d3bf67691e636559e12e0a4c219a8718bea991348ce0229 SHA512 d62faf032d8363a5212fd9cb0a3dee22036893545af5740d543bb76c0e69d6162a66436574d5a8b5ed6f4f18de8f2d2e1c9dcb6fdfe4b1c70b24ab867457806a MISC metadata.xml 402 BLAKE2B 45f4e6adffb186b9a9b36b420aaa5727f025206eca039d9f6fbe3eb302f7200cc24c079480d91c9d92ccd932bef86b87401400f17eba2fd8b4baa3fca66cf236 SHA512 dc9e5a699437291c5f768d66bdfd9d2aaa00e931f358e6d0045e764638332a8db14bd19a782aac0918dc4b42b8658a5974bdfec2971690e6718be247fff512b3 diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.40.0.1718238.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.40.0.1741713.ebuild index a6410d03eb85..24ab0cf868e7 100644 --- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.40.0.1718238.ebuild +++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.40.0.1741713.ebuild @@ -12,7 +12,7 @@ MY_PV_REV=$(ver_cut 4) MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}" -INTERNAL_VER="6.0.2" +INTERNAL_VER="6.0.3" MY_PV_FULL="${MY_PV}-${MY_PV_REV}" @@ -29,13 +29,13 @@ SRC_URI=" " S="${WORKDIR}" -RESTRICT="bindist mirror" - LICENSE="AMD-GPU-PRO-EULA" SLOT="0" KEYWORDS="-* amd64 ~x86" IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu" +RESTRICT="bindist mirror" + REQUIRED_USE="video_cards_amdgpu" BDEPEND="dev-util/patchelf" @@ -65,11 +65,8 @@ src_prepare() { if use abi_x86_64 ; then cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die - # Make sure there's only one file in the folder, to prevent unexpected behavior of the next command - [[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/x86_64-linux-gnu/" - - # Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk64.so.1" - mv amdvlk64.so* amdvlkpro64.so || die + # Add "pro" in the .so file's name + mv amdvlk64.so amdvlkpro64.so || die # same with the SONAME patchelf --set-soname amdvlkpro64.so "${PWD}"/amdvlkpro64.so || die @@ -82,11 +79,8 @@ src_prepare() { if use abi_x86_32 ; then cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die - # Make sure there's only one file in the folder, to prevent unexpected behavior of the next command - [[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/i386-linux-gnu/" - - # Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk32.so.1" - mv amdvlk32.so* amdvlkpro32.so || die + # Add "pro" in the .so file's name + mv amdvlk32.so amdvlkpro32.so || die # same with the SONAME patchelf --set-soname amdvlkpro32.so "${PWD}"/amdvlkpro32.so || die diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-24.10.0.1787253.ebuild index 10cd494f94c5..f844f4c6774b 100644 --- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild +++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-24.10.0.1787253.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,28 +10,32 @@ MY_PV_MIDDLE=$(ver_cut 2) MY_PV_LOW=$(ver_cut 3) MY_PV_REV=$(ver_cut 4) -MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}" +MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}" + +INTERNAL_VER="6.1.3" + MY_PV_FULL="${MY_PV}-${MY_PV_REV}" MY_PN="vulkan-amdgpu-pro" +MY_LINK="https://repo.radeon.com/amdgpu/${INTERNAL_VER}/ubuntu/pool/proprietary/v/${MY_PN}" -MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV}/ubuntu/pool/proprietary/v/${MY_PN}" +UBUNTU_VER="22.04" DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux" HOMEPAGE="https://www.amd.com/en/support" SRC_URI=" - abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}-amd64.deb ) - abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_i386.deb -> ${P}-i386.deb ) + abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}.${UBUNTU_VER}_amd64.deb -> ${P}-amd64.deb ) + abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}.${UBUNTU_VER}_i386.deb -> ${P}-i386.deb ) " S="${WORKDIR}" -RESTRICT="bindist mirror" - LICENSE="AMD-GPU-PRO-EULA" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 ~x86" IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu" +RESTRICT="bindist mirror" + REQUIRED_USE="video_cards_amdgpu" BDEPEND="dev-util/patchelf" @@ -60,8 +64,12 @@ src_unpack() { src_prepare() { if use abi_x86_64 ; then cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die - mv amdvlk64.so.1.0 amdvlkpro64.so.1.0 || die - patchelf --set-soname amdvlkpro64.so.1.0 "${PWD}"/amdvlkpro64.so.1.0 || die + + # Add "pro" in the .so file's name + mv amdvlk64.so amdvlkpro64.so || die + + # same with the SONAME + patchelf --set-soname amdvlkpro64.so "${PWD}"/amdvlkpro64.so || die cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die eapply "${FILESDIR}"/icd_amd64.patch @@ -70,8 +78,12 @@ src_prepare() { if use abi_x86_32 ; then cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die - mv amdvlk32.so.1.0 amdvlkpro32.so.1.0 || die - patchelf --set-soname amdvlkpro32.so.1.0 "${PWD}"/amdvlkpro32.so.1.0 || die + + # Add "pro" in the .so file's name + mv amdvlk32.so amdvlkpro32.so || die + + # same with the SONAME + patchelf --set-soname amdvlkpro32.so "${PWD}"/amdvlkpro32.so || die cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die eapply "${FILESDIR}"/icd_x86.patch @@ -83,12 +95,9 @@ src_prepare() { src_install() { if use abi_x86_64 ; then + # Vulkan driver insinto /usr/lib64 - - # Vulkan - doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so.1.0 - dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so - dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so.1 + doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so # ICD loader insinto /usr/share/vulkan/icd.d @@ -96,12 +105,9 @@ src_install() { fi if use abi_x86_32 ; then + # Vulkan driver insinto /usr/lib - - # Vulkan - doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so.1.0 - dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so - dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so.1 + doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so # ICD loader insinto /usr/share/vulkan/icd.d diff --git a/media-libs/amf-headers/Manifest b/media-libs/amf-headers/Manifest index 7618ee8b2725..35b6ab5626a2 100644 --- a/media-libs/amf-headers/Manifest +++ b/media-libs/amf-headers/Manifest @@ -1,3 +1,5 @@ DIST amf-headers-1.4.33.tar.gz 198142272 BLAKE2B 65e616012463e21bfa113ff62f76baaf186e18c6b3422bf5b2fdf8d208efe0ea7d07b74d6d292bc391202d2190c871dd0d6f997783b3ffa533d4086e395ae67f SHA512 e0c4f583996ff2d1d61c53b8ce7ef2eadb32d2a13930e59146b935840e31d032c5cec48baced70b0007fa5f33e30537d03ddf71140ff51213085aba20e16f5ca +DIST amf-headers-1.4.34.tar.gz 164856609 BLAKE2B d406648ffb7a0f7839971324a5fc4e0a8c3ef3835d2d31a84c05b01826b594323368d6486fd7fb324d004591619a5aacaa292ee39332c04d17688e8dc6c0d051 SHA512 184e30df08b3204425cf9833d8749a5a2470bf781a8d217460f0fe71d421e2dafbf028b4ee600793cd4dafafed6572f4661fd6a6e8f993fd000a6e0f83a836c3 EBUILD amf-headers-1.4.33.ebuild 700 BLAKE2B c316307dda26b30ae2d12fd139bcaa85963ef9d4ae40137bdb216563cd68e8d6b56a99ce781612b386ad2bece4deb77ed7ed25a5b8fe2f322b84e593ec162a2d SHA512 29f422bf67317048e297ec92a57f4841ec85df433f0efc1549d61d57ee26fcbcd1479077f5a59ca07f79d0d4103a56d03b794ec3bf358ac165f041242d6fa359 +EBUILD amf-headers-1.4.34.ebuild 696 BLAKE2B f2eae416402c822a19c222a3f55f4499cff545fe0560534eb638c23c21de018c2030a1b574683fcd56ecfc1ed161933fe6d2c2d74ae1673e7f102e45ea71ae5c SHA512 a40cc7e8955cc5e189c23940b37447053ae9c7a60460aaa76613b838c6098606016203f8823c5eb63ded50a182f6bd5a914d790c012af5700a67cead6dcd5d48 MISC metadata.xml 571 BLAKE2B 921f83bae051789cf587663b4168174eab058dc2866b4d9e24dcb9f3ff5f3b64ea85c7e45282c2eeea42716f7f79a971171333ece1dd72d7d2e49e84efe2ef57 SHA512 ed0a057d7f1c738308eed226c562b5a83bf6ae421f1487f98a1c8361afa65276c5ea2f83f3d8187229d88fe0fe02a41178d37347d28ddc5b22695ae3f4740368 diff --git a/media-libs/amf-headers/amf-headers-1.4.34.ebuild b/media-libs/amf-headers/amf-headers-1.4.34.ebuild new file mode 100644 index 000000000000..d4427b9c36fb --- /dev/null +++ b/media-libs/amf-headers/amf-headers-1.4.34.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF" +else + SRC_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +DESCRIPTION="The Advanced Media Framework (AMF) SDK" +HOMEPAGE="https://github.com/GPUOpen-LibrariesAndSDKs/AMF" + +S="${WORKDIR}/AMF-${PV}" + +LICENSE="MIT" +SLOT="0/34" + +src_unpack() { + default + + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + fi +} + +src_install() { + insinto "/usr/include/AMF" + doins -r "${S}/amf/public/include/"* +} diff --git a/media-libs/ampache_browser/Manifest b/media-libs/ampache_browser/Manifest index 865896e6a1ee..27867a194e72 100644 --- a/media-libs/ampache_browser/Manifest +++ b/media-libs/ampache_browser/Manifest @@ -1,7 +1,5 @@ -DIST ampache_browser-1.0.4.tar.gz 73653 BLAKE2B dc3d264c65b8b9a6fda434fdf5c8f4effe142f77f2138c4033cba935aec1d173cc75d2c5d8a74e977c9f838c8170f77c6c5d9bcad9064319038cd581e934bcc2 SHA512 6b6240e0f4fcf1f16439505e3e0bb32f628ea903a02eeb89b575ac7acd7b57b06af25ee9454c5ffe869d5659852105eb0e415099ff84acc2f9dd3d825b5e62d7 DIST ampache_browser-1.0.6.tar.gz 73982 BLAKE2B c67126c02706c0668884044e03dd128ee33a6b6a9d459899e9cc9e6e24e61e586aee406c9fa30338133c959752559c0dba1a7e38cf19dba8e7908b59c0866a0b SHA512 08e1f5a7fe525819a8b55e66f43fde0cfdff5273103b167400c47b9d67dcf4b818466de8b0c9684dac4c9102aee53e50a202a3e3f9775c7e7471a4d133b6ae24 DIST ampache_browser-1.0.7.tar.gz 75648 BLAKE2B eddd929a90d632712b2cc1d2c6adce37f7567d17421f404954fcbf70714ef38a0fff2646ae44b4a894f087743da708020d0847a6c7f7ac3d8eb7525d6d003545 SHA512 fc9b7492a14f36860f0f63ccf682760d0013dad91c0011dbd58370fd3fa83918add6e22702bf4dda6f8ee7b029fdaf9431bea33ecb6dcccf345d6fed80f863af -EBUILD ampache_browser-1.0.4.ebuild 630 BLAKE2B 6b544496cb4bb6d721043a7fa7c0b8e61c16990c7684d914995b516e9c25644e3497bc4872be2e5efccb6125d45e34666186e97aad0e7e5821ba89c849bbc80c SHA512 482bfe82087865fe04f7b3d0d8841d3c906e1f4707855eb7e2712d1912b54b6147c7b8f21594ede4330f04ee0b5e40a52fb07901bab9684258d42bbb31c90b9c EBUILD ampache_browser-1.0.6.ebuild 737 BLAKE2B e76e0e1dae7dd612d9b0ba02cfb8e109448098fd22bd2dc6f508daeb96cc3a4c8b1fad01aa47e2fd23e8cdbb041ec07084f33855910bbae7e01805b3efa3d69a SHA512 d61e8032f559a459056c4e609e7249ec486bd2cfa04a838165bea63c8fa31f3871da957045cd8c93776410fe6fc0948cafa23dde8e4c316f8b9c0cc5e5d15463 -EBUILD ampache_browser-1.0.7.ebuild 739 BLAKE2B f98ab91143d025aad1a7050922a262718af04a751fb208715093b4a22e04ad0588a8f064d1e48261bba81399de18cb7d1b54cbd5c0add05895c66da529b03620 SHA512 3cf435b7930a01c5f43a319063662d9836385b282fede33d4e6c7f4466cf5d5cc462b7826b89d7eff164cfca86224dd4f600243f72b1bb66b520c23af180b046 +EBUILD ampache_browser-1.0.7.ebuild 737 BLAKE2B 02077ba7c84431fbffbb4b363a5ec57fe9800a5c88fd3ebd23213a056d7911cbfa49f4f6290351d133ea670f819e7bf750cfe868514dfe0dfa73848306be5bc4 SHA512 7638b4506d5fa70933c55d8383add0e53614c6dfdcde54fd0a7dfae3e7fcf61209cd121cd3cbc4d29a7ef1e68822632d41af2a685d27a5c5d87cd32d0cb474c2 MISC metadata.xml 500 BLAKE2B 9fa6175e5bd94abd07d8ef2eb25bcb825bda7f4029ad7319f7838f4ac67ab9fd8cc5bfa3ee73f2e859927a647ce90131f91134315c5f82360e24ae3f996654eb SHA512 2c1a8e1ad4010812d6bf2a726b9810eae6796c1f90020f80301af4e39f8dd55ff6bbbb3f6bb02b8b9e3a4f1d758739ce7b5ba76a68dc5efdac1a02435427813a diff --git a/media-libs/ampache_browser/ampache_browser-1.0.4.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.4.ebuild deleted file mode 100644 index 8649dc997988..000000000000 --- a/media-libs/ampache_browser/ampache_browser-1.0.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Ampache desktop client library" -HOMEPAGE="http://ampache-browser.org https://github.com/ampache-browser/ampache_browser" -SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="debug nls" - -RDEPEND="dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5" - -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - -DUSE_NLS="$(usex nls)" - ) - cmake_src_configure -} diff --git a/media-libs/ampache_browser/ampache_browser-1.0.7.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.7.ebuild index e20f17b9f929..a33d3043d4c7 100644 --- a/media-libs/ampache_browser/ampache_browser-1.0.7.ebuild +++ b/media-libs/ampache_browser/ampache_browser-1.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.g LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" IUSE="debug nls qt6" RDEPEND=" diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index 8c18d7f521a9..eced56bcd8b0 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -1,12 +1,8 @@ -AUX assimp-5.2.5-disable-collada-tests.patch 798 BLAKE2B 302c2ea2a1152f7bcf71d82378991a2a7259e1a4d81808499b163156ddec2351f441fa7db17886977b1e51c10ba7db70ea68d4cdfcfd2dccea9d0cc06082f429 SHA512 36164420838a5bb21c11dbc3955158b07d561e2da944017a6ce65fd9eab399ddcaddeaa3031727d977a283c2af4dbfec611507251e6a91f6ad475d5ef3763a08 -AUX assimp-5.2.5-disable-failing-tests.patch 3612 BLAKE2B 08dd1585e0d5ea37f5b52a88d364f48865f3b8032eba3cbd875047b7a07a5d9df658631cb5649dc6688112a9ec8809d9dfe75959711b0238b78ed01a5bc2eeb9 SHA512 cef65009eaf04cef82c22d86273dc63a30ae32ecf352b9ce9bfc61ecd9b9c67415d4162a02ffad5337d3d2af4f594b6f4387ad68fb4b4c78500d7ea1a3d42b82 -AUX assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch 5237 BLAKE2B 04f0cf86616afcf0e050ae9d8caf956b389362a667a370a1bfc523b428990e09481c92946cf252c04259d69b1718087aa24c65e645f19a86339fd1d4f359a505 SHA512 76fa57de33bb93722d9c83af7c706a99a3a9e76f1136b63edc7ba4036fd75ada9d7d6df2060563f56963a6ec971023944d6701319bb1c810fd2803fb4fb4afc7 -AUX assimp-5.2.5-fix-version.patch 881 BLAKE2B dd859c3437ea89b35a463e3aef64868f49a7c5d157d86b1c618bc15390b67950d9b40ae8717db0d21d7048b177c1ba61f6f871919cdf49e5576fc5be46553cd5 SHA512 9e1515624bc8f9d4eaa0c5d103b386e5cca12817b26e7002af7b0dd412e744fb1296e513371b9f3b0f87e566c9ca9b1b68e216a7f0e5a2ed11096d89b2fab0ae AUX assimp-5.2.5-float-comparison.patch 3809 BLAKE2B 6a0474c759d6a4ff68ced5c7f929062b98ae37594f6bf00a12bdfe787eaeaf24af9704e800114e4f2ccd485547165a09debbbf34820138c047a3830b95cdbc57 SHA512 6e4b55744fe5413e681f67af99f1050695cea15563e5e5f2406f9fd34cfdcfe58b40727e1071ecd98151b756c373d9f189d6e42c0705d4456ca5b676704b5d50 AUX assimp-5.2.5-gtest.patch 843 BLAKE2B 044019d2036755c52f780e1bc4e842f181e067c1084432efe2fa6ce769fdd3f919224a7aece04a30593b477637e7e3760f023b50139ab9daecb741d5239dc021 SHA512 431ecd0dec29837a97323227311d795d1774cbe645098a945a05a8b5c36d3dd83f79ec99e99c3c27ec89adb5b90add09f030a0fdde6086381affdf91c83150ff DIST assimp-5.4.2.tar.gz 53807656 BLAKE2B cfa069cefdddcfdb756db6a72a5f67c528fa2c6a2cc15d8a98432c5a0149288429b76cd125b01471d082caac0a4a13781a853fd0dd8f4de9801e0ef209be0238 SHA512 4bfcc3a1b5a0cf3f382560564cac67088e13c62500c3c77dcef03811e67debe72ff318f5ed145b204d5017b56cb4293f3fe14b4060ca193813cef42b12eebe9d DIST assimp-5.4.3.tar.gz 53964510 BLAKE2B f08711881600d708ad523b2c36488c79a39463b5baa32261b674499582e0f4aa5fd4e8ade4bca0ceff93917f685f240b7dcee4d9140a65e3a9b888559a7b0433 SHA512 4738db84068d36face8caf61c0789178fdfc1310fa8e81ffb9b025e14183bde546b784d691c92438ab310a79ab7b75ab62ee0247d5f01e81ddf04fb94b7a9c0b EBUILD assimp-5.4.2-r1.ebuild 4135 BLAKE2B 609a17d3b1ee3ebf47a9351317640f41ef8075df413b4aeff56ec93d96f8ca529d4a80046db5c4b8a1fac1dc6f3468f87ce8455883fc99f0d17b17cdef831f82 SHA512 29a211cfc18319a165414ffb418acc631ef4c9f60fa007762b2841a1ff448317612fecb37fce08a477f559a3ef1d9ae9df37974f8d66c3b1fe7f5f9aaa4bd98c EBUILD assimp-5.4.2.ebuild 4110 BLAKE2B 331260ac82d44d82f9bda70c1ef725d026da3fea49cb92e9ad9e8ec9f268e12ae281693d2e0b3b1207b5372cb40aca331f43a000f37359ac667012dcdd61f781 SHA512 463148006ae5a61b3969a05f5ace1a5741a9f7a07dd3a27fe8938b519af90d357f2a59feb25ed7c14ab9a63aa0d6e0e9ab385a0bd5afec9caddcf14742ce6f17 -EBUILD assimp-5.4.3.ebuild 4135 BLAKE2B 609a17d3b1ee3ebf47a9351317640f41ef8075df413b4aeff56ec93d96f8ca529d4a80046db5c4b8a1fac1dc6f3468f87ce8455883fc99f0d17b17cdef831f82 SHA512 29a211cfc18319a165414ffb418acc631ef4c9f60fa007762b2841a1ff448317612fecb37fce08a477f559a3ef1d9ae9df37974f8d66c3b1fe7f5f9aaa4bd98c +EBUILD assimp-5.4.3.ebuild 4131 BLAKE2B 93cb8cb54f8a850f6b00ece55cf3743ff95dc7a953ecec5115f60602050d0f6d3845b9b40039a8d41b54cc01a095544c23ee09bf2e787893b3f22faeb60c0c8e SHA512 623561482c28ef5a528d43582c0d785f728126787515a12241cdc463d291a07ae8049a240c460c8fb5c2a6081815ae66573d8570eddf8eac635207e66efc8cb1 MISC metadata.xml 718 BLAKE2B 8f29648faf86ab8d49a42c9aa01b7e164e599ab0815bb57ac4941b1df0dea31f753adb206d3137e7283443111f2c550cb8409b4fa5783340c261fc5fc84489c2 SHA512 ef8e22391931d5cab643ea2d9e83cebedcb21ca4ffb231b394205a9421895df0f2929b4c3a73863eda75a47d22e45751c538b74dbd39565bc1857ec65b4fe34b diff --git a/media-libs/assimp/assimp-5.4.3.ebuild b/media-libs/assimp/assimp-5.4.3.ebuild index ca6c5eae4ed8..e9818e399e12 100644 --- a/media-libs/assimp/assimp-5.4.3.ebuild +++ b/media-libs/assimp/assimp-5.4.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86" IUSE="collada doc samples test" RESTRICT="!test? ( test )" diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch b/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch deleted file mode 100644 index 971578f0016f..000000000000 --- a/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3bd65679f7db2ec95abb22fef7a30a15dcc1c297 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Mon, 23 Jan 2023 19:54:23 +0100 -Subject: [PATCH] disable collada tests - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -63,7 +63,6 @@ SET( COMMON - unit/utSimd.cpp - unit/utIOSystem.cpp - unit/utIOStreamBuffer.cpp -- unit/utIssues.cpp - unit/utAnim.cpp - unit/AssimpAPITest.cpp - unit/AssimpAPITest_aiMatrix3x3.cpp -@@ -137,8 +136,6 @@ SET( IMPORTERS - unit/utBlendImportMaterials.cpp - unit/utBlenderWork.cpp - unit/utBVHImportExport.cpp -- unit/utColladaExport.cpp -- unit/utColladaImportExport.cpp - unit/utCSMImportExport.cpp - unit/utB3DImportExport.cpp - #unit/utM3DImportExport.cpp --- -2.39.1 - diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch deleted file mode 100644 index 92936e6442eb..000000000000 --- a/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch +++ /dev/null @@ -1,95 +0,0 @@ -From aaace4ca2e2d4f46b7dce0940af6e332563c5a21 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 24 Dec 2022 11:19:17 +0100 -Subject: [PATCH] disable failing tests - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp -+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp -@@ -127,25 +127,9 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3RotationZTest) { - EXPECT_EQ(result_cpp, result_c); - } - --TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromRotationAroundAxisTest) { -- const float angle(RandPI.next()); -- const auto axis = random_unit_vec3(); -- aiMatrix3x3::Rotation(angle, axis, result_cpp); -- aiMatrix3FromRotationAroundAxis(&result_c, &axis, angle); -- EXPECT_EQ(result_cpp, result_c); --} -- - TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3TranslationTest) { - const auto axis = random_vec2(); - aiMatrix3x3::Translation(axis, result_cpp); - aiMatrix3Translation(&result_c, &axis); - EXPECT_EQ(result_cpp, result_c); - } -- --TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromToTest) { -- // Use predetermined vectors to prevent running into division by zero. -- const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize(); -- aiMatrix3x3::FromToMatrix(from, to, result_cpp); -- aiMatrix3FromTo(&result_c, &from, &to); -- EXPECT_EQ(result_cpp, result_c); --} ---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp -+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp -@@ -228,14 +228,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4RotationZTest) { - EXPECT_EQ(result_cpp, result_c); - } - --TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromRotationAroundAxisTest) { -- const float angle(RandPI.next()); -- const auto axis = random_unit_vec3(); -- aiMatrix4x4::Rotation(angle, axis, result_cpp); -- aiMatrix4FromRotationAroundAxis(&result_c, &axis, angle); -- EXPECT_EQ(result_cpp, result_c); --} -- - TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4TranslationTest) { - const auto axis = random_vec3(); - aiMatrix4x4::Translation(axis, result_cpp); -@@ -249,11 +241,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) { - aiMatrix4Scaling(&result_c, &scaling); - EXPECT_EQ(result_cpp, result_c); - } -- --TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) { -- // Use predetermined vectors to prevent running into division by zero. -- const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize(); -- aiMatrix4x4::FromToMatrix(from, to, result_cpp); -- aiMatrix4FromTo(&result_c, &from, &to); -- EXPECT_EQ(result_cpp, result_c); --} ---- a/test/unit/AssimpAPITest_aiQuaternion.cpp -+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp -@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromAxisAngleTest) { - EXPECT_EQ(result_cpp, result_c); - } - --TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) { -- const auto qvec3 = random_unit_vec3(); -- result_cpp = aiQuaternion(qvec3); -- aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3); -- EXPECT_EQ(result_cpp, result_c); --} -- - TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) { - result_c = result_cpp = random_quat(); - EXPECT_EQ(result_cpp == result_c, ---- a/test/unit/utVersion.cpp -+++ b/test/unit/utVersion.cpp -@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) { - EXPECT_NE( aiGetCompileFlags(), 0U ); - } - --TEST_F( utVersion, aiGetVersionRevisionTest ) { -- EXPECT_NE( aiGetVersionRevision(), 0U ); --} -- - TEST_F( utVersion, aiGetBranchNameTest ) { - EXPECT_NE( nullptr, aiGetBranchName() ); - } --- -2.39.0 - diff --git a/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch deleted file mode 100644 index 1ee315ab28be..000000000000 --- a/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch +++ /dev/null @@ -1,143 +0,0 @@ -From f3d40e0bd8b7134f963adc08b8c2bb043a385c6f Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sun, 25 Dec 2022 09:46:58 +0100 -Subject: [PATCH] drop failing tests for abi_x86_32 - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp -+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp -@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) { - EXPECT_EQ(result_cpp, result_c); - } - --TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) { -- const auto q = random_quat(); -- result_cpp = q.GetMatrix(); -- aiMatrix3FromQuaternion(&result_c, &q); -- EXPECT_EQ(result_cpp, result_c); --} -- - TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) { - result_c = result_cpp = random_mat3(); - EXPECT_EQ(result_cpp == result_c, -@@ -102,18 +95,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiTransposeMatrix3Test) { - EXPECT_EQ(result_cpp, result_c); - } - --TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3InverseTest) { -- // Use a predetermined matrix to prevent arbitrary -- // cases where it could have a null determinant. -- result_c = result_cpp = aiMatrix3x3( -- 5, 2, 7, -- 4, 6, 9, -- 1, 8, 3); -- result_cpp.Inverse(); -- aiMatrix3Inverse(&result_c); -- EXPECT_EQ(result_cpp, result_c); --} -- - TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3DeterminantTest) { - result_c = result_cpp = random_mat3(); - EXPECT_EQ(result_cpp.Determinant(), ---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp -+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp -@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) { - EXPECT_EQ(result_cpp, result_c); - } - --TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) { -- const aiVector3D s = random_vec3(); -- const aiQuaternion q = random_quat(); -- const aiVector3D t = random_vec3(); -- result_cpp = aiMatrix4x4(s, q, t); -- aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t); -- EXPECT_EQ(result_cpp, result_c); --} -- - TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) { - const aiMatrix4x4 temp = random_mat4(); - result_c = result_cpp = random_mat4(); -@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) { - EXPECT_EQ(result_cpp, result_c); - } - --TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) { -- result_c = result_cpp = random_mat4(); -- EXPECT_EQ(result_cpp.Determinant(), -- aiMatrix4Determinant(&result_c)); --} -- - TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) { - EXPECT_EQ(result_cpp.IsIdentity(), - (bool)aiMatrix4IsIdentity(&result_c)); ---- a/test/unit/AssimpAPITest_aiQuaternion.cpp -+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp -@@ -54,19 +54,6 @@ protected: - aiQuaternion result_c, result_cpp; - }; - --TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) { -- // Use a predetermined transformation matrix -- // to prevent running into division by zero. -- aiMatrix3x3 m, r; -- aiMatrix3x3::Translation(aiVector2D(14,-25), m); -- aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r); -- m = m * r; -- -- result_cpp = aiQuaternion(m); -- aiCreateQuaternionFromMatrix(&result_c, &m); -- EXPECT_EQ(result_cpp, result_c); --} -- - TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) { - const float x(RandPI.next()), - y(RandPI.next()), -@@ -115,14 +102,3 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionMultiplyTest) { - aiQuaternionMultiply(&result_c, &temp); - EXPECT_EQ(result_cpp, result_c); - } -- --TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionInterpolateTest) { -- // Use predetermined quaternions to prevent division by zero -- // during slerp calculations. -- const float INTERPOLATION(0.5f); -- const auto q1 = aiQuaternion(aiVector3D(-1,1,1).Normalize(), Math::aiPi<float>() / 4.0f); -- const auto q2 = aiQuaternion(aiVector3D(1,2,1).Normalize(), Math::aiPi<float>() / 2.0f); -- aiQuaternion::Interpolate(result_cpp, q1, q2, INTERPOLATION); -- aiQuaternionInterpolate(&result_c, &q1, &q2, INTERPOLATION); -- EXPECT_EQ(result_cpp, result_c); --} ---- a/test/unit/AssimpAPITest_aiVector2D.cpp -+++ b/test/unit/AssimpAPITest_aiVector2D.cpp -@@ -74,28 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) { - EXPECT_EQ(result_cpp, result_c); - } - --TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) { -- result_c = result_cpp = random_vec2(); -- result_cpp -= temp; -- aiVector2Subtract(&result_c, &temp); -- EXPECT_EQ(result_cpp, result_c); --} -- --TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) { -- const float FACTOR = RandNonZero.next(); -- result_c = result_cpp = random_vec2(); -- result_cpp *= FACTOR; -- aiVector2Scale(&result_c, FACTOR); -- EXPECT_EQ(result_cpp, result_c); --} -- --TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) { -- result_c = result_cpp = random_vec2(); -- result_cpp = result_cpp.SymMul(temp); -- aiVector2SymMul(&result_c, &temp); -- EXPECT_EQ(result_cpp, result_c); --} -- - TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) { - const float DIVISOR = RandNonZero.next(); - result_c = result_cpp = random_vec2(); --- -2.39.0 - diff --git a/media-libs/assimp/files/assimp-5.2.5-fix-version.patch b/media-libs/assimp/files/assimp-5.2.5-fix-version.patch deleted file mode 100644 index 71b58c4808d1..000000000000 --- a/media-libs/assimp/files/assimp-5.2.5-fix-version.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/assimp/assimp/pull/4730 - -From b526d7a4b82be6d8c1481459975350b94384e805 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 17 Sep 2022 15:15:58 +0200 -Subject: [PATCH] fix version - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED) - add_definitions(-DASSIMP_USE_HUNTER) - ENDIF() - --PROJECT(Assimp VERSION 5.2.4) -+PROJECT(Assimp VERSION 5.2.5) - - # All supported options ############################################### - ---- a/test/unit/utVersion.cpp -+++ b/test/unit/utVersion.cpp -@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) { - } - - TEST_F( utVersion, aiGetVersionPatchTest ) { -- EXPECT_EQ(aiGetVersionPatch(), 4U ); -+ EXPECT_EQ(aiGetVersionPatch(), 5U ); - } - - TEST_F( utVersion, aiGetCompileFlagsTest ) { --- -2.37.3 - diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest index c9ec76492848..5fcb6df67d91 100644 --- a/media-libs/babl/Manifest +++ b/media-libs/babl/Manifest @@ -1,6 +1,6 @@ DIST babl-0.1.106.tar.xz 315068 BLAKE2B 560518beab77ec2f3fc50062bda80839f749992e4c61bef3badd4acfbc2a7bba6dce332ffabe65dcf18e4ba450d0ae1d261b5e34724a1309ea74e50ce3e452c7 SHA512 97dc57141754ff64a961f77df50dcd91b32d3cf26efa8ba9f3dd5fcfae41e96f986178a04ba7a8940effb6e6e33ac98b163551f377dc781308c750222efb4943 DIST babl-0.1.108.tar.xz 317036 BLAKE2B a2ece95d7cad33aa70e41ee9c01bd11b7fb1730cb0e0d64df42c4c933a1ac1955b103d75d2ade613ebee0362ade8aaf8ed1257a3cbe307d623243869244f67c1 SHA512 3ebdd18b32505e3009ba8f4957ffe892226d83012fbf3217b1761645fdcae943a19bda1a1f93adde78a5dd83fa11b0ba23014118228ca4eab4fd18001f1f4970 EBUILD babl-0.1.106.ebuild 1949 BLAKE2B dce3a6dc468602f5485eda654ccdb1c6dfe92035ff94bf1a8bdd8e2f265c89a07a071f2abdd816aa35676137aa718ed50843cbae78a891d11d86ae76566a923b SHA512 3dac8c4ca2ac21e64bde0b60ab4a92ce49a649c5d52d6f557c141874b514ead985f89e59c86a758f78adf2acbaad6f78b948456267debc43bd624c44805b4e91 -EBUILD babl-0.1.108.ebuild 1953 BLAKE2B 03c14cbc7c9a8a704597d0e5cd4eca567edb3afd33a8cb098adffd06e17371afae079a2d9816cc9f08552ce2c5da9cd8971ed0e9d4ad0fda2769bc19a17389e5 SHA512 e42085f20b79b3942772f12eff8b060e8d4f507117632dda816b849838c0d3585fafa9ba8e621a5016cba87886a046521bae3b1bd430b2cf9b8e64d744b75f30 +EBUILD babl-0.1.108.ebuild 1951 BLAKE2B 17f36711f36a249cb9ebbdb90abbdcb13acb6e95bf7fb410a5f7149d44b0c352acf9a3fef2b381eb1a8c2bace111e3b9d7e7fe558b4b73530814001bf494d66a SHA512 9438161acf4c0e31b9c77ababa4c60c8f02f1ae8c0f4f95f48c38eea7192abdab931af3b2708de5058f90247adc87409a5ab054291f4de40dc49ddf7fd743aa9 EBUILD babl-9999.ebuild 1749 BLAKE2B 97f3583da84a236c7835ae140d3f79a1de27a571e54667451223dd5e7d170e9dae6bfdd71593e0eb8fd3cd45a14dd548a0404d19c97ee692576cfdc7edb55cc5 SHA512 8772fa9d4cec0d144032ea4774846f643f5d42139c2d230ea0b08fd4056f22a2f103ae05a8189e2de0be60ee3d9ed1dba1be19a56639d4ebd293196fe4aaac5f MISC metadata.xml 482 BLAKE2B b87a2ff4b72fc2aeed91042dd7b6a65032aa4608c7079fbc94c1d1f85e681bc446aa1fcad5f14cba510febe1430b290417cd498ff09c797ec8b28c84e6451e4e SHA512 3345414f92106c39f8364c1554e0325cfd45cbf94f84315d809bb305faf4093b3b971c79f7c32ea998a8fd0c6c9369c249ce10063a1521690a624860e20de995 diff --git a/media-libs/babl/babl-0.1.108.ebuild b/media-libs/babl/babl-0.1.108.ebuild index 17c114a7df2f..0c5bacbfcfa9 100644 --- a/media-libs/babl/babl-0.1.108.ebuild +++ b/media-libs/babl/babl-0.1.108.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="A dynamic, any to any, pixel format conversion library" diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest index a864081e4d54..61b2fc5c5453 100644 --- a/media-libs/bcg729/Manifest +++ b/media-libs/bcg729/Manifest @@ -1,4 +1,4 @@ DIST bcg729-1.1.1.tar.gz 122475 BLAKE2B 6774f6af439c9308db856be9d4bbb6db5c73e7a807b51dca6338d1506d896052a7830ade7767b45fd5a9ded0a6a0057e207bc1d5b0e33adbaed9dafb13a7bd3b SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8 DIST bcg729-tests-20210101.zip 33438219 BLAKE2B 93bf1538f905f2fb67d703a6275ac7d616c005efb709f4d11e838be8b06e7f87429c4114dfc3e393b7b635dca51bf75a09d676188e9e11facdf7ec45ec5e4e50 SHA512 bd97521dc620e857dc3956ffc8a0b23da86ab2dd00621247ad91f05f04a9df7ce19bda426a307188f9271341332a393cb6e85c5c7e04b85c6e92496b6ffad5fc -EBUILD bcg729-1.1.1.ebuild 1230 BLAKE2B e5cf6a21fb3e106935eec20f2c2a998168fb3fa3328620aeb7f46a5d0e03d59b4ebf2bcc2bac952df84470ddf195d3f896b8a19964973c237c888c9a9afda438 SHA512 5957db739f0058811412001b8f320c656e92d9dfc7da07ffc31d5781c4e8d888f5a93b537d405bdd88382012eae38a2c29161469d505ffd4532d5faa444fcae9 +EBUILD bcg729-1.1.1.ebuild 1237 BLAKE2B 7539c5b71a1ac934335c766b4bc1cd0cdd2772481944e4c0d24c8d0f186ab40a134c59801e2aa876e8597fdf4800878d340839a10bd5017dc0ce9a7883440db6 SHA512 a8ca4a1b8eec1571cd03b1258fb07ab94eec1edda45d2de21aa8af44533ca0543b4a6058721e968e1e4925faaa3bb4ee87e6c346ae2cb0548414d096a9d30337 MISC metadata.xml 415 BLAKE2B 099a0b7a7e7072f8f06793ee2736f5ee1c0b13964422698833bac8f55fc6f5581775baa1a6450af2a10282045e31dedc2959b90eb34277ee56998fe69f18ab38 SHA512 1e3bcd61f7a581eb6474964e1bde75fe3948902111e9ba1a7c501f66b850ed43181fa92be7655b4bdbb5b6fae3a23ea1e4627a574b31a1980dea0273d9224af7 diff --git a/media-libs/bcg729/bcg729-1.1.1.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild index 20dab09531f5..2b5d8de3f110 100644 --- a/media-libs/bcg729/bcg729-1.1.1.ebuild +++ b/media-libs/bcg729/bcg729-1.1.1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_/-}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" IUSE="test" RESTRICT="test" diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest index 53b2f7543826..c259be98f641 100644 --- a/media-libs/cimg/Manifest +++ b/media-libs/cimg/Manifest @@ -1,7 +1,5 @@ -DIST cimg-2.9.3.tar.gz 11222797 BLAKE2B c2135a0219305dafde642198888f5a813f7c73a34dbb015b271cbfd601a4265fe0495cbd74a0ac502cbbd1b8ead49687a945d35d7eaffe5127cbdc9c67664c14 SHA512 038cfa0dbb8beeffa53cc84491988bfee27b0e3e74c3f802185669be5ddc85f0ab002a6bce0e57e3692aa6380715436078cbcccadb0e2b34442db50fc19c1aed DIST cimg-3.2.4.tar.gz 12660194 BLAKE2B f30f24e388a066a6923a72be00055449862cc643bbe870e55198718e185d2fe9213cb8f19cb83c68fe6ff5ea4e93c2529f70c7256b2d022b304cb2b020f0db11 SHA512 71cbf5161a7778a14e105d8aa41bf0431303b6f4a0f4982d3788903b0505f5ae96be9515c67ea6a52e0e76fdcb25efe3cfd7684980545d078ff41e10dbb4fbb6 -DIST cimg-3.4.0.tar.gz 12666868 BLAKE2B e3beea58774b687a310c8aac594571c34097205bf2efd02abd0af50e8bb87afb8db1cd4a38a5ad9ed6e7cdd777f269434e033bdab8dd795957dd2bc30714b711 SHA512 a960354bc245e933a0b6e175bfe1f9d03abff300a9d9e74e67203e204302349a9ec9dc500e2023776c614180d07a408bdfe9f044185c0707b25714f6ac9d8b85 -EBUILD cimg-2.9.3.ebuild 593 BLAKE2B 70b3d6bc70942f9296567570d314ec26a1c95c080b543a5ccce0b6444eb6d8d0ddc0cadda74c487c214de92033af187f2c1489ebe3e73f612b510a74ef451960 SHA512 d974bee754336765eec6ec5488fe25089b725ce8057d53a0965072438bdbf784d776c6616d28bfea0953a0db41722f6dfa66ab56e72104e008d9d40f8b8839d6 +DIST cimg-3.4.1.tar.gz 12667815 BLAKE2B ad65938c75e28dbf9645e23972bd7d4e867c0ec16df686ce16b56cf4704869159ae3716d5d10675ac5965832341551612fbdb78ac6e5ca79157c948200ec031c SHA512 54357c177c1e25117778d444e0317a5a5f9dc9dd40ff2c280b6c05f846b2352c523ba6ab9eeea2e05094cc8fbbfe5a544a5f83eeda46394b3d87962b3b1e31d5 EBUILD cimg-3.2.4.ebuild 592 BLAKE2B 6a1d471309cddac88153b113d90e92870f1037cfe54b8b6d0d9f7afea058879c02628227f717a97d072d50798d959243679bbcb09b07985e10e1fe3630670160 SHA512 4d22c05e8c37666810a2403d93e9096f89840ed9e574d2953b0dfb714e03a0b4b951543b7fee41fe43fbe2d29c1bd3af6de7741c532ce5a9c53523e7070c778f -EBUILD cimg-3.4.0.ebuild 592 BLAKE2B 85b45e53554357ec149a6125a8d545bf0152324f34b99d5a3064123d79a691a1f4f895a28be73a8bedfadd074016cd5a1f9869854878045d1e0a1259cfe88ae6 SHA512 f4d2728375dc7ff893dafc2da8f942a4a0498c5666adad3ad1404b4b47ff711a9d3e8fb9698756d31b18f061631456be1e59bd36be7d711499a77cb57e32d1d2 -MISC metadata.xml 299 BLAKE2B dd8e2707db89c2dc70b41134566ee0ddd45fe680d09193578112ec2dfc580f6dfa523a0891a0c1685d08e8876c745894569d50c9bcddde93cf3c63d5124e8aca SHA512 3e6f11de12e1d83026f948fcb55ef9b7a0eb7b8688c5f91b729a3d593e664058eb2b617d1ba74224b6950c6ff972c7157240a3065fb0265db628b2bb2cde04ec +EBUILD cimg-3.4.1.ebuild 592 BLAKE2B 85b45e53554357ec149a6125a8d545bf0152324f34b99d5a3064123d79a691a1f4f895a28be73a8bedfadd074016cd5a1f9869854878045d1e0a1259cfe88ae6 SHA512 f4d2728375dc7ff893dafc2da8f942a4a0498c5666adad3ad1404b4b47ff711a9d3e8fb9698756d31b18f061631456be1e59bd36be7d711499a77cb57e32d1d2 +MISC metadata.xml 695 BLAKE2B 01ff882592a3d248209386d0873eadd0df9a2ded4bf0595c55228aa722b4297634c6fcc14e1b8b4d474cd6b3632cabcd8174f3ef66eaae94cb9b1b10a0de1628 SHA512 1ef8fabd67cecb9e9dd5fc949cb3e670764fdc34b472ff74611d5629f5bcda62013d8e87efdb997d85c1395ea08bbefec76092ea55242a5200af7584eb188d74 diff --git a/media-libs/cimg/cimg-2.9.3.ebuild b/media-libs/cimg/cimg-2.9.3.ebuild deleted file mode 100644 index 68ac08fd6e5d..000000000000 --- a/media-libs/cimg/cimg-2.9.3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="C++ template image processing toolkit" -HOMEPAGE="https://cimg.eu/ https://github.com/GreycLab/CImg" -SRC_URI="https://github.com/GreycLab/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CeCILL-2 CeCILL-C" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples" - -S="${WORKDIR}/CImg-v.${PV}" - -src_install() { - doheader CImg.h - dodoc README.txt - - use doc && dodoc -r html - if use examples; then - dodoc -r examples - docompress -x "/usr/share/doc/${PF}/examples" - fi -} diff --git a/media-libs/cimg/cimg-3.4.0.ebuild b/media-libs/cimg/cimg-3.4.1.ebuild index 81ead1e98430..81ead1e98430 100644 --- a/media-libs/cimg/cimg-3.4.0.ebuild +++ b/media-libs/cimg/cimg-3.4.1.ebuild diff --git a/media-libs/cimg/metadata.xml b/media-libs/cimg/metadata.xml index 5d7cc3ce7038..300a92c40cbe 100644 --- a/media-libs/cimg/metadata.xml +++ b/media-libs/cimg/metadata.xml @@ -2,7 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <longdescription> + The CImg Library is a small and open-source C++ library for image + processing, designed with these properties in mind: usefullness, + genericity, portability, simplicity, extensibility and freedom. + Due to its generic conception, it can cover a wide range of image + processing applications. + </longdescription> <upstream> + <bugs-to>https://github.com/GreycLab/CImg/issues</bugs-to> <remote-id type="github">GreycLab/CImg</remote-id> <remote-id type="cpe">cpe:/a:cimg:cimg</remote-id> </upstream> diff --git a/media-libs/clutter-gtk/Manifest b/media-libs/clutter-gtk/Manifest index 464717cd41ba..c39f302a3699 100644 --- a/media-libs/clutter-gtk/Manifest +++ b/media-libs/clutter-gtk/Manifest @@ -1,4 +1,4 @@ DIST clutter-gtk-1.8.4.tar.xz 331508 BLAKE2B 4e21b361fb0ebf8e322601e3a9f148125cb489cb6e14a963ee6e7fbf845556dd37fc1fedc89e8288d24bca559afe079cb7efe65c7be5c59c59b21461cf38834a SHA512 810f879a56cd71f1e9c4678ef704a997ee652d052cfea56b3ed9478f7a813a35dd2fdcded028ce17411ae02da52fa31e0fb8d1f4130c7b9f6d25eeb774b51ada EBUILD clutter-gtk-1.8.4-r1.ebuild 1100 BLAKE2B 1206c3d03ac8a9fb35a2f5cd92c1e5f906c4d64fc7379206f6110e592b8239980f5c74bdb6d022d06070ddef678d669059726dbfa0d02bf03faa2e039072094e SHA512 102d35055c4b5c9561f53efeef8007a7bd9c992698c380a082995e643022e893a54b2bf50379969c2a541ab226090d309054d46fdb7d80f337df5e733a955fab -EBUILD clutter-gtk-1.8.4-r2.ebuild 1259 BLAKE2B 0c15d542fafe0f9fd9fede9b89ce5c22b8cb639315e803338b0400416dba7e76a6e386717d02bace17abfe3aa2f9e498c28a5d34a94520d90d6a84c4d6a92f6e SHA512 f39c2239587fdbefd4d4c177ee6130f9b567f6d8078eff93c24274365f749a59f1bd649953860f6e8aca4243f2fe39f3f2571178a4b60c0caf06e7695ad1a893 +EBUILD clutter-gtk-1.8.4-r2.ebuild 1256 BLAKE2B 534fbf981186fc8d609971dfdb1584f3d55def2f531f059d30631b9df00cb9e5230d97b1d59bc7cc5f746f24c28fc5190b11fbc007a625eaca65a1fcda3226f9 SHA512 a0983b795c810fc039f8d3b80c98219dadf2ff70fdee47b0b2e9696f6da048e648f361ce81ec5efcbb194b610d3fc8a8d6dfce37755af9982a67e1f17a35d65e MISC metadata.xml 354 BLAKE2B c6d44a19a31c7c978dab70d00f8160f3f0400275523b7bf591daa86530213fae3fd38b82788700beb3ad79e921bccd32f93dc412371eaec56d1c911aa41f203a SHA512 22ec82a8742c26c8da4a4912c04bf7457f1df0e3993e0bd65c49fa770608888aa3aab9d6ba6405e9227f27c1a6f94e15088b8cd9122c38a5005cc78da0f05006 diff --git a/media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild index d8655c294ab9..ad5e2498f2bb 100644 --- a/media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild +++ b/media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Clutter" LICENSE="LGPL-2.1+" SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="X debug examples gtk +introspection wayland" RDEPEND=" diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest index 0a908f594cbc..1e55825e3ae4 100644 --- a/media-libs/coin/Manifest +++ b/media-libs/coin/Manifest @@ -1,4 +1,7 @@ AUX coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch 581 BLAKE2B 97f7784d780e5d06a8c032a9d5707bd1d883dee59a0c04fe06205b98f2f3bf38d547e683eb9474da0771c3fe0a0964e611a4108c5d34b44679be27a52fdb5639 SHA512 73b95646c47f2ec07f20fb776b5b7df8e8df45a1f13c002e15cce56a8d35e374cc6a0515461aa265ae70b49cde7648554dc9aafb84f27afb6e78f368b67b1b7e +AUX coin-4.0.3-find-qhelpgenerator.patch 842 BLAKE2B 225b06881b36f7adfd3d43fbe8b36f35c24133f8e20d112b8fa534890cfb19d1c8cb9c75f22fd42cbcb108818b080d0fd3fed26deffe939f5bbb47101099d574 SHA512 39f3fadff5c25e0276959d405c0483709fa34e2badc13cecc932a73acdc6570daeeb4e7a36d3abee9fba6c245b7f2ae21971e9db8fe8c68a1bc804a5b6724dc9 DIST coin-4.0.2-src.tar.gz 7160869 BLAKE2B a434ea2a550557024c665e392aa189e991296b5f8c9cd2c0dc5bb71d41a948ed9d9b34eac69dc9a651f70abf8ec1f188cb8df6534d6e31b6e4e1a6ec4acaffcd SHA512 31fcb69627e466c89bb640c5b2351db4e51772408a4ce56cae7d6f550ddf19adf9b121252479297d5c2a208032194d8f4e7bf97686b0611df1ac45231e09baad +DIST coin-4.0.3-src.tar.gz 13099754 BLAKE2B c56f9e7b837bad76996a78ba3351c43b78b082c6250735e678ca9af79b3518d369e223a1625d74c8d007fff814f32e6bd6fe04c4dd5df9dd999f6afed767afeb SHA512 b661bf2124b0de1b46e76a6699b0975abb3aed4dc9019bf32531c535179dc84a90fe4e19def6f6cda7b175470636040d0e58812d532198cf207296d37c539915 EBUILD coin-4.0.2.ebuild 2569 BLAKE2B e4e7a1da2bc14756efed8f1e601ff4e1db004078ae569a11ee8b75f6eeb9f52b2e2cba8a3dacac492ef3f30619488f67e29b66433f78f340985a41fbe9a41872 SHA512 88a059ffa555b701b6b13c3d38c0620fd903e55e4166241b69438b8db56045977aa94821049de7052fa518bd8aa8ad121fbd02456988705d0ff46369674523b3 -MISC metadata.xml 456 BLAKE2B bc0dd1a54611c13dc18dc24cecb17034bf9dc1a2dec1f1ef8fb35c5ce08d5ad069ae19af9e4ed4ed4cea081c414da4db3ecde92eaef8d1095f7dd69ad17afabb SHA512 ac7dda1fbc082b46d13cff9ed35c9b129ab854b8ed3552f9b1dbd7a4be914a5871f219cd280fbd96e6ac4f0b184b74282b8e952818e8a3acef6b25e70f529bc6 +EBUILD coin-4.0.3.ebuild 2601 BLAKE2B 6450359e551f0acdb9576b921810306149b0ee1f9b00d5fc445d28e0eaa55da251d16003514dc5c13d3ace7c9164394bd8ab44a559b4321c2425bccaf595eff9 SHA512 6e90d89ca4876ac476cd98008f7bea23274ef0585f236e3f481b7e7aad3497390ad3fe4b6dee6c165a106ebc3a87419d59408478432861492defcbe281a33ff6 +MISC metadata.xml 524 BLAKE2B 50c53572571e199de0c8dae522d8f12b427ddbc62839e7f95cf4f3778fba3c8e192990d21d85f84f9a9920d491431e259c97148e8be1469d0dd499c500350485 SHA512 1cdeea35e143f6a750663501c43a83575426859ac798fe9e7825661c452d23a62bab7c739d1b6417072f514a372b6ca5f0afdd65358dbe819d0b6a3d6492bcb0 diff --git a/media-libs/coin/coin-4.0.3.ebuild b/media-libs/coin/coin-4.0.3.ebuild new file mode 100644 index 000000000000..75d11ab2481a --- /dev/null +++ b/media-libs/coin/coin-4.0.3.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="High-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1" +HOMEPAGE="https://github.com/coin3d/coin/wiki" +SRC_URI="https://github.com/coin3d/coin/releases/download/v${PV}/${P}-src.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="|| ( GPL-2 PEL )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc +exceptions openal qch test threads" + +REQUIRED_USE="qch? ( doc )" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/bzip2 + dev-libs/expat + media-libs/fontconfig + media-libs/freetype:2 + media-libs/simage + sys-libs/zlib + virtual/opengl + virtual/glu + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + openal? ( media-libs/openal ) +" +DEPEND="${RDEPEND} + dev-libs/boost:0 + x11-base/xorg-proto +" +BDEPEND=" + doc? ( + app-text/doxygen + qch? ( || ( + dev-qt/qttools:6[assistant] + dev-qt/qthelp:5 + ) ) + ) +" + +PATCHES=( "${FILESDIR}"/${P}-find-qhelpgenerator.patch ) + +DOCS=( AUTHORS FAQ FAQ.legal NEWS THANKS docs/HACKING ) + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/859832 + # https://github.com/coin3d/coin/issues/521 + filter-lto + + use debug && append-cppflags -DCOIN_DEBUG=1 + + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + + -DCOIN_BUILD_SHARED_LIBS=ON + -DCOIN_BUILD_TESTS=$(usex test) + -DCOIN_BUILD_DOCUMENTATION=$(usex doc) + + -DCOIN_BUILD_INTERNAL_DOCUMENTATION=OFF + -DCOIN_BUILD_AWESOME_DOCUMENTATION=$(usex doc) + -DCOIN_BUILD_DOCUMENTATION_MAN=$(usex doc) + -DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qch) + -DCOIN_BUILD_DOCUMENTATION_CHM=OFF + + -DCOIN_THREADSAFE=$(usex threads) + -DHAVE_VRML97=ON + -DCOIN_HAVE_JAVASCRIPT=OFF + -DHAVE_NODEKITS=ON + -DHAVE_DRAGGERS=ON + -DHAVE_MANIPULATORS=ON + -DHAVE_SOUND=$(usex openal) + -DHAVE_3DS_IMPORT_CAPABILITIES=ON + -DUSE_EXTERNAL_EXPAT=ON + -DUSE_EXCEPTIONS=$(usex exceptions) + -DUSE_SUPERGLU=OFF + + -DFONTCONFIG_RUNTIME_LINKING=OFF + -DFREETYPE_RUNTIME_LINKING=OFF + -DLIBBZIP2_RUNTIME_LINKING=OFF + -DOPENAL_RUNTIME_LINKING=OFF + -DSIMAGE_RUNTIME_LINKING=OFF + -DZLIB_RUNTIME_LINKING=OFF + -DGLU_RUNTIME_LINKING=OFF + -DSPIDERMONKEY_RUNTIME_LINKING=ON + + -DCOIN_VERBOSE=$(usex debug) + -DHAVE_MULTIPLE_VERSION=OFF + + -DCOIN_BUILD_SINGLE_LIB=ON + ) + use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON ) + + cmake_src_configure +} + +src_test() { + pushd "${BUILD_DIR}/bin" > /dev/null || die + ./CoinTests -r detailed || die "Tests failed." + popd > /dev/null || die +} diff --git a/media-libs/coin/files/coin-4.0.3-find-qhelpgenerator.patch b/media-libs/coin/files/coin-4.0.3-find-qhelpgenerator.patch new file mode 100644 index 000000000000..1ac924a5c28b --- /dev/null +++ b/media-libs/coin/files/coin-4.0.3-find-qhelpgenerator.patch @@ -0,0 +1,23 @@ +--- a/src/doc/CMakeLists.txt 2024-09-06 07:36:34.000000000 +0200 ++++ b/src/doc/CMakeLists.txt 2024-10-13 20:41:26.450802361 +0200 +@@ -32,13 +32,15 @@ + endif() + endif() + if(COIN_BUILD_DOCUMENTATION_QTHELP) +- find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator") +- if(NOT QHG_LOCATION) +- message(FATAL_ERROR "Missing program Qt qhelpgenerator") ++ find_package(Qt6Tools QUIET COMPONENTS Help) ++ if(Qt6Tools_FOUND) ++ get_target_property(QHG_LOCATION Qt6::qhelpgenerator LOCATION) + else() +- set(GENERATE_QHP YES) +- mark_as_advanced(QHG_LOCATION) ++ find_package(Qt5Help REQUIRED) ++ get_target_property(QHG_LOCATION Qt5::qhelpgenerator LOCATION) + endif() ++ set(GENERATE_QHP YES) ++ mark_as_advanced(QHG_LOCATION) + endif() + + # Add default files diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml index bcd622631c00..8ab9e491c2ab 100644 --- a/media-libs/coin/metadata.xml +++ b/media-libs/coin/metadata.xml @@ -6,6 +6,7 @@ </maintainer> <use> <flag name="exceptions">Compile with C++ exceptions</flag> + <flag name="qch">Install API documentation in QCH format</flag> <flag name="qthelp">Build API documentation in QtHelp format</flag> </use> <upstream> diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest index 25bda62995ca..facda585648b 100644 --- a/media-libs/compface/Manifest +++ b/media-libs/compface/Manifest @@ -1,6 +1,6 @@ AUX compface-gentoo.patch 1415 BLAKE2B cac49f8b6cb2680df1ef46a811a3dfaf1f7c170b69f3eeb91daa784e885fd75925169a85e6716944056b9f0fa4d29df96c795c3d16f1a1b89d54468faf555c17 SHA512 e966f02c7566a657751ad4ecd30805c5cb77e9fd76a458d639ff3291d0bd3c4e886bfc37106a755b1387c5ceee331eee1921595249e07175918bb218cd449a10 AUX compface-modern-c-porting.patch 8123 BLAKE2B db65f7854886637ee990bce3d3b46e57af7da0e21e43267cac8dc59bb20fb09b04ed77939631ceeb594029b0be0823965e67a7be52efd462490067addbc107a5 SHA512 a8f8b2d4be269c7a1135394aee9d0d65323fc54db21a73a085c6a50b7659d172f20a9ecf397443292c40ebefd059b3caed2c843b301d9d37f3a31472822e0e85 DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360 -EBUILD compface-1.5.2-r1.ebuild 666 BLAKE2B 19124bbc81fb9bdb10ba875af7c2702c1853bb118dc3c61395e237e4f6853a05f45a7aa2f63b75703d96406d6760ae14904e7c9775d46b6627d78e308d9ff2c3 SHA512 41d586e8037dcc3d7b0d380d6c7ca297b26fc86fb4fbd1127a198b985ed0b3f478062d44e4943e126d22af276010f06d8351a0145819d630b371c7b9645ea8f1 +EBUILD compface-1.5.2-r1.ebuild 659 BLAKE2B d3a696eb35602dbc15d2257ccefa03ab96953349116cadc1fd4a12d046a229283ea2882621d33cf26ba300ba9affac2551e95bd31c85bca0fdc9f0488b6ea2d6 SHA512 13213dde682bf5ff188fe11fb66f6bac29c867f86c93078e3577db16c576c4556f6e580eb9222a0821a9e411ada66d4f88682ac99961e1b9b207164a6c227e2a EBUILD compface-1.5.2.ebuild 614 BLAKE2B 4bcf6eca071e4a40993f949db382c9796b5ef689025b1a79f44c7ba9869163f16fd4673c77d1b8883594cea7cc9329fd6545bead0464aed1450ec741f52d9a70 SHA512 e1f0c250a6892a2d3af46cff37b5aef95bd9164bf5503c5deba2625ef30ff5906f93c486e672e0a89454b395fca62eefeda8576ab3d61f715d71083a9317d0c2 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549 diff --git a/media-libs/compface/compface-1.5.2-r1.ebuild b/media-libs/compface/compface-1.5.2-r1.ebuild index bb0eb52bcfee..ba4cc08ab229 100644 --- a/media-libs/compface/compface-1.5.2-r1.ebuild +++ b/media-libs/compface/compface-1.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="dev-lang/perl" diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest index 197668f04ecc..8e3eca46f8ae 100644 --- a/media-libs/dav1d/Manifest +++ b/media-libs/dav1d/Manifest @@ -1,12 +1,6 @@ -DIST dav1d-1.2.1.tar.xz 873008 BLAKE2B 52478112f1f2c39a020556a8ed18c1267de93fc129941eb87b75fa872188a0389389ba9c7f7ae641726ca78a0a515ce5923968374b8122fec159f33c1f65e7bc SHA512 f172eebc0a5f6c51d31fc9e9758c2dd0de51d8a5d0e00c93a5f2b1b16b7b4a37b365f9c56dea95d400e66b63af5fa4c63d9e720719ac38852777fc8c6066e4a7 -DIST dav1d-1.3.0.tar.xz 885220 BLAKE2B aa79eaa22adde287a31ed60b88ae8d4095e18b92359a7e30aecd13c10eafe07acdeeb2f0bdb232acc6b136cdbd87626ac641df0615683d50f355edfd6c028caf SHA512 a91d217b8656c452dd80f5597e988f0e7a2ea32b12092c2695e7dc388033db7b193f7a8c98413bec31d1c38af376561d39f7618b935c4feeb6498c5d2b43f6a4 -DIST dav1d-1.4.0.tar.xz 942120 BLAKE2B e37f7abc222b9a0f774a76ef6dcc2f28c411220c0f92c2239e51c3313bf1109fb6e4feb1451049248e033f2dd79550536a773f3b7b07e5a7890e8bb760c0f596 SHA512 32fcb1d19f35bec62c05637987e0204cf76880af192685e0acb08ea30cb9dac889ee89be0f847c79c6c51210c375031b26cf6e4aabc91480e44777e9fb3cbe02 -DIST dav1d-1.4.1.tar.xz 948044 BLAKE2B 6d8ddd4ef25055b8de33aa7608085e6569cb9e47ed312c9f57119c8961fd532d786e12722aa550b5f4584a9cca95022ac138b714e2a22b05547713465e43ed56 SHA512 51d893d5128eb3bd5c563bee82a1a450296e596763f64c10cea631aeaf655572b72dcab78be2f1e0d998010d7d22eb376b64603e5f568efe16d75eb5efaeac35 DIST dav1d-1.4.2.tar.xz 970104 BLAKE2B 03c8effb21df5c748f6e836413454577ac0920dce37d6e4922c2a0e493f79c9bb9fb6eabe05e2ac0f0f7089751bec1eb92717305c5faac1b71efd7b0dabe6be7 SHA512 36f8e632f64212db63e126b9ed2ca95c2db930d2388c551cde0b13b783ae872edeab1b5dd2274684bb03e98536d0334552ddcba209cff08c3568d97321034920 -EBUILD dav1d-1.2.1.ebuild 1347 BLAKE2B de3670e808679ad49a33c8d276a2affaef135e36210dbbad92edc657340c8b532145abc96ce44dbcd991ee770f1c8b2a254a8d4edab776c24a000e2424a83898 SHA512 6317af6c42186aa921dee05fa704a3c7ab4a25b7aa48ac8541911014b92282cc6df13e5f7792f68a8987f2688a0ceb82dd8285eb4354f5f8c35f55458f7bf69a -EBUILD dav1d-1.3.0.ebuild 1360 BLAKE2B 53c997faaeb47c4fc8fad8aa51592da5d97061691a900a47f41431d4f640ed6dd93ccb16560a30bfb3f2416325c0555680a657152fbef8696746edbadcd26482 SHA512 028d6fcf03d3be1a71774109eb37444877fdbef18177a50cace2f99bc3f3962d661aaab218029260162761b60a4a7251b6f3d15f13b512c17d7fa3e47156846f -EBUILD dav1d-1.4.0.ebuild 1367 BLAKE2B 0e1d6d32af24e810af9577ecb6d9ca2d3f8409de96ec4563cda3adfb133d702001d68609c8e54468344daef2e467d8559e4a7dba7861bde0c9925605f2c31c14 SHA512 b8bba95dc0acba0cded6d58531cc516a684fa09851be32dda1dd42502e80dc1e6f7c3053eccf75fd5fb83f6a5095207edae5b8bad68ccb2ad7f57495207f5c87 -EBUILD dav1d-1.4.1.ebuild 1367 BLAKE2B 0e1d6d32af24e810af9577ecb6d9ca2d3f8409de96ec4563cda3adfb133d702001d68609c8e54468344daef2e467d8559e4a7dba7861bde0c9925605f2c31c14 SHA512 b8bba95dc0acba0cded6d58531cc516a684fa09851be32dda1dd42502e80dc1e6f7c3053eccf75fd5fb83f6a5095207edae5b8bad68ccb2ad7f57495207f5c87 -EBUILD dav1d-1.4.2.ebuild 1367 BLAKE2B 0e1d6d32af24e810af9577ecb6d9ca2d3f8409de96ec4563cda3adfb133d702001d68609c8e54468344daef2e467d8559e4a7dba7861bde0c9925605f2c31c14 SHA512 b8bba95dc0acba0cded6d58531cc516a684fa09851be32dda1dd42502e80dc1e6f7c3053eccf75fd5fb83f6a5095207edae5b8bad68ccb2ad7f57495207f5c87 +DIST dav1d-1.5.0.tar.xz 1017040 BLAKE2B 7cf75b9de834c77a8012fb560fadca339d0faa0ab92073fd0119f0c5ccbb19017aa271a1aa0939aa698a52e2285b79a956021776a702afe2a7de131ce92d7241 SHA512 774881d27d045f468a8617317fa751e1ce452a15c6d6c2c93c3dd3c3544d6b2b91b0c3eb5ff379f113c26b27a02dc4b54d0751b083dcbcb18bb96c66a6504acb +EBUILD dav1d-1.4.2.ebuild 1360 BLAKE2B 53c997faaeb47c4fc8fad8aa51592da5d97061691a900a47f41431d4f640ed6dd93ccb16560a30bfb3f2416325c0555680a657152fbef8696746edbadcd26482 SHA512 028d6fcf03d3be1a71774109eb37444877fdbef18177a50cace2f99bc3f3962d661aaab218029260162761b60a4a7251b6f3d15f13b512c17d7fa3e47156846f +EBUILD dav1d-1.5.0.ebuild 1367 BLAKE2B 0e1d6d32af24e810af9577ecb6d9ca2d3f8409de96ec4563cda3adfb133d702001d68609c8e54468344daef2e467d8559e4a7dba7861bde0c9925605f2c31c14 SHA512 b8bba95dc0acba0cded6d58531cc516a684fa09851be32dda1dd42502e80dc1e6f7c3053eccf75fd5fb83f6a5095207edae5b8bad68ccb2ad7f57495207f5c87 EBUILD dav1d-9999.ebuild 1367 BLAKE2B 0e1d6d32af24e810af9577ecb6d9ca2d3f8409de96ec4563cda3adfb133d702001d68609c8e54468344daef2e467d8559e4a7dba7861bde0c9925605f2c31c14 SHA512 b8bba95dc0acba0cded6d58531cc516a684fa09851be32dda1dd42502e80dc1e6f7c3053eccf75fd5fb83f6a5095207edae5b8bad68ccb2ad7f57495207f5c87 MISC metadata.xml 616 BLAKE2B e1761e4fa6578e904fb77dfc366a718e1c892583abc30f3552f64385826f0f898d8ba5a288fea3d297bf998acab596deac9532f7a13f123b2f996d13a128df4f SHA512 0f33c2977773ed2ed4dba9b70de50ace72248938c19eafbdf9828ec28aa462aaa9c8f17ed3b5d51cc83f27265ed79769c1df6a62ebe103005e1b3b0660230b7c diff --git a/media-libs/dav1d/dav1d-1.2.1.ebuild b/media-libs/dav1d/dav1d-1.2.1.ebuild deleted file mode 100644 index a04c5acbfb9e..000000000000 --- a/media-libs/dav1d/dav1d-1.2.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d" - inherit git-r3 -else - SRC_URI="https://downloads.videolan.org/pub/videolan/dav1d/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~arm64-macos ~x64-macos" -fi - -inherit meson-multilib - -DESCRIPTION="dav1d is an AV1 Decoder :)" -HOMEPAGE="https://code.videolan.org/videolan/dav1d" - -LICENSE="BSD-2" -# Check SONAME on version bumps! -SLOT="0/6" -IUSE="+8bit +10bit +asm test xxhash" -RESTRICT="!test? ( test )" - -ASM_DEPEND=">=dev-lang/nasm-2.15.05" -DEPEND="xxhash? ( dev-libs/xxhash )" -BDEPEND=" - asm? ( - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} ) - ) -" - -DOCS=( README.md doc/PATENTS THANKS.md ) - -multilib_src_configure() { - local -a bits=() - use 8bit && bits+=( 8 ) - use 10bit && bits+=( 16 ) - - local enable_asm - if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then - enable_asm=false - else - enable_asm=$(usex asm true false) - fi - - local emesonargs=( - -Dbitdepths=$(IFS=,; echo "${bits[*]}") - -Denable_asm=${enable_asm} - $(meson_use test enable_tests) - $(meson_feature xxhash xxhash_muxer) - ) - meson_src_configure -} - -multilib_src_test() { - if multilib_is_native_abi ; then - meson_src_test - fi -} diff --git a/media-libs/dav1d/dav1d-1.3.0.ebuild b/media-libs/dav1d/dav1d-1.3.0.ebuild deleted file mode 100644 index 521131bccf01..000000000000 --- a/media-libs/dav1d/dav1d-1.3.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d" - inherit git-r3 -else - SRC_URI="https://downloads.videolan.org/pub/videolan/dav1d/${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~arm64-macos ~x64-macos" -fi - -inherit meson-multilib - -DESCRIPTION="dav1d is an AV1 Decoder :)" -HOMEPAGE="https://code.videolan.org/videolan/dav1d" - -LICENSE="BSD-2" -# Check SONAME on version bumps! -SLOT="0/7" -IUSE="+8bit +10bit +asm test xxhash" -RESTRICT="!test? ( test )" - -ASM_DEPEND=">=dev-lang/nasm-2.15.05" -DEPEND="xxhash? ( dev-libs/xxhash )" -BDEPEND=" - asm? ( - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} ) - ) -" - -DOCS=( README.md doc/PATENTS THANKS.md ) - -multilib_src_configure() { - local -a bits=() - use 8bit && bits+=( 8 ) - use 10bit && bits+=( 16 ) - - local enable_asm - if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then - enable_asm=false - else - enable_asm=$(usex asm true false) - fi - - local emesonargs=( - -Dbitdepths=$(IFS=,; echo "${bits[*]}") - -Denable_asm=${enable_asm} - $(meson_use test enable_tests) - $(meson_feature xxhash xxhash_muxer) - ) - meson_src_configure -} - -multilib_src_test() { - if multilib_is_native_abi ; then - meson_src_test - fi -} diff --git a/media-libs/dav1d/dav1d-1.4.1.ebuild b/media-libs/dav1d/dav1d-1.4.1.ebuild deleted file mode 100644 index 93a307754a90..000000000000 --- a/media-libs/dav1d/dav1d-1.4.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d" - inherit git-r3 -else - SRC_URI="https://downloads.videolan.org/pub/videolan/dav1d/${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos" -fi - -inherit meson-multilib - -DESCRIPTION="dav1d is an AV1 Decoder :)" -HOMEPAGE="https://code.videolan.org/videolan/dav1d" - -LICENSE="BSD-2" -# Check SONAME on version bumps! -SLOT="0/7" -IUSE="+8bit +10bit +asm test xxhash" -RESTRICT="!test? ( test )" - -ASM_DEPEND=">=dev-lang/nasm-2.15.05" -DEPEND="xxhash? ( dev-libs/xxhash )" -BDEPEND=" - asm? ( - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} ) - ) -" - -DOCS=( README.md doc/PATENTS THANKS.md ) - -multilib_src_configure() { - local -a bits=() - use 8bit && bits+=( 8 ) - use 10bit && bits+=( 16 ) - - local enable_asm - if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then - enable_asm=false - else - enable_asm=$(usex asm true false) - fi - - local emesonargs=( - -Dbitdepths=$(IFS=,; echo "${bits[*]}") - -Denable_asm=${enable_asm} - $(meson_use test enable_tests) - $(meson_feature xxhash xxhash_muxer) - ) - meson_src_configure -} - -multilib_src_test() { - if multilib_is_native_abi ; then - meson_src_test - fi -} diff --git a/media-libs/dav1d/dav1d-1.4.2.ebuild b/media-libs/dav1d/dav1d-1.4.2.ebuild index 93a307754a90..521131bccf01 100644 --- a/media-libs/dav1d/dav1d-1.4.2.ebuild +++ b/media-libs/dav1d/dav1d-1.4.2.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://downloads.videolan.org/pub/videolan/dav1d/${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~arm64-macos ~x64-macos" fi inherit meson-multilib diff --git a/media-libs/dav1d/dav1d-1.4.0.ebuild b/media-libs/dav1d/dav1d-1.5.0.ebuild index 93a307754a90..93a307754a90 100644 --- a/media-libs/dav1d/dav1d-1.4.0.ebuild +++ b/media-libs/dav1d/dav1d-1.5.0.ebuild diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest index 655c9d4bf8d7..cf76ce6d6482 100644 --- a/media-libs/exempi/Manifest +++ b/media-libs/exempi/Manifest @@ -1,6 +1,4 @@ AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736 -DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4 DIST exempi-2.6.5.tar.xz 2843132 BLAKE2B bc8c347af4c9c7bf085311ce055bd1c7cd5c2b845c723dd74bbcdf104be018885a82180333dbdda3cf9a64a4125dfe0fa0904fbd05663c3a6c32e6a60a8ca2d3 SHA512 71a0830c7a547bd7304e38f307a17a5ca70d6d22bb94db93f7e6c0903d1a1a1e211487cd530ec81fb058d0b45224018d23aab9a9394b6cfa025c50f0d77b5002 -EBUILD exempi-2.6.3.ebuild 1284 BLAKE2B 09a4e69936d7b64b41d216a40533d3c4e452d9e8965f48b515c1317338bcb493119274743384a8911a40478ce385b351f9889f2c7e21a38cc06e2cd6c87b603f SHA512 51da65183b75912ad02175dc05ebb524a88e26289fc567786b23f59ce431a0e7013d19dca3801a4d83c65f5b46bcca0e3afabaad5370c33eddde8a0642c9983d -EBUILD exempi-2.6.5.ebuild 1372 BLAKE2B d3e3d57cf2196b4d1ad179e4af72528037797eea836669f864cd0f2109f20f9298df5fc952978b9de3b7466f758fb2be39563171f703b3a70ccab3b0ec80119b SHA512 6a549f30fad95fc5ae824059c1af9435a8b5dbeef30943910a7e68cd77042dc3c9f3bde91e0329afa537166b7fd3c6b542b1e6e9232d417870b26c717c8de35e +EBUILD exempi-2.6.5.ebuild 1368 BLAKE2B c454116febe888644fb959e5067fbdc1e3220b0ac573781a93e842d6c184e78876f9840f722077e3e555aa5bf70763c01c72ed0e9987903595a35db1832a5fbc SHA512 b99f33c0540b118a7ae342171a7856bbb74e07db35d672a8c749ced4048400c43e3416bd850b3f731d9fb5f447cfcb275e3e55b0a5b50634de73e164911e1666 MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392 diff --git a/media-libs/exempi/exempi-2.6.3.ebuild b/media-libs/exempi/exempi-2.6.3.ebuild deleted file mode 100644 index 5d7ffba74015..000000000000 --- a/media-libs/exempi/exempi-2.6.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX" -HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi" -SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz" - -LICENSE="BSD" -SLOT="2/8" -KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/expat-2:= - sys-libs/zlib - virtual/libiconv -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/boost ) -" -BDEPEND=" - dev-build/autoconf-archive - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.2-iconv.patch -) - -src_prepare() { - default - - # Needed for autoconf 2.71 - config_rpath_update . - eautoreconf -} - -src_configure() { - # - --enable-static as --disable-static breaks build - # - Valgrind detection is "disabled" due to bug #295875 - econf \ - --enable-static \ - $(use_enable test unittest) \ - VALGRIND="" -} - -src_install() { - default - - if use examples; then - emake -C samples/source distclean - rm samples/{,source,testfiles}/Makefile* || die - docinto examples - dodoc -r samples/. - fi - - # --disable-static breaks tests - rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/exempi/exempi-2.6.5.ebuild b/media-libs/exempi/exempi-2.6.5.ebuild index 14e4bb78e925..1ff4cb8e14d7 100644 --- a/media-libs/exempi/exempi-2.6.5.ebuild +++ b/media-libs/exempi/exempi-2.6.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz" LICENSE="BSD" SLOT="2/8" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ppc64 ~riscv ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv x86" IUSE="examples test" RESTRICT="!test? ( test )" diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest index 10c7a903a01e..ef5d9ce5cfd3 100644 --- a/media-libs/fcft/Manifest +++ b/media-libs/fcft/Manifest @@ -4,10 +4,12 @@ DIST fcft-3.1.5.tar.gz 742014 BLAKE2B 39266ab2a7ea422671414d97c21a90b0eeabe9ed74 DIST fcft-3.1.6.tar.gz 699121 BLAKE2B 597ce1a701db29d3a8b913d831f1847c9526c450352b565436c843388447d8203b54b3d24ab668690986488c102f281c46685a2072bf4afee2bf58465ab9d6c3 SHA512 4fe4e318561706bd446e79b0df8df4fa5b542b9d546aa7361a1523593c26040d827ce059658c0eac89a77b83c771fd43bc74e2fe29cd16b2846a2db7ec733f49 DIST fcft-3.1.7.tar.gz 697694 BLAKE2B 2afdd26c631d365ae450691a2073fc61d361c759886e77781b6438e0d8e0db6626230bcc70b99ef2d5a5a05006280bca93d2433157a6974093f1af932952b4c2 SHA512 e862856dfb85c5df85f9f32dce8ed9e7fed8b3dc8435876994f53d276a2c597d0cee0b4fbcbb62362a3771e9ca82c49db95da989404d0c8aa5f604dd50c79075 DIST fcft-3.1.8.tar.gz 697836 BLAKE2B da7de65e2fb7ce6d2244d8ea3839a62953cbe772a7388cdb15d8f849c139e2e9124b3ad12113fcd90d4055b38a269bf7bfeba5a408f31469a95b56d4e770e992 SHA512 1b1cfbed4e99db8e290a1dcf6c124949f5fb317e225996e63913974f4a52748a04be053cff934c8f8c0b3add22c87f9e3b1c793366431f788529e62d7a7be69c +DIST fcft-3.1.9.tar.gz 701854 BLAKE2B 0d7500749a311ae5d4f1586a85901884583ae036af2d70765a97c7adb3ff15eec4c94eda5fa960b660911c66a01c6ae6f1c75423b912bf3babd505f1d6a1ab92 SHA512 a6a400baf35ea2780da6acc5e703755349474d82f3bad081ed0551d1d6b724247476bfae6aeab06238a37df269afa4fb7a774501a4665e1e90d6ed9f241307b2 EBUILD fcft-3.1.2-r1.ebuild 2072 BLAKE2B 413f9b8ca65d8a4fee9f6dc06f6a82a5fd71c20e367b4c6d323c5884c716ecf564c6d5be2d711d716a594c6df12dba9674e003114b33ef7dc05bf41f03c4d84b SHA512 afc54726a34924b5b1f68f234598fdaf06ef60ebb66764a1d5304b1f4957e3b60125659a3c7c51d3039896c5bd24bacac74d684713c982c119c619d53a9218ec EBUILD fcft-3.1.3.ebuild 2073 BLAKE2B 3c850b1a7f0afb115d1ba7bd251e719febf4d25a03f40ad2ff1f00c0d26a3b30b9f87d0557f16b6a078d3a9fa6bf6ea9cdd413cc5dfe0b9955fde9971da02125 SHA512 a21760c0192c8f1296a7b8c9b9f6f532436359a46dde213bfb12b3f47db85f3f9bf418bb0d2ee894dee9da55eae1d0d8afd97aab1ab5e9fe50dd683639b50cc9 EBUILD fcft-3.1.5.ebuild 2072 BLAKE2B 413f9b8ca65d8a4fee9f6dc06f6a82a5fd71c20e367b4c6d323c5884c716ecf564c6d5be2d711d716a594c6df12dba9674e003114b33ef7dc05bf41f03c4d84b SHA512 afc54726a34924b5b1f68f234598fdaf06ef60ebb66764a1d5304b1f4957e3b60125659a3c7c51d3039896c5bd24bacac74d684713c982c119c619d53a9218ec EBUILD fcft-3.1.6.ebuild 2073 BLAKE2B 3c850b1a7f0afb115d1ba7bd251e719febf4d25a03f40ad2ff1f00c0d26a3b30b9f87d0557f16b6a078d3a9fa6bf6ea9cdd413cc5dfe0b9955fde9971da02125 SHA512 a21760c0192c8f1296a7b8c9b9f6f532436359a46dde213bfb12b3f47db85f3f9bf418bb0d2ee894dee9da55eae1d0d8afd97aab1ab5e9fe50dd683639b50cc9 EBUILD fcft-3.1.7.ebuild 2081 BLAKE2B 43b7997b1f34c8d152bb7160097d470a4dddd173780c99aaafb90b3bfb0b8fc8883d20b74ababa137e05f7d8411c9f92c196c6d1ad8434b34cb36cde47560da3 SHA512 7098a6f342c20503446933852ae6e4198d8fe0b025da134604159ca43022ecf33eea04e9279ab7b63de6b54ba10bcb3d91f2d7893ae71a058737f222a81b2d5e EBUILD fcft-3.1.8.ebuild 2085 BLAKE2B 938914bc324e42e6aaefced1532e696dc0fc061238848820a11baff2411c61739adb0b3a810b86c8fae172463477e23c6d6a5b2ca99fd7e812f422aaf5118c13 SHA512 0a765a868586b1a60b30d12015f091b51699481aac2e4af4bb0eb76ae2f493b9649d996815d2d6bb6f863f4f6da6355ee42eeb00c30c8041afd7b0282b3140c5 +EBUILD fcft-3.1.9.ebuild 2088 BLAKE2B 76b938ab5ace8dcfe6e5b9f61163eb2e7e6f83bbb799343add0c02e0cc66f6b318443db96625353addeb4e0d3f8a35f08d721b21a2b592ea7abea056dbe97c7b SHA512 973f565bb2f85acb2cccfaaac80b53c070f56ea5e0818a11818384fe4bb867451e2d3101f6302e3088328b0813eba0e3ab1fb1783d03073c2e11c99ac0c4c339 MISC metadata.xml 561 BLAKE2B 56ca6de19ed1985ea15aeeec86f34a8dfcebf2399fc087f24425a7b854aa8558c9d114da95a432f5476cd0ad005e5cbeb3bb9d92ec722aa71fb151c4313c1896 SHA512 ec3d5ee117f8ef81d61a49bdf2d1a01201e2cb5f3fc1d984cdfed6882c58b2057f67e7e3c92cd8f9ab473dfa5af861336a41496ca439e639cf623ce2f788e538 diff --git a/media-libs/fcft/fcft-3.1.9.ebuild b/media-libs/fcft/fcft-3.1.9.ebuild new file mode 100644 index 000000000000..7cbcbbb0160c --- /dev/null +++ b/media-libs/fcft/fcft-3.1.9.ebuild @@ -0,0 +1,94 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit meson python-any-r1 + +DESCRIPTION="Simple library for font loading and glyph rasterization" +HOMEPAGE="https://codeberg.org/dnkl/fcft" +SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + +# MIT for fcft +# ZLIB for nanosvg +LICENSE="MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +IUSE="examples +harfbuzz +libutf8proc test" +REQUIRED_USE=" + libutf8proc? ( harfbuzz ) + examples? ( libutf8proc ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + x11-libs/pixman + examples? ( + dev-libs/libutf8proc:= + dev-libs/wayland + ) + harfbuzz? ( + media-libs/harfbuzz:=[truetype] + ) + libutf8proc? ( + dev-libs/libutf8proc:= + ) +" +DEPEND=" + ${RDEPEND} + app-i18n/unicode-data + dev-libs/tllist + examples? ( + dev-libs/wayland-protocols + ) + test? ( + dev-libs/check + harfbuzz? ( media-fonts/noto-emoji ) + ) +" +BDEPEND=" + ${PYTHON_DEPS} + app-text/scdoc + virtual/pkgconfig + examples? ( + dev-util/wayland-scanner + ) +" + +src_prepare() { + default + + rm -r unicode || die "Failed removing vendored unicode-data" + + sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \ + meson.build || die "Failed changing UnicodeData.txt to system's copy" + sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \ + meson.build || die "Failed changing emoji-data.txt to system's copy" +} + +src_configure() { + local emesonargs=( + $(meson_feature harfbuzz grapheme-shaping) + $(meson_feature libutf8proc run-shaping) + $(meson_use examples) + $(use test && meson_use harfbuzz test-text-shaping) + # bundled, tiny, I believe this means we should always include it + -Dsvg-backend=nanosvg + -Ddocs=enabled + ) + + meson_src_configure +} + +src_install() { + local DOCS=( CHANGELOG.md README.md ) + meson_src_install + + rm -r "${ED}"/usr/share/doc/${PN} || die + + use examples && newbin "${BUILD_DIR}/example/example" fcft-example +} diff --git a/media-libs/fluidsynth-dssi/Manifest b/media-libs/fluidsynth-dssi/Manifest index ec384c5c528a..04a70df6f899 100644 --- a/media-libs/fluidsynth-dssi/Manifest +++ b/media-libs/fluidsynth-dssi/Manifest @@ -1,5 +1,4 @@ AUX 1.0.0-fluidsynth2.patch 2976 BLAKE2B 37574f9644ca71cd2d3eda56582deed12affc57a0ede91ed7f5c8ad41e438c4cdb2463897ead130ceda633781094e2ed03354689308653e018e58dd6412c3cfc SHA512 62848af647f754d46e785c3af13cb5921bdadf54fffbe4bb9d6f15ba1f8ddd1ed55e1c28ec95470cc101a948028f2861820f8d2e77619e58dd4e215d5277d557 DIST fluidsynth-dssi-1.0.0.tar.gz 325047 BLAKE2B 1290a3eda38e9381bba3fcdaeac7cdcd6fe4bd33e521d40ae084118da77f8aa00c45456b5bf71c919c3009b47aa18f4cfc4eb9a643e66c9e0e6b25b6f2fa021d SHA512 e67ef9c4133c1c0bdba16a094f2e179ddc4c0ed5cff22bfd832dd29697604211de6dc5092e9d6cc82dfe6243fa2a91fe6fc41cccb1d9f5a8ee5b31ebc9d2b724 -EBUILD fluidsynth-dssi-1.0.0-r1.ebuild 565 BLAKE2B d4479e35f663c1c6a789ee63f80eb33302f08fb96e7d9f215b0d55413ab2a0be804f557384a9bc4fdd12c3b8d16ebe710ba2355e3eedd929cb113ab346c66c92 SHA512 a239fc09309a438506ea2b871c554a28e06480af106dcb5da85e881b9370b0d89c81b6727fbc035c10150fd35d9bc7c351be3c90d41bd131d4ddce0488f95c0f -EBUILD fluidsynth-dssi-1.0.0-r2.ebuild 630 BLAKE2B a8e99cb240e9c51e1701293f168d6b59f85427afcd7051e347aeb0be688fe9102cc38369dd3e88d56cb0e3b9ec0c78f064336821f4c65344487b204f53c7510f SHA512 e6e24d30dbb6d093cadb06357157ade3b97db5dcada62d70ea3a3988809b703a76b8543fdeba1dd5f586949a5c901e1d48783d8db9bdd262f8159a5ceaf57a3b +EBUILD fluidsynth-dssi-1.0.0-r2.ebuild 628 BLAKE2B b069032538e6d17ce1c5c80b36e6cc8e46f679f0080a5f4582f7ff24b61d60cc7b7f6e2f4640769dcd66989aa5545d604df89f832fdcf47f26eeaa4e5084baac SHA512 f92b5dd3ffbded0d08ee35aaa2512d9430b2c62cb0209bd063f2c5f36611fd21d7d134e8acd55fb9c44d58aac466cc5c045115b069678bcaacff62e7c163583d MISC metadata.xml 344 BLAKE2B c5657f1e556231e674dd3478f8743ac9aa5ef3d03dfcc871760cb133055ce52fce9007b960195473a7b6be7b7f8c155d76ef3a65b7b99091686cbdff3a2e9d14 SHA512 8595976b0274eef6dfed8f7881d86ff82ae87f6e12ad1516dcb93f0a5710225b445ad5d382efe627317fa5d8e205a55323047b62a73e3fd82fac6018bab6b9e9 diff --git a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild deleted file mode 100644 index cc1226f50d0c..000000000000 --- a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="DSSI Soft Synth Interface" -HOMEPAGE="https://dssi.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/dssi/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - media-libs/dssi - media-libs/liblo - media-sound/fluidsynth:= - x11-libs/gtk+:2 -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PV}-fluidsynth2.patch" -) - -src_prepare() { - default - eautoreconf -} diff --git a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r2.ebuild b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r2.ebuild index 9625b90cad74..c58b750fbaaa 100644 --- a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r2.ebuild +++ b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/dssi/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" BDEPEND="virtual/pkgconfig" DEPEND=" diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 16cee5846ab9..1130e8f2896b 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -2,8 +2,10 @@ AUX fontconfig-2.14.0-latin-update.patch 1889 BLAKE2B 42a5faab884bb47e645a8ee6f0 AUX fontconfig-2.14.0-skip-bubblewrap-tests.patch 408 BLAKE2B 911a87e91dcdf49088e9a684a9af753464211f18fd471989410a57363dd71b7cc0940c9a8e61095d901b4d7ee804536262ebc6afb1af3f470d8cd164d2fd2113 SHA512 8302a3ccf5918c8a4c3af3ab3601752c005c0361003281996eba469195127fab0e99c8d225dcb674a1bc198f2c15b982cce49c6bb3234307cf58e47c9206ff5a AUX fontconfig-2.14.2-fix-sysroot-fc-cache.patch 2007 BLAKE2B 91a43c8aec698a9733020031bfded6871d379b20535f6c1291d0d3fa38faaef9e367f0958f6df2b88003190184988dc99f7fa7f013f6837f24b617b83a0d5546 SHA512 73e41f2f19f61514a271141ddb4b640ed3b6060c4ccdcc79a4eefa6a6b4ece0e718012bee4b4b7312561e39ca02cd9663084298000d9cc9aa210c81a16945572 AUX fontconfig-2.14.2-math-fabs.patch 3159 BLAKE2B e3472ed44efdc2ffff81410864c7c25f6e1403464b6bec98b84662522c760ff7cc372dbc886cea2a0108bada1ca1ed923c6646cede70b050a8eb87a7c28d9eb4 SHA512 4fc401a980ec63ba0de40de044408063fd0949f0022dfa4333e5aaaff78ba03f2c18ea369af16e4cc952703d25a1c3d1821047e194c4776e00bb90f7ec8cbcc1 +AUX fontconfig-2.15.0-aliasing.patch 1667 BLAKE2B a3881ac359d90de1d3738fcc0bb4ebf9a9deaed1ad3d95445e4d1a77a0d077b20f24b1e9e4a1fcf724d21bd02b62b2903d284ace3915f6943416222f23975377 SHA512 00171483e4a0ec5bdb2a191e3fe49b33499dc1bf58f3896d3ab5d1eae8190eee96d3b680756d195ecb50ac4c767fafe15bbd54460ec455173871ae304638ada9 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085 DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533 SHA512 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417 EBUILD fontconfig-2.14.2-r3.ebuild 7192 BLAKE2B ac09bacc348d9b612d5e77941c694cb4b3881463cd9e7f0cbebf34669affc3a217158abd672e1aeae5387db106dc7b6004194436f9786039ca8b72654234c1d2 SHA512 253f4a7030c9838e5c005c371d74e3df659ab7ece6a332f8e04d8d5ac9920f79d49fa4475d89e9323e834f37ae27781e2316d4ac33d4068659ecb29a42943d30 -EBUILD fontconfig-2.15.0.ebuild 7145 BLAKE2B 57accc12b3e05fd6c9e1d714ba49a3546ddef15c58827985196f280a6c8135b94de29ccafa079fb8f09510922f278c434e890fb607de89bd666e51689cbac343 SHA512 379d05a02e36d8aad61fe6141225566d3168d0532f9a28c35af76944aeb694e1dd3b0ee1c709ff3e1585ae25cafe9d43040b750628650482c2c558cffecc76aa +EBUILD fontconfig-2.15.0-r1.ebuild 7219 BLAKE2B 12541d2719a0a6ee78aee4789dd90edba81e3b87d037fac0701e4b3a83a75320fa431bb8e37ca39dc2e19389341db2680542185967b1b1f29d700588e583a3fb SHA512 5ebe4099b56a3eb1b4728de8d7163e4c95ccb317ff1f59eaaa1997768a0ad27a9ec72c44b40fe0eba6312965a82007f1cf7e0ab913cc19a39de5eeb7e6284bfa +EBUILD fontconfig-2.15.0.ebuild 7145 BLAKE2B 16aba4bc2a195da5d43084008dff53d06626f07f0dd09c824124f59fef89693cb87ed13dbbd1e9271698c7956d9587a99d04488333545c389f2a5abf2a974614 SHA512 273d3c5350a13c0155eadb084c3830865417feb10fd272fa8738cdb65210054351026e848605ab818eaace7a88a08a571596ef57194363a8ea945880aa898a5e MISC metadata.xml 672 BLAKE2B d23112b5d408aed97ad68bc9a141a570c22fd6bbf0022e979b7006817ae27bcba21be43558cb42df06f3c280cbed5570c62805bb69be8a64b1f41bd90b200bc0 SHA512 1ff9c1f22b9766127692eec4824ce966f7a7305ddfae0dd1d8b0e5b432926508dd7a898eada6c182e02c985e11c2f9a22f13eac195333ed32952af0e89015e9a diff --git a/media-libs/fontconfig/files/fontconfig-2.15.0-aliasing.patch b/media-libs/fontconfig/files/fontconfig-2.15.0-aliasing.patch new file mode 100644 index 000000000000..03709ac2c3a7 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.15.0-aliasing.patch @@ -0,0 +1,53 @@ +https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/333 + +From 8db62f5a77fd53543dd58e12da7bd96082228893 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Oct 2024 16:48:19 +0100 +Subject: [PATCH] fontconfig: mark _FcPatternIter as may_alias + +We had a report of GCC 14 with -O3 -flto causing wrong font +sizes with fontconfig (showing up in qalculate-gtk). + +It turns out to be because _FcPatternIter and _FcPatternPrivateIter +are punned between which violates strict-aliasing rules, which +manifested in FcDefaultSubstitute getting a bogus value from +FcValueCanonicalize for size. + +void* isn't allowed to alias anything -- you can pass addresses +around provided you cast back to the original type, but if you +access through the wrong type, you've violated aliasing rules. + +Bug: https://bugs.gentoo.org/940923 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/fontconfig/fontconfig.h ++++ b/fontconfig/fontconfig.h +@@ -32,8 +32,10 @@ + + #if defined(__GNUC__) && (__GNUC__ >= 4) + #define FC_ATTRIBUTE_SENTINEL(x) __attribute__((__sentinel__(0))) ++#define FC_ATTRIBUTE_MAY_ALIAS __attribute__((may_alias)) + #else + #define FC_ATTRIBUTE_SENTINEL(x) ++#define FC_ATTRIBUTE_MAY_ALIAS + #endif + + #ifndef FcPublic +@@ -253,7 +255,7 @@ typedef enum _FcValueBinding { + + typedef struct _FcPattern FcPattern; + +-typedef struct _FcPatternIter { ++typedef struct FC_ATTRIBUTE_MAY_ALIAS _FcPatternIter { + void *dummy1; + void *dummy2; + } FcPatternIter; +@@ -1160,6 +1162,7 @@ FcConfigParseAndLoadFromMemory (FcConfig *config, + _FCFUNCPROTOEND + + #undef FC_ATTRIBUTE_SENTINEL ++#undef FC_ATTRIBUTE_MAY_ALIAS + + + #ifndef _FCINT_H_ +-- +GitLab diff --git a/media-libs/fontconfig/fontconfig-2.15.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.15.0-r1.ebuild new file mode 100644 index 000000000000..9259f43d257c --- /dev/null +++ b/media-libs/fontconfig/fontconfig-2.15.0-r1.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit multilib meson-multilib python-any-r1 readme.gentoo-r1 + +DESCRIPTION="A library for configuring and customizing font access" +HOMEPAGE="https://fontconfig.org/" +SRC_URI="https://fontconfig.org/release/${P}.tar.xz" + +LICENSE="MIT" +SLOT="1.0" +if ! [[ $(ver_cut 3) -ge 90 ]] ; then + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +IUSE="doc nls test" +RESTRICT="!test? ( test )" + +# - Check minimum freetype & other deps on bumps. See +# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314. +# Note that FT versioning is confusing, need to map it using +# https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT +# But sometimes it's actually greater than that, e.g. see Fedora's spec file +# https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1 +# +# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the +# default and used by every distro. See bug #283191. +# +# - There's a test-only dep on json-c. +# It might become an optional(?) runtime dep in future though. Who knows. +# Keep an eye on it. +RDEPEND=" + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] + !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) ) + elibc_Darwin? ( sys-libs/native-uuid ) + elibc_SunOS? ( sys-libs/libuuid ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-libs/json-c ) +" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/gperf + virtual/pkgconfig + doc? ( + =app-text/docbook-sgml-dtd-3.1* + app-text/docbook-sgml-utils[jadetex] + ) + nls? ( >=sys-devel/gettext-0.19.8 ) +" +PDEPEND="virtual/ttf-fonts" +# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT +# when cross-compiling. +IDEPEND="app-eselect/eselect-fontconfig" + +PATCHES=( + # bug #130466 + make liberation default + "${FILESDIR}"/${PN}-2.14.0-latin-update.patch + # Avoid test failure (bubblewrap doesn't work within sandbox) + "${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch + # Fix aliasing (bug #940923) + "${FILESDIR}"/${PN}-2.15.0-aliasing.patch + + # Patches from upstream (can usually be removed with next version bump) + "${FILESDIR}"/${PN}-2.14.2-math-fabs.patch +) + +DOC_CONTENTS="Please make fontconfig configuration changes using +\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be +overwritten. If you need to reset your configuration to upstream defaults, +delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig." + +src_prepare() { + default + + # Test needs network access + # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319 + # On bumps, please check to see if this has been fixed + # to allow local access! + sed -i -e '/test-crbug1004254/d' test/meson.build || die +} + +multilib_src_configure() { + local addfonts=( + "${EPREFIX}"/usr/local/share/fonts + ) + + # Harvest some font locations, such that users can benefit from the + # host OS's installed fonts + case ${CHOST} in + *-darwin*) + addfonts+=( + /Library/Fonts + /System/Library/Fonts + ) + ;; + + *-solaris*) + [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \ + addfonts+=( /usr/X/lib/X11/fonts/TrueType ) + [[ -d /usr/X/lib/X11/fonts/Type1 ]] && + addfonts+=( /usr/X/lib/X11/fonts/Type1 ) + ;; + + *-linux-gnu) + use prefix && [[ -d /usr/share/fonts ]] && \ + addfonts+=( /usr/share/fonts ) + ;; + esac + + local emesonargs=( + # USE=doc only controls the additional bits like html/pdf + # and regeneration of man pages from source. We always install + # the prebuilt man pages. + $(meson_native_use_feature doc) + $(meson_native_use_feature doc doc-txt) + $(meson_native_use_feature doc doc-html) + $(meson_native_use_feature doc doc-man) + $(meson_native_use_feature doc doc-pdf) + + $(meson_native_use_feature nls) + $(meson_feature test tests) + + -Dcache-build=disabled + -Dcache-dir="${EPREFIX}"/var/cache/fontconfig + -Ddefault-fonts-dirs="${EPREFIX}"/usr/share/fonts + -Dadditional-fonts-dirs=$(IFS=, ; echo "${addfonts[*]}" ) + -Dtemplate-dir="${EPREFIX}"/etc/fonts/conf.avail + + # Let users choose via eselect-fontconfig. See bug #900681 + # and https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/356. + -Ddefault-sub-pixel-rendering=none + ) + + meson_src_configure +} + +multilib_src_install() { + MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) ) + + meson_src_install + + # Avoid calling this multiple times, bug #459210 + if multilib_is_native_abi; then + insinto /etc/fonts + doins fonts.conf + fi +} + +multilib_src_install_all() { + einstalldocs + + # fc-lang directory contains language coverage datafiles + # which are needed to test the coverage of fonts. + insinto /usr/share/fc-lang + doins fc-lang/*.orth + + dodoc doc/fontconfig-user.{txt,pdf} + + if ! use doc ; then + find "${S}" -name "*.[[:digit:]]" -type f -exec doman '{}' + || die + fi + + if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ; then + mv "${ED}"/usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${PF} || die + rm -rf "${ED}"/usr/share/doc/fontconfig || die + fi + + # Changes should be made to /etc/fonts/local.conf, and as we had + # too much problems with broken fonts.conf we force update it ... + echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig || die + doenvd "${T}"/37fontconfig + + # As of fontconfig 2.7, everything sticks their noses in here. + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig || die + + readme.gentoo_create_doc +} + +pkg_preinst() { + # bug #193476 + # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various + # config files. If we install as-is, we'll blow away user settings. + ebegin "Syncing fontconfig configuration to system" + if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then + local file f + for file in "${EROOT}"/etc/fonts/conf.avail/* ; do + f=${file##*/} + if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then + [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \ + && ln -sf ../conf.avail/"${f}" \ + "${ED}"/etc/fonts/conf.d/ &>/dev/null + else + [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \ + && rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null + fi + done + fi + eend $? +} + +pkg_postinst() { + einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/" + find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete + + readme.gentoo_print_elog + + local ver + for ver in ${REPLACING_VERSIONS} ; do + # 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf + if ver_test ${ver} -lt 2.14.2-r2 && ver_test ${ver} -ge 2.14.2 ; then + if [[ -e "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] ; then + einfo "Deleting 10-sub-pixel-none.conf from bad fontconfig-2.14.2 (bug #900681)" + rm "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf || die + fi + fi + done + + if [[ -z ${ROOT} ]] ; then + multilib_pkg_postinst() { + ebegin "Creating global font cache for ${ABI}" + "${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf + eend $? + } + + multilib_parallel_foreach_abi multilib_pkg_postinst + fi +} diff --git a/media-libs/fontconfig/fontconfig-2.15.0.ebuild b/media-libs/fontconfig/fontconfig-2.15.0.ebuild index 8179cf88c862..4a576a0f8ebd 100644 --- a/media-libs/fontconfig/fontconfig-2.15.0.ebuild +++ b/media-libs/fontconfig/fontconfig-2.15.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit multilib meson-multilib python-any-r1 readme.gentoo-r1 DESCRIPTION="A library for configuring and customizing font access" diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest index 249bb167921b..0a47bb52f17f 100644 --- a/media-libs/ftgl/Manifest +++ b/media-libs/ftgl/Manifest @@ -1,7 +1,9 @@ AUX ftgl-2.1.3_rc5-clang.patch 900 BLAKE2B b6d3e112c35d57a6659478980ea2c258937d51775e8bc7ca2522dd8e4f0530c4bf6eac15ec9b01c2736a4ba0e2a566aa72f2f1d55e39cdd17e538e50494191c3 SHA512 984ce9dc8dcb76297516101ea12c60a71679afface99b826a7e415a899c21ee5df4c8e7cfbf0d072e8127a4bc0dde2b938be7b3859f8ed2555090c24b4c9f9bf +AUX ftgl-2.1.3_rc5-freetype-2.13.3.patch 1477 BLAKE2B b1592ef8643f8015c19ffb32fff764d04015398e71e7b0072c0a640c6a988d8732fc4f0d5a51313b0828e0f58f7dd2b4425e8626471f7cd15eeb9c6cdee80933 SHA512 56ad4bb98360c5e5f21c67e2804c94b51924d48c264e907ef97bc1e7d30045adefb7d9c831ca988b6f7899f8c5a299ced155265c46cb6c0bdbc033421999b503 AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af130a6263312f5c48deb24f08db723422cb148b0d0d4a250b461604a7cc5e32270e3dc2050a2230487d2a92674386c8f636d7c0e1f SHA512 81d7ce2043e86bd451d07f97e8686fd90527994154410eb9519d18c77b97b9311c062332fe4f6e1acbb566810d961f87626f5a56ab7843ff4e2eb3d66f3be7d4 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4 EBUILD ftgl-2.1.3_rc5-r1.ebuild 1307 BLAKE2B 5a3f48dfe0e930b5f11c19933f8cdf393e38374c629755fb9c89e8aa383ac5e287295f3f98f7664db255155feecebcd3ab7be6f09672c35d3ca8a24ef63d8fe2 SHA512 d16fa9365b82d35dd9434f03403f09c775d7063d60f23179d516e788a34f6019c5421cc82d7bcb23c64b2f2d7da0abb5c2da496ed41a5fdee65cba9f963dcb00 +EBUILD ftgl-2.1.3_rc5-r2.ebuild 1356 BLAKE2B 1b47d9a24819b75e66965688637123eb27d86925000609a95d4be509543c8424ed7b85e4feedf2dcad87b5354d63f1c55d0ed795c8df4072a1b5a09fa2c254e6 SHA512 b4ec8b80ab2f638d7241d20c09087165599073e1c1b26eea4cc91d974844bde04f5dc5174a99c615bac735b4ebbfc2b5dee49f3c6b6375d6e731e6a010043579 MISC metadata.xml 328 BLAKE2B 176e85d39009b168447e2bb51661a59f9e121fd965fd668c40b32a39126679b94b942a53307cbeb5d7c68eb1acaa433a65e9080e56d50d59b7fec01c7bfbbd44 SHA512 043d076e9f5bce255c55625561cdbbc59720208d9a3b0786ce67e31940905e0b2cdc4f29695bc297667faf13b4d6d5ee350fa80a687406214435f9efeb808ca1 diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype-2.13.3.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype-2.13.3.patch new file mode 100644 index 000000000000..d22b25757fa6 --- /dev/null +++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype-2.13.3.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/937849 + +--- a/src/FTContour.cpp ++++ b/src/FTContour.cpp +@@ -163,7 +163,7 @@ void FTContour::SetParity(int parity) + } + + +-FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n) ++FTContour::FTContour(FT_Vector* contour, FTContour::PointTagsType tags, unsigned int n) + { + FTPoint prev, cur(contour[(n - 1) % n]), next(contour[0]); + FTPoint a, b = next - cur; +--- a/src/FTContour.h ++++ b/src/FTContour.h +@@ -44,6 +44,12 @@ + */ + class FTContour + { ++#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003 ++ typedef char* PointTagsType; ++#else ++ typedef unsigned char* PointTagsType; ++#endif ++ + public: + /** + * Constructor +@@ -52,7 +58,7 @@ class FTContour + * @param pointTags + * @param numberOfPoints + */ +- FTContour(FT_Vector* contour, char* pointTags, unsigned int numberOfPoints); ++ FTContour(FT_Vector* contour, PointTagsType pointTags, unsigned int numberOfPoints); + + /** + * Destructor +--- a/src/FTVectoriser.cpp ++++ b/src/FTVectoriser.cpp +@@ -166,7 +166,7 @@ void FTVectoriser::ProcessContours() + for(int i = 0; i < ftContourCount; ++i) + { + FT_Vector* pointList = &outline.points[startIndex]; +- char* tagList = &outline.tags[startIndex]; ++ auto tagList = &outline.tags[startIndex]; + + endIndex = outline.contours[i]; + contourLength = (endIndex - startIndex) + 1; + diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild new file mode 100644 index 000000000000..0fb8b7874d6b --- /dev/null +++ b/media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +MY_PV="${PV/_/-}" +MY_PV2="${PV/_/\~}" +MY_P="${PN}-${MY_PV}" +MY_P2="${PN}-${MY_PV2}" + +DESCRIPTION="library to use arbitrary fonts in OpenGL applications" +HOMEPAGE="https://sourceforge.net/projects/ftgl/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P2}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs" + +DEPEND=" + media-libs/freeglut + >=media-libs/freetype-2.0.9 + virtual/opengl + virtual/glu +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch + "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${P}-freetype-2.13.3.patch +) + +src_prepare() { + default + + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die + eautoreconf +} + +src_configure() { + strip-flags # ftgl is sensitive - bug #112820 + econf $(use_enable static-libs static) +} + +src_install() { + local DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt) + + default + + rm -r "${ED}"/usr/share/doc/ftgl || die + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index 32aef1ffc609..8373a80f97e4 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -1,6 +1,6 @@ DIST gegl-0.4.46.tar.xz 5799248 BLAKE2B 2fc9ccd0c711cc901abd50740a24d0f75b162cbb196bdd62ab8430882da3b9ea72c08dd587ecfecaf5e4ba9aca4df51bcd7d98ec197325375b1d954c2995029e SHA512 cd733208da7dc1ec77ca023f03f47e578350e156ad07ece701b39f517a292e9f9c081b3a8a2db846813483b4ddb21f32f9fc8b9c70fea8a6ba27bb97ef8bb847 DIST gegl-0.4.48.tar.xz 5805488 BLAKE2B 3a800004f166fdbfbd563688bb71c4579bba132380f5f45496e8fb813943333b89781320230adf6e0ee49b9bde7db37d81929a8fd42e19e62281e7f8d1ea3bfb SHA512 8f47e6445062894c16d54eeeec4a55cccc32fc49c9fb9be3428a591daaeb21b1a5b8529a68d82613fd75f107bb8c0418c9e5337346bd94da3226e545189c226b EBUILD gegl-0.4.46.ebuild 4962 BLAKE2B 3220ef54e9792687d01d7c8cb6bcd84b8ed003fad20c94ae6464a254636d49cce2633e1d7e1a25f08fad242cea00d83d9247faf8df481749608b82e0530d4775 SHA512 3d1debd2428143be83ae4bb15cb8f2ec7933ec55541313d87f9f6ad38755317b7334ab58abbda01db16cd8d1d661a9db3b6ef65faaafb91b767dd9f6ce1c2e0c -EBUILD gegl-0.4.48.ebuild 4966 BLAKE2B daea0f052728f5318e1b59b6b8757f6dbec628be8253fd477ed05d598f193611e952fcc94099ab837c3a4959d88ed26ce5782733f619461635ba70a289adbc63 SHA512 253cc092507607e9a45eb9263a75420b91f8d4d1a73b6bdcf410c5e1143d7c59d0734c642e152db1f9f6077afda2243c8ee47051a00a9179d88065a11c4650da +EBUILD gegl-0.4.48.ebuild 4964 BLAKE2B ae8a66c5dce49691b97ac9d93b02b7ab8ffd468ae62df137b91ba2841b3de5c0eb8961766a06c3b55ddaa2c37e0f8ef65df7f43e4362dce1f0dde011e6f988f7 SHA512 22f30aefb0816f3af5329431c29ea58b861214a8890912b8a4b6a407b2452406d9cbef32db557d8598cc41a7723c9b1fbcb3c856012e791c5eb71e18f67403ec EBUILD gegl-9999.ebuild 4745 BLAKE2B 664ec99ae4b444277accf25895c5552d5a0d3860a4f29df4a2ed9685e59f68e83deb066a87fd9253507b1619813e9d860ba82c05335a08f8fcba555cbceb63d8 SHA512 87e7c424619ffba6bec190270b281e4945f71f72b0fd1341231e62401669e66a9500daeaf3ead51cee9fe977669b6757537f748fe4f00c0ea3e81447c5ae8d4a MISC metadata.xml 761 BLAKE2B fa74f6ff5ae13c05793505d0a27b7bc8587748ad356fa4f3ec5b48bd2919c6197788ab02bdc02fbdbdfe2f376d93222b600e30915e50f4ee4643e973ce054d86 SHA512 8cf93e9c5130a017bb864144e88cd2a4f2eff17b5543514a3ca84066b90e394dda6ee64a5e49d8db3b48eb905df5eef815f3b2689bc2be9772a01dcd2cecad30 diff --git a/media-libs/gegl/gegl-0.4.48.ebuild b/media-libs/gegl/gegl-0.4.48.ebuild index a133c240b449..94ff22957d61 100644 --- a/media-libs/gegl/gegl-0.4.48.ebuild +++ b/media-libs/gegl/gegl-0.4.48.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest index 3d8e0d610618..132d41ddfbf4 100644 --- a/media-libs/gexiv2/Manifest +++ b/media-libs/gexiv2/Manifest @@ -1,3 +1,5 @@ DIST gexiv2-0.14.2.tar.xz 389488 BLAKE2B 37e79b1dd4c4324d4d7e2ef709b803a11aff4fbbe50ce5f0a4ff3f0053c77e251150297c1d0b42399c08f67bb669ee88b1e53ea1e853689480b3491ab45bc3e5 SHA512 16536be5180d5f13f549a68f5b701343a1246eca99083e43e6fc700b151614ea80696f931fcbc721b05955173e3206819b593e5b0fcd8ad4fd7d3b287d9c1441 +DIST gexiv2-0.14.3.tar.xz 389976 BLAKE2B 157e551ff74ab8158343b993b5eccfb282f9acc851fb43c60886b199b0cc309958efd0440304b49d69ef6cd8969755fd8a6a31c9733b15d16a21e8f90cdff223 SHA512 24c97fa09b9ee32cb98da4637ea78eb72ae7e2d1792f9ebb31d63e305b3e0e1f6935b8647589c76c39ba631a15c1d8d2f3879c7dff81433786e9533b6348b6a0 EBUILD gexiv2-0.14.2.ebuild 1764 BLAKE2B 1aa5695c234829325986c764472e00596f3a9aacde11b2993d71633e694c45c5f2d569fac08b0f23701c2fe1013d54adc09d29b288a99e082c38c68b0b48ba48 SHA512 43e746d935da379654b50f05ec0157679e5dac8bc62111a87425794427c3b97bf3f2cfa83dd0d0230be80333047e58a2383c06300873ae0fdbd3475bba78e114 +EBUILD gexiv2-0.14.3.ebuild 1770 BLAKE2B 84acc2767f821da0978042f52c2f92f8ffb99ad236289306e39ee0ef369c39f12af8df4a570d89fa84c6e693bfad37e3222fc3fad8bc8e868fb053fff5c80873 SHA512 df268b20d387737e60e5bd3023a5c87931e84d8c18134e903e032891a96aadf74edc290bb1f0bedefda8a08b367a049e72cb0db485664d2a924b283cbf0c2a6e MISC metadata.xml 615 BLAKE2B 76b7eab8ca423cb9a816de9ee01bcf7211b14da002292e95bda41db4ed779523b97b95115803ab10ba6b4117c03ff1fd83308d6eac111c1a7813620cc5c56080 SHA512 0a85fe161f01d944a319018dd1dd63b96eafb1d83f3547c707498697dc554088c5ab9fa8fd978a326357fc8a78728e548da2f16b2ccfdcbd2b6c68c5d3623f85 diff --git a/media-libs/gexiv2/gexiv2-0.14.3.ebuild b/media-libs/gexiv2/gexiv2-0.14.3.ebuild new file mode 100644 index 000000000000..5a52d62a46fb --- /dev/null +++ b/media-libs/gexiv2/gexiv2-0.14.3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit gnome.org meson python-r1 vala + +DESCRIPTION="GObject-based wrapper around the Exiv2 library" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gexiv2" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="LGPL-2.1+ GPL-2" +SLOT="0" +IUSE="gtk-doc +introspection python test +vala" +REQUIRED_USE=" + python? ( introspection ${PYTHON_REQUIRED_USE} ) + test? ( python introspection ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=media-gfx/exiv2-0.26:= + >=dev-libs/glib-2.46.0:2 + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + python? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 + ) + test? ( media-gfx/exiv2[xmp] ) + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +src_prepare() { + default + use vala && vala_setup +} + +src_configure() { + local emesonargs=( + $(meson_use test tests) + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + $(meson_use vala vapi) + -Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either + # Prevents installation of python modules (uses install_data from meson + # which does not optimize the modules) + -Dpython3=false + ) + meson_src_configure +} + +src_install() { + meson_src_install + + if use python ; then + python_moduleinto gi/overrides/ + python_foreach_impl python_domodule GExiv2.py + python_foreach_impl python_optimize + fi +} diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest index 38be9aed4ea0..3f9acc095abf 100644 --- a/media-libs/giflib/Manifest +++ b/media-libs/giflib/Manifest @@ -1,9 +1,6 @@ -AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d293573cfbc80a1105f65041d201a0231cb7e69791b8441a5b286841b507ad6b908f4fe0a514a79b8ba6546385f2fa70 SHA512 2d899722238eecd8bdfa7412cf5778c42c58d2e93c9e02e458b5dc636933f7765fd39ceb7906200425039a6c908b47403ec306dc3c79e1402f3824a351a17081 AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3 AUX giflib-5.2.2-fortify.patch 868 BLAKE2B 3abefc79d531ba086817c233709d16e842dc7751dc6ef013f999ece74dfce76a7536ff0982dccb946c9317f8f1517cbc41eed80c491f311259da0e4583fedf7e SHA512 475cf618ed43e346794d027cb53eed54a9d363f8c76f5ad5ed4b830db63f3970cccad197a79c658290c6df148d23bc18d3d196ec8fbcf1b43e9b258d15cafa13 AUX giflib-5.2.2-verbose-tests.patch 2343 BLAKE2B ef6591b6ded7e0502700d80df92486e0a7245c5861b539a9c0625a0fa790492486ee88306349f1616d21f72d98615bba45b2014cad0b1a8c70837b0ae1fff810 SHA512 a3e38ecfbe13c9351ee93d92d1064104bb06e63e63674bdde880ea61d4191f498d74aab7a7a3978b56a02d3c5ac3bfd875c0315a72de7e84e41198a2213f6381 -DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736 DIST giflib-5.2.2.tar.gz 447175 BLAKE2B 5729628044f1bd9227856c76f67b673760c7c93860d9131ab0f67d900b8090fa24693ce16555ff65cfd839c6c960630d49a19ee26e03bdc9d2b4626f9efac393 SHA512 0865ab2b1904fa14640c655fdb14bb54244ad18a66e358565c00287875d00912343f9be8bfac7658cc0146200d626f7ec9160d7a339f20ba3be6b9941d73975f -EBUILD giflib-5.2.1-r1.ebuild 1847 BLAKE2B e7f9a3ef815e73b75883d1cbf644fc290842eea6087bdcf3114d036ae0e88cb8e78892f3db20ec6032b35034ed2df692a8f827f5d945dfd602d02ff30ec94fe2 SHA512 f61f42cd73421a038a94a72ef8ff7f41db73d06c6aa15d58f62e889dac68af2dd89fe669fb25d35c1796e44017d79b07eb04998ddd192f331f0a1f12cd026c0e -EBUILD giflib-5.2.2.ebuild 1604 BLAKE2B d09029ff29eb35a869ef63465ca8bcde20515f7687bdb803f997634000afdba9e4831b5cd26580f430fad0ddbac83ae9cf4f01e8de7d4b9447c66f1e08d70562 SHA512 6fd606368c0bdeabdcdc268797489459aeed8542d8eb848c950d24503c03fc472f9ece35b3647c1e2f50c1c2ed8c5c486c2c9e86ffa4f4bccf52f79204797eb9 +EBUILD giflib-5.2.2.ebuild 1642 BLAKE2B bb6ec41761c6beee280758795f0fb0d1d32bdcdc1eaeec75f5621b64a179c3cc173bf5ba089c2be53629d61bc8b02b35a1659e1af52c39f35112a9900b425406 SHA512 140e390cab40b812f6cff5d6a2ed6ff2778931d3bdea7a364d183a573141ae57e62ecc3a2b62143e5be46e7fd96d2dc1e2640494c171d9a68eaa6c53c14e8378 MISC metadata.xml 407 BLAKE2B 1cd650ccc597cbc965db8c5ff6ca1303740b2b36024b9d211c6126fa359a28d8f358d32f077b79ecf127f3afda8c0d40121b3a33c67304e135aba4673dfcee9d SHA512 d9bfaf6524644d68fd54d434772c2ff7ca85c2eaf86a59828b620e8af21b47c3c8121cfb6eafa28d314c6036089c549eb04b4b47f912350a7adb8120720c8cea diff --git a/media-libs/giflib/files/giflib-5.1.9-gentoo.patch b/media-libs/giflib/files/giflib-5.1.9-gentoo.patch deleted file mode 100644 index 0cb20183bd81..000000000000 --- a/media-libs/giflib/files/giflib-5.1.9-gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- giflib-5.1.9/Makefile -+++ giflib-5.1.9/Makefile -@@ -63,7 +63,6 @@ - LDLIBS=libgif.a -lm - - all: libgif.so libgif.a libutil.so libutil.a $(UTILS) -- $(MAKE) -C doc - - $(UTILS):: libgif.a libutil.a - diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild deleted file mode 100644 index 265e7e403a83..000000000000 --- a/media-libs/giflib/giflib-5.2.1-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs - -DESCRIPTION="Library to handle, display and manipulate GIF images" -HOMEPAGE="https://sourceforge.net/projects/giflib/" -SRC_URI="https://downloads.sourceforge.net/giflib/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/7" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="doc static-libs" - -PATCHES=( - "${FILESDIR}"/${PN}-5.1.9-gentoo.patch - "${FILESDIR}"/${PN}-5.2.1-fix-missing-quantize-API-symbols.patch -) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_compile() { - # Use reallocarray() from libc if available. - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include <stdlib.h>\nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then - local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY" - sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die - rm openbsd-reallocarray.c || die - fi - - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \ - LDFLAGS="${LDFLAGS}" \ - OFLAGS="" \ - all - - if use doc && multilib_is_native_abi; then - emake -C doc - fi -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - install - - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi - - if use doc && multilib_is_native_abi; then - docinto html - dodoc doc/*.html - fi -} - -multilib_src_install_all() { - local DOCS=( ChangeLog NEWS README TODO ) - einstalldocs - if use doc ; then - docinto html - dodoc -r doc/{gifstandard,whatsinagif} - fi -} - -multilib_src_test() { - emake -j1 check -} diff --git a/media-libs/giflib/giflib-5.2.2.ebuild b/media-libs/giflib/giflib-5.2.2.ebuild index c5a7524b7025..e47ebb73b906 100644 --- a/media-libs/giflib/giflib-5.2.2.ebuild +++ b/media-libs/giflib/giflib-5.2.2.ebuild @@ -11,9 +11,11 @@ SRC_URI="https://downloads.sourceforge.net/giflib/${P}.tar.gz" LICENSE="MIT" SLOT="0/7" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="doc static-libs" +BDEPEND="doc? ( virtual/imagemagick-tools )" + PATCHES=( "${FILESDIR}"/${PN}-5.2.1-fix-missing-quantize-API-symbols.patch "${FILESDIR}"/${PN}-5.2.2-fortify.patch diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index c01d47b00d9f..ff34f0ce5fce 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -1,15 +1,7 @@ AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292 -DIST intel-gmmlib-22.3.19.tar.gz 846342 BLAKE2B ce3c25740d9c3f556db31f880b47fba8358dd7d7d53d80bc9923bec8c67fdeee3ae4efa5465390c229bfdc2f6c64fa0a7963516f83d12061d34bf51102cb3a64 SHA512 804e4995983884832dbb6d08a4e3c8ca8d60e7ef2c5a0de12d0facfac1fdce619ad229ad1a6b62fdf0ba74a968caf3bb884e283af8cf38babacff350fc9728b9 -DIST intel-gmmlib-22.4.1.tar.gz 867162 BLAKE2B cc3dea9441f1b21b95595d5674046afec5ae673c6244b94572ba11d3451ddb9dae8adce9fe4310a5a0de3c723a3b7aef1031b9ca53f54b63fbefe43fadb7c2d1 SHA512 b44bd2f18ed97446c2e4f5ca7119cfde63f249fe8b5f23f0a531a2ec724aa51fe70014320d8f6dee85246df8ce220d5938654483d276eda60027162e304a3b64 -DIST intel-gmmlib-22.5.0.tar.gz 867541 BLAKE2B 89ac0fdac7212ea1122140357f04ffe67a27d4d743615b4d97121931370f44568cdcccfbeb681d8fe564b269f4fe1c0f47b50c9e7cc2ce44863d03ec47a75bdb SHA512 f4f33197cf635a71c02d1027f96268b0ebac66ba765b1b6d4d827b9cd7a044197a9a042371c5bf6550110b9d5b127bcf63627124a338cc9e8ee1e8bc1d90dbc2 -DIST intel-gmmlib-22.5.1.tar.gz 867534 BLAKE2B 2ea81d4444f5c79c87ccba1edaf5e00e88a7c95c1d236f55fa8b0776f31ea91acb54c99d0c3e13199183827b94f7c1f7136e40442ae30298093a0b86fdf61085 SHA512 515268f6451b5f822338820a121cb436cf73920afa1b092855188cf1b4fc8e11b3ed6d8481ba7c686aa4242fdd2f26ff9657ae9293df8197a428b0151ee4871f DIST intel-gmmlib-22.5.2.tar.gz 867665 BLAKE2B 64559ec6489614df352ba58d25f8706c234f3cff008228a7056e29d92584fab27af311fdb3db8c2e4f6983598019c646df8761ed422a47bcdbff02e79896d613 SHA512 516e2cc0d678d8fd44d8d2b1bfdf61c05670c01c906bd7f55a807846cd6399d4b616f86e6a1d85e2a6a0480c4616a40e9d5b29a3f45fbf588cc4d725ada71d49 -EBUILD gmmlib-22.3.19.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb -EBUILD gmmlib-22.4.1.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb -EBUILD gmmlib-22.5.0.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 -EBUILD gmmlib-22.5.1.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 -EBUILD gmmlib-22.5.2.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 +EBUILD gmmlib-22.5.2.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb EBUILD gmmlib-9999.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9 diff --git a/media-libs/gmmlib/gmmlib-22.3.19.ebuild b/media-libs/gmmlib/gmmlib-22.3.19.ebuild deleted file mode 100644 index 0a7ae2c25cdb..000000000000 --- a/media-libs/gmmlib/gmmlib-22.3.19.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - KEYWORDS="amd64" - SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" - S="${WORKDIR}/${PN}-intel-${P}" -fi - -DESCRIPTION="Intel Graphics Memory Management Library" -HOMEPAGE="https://github.com/intel/gmmlib" - -LICENSE="MIT" -SLOT="0/12.3" -IUSE="+custom-cflags test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch - "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING="$(usex test)" - -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" - ) - - cmake_src_configure -} diff --git a/media-libs/gmmlib/gmmlib-22.4.1.ebuild b/media-libs/gmmlib/gmmlib-22.4.1.ebuild deleted file mode 100644 index 0a7ae2c25cdb..000000000000 --- a/media-libs/gmmlib/gmmlib-22.4.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - KEYWORDS="amd64" - SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" - S="${WORKDIR}/${PN}-intel-${P}" -fi - -DESCRIPTION="Intel Graphics Memory Management Library" -HOMEPAGE="https://github.com/intel/gmmlib" - -LICENSE="MIT" -SLOT="0/12.3" -IUSE="+custom-cflags test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch - "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING="$(usex test)" - -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" - ) - - cmake_src_configure -} diff --git a/media-libs/gmmlib/gmmlib-22.5.0.ebuild b/media-libs/gmmlib/gmmlib-22.5.0.ebuild deleted file mode 100644 index 2a09f24b8f3d..000000000000 --- a/media-libs/gmmlib/gmmlib-22.5.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" - S="${WORKDIR}/${PN}-intel-${P}" -fi - -DESCRIPTION="Intel Graphics Memory Management Library" -HOMEPAGE="https://github.com/intel/gmmlib" - -LICENSE="MIT" -SLOT="0/12.3" -IUSE="+custom-cflags test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch - "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING="$(usex test)" - -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" - ) - - cmake_src_configure -} diff --git a/media-libs/gmmlib/gmmlib-22.5.1.ebuild b/media-libs/gmmlib/gmmlib-22.5.1.ebuild deleted file mode 100644 index 2a09f24b8f3d..000000000000 --- a/media-libs/gmmlib/gmmlib-22.5.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" - S="${WORKDIR}/${PN}-intel-${P}" -fi - -DESCRIPTION="Intel Graphics Memory Management Library" -HOMEPAGE="https://github.com/intel/gmmlib" - -LICENSE="MIT" -SLOT="0/12.3" -IUSE="+custom-cflags test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch - "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch - "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING="$(usex test)" - -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" - ) - - cmake_src_configure -} diff --git a/media-libs/gmmlib/gmmlib-22.5.2.ebuild b/media-libs/gmmlib/gmmlib-22.5.2.ebuild index 2a09f24b8f3d..0a7ae2c25cdb 100644 --- a/media-libs/gmmlib/gmmlib-22.5.2.ebuild +++ b/media-libs/gmmlib/gmmlib-22.5.2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then fi inherit git-r3 else - KEYWORDS="~amd64" + KEYWORDS="amd64" SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" S="${WORKDIR}/${PN}-intel-${P}" fi diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest index fcb2aceb5356..972c7588c2a9 100644 --- a/media-libs/graphene/Manifest +++ b/media-libs/graphene/Manifest @@ -1,3 +1,3 @@ DIST graphene-1.10.8.tar.gz 178557 BLAKE2B 57739a9cfc246a38968fa8352e0c05ce9e32e50753e7d18b8b25ecebd1ea294cfad26168437e290209011b51085fad7d8a47852b99510a7402f9a7dd00ac17f0 SHA512 526b0c17049459b687ceb7f6c26c9d982535e4048e74a0b6282704f9811d3c2e7e0e6cfef166aa953306b6cf77add6677bc600ae0c66cc052dc04c3d0345bd68 -EBUILD graphene-1.10.8-r1.ebuild 1550 BLAKE2B de63395db7b4e864e2c9c8c9f1d4b204b6ab6fe05f81e583af428f4cb043e08d86ae61d877ef91cf34e19c54d9313804c9a0613026f7dc77949ecd8d07fe9592 SHA512 5f3227d4831596ec2aed58f947a880aa3842dfa8c973a991a652c4db6324707f0d89170867af38f4c768ccb7c25252a40cd3c57520064bb0c747d067171f92c1 +EBUILD graphene-1.10.8-r1.ebuild 1550 BLAKE2B 81bc8c0f1d8111bb96c6bc13b0be9622f03013830750c0d0d0cff07f69c0d6f77411af198d6007edd011ea9549e04235cd0ddb683a7cee762b5dd6de79da1772 SHA512 58507a56c2d9b5e276c51bbf8fe374fb3167ba2adc3b5b3a5aa60adb5c5eaf703501c625c85be8c50cab20a7b008f5de8e40a633aa0912b121248668103fbf5d MISC metadata.xml 334 BLAKE2B 72027568b7436430c57d6ca3e522368786b9219c7b139eeb3c1e04f398539c2f1e78d63c741546813e4118904777c202dc56be114cd27b7056ef289e14cfd074 SHA512 8300692156435706d82417194a9d8fcc6865560b67d723ea38d0a985f7b910f4f9c65cea31049e30fdf854ab2d4d4983197a006803b2b6fb6d28cc7e40746959 diff --git a/media-libs/graphene/graphene-1.10.8-r1.ebuild b/media-libs/graphene/graphene-1.10.8-r1.ebuild index 5e8d6a2aa505..ac033b60e647 100644 --- a/media-libs/graphene/graphene-1.10.8-r1.ebuild +++ b/media-libs/graphene/graphene-1.10.8-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit xdg-utils meson-multilib python-any-r1 DESCRIPTION="A thin layer of types for graphic libraries" diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index b4425972c115..c5918fc7e108 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,6 +1,10 @@ +DIST harfbuzz-10.0.1.tar.xz 17914712 BLAKE2B d1506658646a589c772d8efec1f40095ff8097f5d34c6498aa848027e71583c511d337ceea5005a4f5ce08f28c2d952fd3007383d701e957fb0c923edeba9466 SHA512 3fb7dda6e51496337698d46cebe623f678a4e5b0f006be6e1309143a82408a362c149812477e083e14811a5cba565d76eb2c0804f5e1bbea7e1bf83678176048 +DIST harfbuzz-10.1.0.tar.xz 17922136 BLAKE2B 7d78e31d045b984d8d1a8b1d1f8f282ff9b7dc748ffd65355266266e75064b14eb94ec6b1418e208ebb0fffb99ef174d1978ab14f0c318c1112c2d8005285979 SHA512 14b0e8fd417af9c78f36e532e3737c163902b85837be1028a8fd569508639b87afeb56f70a2313ba2f0f6d4b72bb6cee0bf50fb333dfc503c713e4d9cd86e9c3 DIST harfbuzz-8.5.0.tar.xz 19468172 BLAKE2B f598d7de953834499d1ab36c0fc9d95099fd7e99b87f630e1527aaa39deb2d339b9f3caaea3643238c6c1b321557f794f273929950b54fe9de2faa430d77855a SHA512 d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c DIST harfbuzz-9.0.0.tar.xz 17895360 BLAKE2B fd35c41d25e77c96b1fc760b8ca0ffd1ac8f3382b51991bb28797d55c2171bf0700ac65266996bf5cab82b8e9c835c2fad9c8374d9c60d2a361c924d805afbf6 SHA512 2700b560727d9c4440ad9c74a170b857f20f9e553e5d98b0c4bcf086a25ba644149d7c89009a41d964af7a924efcc486da4dcbfa5cc4d47f9f10e9b6b8c689af +EBUILD harfbuzz-10.0.1.ebuild 2420 BLAKE2B 9f13f312444fb438d920d46b82bcfa7fa3400dfb9064b9015efce564b21d69d6be7932e19042aa474b890170c5e8c3b24a0f05c49574f828d096b91d231003ad SHA512 986cdf49bb95513a02ad2e9bfe7399787aa5bb0c57eb964784d47f951dad66660221a49c3803a5eb7090f86a4a4e57721b086ec00b3663c5ff4061808b3b2883 +EBUILD harfbuzz-10.1.0.ebuild 2420 BLAKE2B 9f13f312444fb438d920d46b82bcfa7fa3400dfb9064b9015efce564b21d69d6be7932e19042aa474b890170c5e8c3b24a0f05c49574f828d096b91d231003ad SHA512 986cdf49bb95513a02ad2e9bfe7399787aa5bb0c57eb964784d47f951dad66660221a49c3803a5eb7090f86a4a4e57721b086ec00b3663c5ff4061808b3b2883 EBUILD harfbuzz-8.5.0.ebuild 2708 BLAKE2B 48104feaba9afb67c3953d0281bf20b13e2425c85a33a3170097e2befa258d1762806648a484731bcc8e8303e6bb6d77c21b4115665393ef1a2f0029fcb3a1ed SHA512 e29cde2c603081e591641e4e19174b881285a75c27fed455731d6a8cc62e3ae187ff2a553cc3fc14116fe35c547b962c549a207b97a1d8692fee693cd9e68f5d -EBUILD harfbuzz-9.0.0.ebuild 2414 BLAKE2B e5d23ff0d10c0e6f37325f14d79da8828ce6a281db4c6863873540bdac23423e0c64bcba0b5192a8368d1d0cb0f413fd03172639456807fa5b9e58ce800657ce SHA512 42ee377ba1d8822c20f52365bf061f939c0c7de18d482137270a790279e70a5b4b97acd8193e012b30051c2bae6f8235a7c8d74ff05988bf93d8345364589509 -EBUILD harfbuzz-9999.ebuild 2420 BLAKE2B 308d59d4784c5821eb8ca811df29447c00cadff92aabd1804d65c34b48f92743a9583536988db6c4b9c1d9f7222f1b56432cff1fb859c777d07903d6964dc0c4 SHA512 10681abed3047701dfd1c45c65da10ac9943b43fcb9f5e3719754ed2cd2b211ea4eac806a738e4cd7f7126c76cfdbee982cccd2e527e2a29629db7149db299e7 +EBUILD harfbuzz-9.0.0.ebuild 2412 BLAKE2B c8dd2032d78c0af08f0b20b17c285c9b6a9d55550f951b5555f8b45e99884c08fdc7fae71e2c57f5d42e220566d1d8f52f5e0e7bb3501d3c52a80b8f65ac3b25 SHA512 21153ddb24dd2b80f14237d6667ff2f6f92f12da835d219a88733f15398f3d9212b1f638acf4f700201ae1876f99161ec37ad24dbc55236c4cf4d8e95cf2c4c3 +EBUILD harfbuzz-9999.ebuild 2420 BLAKE2B 9f13f312444fb438d920d46b82bcfa7fa3400dfb9064b9015efce564b21d69d6be7932e19042aa474b890170c5e8c3b24a0f05c49574f828d096b91d231003ad SHA512 986cdf49bb95513a02ad2e9bfe7399787aa5bb0c57eb964784d47f951dad66660221a49c3803a5eb7090f86a4a4e57721b086ec00b3663c5ff4061808b3b2883 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70 diff --git a/media-libs/harfbuzz/harfbuzz-10.0.1.ebuild b/media-libs/harfbuzz/harfbuzz-10.0.1.ebuild new file mode 100644 index 000000000000..7214ae683e59 --- /dev/null +++ b/media-libs/harfbuzz/harfbuzz-10.0.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic meson-multilib python-any-r1 xdg-utils + +DESCRIPTION="An OpenType text shaping engine" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git" + inherit git-r3 +else + SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="Old-MIT ISC icu" +# 0.9.18 introduced the harfbuzz-icu split; bug #472416 +# 3.0.0 dropped some unstable APIs; bug #813705 +# 6.0.0 changed libharfbuzz-subset.so ABI +SLOT="0/6.0.0" + +IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype" +RESTRICT="!test? ( test )" +REQUIRED_USE="introspection? ( glib )" + +RDEPEND=" + cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] ) + glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) + graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.34:= ) + truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + introspection? ( dev-util/glib-utils ) +" + +src_prepare() { + default + + xdg_environment_reset + + # bug #790359 + filter-flags -fexceptions -fthreadsafe-statics + + if ! use debug ; then + append-cppflags -DHB_NDEBUG + fi +} + +multilib_src_configure() { + # harfbuzz-gobject only used for introspection, bug #535852 + local emesonargs=( + -Dcoretext=disabled + -Dchafa=disabled + -Dwasm=disabled + + $(meson_feature cairo) + $(meson_feature glib) + $(meson_feature graphite graphite2) + $(meson_feature icu) + $(meson_feature introspection gobject) + $(meson_feature test tests) + $(meson_feature truetype freetype) + + $(meson_native_use_feature doc docs) + $(meson_native_use_feature introspection) + # Breaks building tests.. + #$(meson_native_use_feature utilities) + + $(meson_use experimental experimental_api) + ) + + meson_src_configure +} + +multilib_src_test() { + # harfbuzz:src / check-static-inits times out on hppa + meson_src_test --timeout-multiplier 5 +} diff --git a/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild new file mode 100644 index 000000000000..7214ae683e59 --- /dev/null +++ b/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic meson-multilib python-any-r1 xdg-utils + +DESCRIPTION="An OpenType text shaping engine" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git" + inherit git-r3 +else + SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="Old-MIT ISC icu" +# 0.9.18 introduced the harfbuzz-icu split; bug #472416 +# 3.0.0 dropped some unstable APIs; bug #813705 +# 6.0.0 changed libharfbuzz-subset.so ABI +SLOT="0/6.0.0" + +IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype" +RESTRICT="!test? ( test )" +REQUIRED_USE="introspection? ( glib )" + +RDEPEND=" + cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] ) + glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) + graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.34:= ) + truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + introspection? ( dev-util/glib-utils ) +" + +src_prepare() { + default + + xdg_environment_reset + + # bug #790359 + filter-flags -fexceptions -fthreadsafe-statics + + if ! use debug ; then + append-cppflags -DHB_NDEBUG + fi +} + +multilib_src_configure() { + # harfbuzz-gobject only used for introspection, bug #535852 + local emesonargs=( + -Dcoretext=disabled + -Dchafa=disabled + -Dwasm=disabled + + $(meson_feature cairo) + $(meson_feature glib) + $(meson_feature graphite graphite2) + $(meson_feature icu) + $(meson_feature introspection gobject) + $(meson_feature test tests) + $(meson_feature truetype freetype) + + $(meson_native_use_feature doc docs) + $(meson_native_use_feature introspection) + # Breaks building tests.. + #$(meson_native_use_feature utilities) + + $(meson_use experimental experimental_api) + ) + + meson_src_configure +} + +multilib_src_test() { + # harfbuzz:src / check-static-inits times out on hppa + meson_src_test --timeout-multiplier 5 +} diff --git a/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild index bf32dbe4aae7..65c323f24324 100644 --- a/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit flag-o-matic meson-multilib python-any-r1 xdg-utils @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="Old-MIT ISC icu" diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index 406a30ae945b..7214ae683e59 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit flag-o-matic meson-multilib python-any-r1 xdg-utils diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest index dada70472802..6510d7431bbd 100644 --- a/media-libs/jbig2dec/Manifest +++ b/media-libs/jbig2dec/Manifest @@ -1,7 +1,4 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45 -DIST jbig2dec-0.19.tar.gz 149134 BLAKE2B 576f3a516499b6291d25dfdefe5af62899665167526dca11435bc07e04a3feb707f82d3a8bdda774f5cfe0d792c3147e77aa94fa57feac25ba1c0a7805c5fc58 SHA512 d5a27951cc9c06c184f454e258e81b6e4d5aa2742a4da821522b9a42ecc78e7e1b78058dabc23821618e62d62d8832011f16b5ef2d66beac463da6b809fd02af DIST jbig2dec-0.20.tar.gz 149782 BLAKE2B 6e5a26b736bbc5dc25614e192855d74a59337f5e5aa82cd0882e42a34259295d7df7f8c7acfb88b53ac3817141459c6d6cc58c0d36c1c341e2afedbed8f7d83d SHA512 8b8a28b93b23e4284ca229e6c8935fd161ce5c597f7470a46ec06a3241d0ac23cf921aecdd4e0c1bd3c904591409054236f2ce25b6d8ae40db742559c7f4dbe9 -EBUILD jbig2dec-0.19-r1.ebuild 1506 BLAKE2B 0be079c7353f552172e6274545fc621b49ffd72cc39dc04e65cef9fc0a32994b21dfd144bbc8bf8e21adf8500de173a9fa6b6b8ee10ecc2f06d56d0c900c3191 SHA512 fd30c16ad6de781a5eefb5574f677bb7a02e6c38f3b67153818ccc4dd4f8c71d1a8f137b7fd21ead519b9fa079db74a94434b10979dc4a78f57f1ca0d300af9b -EBUILD jbig2dec-0.19.ebuild 1498 BLAKE2B b8f04575e953d9cc0b3524851d3ab74f9500735ba97f22fadac5b1349b027f276dc9cb473671b5b5d6ac35e639b1ab57cb3ff848097547336630bbeb90e8d17d SHA512 c9120cd5d798305252a85bc486458e358efe53f50ade96843d13a6ebf94885b53c143251eb070b98dc6caacda673f3e8de1c4e444221f68e0e43a8bafb2592de -EBUILD jbig2dec-0.20.ebuild 1506 BLAKE2B 0be079c7353f552172e6274545fc621b49ffd72cc39dc04e65cef9fc0a32994b21dfd144bbc8bf8e21adf8500de173a9fa6b6b8ee10ecc2f06d56d0c900c3191 SHA512 fd30c16ad6de781a5eefb5574f677bb7a02e6c38f3b67153818ccc4dd4f8c71d1a8f137b7fd21ead519b9fa079db74a94434b10979dc4a78f57f1ca0d300af9b +EBUILD jbig2dec-0.20.ebuild 1498 BLAKE2B 2694b4b2f690ce3edaad176cb918d8b11846da6c0fba4e8b0ce31470376aaf5494dba9b4689da1b653d6f0466c7ca22fac498b4b5ec4bf4055d6f332f1428de1 SHA512 270ae81d56c53728776075688dfa00e56d8b5a762e9bab7de72ba2652f2f46c0aea42ac028301fedff58fa4fdccfc32b3de9a017173184e28344eab44f0cb57a MISC metadata.xml 414 BLAKE2B cae9b25dd53d68c263a4afe3c1a18c02923fd665b60791df7d0b9b55d82184159c5c1ced1786bd443d38668b1f12b083191cb1da4e9a576c5da5e4d36828d56c SHA512 1e5bcded3676b4d336781551dcd875e1d7cc5532eaf13cbf013799c225f94967c8f592707492cf8908a65d76e473452fa5b0419fbaea73f1c718660e65ffdcba diff --git a/media-libs/jbig2dec/jbig2dec-0.19-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.19-r1.ebuild deleted file mode 100644 index f8fa76821185..000000000000 --- a/media-libs/jbig2dec/jbig2dec-0.19-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools python-any-r1 - -DESCRIPTION="A decoder implementation of the JBIG2 image compression format" -HOMEPAGE="https://jbig2dec.com/" -SRC_URI=" - https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://jbig2dec.sourceforge.net/ubc/jb2streams.zip ) -" - -LICENSE="AGPL-3" -SLOT="0/$(ver_cut 1-2)" #698428 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="png static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - app-arch/unzip - ${PYTHON_DEPS} - ) -" -RDEPEND="png? ( media-libs/libpng:= )" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES README ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - if use test; then - mkdir "${WORKDIR}/ubc" || die - mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die - mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die - fi - - # We only need configure.ac and config_types.h.in - sed -i \ - -e '/^# do we need automake?/,/^autoheader/d' \ - -e '/echo " $AUTOM.*/,$d' \ - autogen.sh \ - || die "failed to modify autogen.sh" - - ./autogen.sh || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_with png libpng) -} - -src_install() { - default - - find "${ED}" -name '*.la' -exec rm {} + || die -} diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild deleted file mode 100644 index dc4f4ef423fb..000000000000 --- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools python-any-r1 - -DESCRIPTION="A decoder implementation of the JBIG2 image compression format" -HOMEPAGE="https://jbig2dec.com/" -SRC_URI=" - https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://jbig2dec.sourceforge.net/ubc/jb2streams.zip ) -" - -LICENSE="AGPL-3" -SLOT="0/$(ver_cut 1-2)" #698428 -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="png static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - app-arch/unzip - ${PYTHON_DEPS} - ) -" -RDEPEND="png? ( media-libs/libpng:= )" -DEPEND="${RDEPEND}" - -DOCS=( CHANGES README ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - if use test; then - mkdir "${WORKDIR}/ubc" || die - mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die - mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die - fi - - # We only need configure.ac and config_types.h.in - sed -i \ - -e '/^# do we need automake?/,/^autoheader/d' \ - -e '/echo " $AUTOM.*/,$d' \ - autogen.sh \ - || die "failed to modify autogen.sh" - - ./autogen.sh || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_with png libpng) -} - -src_install() { - default - - find "${ED}" -name '*.la' -exec rm {} + || die -} diff --git a/media-libs/jbig2dec/jbig2dec-0.20.ebuild b/media-libs/jbig2dec/jbig2dec-0.20.ebuild index f8fa76821185..7fedde251859 100644 --- a/media-libs/jbig2dec/jbig2dec-0.20.ebuild +++ b/media-libs/jbig2dec/jbig2dec-0.20.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="AGPL-3" SLOT="0/$(ver_cut 1-2)" #698428 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="png static-libs test" RESTRICT="!test? ( test )" diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest index 9477f9347f59..257b053f68f6 100644 --- a/media-libs/kcolorpicker/Manifest +++ b/media-libs/kcolorpicker/Manifest @@ -1,5 +1,3 @@ -DIST kColorPicker-0.2.0.tar.gz 12735 BLAKE2B 39b0c80ec5b498800dd251901b0bd57c839693f071185afacefa8d5a715ff18f2297c50486d98871471c40e0904a07ff40198b548d9368937b120a1eef07929f SHA512 44f9f317ebe5dd3131a9e44071f9f5b397b0d5cceece566f3ecf19932c8e36dafe1a434e623239421bead9413f0859bc3380174d7f14843770691e4d15a956eb DIST kColorPicker-0.3.1.tar.gz 12861 BLAKE2B 927ad41de0d9576d6fc004595a775715bcffeba7149a8111a7311fd44e8e58b01abbfda898174acefb9e0bad969420bf05eda45694cbc0cd8a3d3cf942709179 SHA512 bb91d8dfa555e60206665453cde8f4f7536154fe7660aeab276c0a509bdb19caf04276eb0935537b390657881db020ecb943de3e5b8d286f3cd7d89bf7010674 -EBUILD kcolorpicker-0.2.0.ebuild 753 BLAKE2B 64d7773a51e83780ef30f2200d3d11031778560313c808164eb9fec1d7e0dabf10a3f4ff7e4a1305f295a8c18d8e0701bb6362aed12914f555547690838e815a SHA512 2e446279704de70a27f5b7d75c25e70e4cfc70bffb06afcb9c70d6495a376020640ae941dc57fc860af33749c04e7894a74672b427986b7f04df8758d424a5d4 EBUILD kcolorpicker-0.3.1.ebuild 771 BLAKE2B f98b87a5c1b38cdb11a4b206f0452676c0e6648c388030bef51355dd303b5bd13e2c90f00823e5e5fcad050e739dedfbf4ec0ad99ffe3dc2e88b250a182f3e75 SHA512 99668e51859d17c6ebe0c39ff63451c39fa057e0e716635565e335a533448af50dc996de7d48cdef5772b2f7312fc08e6011cc9e72e46686ff3e945ce7cb1a99 MISC metadata.xml 806 BLAKE2B 9ba16fcdf82d0b4880fd2c77fb9ac9050ba06ef923b54fa2583eb79a7703805334b5bd098c276005d443eeb27d534f9bc890a204f30cc5569e34ed90fa34eca9 SHA512 f31ccb93db41c34d4abd890e52845ff597df8062d7efed769866329f452cc542f8b0f0f9ce6fdd91d8e590255a5c08738d1ac9b984832691c3621412e4191f7b diff --git a/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild deleted file mode 100644 index c404fd9f681d..000000000000 --- a/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VIRTUALX_REQUIRED="test" -inherit cmake virtualx - -MY_PN=kColorPicker -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Qt based color picker with popup menu" -HOMEPAGE="https://github.com/ksnip/kColorPicker" -SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" -IUSE="test" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5[png] -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest index a1058197d077..ea99ed2bee2c 100644 --- a/media-libs/kimageannotator/Manifest +++ b/media-libs/kimageannotator/Manifest @@ -1,6 +1,4 @@ AUX kimageannotator-0.7.1-fix_KeyInputHelperTest.patch 1115 BLAKE2B adc0a59d6f4cd6fd9f15df80d36f5a0ddaf710db7d500d6d379f3ee312e052cc37290adbd82348bc6b8661020729072bea9d4bd332f381c3a06df23a7f188746 SHA512 07f55043cfe866f8b66c3fc9284d8e1834c4c2be7deb313ee93ee9e64b26d1040fc650b86fe41b0850884409f15ea0fc7263986c469332cf1ef696a9afaf9c59 -DIST kImageAnnotator-0.6.1.tar.gz 264176 BLAKE2B dfbfb50d2187572b0e68f1a699e91391fbb1fbc36f9b44f3ad97cab9e4ab3329e20ae4abe7fc68f1cf8dfd1960f2b03b3d6a6c949b4a7102b0c22d35690b8e05 SHA512 92ec8ff06011856e98e5624f9c3d98227e10991385fa41e110187db9b5d7b8de075199844e886618668040b69f8910be51b8cf55a009fac8887954c5b7695b25 DIST kImageAnnotator-0.7.1.tar.gz 266861 BLAKE2B 861aedec7481e022db4c75bcd5d10e202da2073d7ffde7c60ab6ebe16b25d301045c6ef7ade0c69b594719e5094031842b96f62981565f7fe7252474486e41b1 SHA512 cb5e7e87f1b7c72108a8ace7fb60ef644e2de19e78b3e61e50e6d534b235710e5e62464f8d136ee46b7f96cb3235601eb80b09b41d972d8df9ef6fe09cb34c95 -EBUILD kimageannotator-0.6.1.ebuild 955 BLAKE2B 8ba316ef8047fe62a0dced861ae554a2caed4c0f89d198e577a9154b544946e76f5b009f6ed31bb53b7f96e9f81a1d4b80ab71de7a989b8f03af992040149a02 SHA512 93552ceddb3980131639ec69dda0899ef24264378a08de57165f14bfe60b8cb54c833e64620b41262cc397333e0c48e40e4d0092134e926d911e601b62d84e21 EBUILD kimageannotator-0.7.1.ebuild 1001 BLAKE2B f51de250b22dbba19e3d540343a597b7bcbf0e1c852ca6e2056a2566c426bf0dcc2b187ffb210f89267ad1540d28611199d4b947f247c3bb0e9e10f2805d209b SHA512 05c666ea2ca4e545c6fbeeb05d1ded40e7b468c941dd86e136456c4c083269442bf135f162691f80a8f597a39fd68ab99f04cc2edee9a7ee6173d182aa08e1e1 MISC metadata.xml 594 BLAKE2B d54c8385b90271cf917c61e72900f9080dd03f83b46d0f15730af188f3965705742608cd1b54f24deba32e72416e457e86ed5d38996bb4517222808d850e9993 SHA512 680038e96337f6f8b1cd66268947431f49d1c04e71988b453f6557e1a6da2d9861b36e3c59f643a03460dc67bdd5564218a97769302b789cf040f12f619a8586 diff --git a/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild deleted file mode 100644 index b199184cf2ae..000000000000 --- a/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VIRTUALX_REQUIRED="test" -inherit cmake virtualx - -MY_PN=kImageAnnotator -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Tool for annotating images" -HOMEPAGE="https://github.com/ksnip/kImageAnnotator" -SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" -IUSE="test" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5[png] - >=media-libs/kcolorpicker-0.2.0 - <media-libs/kcolorpicker-0.3.0 - x11-libs/libX11 -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - test? ( - dev-qt/qttest:5 - dev-cpp/gtest - ) -" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_test() { - BUILD_DIR="${BUILD_DIR}/tests" virtx cmake_src_test -} diff --git a/media-libs/kquickimageeditor/Manifest b/media-libs/kquickimageeditor/Manifest index b413288e819d..ab39777f80d7 100644 --- a/media-libs/kquickimageeditor/Manifest +++ b/media-libs/kquickimageeditor/Manifest @@ -1,5 +1,3 @@ -DIST kquickimageeditor-0.3.0.tar.xz 3286792 BLAKE2B 54bcbe7d8db7f9e6d35708125ce25d56a9ca7cb9c78a25a90cb1041ec899d9cdf89b84a995f0939566dadf195f272096d5374205b4cc4990cd1ecfe17ef1fc83 SHA512 51f25c5f2089c2bc9ef4715a4535b72cbf50664d17fe23dc80b266831d65a525027fa16d111400d4cf2c6b8210cbd572a3b3a0e4e921d42d331905718364ad7f DIST kquickimageeditor-0.4.0.tar.xz 3294388 BLAKE2B 64214edc236871cbeef7cf8d11ba376a1752852a68d11dd46cfdee6dab2fcf0d3f319e825170aa7e01b506ff4b7e3972c120485d8da1bfd7b4e6ff4a38c57e66 SHA512 58ae6af9dc9c8fb0bd99279246acb360eee4110b8e2b1f51bbcb3daf246a60fcb308b111e164a40f1bff09c6f0c1298dfe1588d7bd0f2a571bda8ac9d6252e8c -EBUILD kquickimageeditor-0.3.0-r100.ebuild 718 BLAKE2B 43589d267ddbbc5151e98961785f6223fda4aec8b4a2ea161fdb7261bf387cb6c9eeacfd584796c720dcc26047a0267e14cf49e0717d55248c7956a292ffa78e SHA512 bbc00b654b6867a4e505332bdac2e6360eb51059227acef85ac798f64d96f132ef4519949cbbead7dcd5559db30dca6b68a0e5e15d163a09ac2c1ef931020a34 -EBUILD kquickimageeditor-0.4.0.ebuild 682 BLAKE2B e46da692c248a47cb705478db07803348d8a928328f7c54ed759d8d88e1aeb5fe04b1da4ba3a045745cb0543091a3835cdf0437bfad432036aaeb4d86a326f00 SHA512 6459e911bfe7e2e5162bb7a7b1c1d59ed2261b5431e9b3627eef9801079a54c52611c178fcf327fa72ceb213efbf6de92853aa8de8d78d6ee2b69648f959b32d +EBUILD kquickimageeditor-0.4.0.ebuild 680 BLAKE2B b63e475108ee798478217993ba5cf315f9e9c653d05705e8eb61359255f692830945a09843a9aaa875495b3d6529cb954caf4fed200f040123e56f336219b242 SHA512 20617f3d0b05f98ade2f82bb201dc09bfcf29836075afded1cc62e1096a06a1939722f104145529facf4fa5b1d5be0f77f9bff7eac234351ae03eb7c758425af MISC metadata.xml 389 BLAKE2B 1a40d2e6e9a20deb5aa726b6b3d355f41baae2aa9e091d0c7dc0c2cbf4cf9741d23bbc4338f49af52752da876430554cec8e7a9b0db50536a50480b3afb43aaa SHA512 6c160febb064cb5ec85fec3ca63db97d29f868da68f8d26e42ef90ef52e4e0a487f4897aaddb9db13b89b0ac0e270de1e29a853a871f03f41c0be2e3d689e680 diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.3.0-r100.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.3.0-r100.ebuild deleted file mode 100644 index 23b504c78829..000000000000 --- a/media-libs/kquickimageeditor/kquickimageeditor-0.3.0-r100.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.249.0 -QTMIN=6.6.2 -inherit ecm kde.org - -DESCRIPTION="QtQuick components providing basic image editing capabilities" -HOMEPAGE="https://invent.kde.org/libraries/kquickimageeditor -https://api.kde.org/kquickimageeditor/html/index.html" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="6" - -DEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[gui] - >=dev-qt/qtdeclarative-${QTMIN}:6 -" -RDEPEND="${DEPEND} - !${CATEGORY}/${PN}:5 - >=dev-qt/qt5compat-${QTMIN}:6[qml] - >=kde-frameworks/kirigami-${KFMIN}:6 -" diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.4.0.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.4.0.ebuild index a013e066c728..196a0b8269c2 100644 --- a/media-libs/kquickimageeditor/kquickimageeditor-0.4.0.ebuild +++ b/media-libs/kquickimageeditor/kquickimageeditor-0.4.0.ebuild @@ -13,7 +13,7 @@ https://api.kde.org/kquickimageeditor/html/index.html" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" fi LICENSE="LGPL-2.1+" diff --git a/media-libs/ksanecore-common/Manifest b/media-libs/ksanecore-common/Manifest index 320e36500867..541482db1958 100644 --- a/media-libs/ksanecore-common/Manifest +++ b/media-libs/ksanecore-common/Manifest @@ -1,5 +1,5 @@ -DIST ksanecore-24.05.2.tar.xz 51080 BLAKE2B c57152bbff1c3eb4c6de3f20809d9e3a7ec5c81c981823e3750142006f1c6ac0f7bfc5913042edfcaa6a8e2f2210c8dc8963097d60dffc153ffb9078e3ca13bd SHA512 862c5997f0e10e6b3382127fe1d5efee37621212f2ec70a5346bf914cbe6ff9d1476cd05b119e0784222c8a195787f30b4454aaeeeb9535d0d52362a7ba0a718 DIST ksanecore-24.08.1.tar.xz 51164 BLAKE2B b4d9ecc8886b963efbbd5ed8dcca84cb7e0805726306ad942fbae9a73f1402e25851142893943b63c90e60c7d3b00542e0174fe9e07379146667d1383080cc8b SHA512 ebfccc54704438a9ec0fab2f8029c95745921438b63a8928a048f6f2cfcfea4c1f871fe7872331d8e9e7ac24a0a5e0df654b388430102f73027ee0afcf8ee002 -EBUILD ksanecore-common-24.05.2.ebuild 364 BLAKE2B 6209d72b32e2703bf688bdaf6aed825917a8053799a7be4b7bef48503677eca63a8113510fbe7d4aad4f55a05bb85e294150ac8bc21a0ffd80f883ffd037a426 SHA512 6b8575f6d6ff49ef2b618b4982ca080b33806e88612bfbdb0322f98cf7007986db6b5420078f118cbc1f91f0c28a253022ff3b65c983da44021eeac7032ffc05 -EBUILD ksanecore-common-24.08.1.ebuild 367 BLAKE2B d39c69d74afa352fc23f0db2c9123d54002eba818303f3f747ea0d06e47c0d43e403fa0f3a8a0e8e0fadff37384b5111952933811c2b6db3f9e88e0b482ad714 SHA512 b7433e152a74e2f79a80b8e00453ecca83241b2bda2147615325ac716221d4ebffe374430c2ced2d9e9c99ebabad064b78905a4ab5d144d917e183d009496067 +DIST ksanecore-24.08.3.tar.xz 51184 BLAKE2B 285285ece94d8c55a81be2cb932c1e34b2154d04101a4501fb2cc69c310656529eee7e3d612ff12a240009a86d22d5738352dbad408d8a7871fc66c378083077 SHA512 808c220cf01ec9de1fc5e6cf55f873fe6f70f8ab231e59b7c048db5a5b7ecde542e3291798118d0e65b99c4b627e34beceef38948ba208e9dfb2c992e65a06f8 +EBUILD ksanecore-common-24.08.1.ebuild 364 BLAKE2B 6209d72b32e2703bf688bdaf6aed825917a8053799a7be4b7bef48503677eca63a8113510fbe7d4aad4f55a05bb85e294150ac8bc21a0ffd80f883ffd037a426 SHA512 6b8575f6d6ff49ef2b618b4982ca080b33806e88612bfbdb0322f98cf7007986db6b5420078f118cbc1f91f0c28a253022ff3b65c983da44021eeac7032ffc05 +EBUILD ksanecore-common-24.08.3.ebuild 367 BLAKE2B d39c69d74afa352fc23f0db2c9123d54002eba818303f3f747ea0d06e47c0d43e403fa0f3a8a0e8e0fadff37384b5111952933811c2b6db3f9e88e0b482ad714 SHA512 b7433e152a74e2f79a80b8e00453ecca83241b2bda2147615325ac716221d4ebffe374430c2ced2d9e9c99ebabad064b78905a4ab5d144d917e183d009496067 MISC metadata.xml 381 BLAKE2B 42cf8662e7a405016cbf593e43771e2a354116ed82825cf42ba21c41d9dcd22dfc868fcc1837ae47b3c13b229908a7a1db8b1fe636b53418664f7835cabe4c35 SHA512 1d3caf0c29b67b79a29c02db8625ee17306f6c114b48599b432c5ced09d51aa02339e75d1552b56fa86ad4ec781c44cc909f8f7cccc0eadc2043ce3103604c38 diff --git a/media-libs/ksanecore-common/ksanecore-common-24.08.1.ebuild b/media-libs/ksanecore-common/ksanecore-common-24.08.1.ebuild index 3fd16d901523..d598909ef7f0 100644 --- a/media-libs/ksanecore-common/ksanecore-common-24.08.1.ebuild +++ b/media-libs/ksanecore-common/ksanecore-common-24.08.1.ebuild @@ -10,7 +10,7 @@ inherit ecm-common gear.kde.org LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" RDEPEND=" !<media-libs/ksanecore-23.08.5-r2:5 diff --git a/media-libs/ksanecore-common/ksanecore-common-24.05.2.ebuild b/media-libs/ksanecore-common/ksanecore-common-24.08.3.ebuild index d598909ef7f0..3fd16d901523 100644 --- a/media-libs/ksanecore-common/ksanecore-common-24.05.2.ebuild +++ b/media-libs/ksanecore-common/ksanecore-common-24.08.3.ebuild @@ -10,7 +10,7 @@ inherit ecm-common gear.kde.org LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" RDEPEND=" !<media-libs/ksanecore-23.08.5-r2:5 diff --git a/media-libs/ksanecore/Manifest b/media-libs/ksanecore/Manifest index 99db39515a98..904782d623a0 100644 --- a/media-libs/ksanecore/Manifest +++ b/media-libs/ksanecore/Manifest @@ -1,7 +1,7 @@ DIST ksanecore-23.08.5.tar.xz 50052 BLAKE2B 500c574d40a8c927cd8568d3d0094789731b58cbe64de8ff04ee993adb8503cbb4d999d14c3222d142bb2485f1131dfe45c0a6a305347180e1021d1aa661d020 SHA512 93bbb6160c063e54be4cb115cf164354fb545ff458aa2066d98a38e81d48dfed4260a4b2afcb252ba43cf25ed102345018e0ad99b7ca66b9cb0b2fb64235b440 -DIST ksanecore-24.05.2.tar.xz 51080 BLAKE2B c57152bbff1c3eb4c6de3f20809d9e3a7ec5c81c981823e3750142006f1c6ac0f7bfc5913042edfcaa6a8e2f2210c8dc8963097d60dffc153ffb9078e3ca13bd SHA512 862c5997f0e10e6b3382127fe1d5efee37621212f2ec70a5346bf914cbe6ff9d1476cd05b119e0784222c8a195787f30b4454aaeeeb9535d0d52362a7ba0a718 DIST ksanecore-24.08.1.tar.xz 51164 BLAKE2B b4d9ecc8886b963efbbd5ed8dcca84cb7e0805726306ad942fbae9a73f1402e25851142893943b63c90e60c7d3b00542e0174fe9e07379146667d1383080cc8b SHA512 ebfccc54704438a9ec0fab2f8029c95745921438b63a8928a048f6f2cfcfea4c1f871fe7872331d8e9e7ac24a0a5e0df654b388430102f73027ee0afcf8ee002 +DIST ksanecore-24.08.3.tar.xz 51184 BLAKE2B 285285ece94d8c55a81be2cb932c1e34b2154d04101a4501fb2cc69c310656529eee7e3d612ff12a240009a86d22d5738352dbad408d8a7871fc66c378083077 SHA512 808c220cf01ec9de1fc5e6cf55f873fe6f70f8ab231e59b7c048db5a5b7ecde542e3291798118d0e65b99c4b627e34beceef38948ba208e9dfb2c992e65a06f8 EBUILD ksanecore-23.08.5-r2.ebuild 639 BLAKE2B 29131577438d281cd2cb4832e9793d0589ede29e4457ebf2dea7c35cf39d95d925b693fa98fa5e38120765638fdf8f4511e557da986b8a70c1a8c8f0701f9d6f SHA512 94afb3aac2dd4282a78ab910dc21fa4aaf122e80ea87a7bf305a2d6a468087ebaa21d8a83371d27dc9983bda3b07bb02a283395f4bff27f136457059314386f8 -EBUILD ksanecore-24.05.2-r1.ebuild 642 BLAKE2B 2df20c851c3475d7252bc90873ddbb8da874ce927a7b1bc6fa5ddfd319bda4e50b1e35bc527449ed69dc5081921e0b1d5f97235388d0e1873ae9c8192a9cb35b SHA512 11105965e653407be869fbfbb3716c8100edd3b9e9805efe562e23378f6ab5969e79314b6fcf55cc50daf325788e727fa8533bf64d8f38a918dfedbd3c31758f -EBUILD ksanecore-24.08.1.ebuild 644 BLAKE2B 7983b4d938bf81160ca83fe41a07190b94d37de9cbeb455f96abfd07c0b9d5c8cff58b9bcdd2873ebc70f6c75c6a429a47a3164ec84d10dbc8b6588b46e5205f SHA512 c71602af4192e509a0c6267d4d7084915cabfafe198ff7b7d7d727486f3d60518257087b614f2e0df772750a49b3b3b5974b3dd1d84521f197d86b6238928aa8 +EBUILD ksanecore-24.08.1.ebuild 642 BLAKE2B b861222212cf1e437541bd3558de13f8aa57017721207d010f687f02864716a75b60834ab2d37e57c2ddbced478ffbd4450bd28d2ee5d8e507aee1ea3f9ffd7e SHA512 f298920b638e72fa325f4b636661c2510778153a0413483df7568cb4a221323aa7aa4773bef87516416e4c92a0ee47ead55b8503bdab2a89fc4391dc2a93b24b +EBUILD ksanecore-24.08.3.ebuild 644 BLAKE2B 7983b4d938bf81160ca83fe41a07190b94d37de9cbeb455f96abfd07c0b9d5c8cff58b9bcdd2873ebc70f6c75c6a429a47a3164ec84d10dbc8b6588b46e5205f SHA512 c71602af4192e509a0c6267d4d7084915cabfafe198ff7b7d7d727486f3d60518257087b614f2e0df772750a49b3b3b5974b3dd1d84521f197d86b6238928aa8 MISC metadata.xml 338 BLAKE2B a2597ee8510ec4e47f014dcf1d255490b5dae78003e5526665945d4092116cc4e3f2bf3d76e03b5fdcb8a70f872b35c70ca1d89f6c8b4f2d67f2d7bad6a502d5 SHA512 34040d0fa7bdbb70bce78cd8d543e69db0e835deb85c33055769277df44a5ed1b8efcb7ba5aeaeb1b389704b42b941279b9faabc8f476b87beb06bbb266217f8 diff --git a/media-libs/ksanecore/ksanecore-24.08.1.ebuild b/media-libs/ksanecore/ksanecore-24.08.1.ebuild index 625b222fc648..ed8e9ed31c12 100644 --- a/media-libs/ksanecore/ksanecore-24.08.1.ebuild +++ b/media-libs/ksanecore/ksanecore-24.08.1.ebuild @@ -13,7 +13,7 @@ https://api.kde.org/ksanecore/html/index.html" LICENSE="|| ( LGPL-2.1 LGPL-3 )" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-libs/ksanecore/ksanecore-24.05.2-r1.ebuild b/media-libs/ksanecore/ksanecore-24.08.3.ebuild index 3e7842beb286..625b222fc648 100644 --- a/media-libs/ksanecore/ksanecore-24.05.2-r1.ebuild +++ b/media-libs/ksanecore/ksanecore-24.08.3.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KFMIN=6.3.0 -QTMIN=6.6.2 +KFMIN=6.5.0 +QTMIN=6.7.2 inherit ecm gear.kde.org DESCRIPTION="Qt-based interface for SANE library to control scanner hardware" @@ -13,7 +13,7 @@ https://api.kde.org/ksanecore/html/index.html" LICENSE="|| ( LGPL-2.1 LGPL-3 )" SLOT="6" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest index 52f0cb70cc1c..380bce07c037 100644 --- a/media-libs/lcms/Manifest +++ b/media-libs/lcms/Manifest @@ -5,5 +5,5 @@ AUX lcms-2.15-pthread-linking.patch 1376 BLAKE2B abeaeca00fb8bd7dcb1eb3616370487 DIST lcms2-2.15.tar.gz 7548405 BLAKE2B 97ce1e87c8de17e7d0dd1b00e1b49cf4e3c6912c74ff16d5afb9979565ad830fd8b3f08f7535ae8b5e763fbd22d2a058c577536ddb7487b7aa8fb25d585f8c84 SHA512 ab038c369e66736e0dd3810fbac6cf5381bc3102c4dd693819367b1224f59d9e853ede081388464c0e7c213d92e6cddc48c23020953af10ad6c6802cfa17e213 DIST lcms2-2.16.tar.gz 7632822 BLAKE2B cf4d10908e6b8e6cf15ec8a99f0a299a9bcb7082f0df5ab1c9d84fcb739132855edf717c2ab746040fc09bace7afaaa8a39538e7ceabd0e68cdb3b4fb5627c6d SHA512 638dd6ad6787456c8145510d18b2d0727bd0a446a13ac2934aabc9531d1156eca2a2c0fd780a453823fbd35a1895f9d8de5dc4b3cab505459dd3f0535b4e837d EBUILD lcms-2.15.ebuild 1486 BLAKE2B 4b2d395de3775e012b1cc5e98fd30738724e0d5e55f38f729ed07cd4cdf9e4519f08de044b2a67183cfd0b3f4767e8c41db9205be182c40ef309dd4a4b8c2c1a SHA512 d93e431d023af73f6f51286cb70cf3b64652d1ad3912a0693566356a4d0855f28ab2ffabdea3a13e5261a705210271feea662393c5610d29a1bae43c181a1326 -EBUILD lcms-2.16-r1.ebuild 1314 BLAKE2B 8a62c69bb4e4bd2675a49e9f80af0153bfb0198260c2c89abb56daf8f94665597e0375cd672277b7e08ea4abc89b67da2be04e4b1a736afbb584b0f49eae108a SHA512 46d3b98d6e6d10dd9b893fc8473f3e395e52cf89aa106f1d83cfdf028ad1f2720c51b8bd13c5911d516d4c5317b1c0bf5528cd156bc6025b361ce1c68ee28035 +EBUILD lcms-2.16-r1.ebuild 1306 BLAKE2B 1c5fbcb682713ccc0674a31d548d6dd9a101cc89a2f0689b0dee05144ee3cf2b520b324ad39e5f7657f3024efaca4fe3bc85ccead6dce01688ae85cf1a2ae035 SHA512 960ab2942cb036f249f0623600969add2acda16eee1d1fe70a38e5b76ab9f8151aaacf2d144f1c55435af1cb61e88038e3b55a809fe5ffdeca511f9bd7f37e96 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35 diff --git a/media-libs/lcms/lcms-2.16-r1.ebuild b/media-libs/lcms/lcms-2.16-r1.ebuild index 9c780e94e7c6..8b9d3ba8f30d 100644 --- a/media-libs/lcms/lcms-2.16-r1.ebuild +++ b/media-libs/lcms/lcms-2.16-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/lcms2-${PV/_}" LICENSE="GPL-3 MIT" SLOT="2" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="doc jpeg static-libs tiff" diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest index 7fe55b30b52d..75b96f6d36d5 100644 --- a/media-libs/leptonica/Manifest +++ b/media-libs/leptonica/Manifest @@ -1,5 +1,7 @@ DIST leptonica-1.83.1.tar.gz 14028566 BLAKE2B 56c501f16eb58366e4ed2f168f714adef968c271a0636cc0f3663b762aac29352a508421702e8ab063f78f3faf01e3d9eb72fff43093b05722a1a604beb66a59 SHA512 14c76b8795e494637cd225982cd27a1cd82d22b34c0c0d6ed061530c0ed8cec87fc1c8482bbda8f56a04f240b9fb50d481b8fffe5df846958cb146f9d2d51553 DIST leptonica-1.84.1.tar.gz 14102299 BLAKE2B 1da9b5bd2b72fa82320126dd8e6e647fbc50be0dcd71a0f8e392d9617911fe4f224d51158ab230476afbf7fd0e15cae1b59d8469cbf68a43893ada09a8d93673 SHA512 949be33a09e1dfc04527f5401d3d682999bd6904dca0b4950b457d12564e3290ec5b62ab4b14ef14d6f499a0fbfa0ebc37c2e8ab2966913883127b9489f47e97 +DIST leptonica-1.85.0.tar.gz 14757419 BLAKE2B db26f30121f8fa7807068d3e55c1cc3ed2f8a7a6f8bb8cc46a240257d11842000b63a4b08542c87a90bc446ccb53a1fe36823661416ec120da8e9b199ddb8def SHA512 ad097f8238bb88f044511bedb6debfb8a1492a4636348b21ce103034d3878ae1097e7ca8de9c39ef01f34589526d7e8aee68fb1b83aae5ffc0026c04360b882c EBUILD leptonica-1.83.1.ebuild 2066 BLAKE2B b72ce63ca165aea03f386bc43f5be4240d1a342ac7c9010a7a9fe46d6b1f0664e11deb96236d93f087c2bbd28df69457c4ac37cd2c5d82b3e6e499cda8616c8b SHA512 468c40bc767edaec9b4b7f285f568420908ee791567d281fe39d29e2a3484233eb0fd671b124c2c4acf9e71fa4a8ffe5e48c8b24f96a35c20dc1c41f372d283c EBUILD leptonica-1.84.1-r2.ebuild 2089 BLAKE2B 73f72e54751b764805a9a989380a9a95b12335dac9a6ed95900592de021309603685b53ca41d1d552fb009bf32db93ecbaa0b04e5e459fcd9807e748d9807c28 SHA512 77c35f7ff8733ab08a76ceea9664e5f5e4db4059e1357822647fd8dfeb8c3063fc0f1d0f9ea27add800312bb0e94a3689d1409b5b8ba27664a3025c05ea9a630 +EBUILD leptonica-1.85.0.ebuild 2089 BLAKE2B 73f72e54751b764805a9a989380a9a95b12335dac9a6ed95900592de021309603685b53ca41d1d552fb009bf32db93ecbaa0b04e5e459fcd9807e748d9807c28 SHA512 77c35f7ff8733ab08a76ceea9664e5f5e4db4059e1357822647fd8dfeb8c3063fc0f1d0f9ea27add800312bb0e94a3689d1409b5b8ba27664a3025c05ea9a630 MISC metadata.xml 669 BLAKE2B 27b4a63ae3b2603632b28a501a22ea6142f35969386be65d4b4ded7311a046d21d7a4faddcb1558a3872e80d708eeb22bb2d03a90d009383c3e34016ef1778d8 SHA512 3a547cefac4630ed8fc4b041a1925be4f3aced7aff960b7e98109da12d9c8e4e2ec3a85fae9f991516cb67fea4e9edeab1c46280741795991e01b0ace7aa9d16 diff --git a/media-libs/leptonica/leptonica-1.85.0.ebuild b/media-libs/leptonica/leptonica-1.85.0.ebuild new file mode 100644 index 000000000000..3de09739be9f --- /dev/null +++ b/media-libs/leptonica/leptonica-1.85.0.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool multilib-minimal + +DESCRIPTION="C library for image processing and analysis" +HOMEPAGE="http://www.leptonica.org/" +SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos" +IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib" +# N.B. Tests need some features enabled: +REQUIRED_USE=" + tiff? ( jpeg ) + test? ( jpeg png tiff zlib ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) + png? ( + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib:=[${MULTILIB_USEDEP}] + ) + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) + webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + test? ( media-libs/tiff[jpeg,zlib] )" + +DOCS=( README version-notes ) + +src_prepare() { + default + elibtoolize + + # unhtmlize docs + local X + for X in ${DOCS[@]}; do + awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \ + "${X}.html" > "${X}" || die 'awk failed' + rm -f -- "${X}.html" + done +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + --enable-shared \ + $(use_with gif giflib) \ + $(use_with jpeg) \ + $(use_with jpeg2k libopenjpeg) \ + $(use_with png libpng) \ + $(use_with tiff libtiff) \ + $(use_with webp libwebp) \ + $(use_with webp libwebpmux) \ + $(use_with zlib) \ + $(use_enable static-libs static) \ + $(multilib_native_use_enable utils programs) +} + +multilib_src_test() { + default + + # ${TMPDIR} is not respected. It used to be but it lead to issues + # and there have been long debates with upstream about it. :( + rm -rf /tmp/lept/ || die +} + +multilib_src_install_all() { + einstalldocs + + # libtool archives covered by pkg-config + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest index f0b04216e01b..afe1dd58e721 100644 --- a/media-libs/lib3ds/Manifest +++ b/media-libs/lib3ds/Manifest @@ -3,5 +3,5 @@ AUX lib3ds-1.3.0-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca6 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87 EBUILD lib3ds-1.3.0-r2.ebuild 750 BLAKE2B 80525700489d42266f54a88bc5d0d488d0a86b9fcb2889d1afbbc03db58357e690049c573fe857caf8121f03ce42ec5abd8b1854553bb58423f051eaa708d08a SHA512 9e2faad79da1d9ac56a3b3f581adef3ab35e31c1de0ca3956348a2bd380fd27a7af0836772be180551d90fe10719ff3d37087aa18b9780a798b53c241c021b29 -EBUILD lib3ds-2.0.0_rc1-r1.ebuild 748 BLAKE2B 66c470eff4826cb038c02de2f2ac3335b296549cdd19eae3f4b211029f0a5f669e9a4e4fbe0daaf66434d091875417f5488edd4314f73fd1049a6c7a16deffb8 SHA512 17724d8b10e38e39f7faada87c84c4b07dd9b10cba7176fd323cff09b7370763b1c34bb17f9b38231dfd81afd5ade93c3ff9f65c114dbf27a5a77f99743d4ecd +EBUILD lib3ds-2.0.0_rc1-r1.ebuild 747 BLAKE2B ed6105f62519bea5c9bdbd71db6b2af5c13047eb32d6e6f2aae50f4c1d85543cee559023c422b98b5b9d9bfe610a650310b2a449f06bcb134190ac2f0472dc36 SHA512 72be544f25339a50792aa737db4862b1e6925d00e33519d3c516bde70c51666bc2b753d9d4d8de66c603862f12ca334dbddad1c56386b3f953ac64732e609225 MISC metadata.xml 597 BLAKE2B f36443b4e7047530b32949750b0b0c3e3b7163243c93e38390379bda9e5d08dd5c9da9f7a6df8c51c2c08b6206ffd15f31f63590f4a2e2b901ccad2268892298 SHA512 c91019a51555c0f26cacca2bf6f68e3d47d2d94b243127703f042219f71c60df91676f8c8a826797a003ed1d1435d64706ef19b8eb8c307102014c95f7e28dc3 diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild index 54f706d22467..e61cba3cbdec 100644 --- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild +++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" +KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86" IUSE="static-libs" BDEPEND="app-arch/unzip" diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest index 79fd0b365f0f..1438d5a0511b 100644 --- a/media-libs/libaom/Manifest +++ b/media-libs/libaom/Manifest @@ -1,23 +1,12 @@ AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c9189abf160d3460e247446db4ad0e534bde7f382aeaa4e1457c0a4ddb7cf3c9666fd173efa1955a22fc4d3708a93dcd6b7c160f07 SHA512 30cc17c38219e81f92f1f034786d5d4096a0e657c86dfe581f84d18fc201a0e34bd331e98271f92c07e5dc49740e164a983b3316fc57599b98aea2615f7cf107 AUX libaom-3.7.0-allow-fortify-source.patch 467 BLAKE2B 405f87a6467daae59823eedc9fd7cac959909d5c07df6b4930b55af129750bfd0ed2749b41c6a4fbdb2a8dd49a6881e9de0af526972d27c8c731ce29ab34d1af SHA512 ab69882b8652cb61bdfa14b5fbf5e5cef3344df3aee852f42192af1e935299be1029947a3cb80527362b2db57c93197b889fb45dc562123353b7a3871feaa811 -AUX libaom-3.7.0-big-endian-tests.patch 1611 BLAKE2B 9c0ab0a6a5788fdbc87f30ef5f2a6524521dcf1ec1911544827acb912551c08fcf370c369abfde1567d691a8b814ec897d90819431d7ad091dc247dc7e7396e0 SHA512 299f511b45ba9f1511ab508159f7341ff6ca433118feefd66e96266131588203fc651b4b88be79487b1cbb688c7946dddeeba1b07d88c471da95465e6782fb87 -AUX libaom-3.7.0-big-endian.patch 4168 BLAKE2B 6c9a9ac0933b29b3ee8111d8068dfff144385ae68ebf693a335672c3138cc31ef346486af44b0b0fff9bad58ad72d2335962b78bc82e40b1a7f4a4c9b5d3ca28 SHA512 aebd3f9d16f0cc6a6a0b7a240d5d8cb55d28fc8fe4a00444b26c4b54fed0536ff3577aab5aa624cd9900858770dfdad50f9429d91ee0638058d4be34873e8be6 AUX libaom-3.8.1-tests-parallel.patch 907 BLAKE2B 3c969182fed047b6075ebd0d19f50dfe19028658da42eefc991eaf4ed15736ac95219f5562dc8c04e34849c615fe74a5c940701e274ed7485387092d8d46fb50 SHA512 293924e8732640977c706dcf7fe811f76f093402faa3db8e61d35e32552df889dc63073f004dce4bc4230ceb647f78d0085c9a0099b597b148b9a29fc38f2544 -AUX libaom-3.9.0-guard-ssse3.patch 1570 BLAKE2B 69b5b73ba6ff68b1e5badfcd7cfdf9cc6afeca2838363273852c7757efba448881d042e52be9632c7593cd0992daea439c05da3423a7d31c2abac64fe86723f0 SHA512 5222e5af8a41da106074ed312fb1c35ce7337b43cc6d0ec3e9fbf11fecef2e5f756d64dafa3d5cb6a0d4d31afa9e155b795dfe0db37b891f54ad2d1b409b74a4 AUX libaom-3.9.1-gcc15-cstdint.patch 1173 BLAKE2B a52439c510a54a1af72c56efff47e004ffef6c276aeebc02981b95afeca30dbacaa87baadfb25f2638454ccbc556b023c06814878fcb45a0eaa0c3e5682fdb25 SHA512 396deeaefec8152c4f45a8c788941a30688d2b7d72cb6233902e3b4cdc7d2bb1110fed56219b176a77057dd7231a5deab3c190f261cdf9e194af519fbb71d09a -DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4 -DIST libaom-3.7.0-testdata.tar.xz 374076136 BLAKE2B 17036f37fbb04d59b50e13e5e2258215e99cab4b6f64ac558213009477bc22f43267b60bcbb30ec10325de2aed48b22237b12cd6220f4330e300b62bafedac0b SHA512 c08ef4c9c45f1a27e6c31b8cc9799d8e65d895663a79d7be51da1733be6d8013adaad3a8f1d7491f555a2eea58aead44b9ce935c3e9bb957cb8bbb93f6f4fd98 -DIST libaom-3.7.0.tar.gz 5347924 BLAKE2B 2693d60f5afa810e00ab6aadcf8ca763e328bc64e47b3678eeba9993db89b25cfa0380beeff5a5938f19da74410ce83068c318cff2aea30e5fe39680ac67e937 SHA512 b763a877db26dcaddea5513825900917e55bc131bf78a83f941f1e74b534a514cb599fb64c3ac18a8202ac0a72c511dfef6eeff21dfbe59ed9816887ca3ec5f3 -DIST libaom-3.8.1-testdata.tar.xz 426372276 BLAKE2B 4d6194a98612045023f4d35ca851a37ffc69cbfbfd015d5c1f4e3aebb6789096d7b7f82b9641c545e4203b44fe8a9243de83bb23a8c53aced30ec26aed0376e0 SHA512 03bf5d521c613728dd12fd33bb76fc64a20798e276dbdc2501446e1fb9891552e88adb25f0e4ff65d6c8aad301a550aec195498ab1f1a506bce3fe384e24cc0e -DIST libaom-3.8.1.tar.gz 5450909 BLAKE2B fec3123f8ee68b1027a1a2019969c098b730da72be2902274659b983857f2d8f62dae5b563543b3f144ae8bc51b6d6fdd4fcd6aadf2ca04d5a4dd5be987fbbac SHA512 f9ee918a37699cfaf2bcb5aa16a4d8b077feb1fc577d8c5437ed3fa1a1c0a5d734c9564e3c8c0f0b1baf43dc5abb7ff0196a77607b10d926c0be7858778ac1e3 -DIST libaom-3.9.0-testdata.tar.xz 426348008 BLAKE2B 1d95116e738a3271cbb6381cdeb3d2cd359bd3d3001e759e6ed9f56f7f0d87b6a0a557f3655c4c5640e7812cee2e10de5626de70794c6b49fdac51f33d9a1b56 SHA512 b8e68cffa844ac33f3fd7cce8de08e90bc4e401055fa24e58ea6e1217a64db62bd09c469267106b1e82d480550238ac6aaa12c86f75e9fbfd8fa847180b41537 -DIST libaom-3.9.0.tar.gz 5518815 BLAKE2B 4c68b58f6a8e347ee912e309a030804c4a3cc99714e2aaf127add63222df3056c7cf4b6c50f4861557b0892739035149b5e002e25272882eff55cde5d9b745b7 SHA512 0793e0801be72d35144162141a180ff5e3ae11186f734af738b1eb2d81bff1364be7741cc34ae2507d2b88de11f840609a09f8b05b75e8d853aa80626241bf95 +DIST libaom-3.10.0-testdata.tar.xz 426166968 BLAKE2B 1cebddf22a81ea04ea33b94e8e286e3ece97db940850a073bb15dd203414adb9ce89f34fe03d1dea66fef827f33b085772bc5144d182977bcaf545593ca94324 SHA512 a1aae4f8ab6c98ed567a6516d285100af7ef987019ff87294cd1a08d8e74839e652decf85f2a8b5eecab58cb8066684a676716af05fb5f37e6adf2312b996e1a +DIST libaom-3.10.0.tar.gz 5445319 BLAKE2B c4ee6980d5223413f09d163782133a5b7e041f646bfae26a0f386672a964e7f5ab1ec38fc19cc332b38f0bff4b4b96405104f87ca162395ce036d18dd86ef9dc SHA512 70ceb4385032bdac5e892ed78f10878ef54faeabdd042d4a3b92f838146a61baa69d4d4e2576dcf8223918f79b6db72485fd95b5c05a20d41634310cc6b44c44 DIST libaom-3.9.1-testdata.tar.xz 426413144 BLAKE2B 99fad74bbfabbfd1a7b9a2a3ae72c1c5a4810a70cb6f2df54ad4e29da5afd9278fcc2555f859f51dadab41e1d1829d08ee9efee415ca34d05acd5175caf35205 SHA512 81ce77937264c3a4f6da19dab5cfc4feb559359c154fc00105e6aee6aebb1900e4ecaadd248ba09c5aa266ba0f937451a075338c474ca69a64871d6e6f9c4480 DIST libaom-3.9.1.tar.gz 5524048 BLAKE2B 2f983a4a563e16120aa8937e059f4cd267fb60b6d4148f952f1e664a50b84bc0d8ba7629231b60e4263963d97559a819752a4fa0dcf2427c9f94036716221324 SHA512 d134583c9cc17e0c8e0dec17677a5daca6f42636f3cde83e1b0fc5250f7372f190c125afb845540cd947fb28462cc91b111a69ae4fec51946c3730cacf42c36e -EBUILD libaom-3.5.0.ebuild 3292 BLAKE2B 3b4681c03dfc7196988c307fea3c6aca874f722be082ef853860a471ad85a42db35e499f541bccf2cd01bcce9e679252f57aedfe0af789bd2e23568cd775c19f SHA512 6ed0b74f3920883ff37a0edf1a00096daed9295583da34e60d228602a0fe627224046c059c5dfd4f486b8ee407ee492756fad0e9fac6a5faaac8c92a9a310a30 -EBUILD libaom-3.7.0-r2.ebuild 4382 BLAKE2B a51a503b0c20d9e193084ac04b2b183de398bc3c28493cfd1c2e26147954b1b904063e6f785b93a1a94e567ef8cdbe930d39b434fa0e18d80679c6cc212ec4e0 SHA512 8a2de72b09b5dcaff7ce21934d59002a44ac59e5a2eeb0ed70b423b611e3caec76037ad934a2acaa5df379077cd3588fd9a4c2e9eb7e0b55330942138805fc56 -EBUILD libaom-3.8.1.ebuild 5015 BLAKE2B 561e6364a992a899a7fee70fcc21ec55c682951dbaf8fb49e502c3f593a3ea86a5c17b0c52a3735460dc6a8af5f6776351031a194a2d60b2b5e37d62215c5c9e SHA512 9aacaccc730e10a8d6442733cd142589f11d22071b490dd858a76a905016b9f004474a1bfd5740ea13f6704c470790b4c6cb27e79f28e30106b399f732b4bcd6 -EBUILD libaom-3.9.0.ebuild 4540 BLAKE2B d24aba5ad3754ffa126f77f37157c292dc8d2a2fce555db5fb9ea6fc5096273c3c24ce7b021de0fb4752ed8b2336b1616580b0c3ba8a9c34f11c61fbcfef22e5 SHA512 163f0d4fc42dc35312b05da69569dc42163d1394279fab681e19fb3ceb60bcc1d7c3349971b5504fe453d8766a7dc269f19b1d91b7fa13666a2569f54e6d0084 -EBUILD libaom-3.9.1.ebuild 4541 BLAKE2B c15d34a4868b434cdec52293c804a2727d047eebba984e47ca5d62995a76e5093af9aa62a0d8d22754a62d1a7d3821779b283b290cedf08d37598a9af819e9d8 SHA512 fc418bf0667542148e8c02a7f5c57678caf1e6dabbcf07f3ab67152047d1484db0d334a6160804452285adbebf0ce2e787a4ada0b9dd0cdf3df5a65916c1cf48 -EBUILD libaom-9999.ebuild 4514 BLAKE2B a21027df09390d3893b8ea1d7717aebaf1b43ec72d6da81e19678b612da5677b7a414aa8ce92e678a6aa32b3b0c91ba1f723e4c5ed440d5157ee25d0a01d3c59 SHA512 e499d3254f6928353fd9a340daa3a8a74f45d3fffa266a5cf288fe382c674c5c8fc915e15a1f7126f3bc2183b399691b8c699dca78b1b5da2601505c9f464a68 +EBUILD libaom-3.10.0.ebuild 4494 BLAKE2B 34b418494bef384839662b119614373f3ed16cbaaf040fa78ae328c0ce41f60b4581878108fd3653bbd5372374dd3f3ba5dd3b9489470a183f03c95232a74876 SHA512 94e28224e75d96ce1e2b219fd1f33336bfb92c2c95bf1ebce1eb16c0d5c4227d0a8311f23e69bcc07c8955ee300fb2ebdb5b2721026178f9832edeb4377d2a82 +EBUILD libaom-3.9.1.ebuild 4536 BLAKE2B 202e0898e1e87c06a4abbae96a696f82107236f5fdf83de65381f617fbeda74578c1e99c1accc486e40819f92b46f6770173c6434402bdf7c6947a38d55332fb SHA512 7ff82d88343abd999acda868643e6d9cd67ac69d6256fdd65f7e6f9c685f81991f574bbb16125a1f4ed7f75f38d554a4b8cb391ca7c5dbf5e5c6a6e03d341629 +EBUILD libaom-9999.ebuild 4514 BLAKE2B f6107b7954d9021b70dd4733a61c56f40f7c75bed24b2bb843a101330d9def39e1f1e98790720e72abf376e80453daccedff59ac135c5217d158979739065b68 SHA512 16445e19e6bdc17dc868ec009fa1ba7cb98c06b3d53fc8601172e4a096f715b94b4a5df7dae73a6ce477f21fd1a1c49a3f544be280e5809f6d95d8c4fb63a5dc MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8 diff --git a/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch b/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch deleted file mode 100644 index 38559c564726..000000000000 --- a/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 -https://aomedia.googlesource.com/aom/+/7029529477e1473e6eb7417538cea18edc5e3bd0 - -From 7029529477e1473e6eb7417538cea18edc5e3bd0 Mon Sep 17 00:00:00 2001 -From: Wan-Teh Chang <wtc@google.com> -Date: Wed, 13 Sep 2023 10:55:05 -0700 -Subject: [PATCH] Fix big-endian bugs in CodingPathSync tests - -Change Serialize() to read uint16_t samples correctly. Although only the -least significant byte of each sample is nonzero, we cannot assume the -least significant byte of the c-th sample in `row` is row[c * 2]. That -is correct only on little-endian systems. - -Bug: aomedia:3487 -Change-Id: I9919ce6e3c877608ca7488fe4cc6957bcfe8c4cc ---- - test/coding_path_sync.cc | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/test/coding_path_sync.cc b/test/coding_path_sync.cc -index c3e51fd565..31bc2d56b0 100644 ---- a/test/coding_path_sync.cc -+++ b/test/coding_path_sync.cc -@@ -130,11 +130,13 @@ std::vector<int16_t> Serialize(const aom_image_t *img) { - - for (int r = 0; r < h; ++r) { - for (int c = 0; c < w; ++c) { -- unsigned char *row = img->planes[plane] + r * img->stride[plane]; -- if (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) -- bytes.push_back(row[c * 2]); -- else -+ const unsigned char *row = img->planes[plane] + r * img->stride[plane]; -+ if (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) { -+ const uint16_t *row16 = reinterpret_cast<const uint16_t *>(row); -+ bytes.push_back(row16[c]); -+ } else { - bytes.push_back(row[c]); -+ } - } - } - } --- -2.42.0 diff --git a/media-libs/libaom/files/libaom-3.7.0-big-endian.patch b/media-libs/libaom/files/libaom-3.7.0-big-endian.patch deleted file mode 100644 index 907e5fd1110e..000000000000 --- a/media-libs/libaom/files/libaom-3.7.0-big-endian.patch +++ /dev/null @@ -1,130 +0,0 @@ -https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 -https://aomedia.googlesource.com/aom/+/8b65d76f2f95b1bfdc82b8f135246cb367d444e6%5E%21/ - -From 8b65d76f2f95b1bfdc82b8f135246cb367d444e6 Mon Sep 17 00:00:00 2001 -From: Wan-Teh Chang <wtc@google.com> -Date: Tue, 12 Sep 2023 16:38:47 -0700 -Subject: [PATCH] Fix byte order issue in write_enc_data_to_out_buf - -Fix the byte order issue for big-endian systems introduced in -https://aomedia-review.googlesource.com/c/aom/+/167581. - -Use the existing HToBE64 macro defined in aom_util/endian_inl.h and -delete the new get_byteswap64 function from aom_ports/bitops.h. - -Based on the patch in bug aomedia:3487. - -Bug: aomedia:3487 -Change-Id: I56183e062a9f2b18c4c6158fd8e47c5062de85ee ---- - aom_dsp/entenc.h | 7 ++++--- - aom_ports/bitops.h | 35 +---------------------------------- - 2 files changed, 5 insertions(+), 37 deletions(-) - -diff --git a/aom_dsp/entenc.h b/aom_dsp/entenc.h -index 467e47bf56..d26f027ed0 100644 ---- a/aom_dsp/entenc.h -+++ b/aom_dsp/entenc.h -@@ -13,7 +13,7 @@ - #define AOM_AOM_DSP_ENTENC_H_ - #include <stddef.h> - #include "aom_dsp/entcode.h" --#include "aom_ports/bitops.h" -+#include "aom_util/endian_inl.h" - - #ifdef __cplusplus - extern "C" { -@@ -87,13 +87,14 @@ static AOM_INLINE void propagate_carry_bwd(unsigned char *buf, uint32_t offs) { - } while (carry); - } - --// Reverse byte order and write data to buffer adding the carry-bit -+// Convert to big-endian byte order and write data to buffer adding the -+// carry-bit - static AOM_INLINE void write_enc_data_to_out_buf(unsigned char *out, - uint32_t offs, uint64_t output, - uint64_t carry, - uint32_t *enc_offs, - uint8_t num_bytes_ready) { -- const uint64_t reg = get_byteswap64(output) >> ((8 - num_bytes_ready) << 3); -+ const uint64_t reg = HToBE64(output << ((8 - num_bytes_ready) << 3)); - memcpy(&out[offs], ®, 8); - // Propagate carry backwards if exists - if (carry) { -diff --git a/aom_ports/bitops.h b/aom_ports/bitops.h -index 3c5b992bde..7f4c165f5a 100644 ---- a/aom_ports/bitops.h -+++ b/aom_ports/bitops.h -@@ -13,7 +13,6 @@ - #define AOM_AOM_PORTS_BITOPS_H_ - - #include <assert.h> --#include <stdint.h> - - #include "aom_ports/msvc.h" - #include "config/aom_config.h" -@@ -34,12 +33,8 @@ extern "C" { - // These versions of get_msb() are only valid when n != 0 because all - // of the optimized versions are undefined when n == 0: - --// get_byteswap64: --// Returns the number (uint64_t) with byte-positions reversed --// e.g. input 0x123456789ABCDEF0 returns 0xF0DEBC9A78563412 -- - // GCC compiler: https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html --// MSVC: https://learn.microsoft.com/en-us/cpp/c-runtime-library/ -+// MSVC: https://learn.microsoft.com/en-us/cpp/intrinsics/compiler-intrinsics - - // use GNU builtins where available. - #if defined(__GNUC__) && \ -@@ -48,10 +43,6 @@ static INLINE int get_msb(unsigned int n) { - assert(n != 0); - return 31 ^ __builtin_clz(n); - } -- --static INLINE uint64_t get_byteswap64(uint64_t num) { -- return __builtin_bswap64(num); --} - #elif defined(USE_MSC_INTRINSICS) - #pragma intrinsic(_BitScanReverse) - -@@ -61,10 +52,6 @@ static INLINE int get_msb(unsigned int n) { - _BitScanReverse(&first_set_bit, n); - return first_set_bit; - } -- --static INLINE uint64_t get_byteswap64(uint64_t num) { -- return _byteswap_uint64(num); --} - #undef USE_MSC_INTRINSICS - #else - static INLINE int get_msb(unsigned int n) { -@@ -82,26 +69,6 @@ static INLINE int get_msb(unsigned int n) { - } - return log; - } -- --static INLINE uint64_t get_byteswap64(uint64_t num) { -- uint64_t out = 0x00; -- uint64_t mask = 0xFF00000000000000; -- int bit_shift = 56; // 7 bytes -- // 4 ms bytes -- do { -- out |= (num & mask) >> bit_shift; -- mask >>= 8; -- bit_shift -= 16; -- } while (bit_shift >= 0); -- // 4 ls bytes -- bit_shift = 8; // 1 byte -- do { -- out |= (num & mask) << bit_shift; -- mask >>= 8; -- bit_shift += 16; -- } while (bit_shift <= 56); -- return out; --} - #endif - - #ifdef __cplusplus --- -2.42.0 diff --git a/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch b/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch deleted file mode 100644 index 40cb17f0a354..000000000000 --- a/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch +++ /dev/null @@ -1,67 +0,0 @@ -https://bugs.chromium.org/p/aomedia/issues/detail?id=3578#c6 -https://bugs.gentoo.org/933429 - -From 8670445106036383c1f55c08b1a3283bd0accf7a Mon Sep 17 00:00:00 2001 -From: Wan-Teh Chang <wtc@google.com> -Date: Mon, 3 Jun 2024 11:13:53 -0700 -Subject: [PATCH] Guard DECLS(ssse3), FNS(ssse3) with #if HAVE_SSSE3 - -The aom_dsp/x86/variance_sse2.c file is compiled if the ENABLE_SSE2 -cmake option is enabled. The file also contains some SSSE3 code. That -code should only be compiled if the ENABLE_SSSE3 cmake option is -enabled. - -Bug: aomedia:3578 -Change-Id: I86685862e7da9506bd551b76228cdc9920c68ab1 -(cherry picked from commit afb5237d908bd04ce6ea15eae85db4a54cba289c) ---- - aom_dsp/x86/variance_sse2.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/aom_dsp/x86/variance_sse2.c b/aom_dsp/x86/variance_sse2.c -index 81b30072a5..e71244f1c7 100644 ---- a/aom_dsp/x86/variance_sse2.c -+++ b/aom_dsp/x86/variance_sse2.c -@@ -415,7 +415,9 @@ unsigned int aom_mse16x16_sse2(const uint8_t *src, int src_stride, - DECL(8, opt); \ - DECL(16, opt) - -+#if HAVE_SSSE3 - DECLS(ssse3); -+#endif - #undef DECLS - #undef DECL - -@@ -491,7 +493,9 @@ DECLS(ssse3); - FN(4, 4, 4, 2, 2, opt, (int32_t), (int32_t)) - #endif - -+#if HAVE_SSSE3 - FNS(ssse3) -+#endif - - #undef FNS - #undef FN -@@ -508,7 +512,9 @@ FNS(ssse3) - DECL(8, opt); \ - DECL(16, opt) - -+#if HAVE_SSSE3 - DECLS(ssse3); -+#endif - #undef DECL - #undef DECLS - -@@ -588,7 +594,9 @@ DECLS(ssse3); - FN(4, 4, 4, 2, 2, opt, (uint32_t), (int32_t)) - #endif - -+#if HAVE_SSSE3 - FNS(ssse3) -+#endif - - #undef FNS - #undef FN --- -2.45.2 - diff --git a/media-libs/libaom/libaom-3.9.0.ebuild b/media-libs/libaom/libaom-3.10.0.ebuild index a44e3bdd68dd..842d301977da 100644 --- a/media-libs/libaom/libaom-3.9.0.ebuild +++ b/media-libs/libaom/libaom-3.10.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake-multilib flag-o-matic multiprocessing python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -50,7 +50,6 @@ PATCHES=( "${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch "${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch "${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch - "${FILESDIR}"/libaom-3.9.0-guard-ssse3.patch ) multilib_src_configure() { diff --git a/media-libs/libaom/libaom-3.5.0.ebuild b/media-libs/libaom/libaom-3.5.0.ebuild deleted file mode 100644 index d00dcbee1d8b..000000000000 --- a/media-libs/libaom/libaom-3.5.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://aomedia.googlesource.com/aom" -else - SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv x86" -fi - -DESCRIPTION="Alliance for Open Media AV1 Codec SDK" -HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/" - -LICENSE="BSD-2" -SLOT="0/3" -IUSE="doc +examples test" -IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3" -IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" -IUSE="${IUSE} cpu_flags_arm_neon" -# Tests need more wiring up -RESTRICT="!test? ( test ) test" - -REQUIRED_USE=" - cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) -" - -BDEPEND="${PYTHON_DEPS} - dev-lang/perl - abi_x86_32? ( dev-lang/yasm ) - abi_x86_64? ( dev-lang/yasm ) - abi_x86_x32? ( dev-lang/yasm ) - doc? ( app-text/doxygen ) -" - -# The PATENTS file is required to be distributed with this package, bug #682214 -DOCS=( PATENTS ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_CCACHE=OFF - -DENABLE_DOCS=$(multilib_native_usex doc ON OFF) - -DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF) - -DENABLE_NASM=OFF - -DENABLE_TESTS=$(usex test) - -DENABLE_TOOLS=ON - -DENABLE_WERROR=OFF - - # Needs libjxl, currently unpackaged. - -DCONFIG_TUNE_BUTTERAUGLI=0 - - # neon support is assumed to be always enabled on arm64 - -DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF)) - # ENABLE_DSPR2 / ENABLE_MSA for mips - -DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF) - -DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF) - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF) - -DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF) - -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF) - -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF) - -DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF) - -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) - ) - - # For 32-bit multilib builds, force some intrinsics on to work around - # bug #816027. libaom seems to do runtime detection for some targets - # at least, so this isn't an issue. - if ! multilib_is_native_abi && use amd64 ; then - mycmakeargs+=( - -DENABLE_SSE3=ON - -DENABLE_SSSE3=ON - ) - fi - - # On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456 - # Just force generic, given it's a niche situation. - # TODO: could try forcing armv7 or similar? - if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then - ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)" - mycmakeargs+=( - -DAOM_TARGET_CPU=generic - ) - fi - - cmake_src_configure -} - -multilib_src_test() { - "${BUILD_DIR}"/test_libaom || die -} - -multilib_src_install() { - if multilib_is_native_abi && use doc ; then - local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) - fi - - cmake_src_install -} - -multilib_src_install_all() { - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die -} diff --git a/media-libs/libaom/libaom-3.7.0-r2.ebuild b/media-libs/libaom/libaom-3.7.0-r2.ebuild deleted file mode 100644 index bb0edd72931d..000000000000 --- a/media-libs/libaom/libaom-3.7.0-r2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://aomedia.googlesource.com/aom" -else - # To update test data tarball, follow these steps: - # 1. Clone the upstream repo and check out the relevant tag, - # or download the release tarball - # 2. Regular cmake configure (options don't matter here): - # cd build && cmake .. - # 3. Set LIBAOM_TEST_DATA_PATH to the directory you want and - # run the "make testdata" target: - # LIBAOM_TEST_DATA_PATH=../libaom-3.7.0-testdata make testdata - # This will download the test data from the internet. - # 4. Create a tarball out of that directory. - # cd .. && tar cvaf libaom-3.7.0-testdata.tar.xz libaom-3.7.0-testdata - SRC_URI=" - https://storage.googleapis.com/aom-releases/${P}.tar.gz - test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz ) - " - KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv x86" -fi - -DESCRIPTION="Alliance for Open Media AV1 Codec SDK" -HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/" - -LICENSE="BSD-2" -SLOT="0/3" -IUSE="big-endian doc +examples test" -IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3" -IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" -IUSE="${IUSE} cpu_flags_arm_neon cpu_flags_ppc_vsx" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) -" - -BDEPEND="${PYTHON_DEPS} - dev-lang/perl - abi_x86_32? ( dev-lang/yasm ) - abi_x86_64? ( dev-lang/yasm ) - abi_x86_x32? ( dev-lang/yasm ) - doc? ( app-text/doxygen ) -" - -# The PATENTS file is required to be distributed with this package, bug #682214 -DOCS=( PATENTS ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch - "${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch - - "${FILESDIR}"/${P}-big-endian.patch - "${FILESDIR}"/${P}-big-endian-tests.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DENABLE_CCACHE=OFF - -DENABLE_DOCS=$(multilib_native_usex doc ON OFF) - -DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF) - -DENABLE_NASM=OFF - -DENABLE_TESTS=$(usex test) - -DENABLE_TOOLS=ON - -DENABLE_WERROR=OFF - # https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 shows - # that big endian detection doesn't really work otherwise. - -DCONFIG_BIG_ENDIAN=$(usex big-endian 1 0) - - # Needs libjxl, currently unpackaged. - -DCONFIG_TUNE_BUTTERAUGLI=0 - - # neon support is assumed to be always enabled on arm64 - -DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF)) - # ENABLE_DSPR2 / ENABLE_MSA for mips - -DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF) - -DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF) - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF) - -DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF) - -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF) - -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF) - -DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF) - -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) - - -DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF) - ) - - # For 32-bit multilib builds, force some intrinsics on to work around - # bug #816027. libaom seems to do runtime detection for some targets - # at least, so this isn't an issue. - if ! multilib_is_native_abi && use amd64 ; then - mycmakeargs+=( - -DENABLE_SSE3=ON - -DENABLE_SSSE3=ON - ) - fi - - # On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456 - # Just force generic, given it's a niche situation. - # TODO: could try forcing armv7 or similar? - if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then - ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)" - mycmakeargs+=( - -DAOM_TARGET_CPU=generic - ) - fi - - cmake_src_configure -} - -multilib_src_test() { - LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die -} - -multilib_src_install() { - if multilib_is_native_abi && use doc ; then - local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) - fi - - cmake_src_install -} - -multilib_src_install_all() { - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die -} diff --git a/media-libs/libaom/libaom-3.8.1.ebuild b/media-libs/libaom/libaom-3.8.1.ebuild deleted file mode 100644 index ae460624433a..000000000000 --- a/media-libs/libaom/libaom-3.8.1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic multiprocessing python-any-r1 - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://aomedia.googlesource.com/aom" -else - # To update test data tarball, follow these steps: - # 1. Clone the upstream repo and check out the relevant tag, - # or download the release tarball - # 2. Regular cmake configure (options don't matter here): - # cd build && cmake .. - # 3. Set LIBAOM_TEST_DATA_PATH to the directory you want and - # run the "make testdata" target: - # LIBAOM_TEST_DATA_PATH=../libaom-3.7.1-testdata make testdata - # This will download the test data from the internet. - # 4. Create a tarball out of that directory. - # cd .. && tar cvaf libaom-3.7.1-testdata.tar.xz libaom-3.7.1-testdata - SRC_URI=" - https://storage.googleapis.com/aom-releases/${P}.tar.gz - test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz ) - " - KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv x86" -fi - -DESCRIPTION="Alliance for Open Media AV1 Codec SDK" -HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/" - -LICENSE="BSD-2" -SLOT="0/3" -IUSE="big-endian debug doc +examples test" -IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3" -IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2" -IUSE="${IUSE} cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) -" - -BDEPEND="${PYTHON_DEPS} - dev-lang/perl - abi_x86_32? ( dev-lang/yasm ) - abi_x86_64? ( dev-lang/yasm ) - abi_x86_x32? ( dev-lang/yasm ) - doc? ( app-text/doxygen ) -" - -# The PATENTS file is required to be distributed with this package, bug #682214 -DOCS=( PATENTS ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch - "${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch - "${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch -) - -multilib_src_configure() { - # Follow upstream recommendations in README (bug #921438) and avoid - # asserts during common use (bug #914614). - append-cppflags $(usex debug '-UNDEBUG' '-DNDEBUG') - - local mycmakeargs=( - -DENABLE_CCACHE=OFF - -DENABLE_DOCS=$(multilib_native_usex doc ON OFF) - -DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF) - -DENABLE_NASM=OFF - -DENABLE_TESTS=$(usex test) - -DENABLE_TOOLS=ON - -DENABLE_WERROR=OFF - # https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 shows - # that big endian detection doesn't really work otherwise. - -DCONFIG_BIG_ENDIAN=$(usex big-endian 1 0) - - # Needs libjxl, currently unpackaged. - -DCONFIG_TUNE_BUTTERAUGLI=0 - - # arm - -DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DENABLE_ARM_CRC32=$(usex cpu_flags_arm_crc32 ON OFF) - # bug #917277 - -DENABLE_NEON_DOTPROD=OFF - # bug #917278 - -DENABLE_NEON_I8MM=OFF - # bug #920474 - -DENABLE_SVE=OFF - - # mips - # ENABLE_DSPR2 / ENABLE_MSA for mips - - # amd64 - -DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF) - -DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF) - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF) - -DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF) - -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF) - -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF) - -DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF) - -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) - - # ppc - -DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF) - ) - - # For 32-bit multilib builds, force some intrinsics on to work around - # bug #816027. libaom seems to do runtime detection for some targets - # at least, so this isn't an issue. - if ! multilib_is_native_abi && use amd64 ; then - mycmakeargs+=( - -DENABLE_SSE3=ON - -DENABLE_SSSE3=ON - ) - fi - - # On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456 - # Just force generic, given it's a niche situation. - # TODO: could try forcing armv7 or similar? - if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then - ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)" - mycmakeargs+=( - -DAOM_TARGET_CPU=generic - ) - fi - - # LIBAOM_TEST_PROCS is added by our tests-parallel.patch - export LIBAOM_TEST_PROCS="$(makeopts_jobs)" - - cmake_src_configure -} - -multilib_src_test() { - einfo "Running quiet tests which take hours." - # We use ninja rather than test_libaom directly so we can run it in parallel - # with sharding, see https://aomedia.googlesource.com/aom/#sharded-testing. - LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" eninja -C "${BUILD_DIR}" runtests -} - -multilib_src_install() { - if multilib_is_native_abi && use doc ; then - local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) - fi - - cmake_src_install -} - -multilib_src_install_all() { - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die -} diff --git a/media-libs/libaom/libaom-3.9.1.ebuild b/media-libs/libaom/libaom-3.9.1.ebuild index f4000c99c60c..d5a30ed2a615 100644 --- a/media-libs/libaom/libaom-3.9.1.ebuild +++ b/media-libs/libaom/libaom-3.9.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake-multilib flag-o-matic multiprocessing python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -16,7 +16,7 @@ else https://storage.googleapis.com/aom-releases/${P}.tar.gz test? ( https://deps.gentoo.zip/${CATEGORY}/${P}-testdata.tar.xz ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv x86" fi DESCRIPTION="Alliance for Open Media AV1 Codec SDK" diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild index 11494b9a7c38..96f6cef67930 100644 --- a/media-libs/libaom/libaom-9999.ebuild +++ b/media-libs/libaom/libaom-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake-multilib flag-o-matic multiprocessing python-any-r1 if [[ ${PV} == *9999* ]]; then diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest index 6ee5c2c908d9..500113334f8f 100644 --- a/media-libs/libass/Manifest +++ b/media-libs/libass/Manifest @@ -1,4 +1,5 @@ DIST libass-0.17.1.tar.xz 403160 BLAKE2B b191e8910ddb3e41fb9df79b27517a127c0da2ad74c0a81920bc2cf8843ab18b02a60738024fa8d3594b91bd26ec6ea7f87e17ca5e07825a6017dd29d2b72b32 SHA512 437b4b60db2626e48f438b5138ab4dbf2c2ab4c8f0b587a6e554510c6719544ef2235c601ff1e482d020410f9bab95ad1a9b176d19a3bd54880499a576b41f23 DIST libass-0.17.1.tar.xz.asc 228 BLAKE2B 0e70c104438be4409239f435d7872737fde1aba4485816ad0e35f0de743ee303662e66334425d0d511af4974e03443ba6d33ac44f941de9b0da17a56f204edea SHA512 a28c8271b4c5b5756620be9baf81b0262eb71c4f20d1aadb24238d1d0ccba44fdb3b25d788a3f7c9039945431a3d31842a7855660cc28a0a8acc36ff8f0c0298 +EBUILD libass-0.17.1-r2.ebuild 1578 BLAKE2B e7eefd464cc3b7e12d73b887deea2204cb52bb328115fff72f1ffa055ccc09690bc20aef28ba6b7f176be194f5de02f18169646706441766bdbee4b1341a25fb SHA512 1f73d225e84ae7d42a703a7d860d4ee7b6df165b65a78755f119d4c8a06dac772ac61365ef6ca29d7a2eac1fef0fdb4dddeccbec76ef23b93e57a05efec21f8c EBUILD libass-0.17.1.ebuild 1472 BLAKE2B 6c50eb39b4bf41d818fd76463701f3672cd900420803457a936740d10b4ac9cfba6116b79171a4238622e47e7080942602aede0558ad8bc7d6923de0e869c2cb SHA512 c28d93e656d362284b43d3902f3d5bf5c2ae3ca014867d80bf99211d27bfd953f977670432d0283d76a9cbb92cd7d89d06da0d94691b1739d25d24dc7be6c41c -MISC metadata.xml 310 BLAKE2B 32f2b0eb7f05223e3d092b3d75b7b1095afdac6dc322bd21fc8d32b6089cfccdc46300801e9d7566269fc0fb54780b6c1efff6e41be8de0aa31b26bdc52a44fd SHA512 97c76a4e387bbf43b14bf7799fe889c27e74e8e0b18c2027fc0c365e25ec5186ead530afe6d8e4d6b95440f0cb781d7ebc46e1eae1cc7b2161a199d38bd2a186 +MISC metadata.xml 435 BLAKE2B 28ce115edcd9e3cd8a50a75a83395b4d2d9c7b8c88a7a4f3fba3f6037c7754376fb2736c1a4b61161f7656647f6c1b518e7f31c0da07d7a03647da9908033ae8 SHA512 f7873c6c98fc5e39eec3e7709065b680e313a54ab3e1570499371ede7e1c80aa433e509b63dd68ddcaadd6dc9ef5d8e95be01e53fd92edb6665ba63f3a817cad diff --git a/media-libs/libass/libass-0.17.1-r2.ebuild b/media-libs/libass/libass-0.17.1-r2.ebuild new file mode 100644 index 000000000000..eac26bff0857 --- /dev/null +++ b/media-libs/libass/libass-0.17.1-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libass.asc +inherit multilib-minimal verify-sig + +DESCRIPTION="Library for SSA/ASS subtitles rendering" +HOMEPAGE="https://github.com/libass/libass" +SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz" +SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz.asc )" + +LICENSE="ISC" +SLOT="0/9" # subslot = libass soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+fontconfig libunibreak test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-1.2.3:=[truetype,${MULTILIB_USEDEP}] + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + libunibreak? ( dev-libs/libunibreak:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + amd64? ( dev-lang/nasm ) + x86? ( dev-lang/nasm ) + test? ( media-libs/libpng[${MULTILIB_USEDEP}] ) + verify-sig? ( sec-keys/openpgp-keys-libass ) +" + +DOCS=( Changelog ) + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable fontconfig) \ + $(multilib_native_use_enable libunibreak) \ + $(use_enable test) \ + --disable-require-system-font-provider +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/media-libs/libass/metadata.xml b/media-libs/libass/metadata.xml index 589ec7043bf8..62a5b8661a6a 100644 --- a/media-libs/libass/metadata.xml +++ b/media-libs/libass/metadata.xml @@ -4,6 +4,9 @@ <maintainer type="project"> <email>media-video@gentoo.org</email> </maintainer> + <use> + <flag name="libunibreak">Use <pkg>dev-libs/libunibreak</pkg> for Unicode line breaking algorithm</flag> + </use> <upstream> <remote-id type="github">libass/libass</remote-id> </upstream> diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest index 914f66bbcd0e..db55c0750a4a 100644 --- a/media-libs/libavif/Manifest +++ b/media-libs/libavif/Manifest @@ -1,10 +1,4 @@ -DIST libavif-0.10.1.tar.gz 2085698 BLAKE2B 5be3f9adf7e0a5747e42c90ce2768eba90053c821805cc8e39915d6cbc4cd42554b1473118b41eb25010d20a2b5a3c141b9cbd6ff55c46abd79eb97cdee6b0e5 SHA512 2f6f248c56c983761149d3c201fc2a2ea5072a32516578a7fdb2c66e3cd22491540f400e23581f873b15454250eeec8d433924ae2c1de9371b7924a5d82bef6b -DIST libavif-0.11.1.tar.gz 5826813 BLAKE2B 8fcbc9e1655546b7f4e62882b44d07b8bcfceef599e0feb5658c475cbc35cbb27bae0ad58475c2657351a890ccb957fa8a0e28328bbb5664cd8a57cedfb58019 SHA512 4a9e2711fccddf35c477db6e2fa2f76c0648aafaa98b4e3f34df62c0fbd02ddcd57762f1f8149822da4f1bc3757ee75ec1d9ced5e56a54dbe9d0b43265aacd4c -DIST libavif-1.0.4.tar.gz 10575992 BLAKE2B 69b7f376e8254f1f6b5df727e572e6aeef02710d8a09ad3289a71a38c2632b2cfdbee9284fcf08fccc5f072dc3aa2109f44b41ae10f0dad8cb299040ffc71c23 SHA512 37f0de757180c6414778e688006940395960b316c25192d6beb97a07942aff4bd3b712dec2eff52cd26f5d72c352731442175dfeb90e2e1381133539760142b0 DIST libavif-1.1.1.tar.gz 13644189 BLAKE2B c0a473b172206ea32358c28e7b94d8038b24030e4845611341076518cd82fd2bea78eb8e22e5481062b893ffb70789619ce4f85129a94a0db70a667c000f4fd0 SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21 -EBUILD libavif-0.10.1.ebuild 2499 BLAKE2B 17f9ef679e75469c782c98cf58587052a68a3b5ca560b8568916ab91ccc0fda0d56fa4cac79ffc3619ee2ffa7c510dd926662ce637f75bea5baa4734424ea210 SHA512 64f256bd788cbef3ebd07eb96568faa35fa7fc0ffe5e999f8faa20553525270f90396dd0d8733f0d65bb4c869468edfedbecc48a459dc3b2072833cc155c5db0 -EBUILD libavif-0.11.1.ebuild 2597 BLAKE2B d1d18786e4cb7d96aa2f4c367be360a6d25b22fd56156e1e1b59b3f88fd2986966e5466c647bdfb58ca000a21811beccc8bd3d4d4568d8186e0daa4f414af994 SHA512 d4c04bd161e1cd8f0c35fb7f8006172b2d3a263294b091dec6ccb732180b30d52caa640a0e190b5f603e81a93c178249644c551946b527f07916f6691e4ebee6 -EBUILD libavif-1.0.4.ebuild 2694 BLAKE2B 6ebf56ebc234559d892e4cced708fceb7b4b05b651de5d415fc59cf78d4a172152cf1770b8ed4559e78d77520069d05d7bc8b673c3c69fee0fba519fe97db131 SHA512 b2f7d7c8bc2afd0189f66dc8f6e5039a479674d308d5600f150b9ef20b93a6ffca76af0aefda129845306164bcd052ebfd1a50bd02f154cadc587dcb750875e8 -EBUILD libavif-1.1.1.ebuild 2862 BLAKE2B 3c80d58273ce15551fd6d3b6db53373a368ea7486ac8f544320b2868ec1e20bdfd29469089deea0a5562d3550f542a29dd0f418b530de504b17d24bd68a4d046 SHA512 252a8100ce375d28848e3e06e4b832cef2e43953b883c3c1c594dee93750c150426f73324b1e4c8b405d0969ca4e37725a1e34286a4a38b80072f3ef3e4a4e54 +EBUILD libavif-1.1.1.ebuild 2856 BLAKE2B 763fce77023cda7a64e6aa9ab79c175f675925ff8fa5d37701a9f693ad6a014fe5b50364862179b613767a461bdd9b89f983b74a7cc97ad2223a574b8ef44b55 SHA512 bde522cf659a9daa42fc661a14f0db306ab7073dc973123a874ba6c2846c8dbe51f2538cf7d8db2f4884f08be14a86c866562b98465f87af473426e9c2f98501 EBUILD libavif-9999.ebuild 2754 BLAKE2B a39ce76f57e845238cb7c19f5ec8ec52d82167867642bc256a8ca0c3419e66d5103018e86b57eda3904ed0d537b2967ac5b527febd6088600d850b2b059c9b95 SHA512 2701e2387f6d0b3016a04108af980f453cdf64015ade320acf842800e852aa367e158d6edebb565f29505447b4d9188fa5f5c25a8bd2cb14f7cc9c8dab7e7a38 MISC metadata.xml 1033 BLAKE2B 94be58c7c8d0ea88d86c1203b3f77ce4a2bd699360ceba9991b4de77ab626c707941ef79d57f189510de2e43da641d2ce836bcc50df0db4e105f4d6274183653 SHA512 0073116364038e100579fd0db821552a285c5bfc85f2cd20b2b2ff21cc5740df01c59f23964189912d6cc9700515bd604b0fb1efd951f08c6e181bf47b3b59d7 diff --git a/media-libs/libavif/libavif-0.10.1.ebuild b/media-libs/libavif/libavif-0.10.1.ebuild deleted file mode 100644 index ac23f8d54513..000000000000 --- a/media-libs/libavif/libavif-0.10.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2020-2024 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 ~mips ppc64 ~riscv sparc 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}] ) - 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) - ) - 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_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 - - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libavif/libavif-0.11.1.ebuild b/media-libs/libavif/libavif-0.11.1.ebuild deleted file mode 100644 index 17f6d6812852..000000000000 --- a/media-libs/libavif/libavif-0.11.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 2020-2024 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 ~mips ~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_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 - - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libavif/libavif-1.0.4.ebuild b/media-libs/libavif/libavif-1.0.4.ebuild deleted file mode 100644 index 31c90384ef3f..000000000000 --- a/media-libs/libavif/libavif-1.0.4.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2020-2024 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/16" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv ~sparc ~x86" -IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1 test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( aom dav1d )" - -DEPEND=" - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - media-libs/libpng:=[${MULTILIB_USEDEP}] - aom? ( >=media-libs/libaom-3.3.0:=[${MULTILIB_USEDEP}] ) - dav1d? ( >=media-libs/dav1d-1.0.0:=[${MULTILIB_USEDEP}] ) - extras? ( test? ( dev-cpp/gtest ) ) - gdk-pixbuf? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - 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 test ON OFF) - -DAVIF_ENABLE_GTEST=$(usex extras $(usex test ON OFF) 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_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 - - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libavif/libavif-1.1.1.ebuild b/media-libs/libavif/libavif-1.1.1.ebuild index 6cba38dd2c3c..df8fabdd6a60 100644 --- a/media-libs/libavif/libavif-1.1.1.ebuild +++ b/media-libs/libavif/libavif-1.1.1.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD-2" # See bug #822336 re subslot SLOT="0/16.1.1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc64 ~riscv sparc x86" IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1 test" RESTRICT="!test? ( test )" REQUIRED_USE="|| ( aom dav1d )" diff --git a/media-libs/libbsb/Manifest b/media-libs/libbsb/Manifest index 5bce055f5b5b..c91e7f9e3045 100644 --- a/media-libs/libbsb/Manifest +++ b/media-libs/libbsb/Manifest @@ -1,4 +1,3 @@ DIST libbsb-0.0.7.tar.gz 155443 BLAKE2B b37eea6c3fff957b977008cb44ef5dc7a1a136bcf6d4d8d0dc0f317663d4b06301b93d19e157d3f9465ba0c52084aff2d3e3c04fa0a512a7520589eee585c9a7 SHA512 9a6d7f3d5c2680e008e87ac8b31b676814c9e89b4fb6a42cbbfd96d2d7bc7d734593a3aa94420a374e89431ffac655efdc48cf06718e682933f8975bc3c56515 -EBUILD libbsb-0.0.7-r1.ebuild 611 BLAKE2B f0df878f0a7c3e04789679e4e461e47467ce45872e7a04de136d7af7d5a9758c8ebc5a038bdc207ff53d796678bf69d8e5672081aa0c662cc83fef406a477d63 SHA512 80b8715454f3c1b4a341ca8336fe0dafdf83a513466362215703594d65a5a40483280c4bf927a8617be4f76bb86f6e3cf93005a7ad67a5c3cc009345ac25df86 EBUILD libbsb-0.0.7-r2.ebuild 711 BLAKE2B 1d191bbac81cc8dcef99a8c26d4d50b01c407fd306edd97b00b3e154db001815a67ed6b7992ba5fe78560b554a6e4faff4a27ed92d065f0040d65d09917784d1 SHA512 d9ff3f048a30de76bb9ffcf930787322e90dc4e78e06b658d615bef26fc933e671ee0bc312109a003cd7f3ba2da2d2de924ad61d01d1519a70505b3e1b83f681 MISC metadata.xml 295 BLAKE2B 10c751277dd60deaf3396ac58289f4dfbd2310b4556b70913b0d2359ab5e63099ac3b248ee821723f189f69cb8ed91713cc899a33cff4281f6acec544bd30c99 SHA512 743123a3e9f36f5ebade194fc3c64582d197e2bafa0367e07adf8ce683aae2f86077028a7fcab7a9ab414d00ef5e31a56c368240c4a4a5df687289131654df0a diff --git a/media-libs/libbsb/libbsb-0.0.7-r1.ebuild b/media-libs/libbsb/libbsb-0.0.7-r1.ebuild deleted file mode 100644 index 60e8aeaa5d9a..000000000000 --- a/media-libs/libbsb/libbsb-0.0.7-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A portable C library for reading and writing BSB format image files" -HOMEPAGE="http://libbsb.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="media-libs/libpng - media-libs/tiff:=" -RDEPEND="${DEPEND}" - -# "make check" in 0.0.7 fails with newer tiff versions (4.0.0) altough the -# tools work perfectly, so restrict test until this is fixed upstream -RESTRICT="test" - -DOCS=( README AUTHORS ) diff --git a/media-libs/libcanberra-gtk3/Manifest b/media-libs/libcanberra-gtk3/Manifest new file mode 100644 index 000000000000..3c48594c9ba2 --- /dev/null +++ b/media-libs/libcanberra-gtk3/Manifest @@ -0,0 +1,5 @@ +AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a +AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d +DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 +EBUILD libcanberra-gtk3-0.30.ebuild 2185 BLAKE2B 950281190fcf9569961f436086e510172a1d3cd28e8de41ee21be09735ed477addd54929bbfec895e06c562267c58e679482b73306516c12dcaacd15a9a639af SHA512 45e8d60f2d4654bdfc8c495d5cc6b3ddf9c2657226c123ae2f092404dff4519b7403c17af5c42b52e2f1db1d96807a5d80d1c41d2c266325c5fcb408cc2a67ae +MISC metadata.xml 368 BLAKE2B 191cf45377c726b49548737b12f971668c0e735f5226ee54fa9dde31c5575e29c9a5cb9d54bf9bc2f1aff6a565c4c7931928f5b6edb291781477464858edda39 SHA512 d227c9f4b6956e4e6c20004cfc93e54643fb94eaef0da7abc20e0489248747dae47eb7ceb0551c70c7c0cd3c5291b305b0a103fa2769144b6b6484212ed2bca0 diff --git a/media-libs/libcanberra-gtk3/files/libcanberra-0.30-wayland.patch b/media-libs/libcanberra-gtk3/files/libcanberra-0.30-wayland.patch new file mode 100644 index 000000000000..e51cfe00c0df --- /dev/null +++ b/media-libs/libcanberra-gtk3/files/libcanberra-0.30-wayland.patch @@ -0,0 +1,64 @@ +From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From: Michael Meeks <michael.meeks@suse.com> +Date: Fri, 09 Nov 2012 16:16:40 +0000 +Subject: gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland + +--- +diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c +index 67791f0..c1532ab 100644 +--- a/src/canberra-gtk-module.c ++++ b/src/canberra-gtk-module.c +@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) { + gboolean ret = FALSE; + Atom xembed; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return FALSE; ++#endif ++ + /* Gnome Panel applets are XEMBED windows. We need to make sure we + * ignore them */ + +diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c +index 34446f5..08cb668 100644 +--- a/src/canberra-gtk.c ++++ b/src/canberra-gtk.c +@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +-- +cgit v0.9.2 diff --git a/media-libs/libcanberra-gtk3/files/libcanberra-gtk-module.sh b/media-libs/libcanberra-gtk3/files/libcanberra-gtk-module.sh new file mode 100644 index 000000000000..63c16af71861 --- /dev/null +++ b/media-libs/libcanberra-gtk3/files/libcanberra-gtk-module.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# to be sourced + +case "$SESSION" in + GNOME) + # Done by gnome-settings-daemon + ;; + *) + if [ -z "$GTK_MODULES" ] ; then + GTK_MODULES="canberra-gtk-module" + else + GTK_MODULES="$GTK_MODULES:canberra-gtk-module" + fi + export GTK_MODULES + ;; +esac diff --git a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild new file mode 100644 index 000000000000..a8771a5d9054 --- /dev/null +++ b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="libcanberra" +MY_P="libcanberra-${PV}" +inherit libtool multilib-minimal + +DESCRIPTION="GTK3 bindings for libcanberra, the portable sound event library" +HOMEPAGE="https://0pointer.de/lennart/projects/libcanberra/" +SRC_URI="https://0pointer.de/lennart/projects/${MY_PN}/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gnome" + +COMMON_DEPEND=" + ~media-libs/libcanberra-${PV}[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[X,${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] +" +DEPEND="${COMMON_DEPEND} + dev-libs/libltdl:0[${MULTILIB_USEDEP}] + media-libs/libvorbis[${MULTILIB_USEDEP}] +" +RDEPEND="${COMMON_DEPEND} + !<media-libs/libcanberra-0.30-r8[gtk3(-)] + gnome? ( + gnome-base/dconf + gnome-base/gsettings-desktop-schemas ) +" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +PATCHES=( + # gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master') + "${FILESDIR}/${MY_P}-wayland.patch" +) + +src_prepare() { + default + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --docdir="${EPREFIX}"/usr/share/doc/${PF} + --disable-alsa + --disable-oss + --disable-pulse + --disable-gstreamer + --disable-gtk + --enable-gtk3 + --disable-tdb + --disable-udev + --disable-lynx + --disable-gtk-doc + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install() { + # Disable parallel installation until bug #253862 is solved + emake DESTDIR="${D}" -j1 install +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + + rm "${ED}"/usr/include/canberra.h || die + + find "${ED}"/usr \( -iname libcanberra.pc -o -iname libcanberra.vapi \ + -o -iname libcanberra-multi.so -o -iname libcanberra-null.so \ + -o -iname libcanberra.so* \) -delete || die + + # This is needed for desktops different than GNOME, bug #520550 + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}"/${MY_PN}-gtk-module.sh 40-${MY_PN}-gtk-module +} diff --git a/media-libs/libcanberra-gtk3/metadata.xml b/media-libs/libcanberra-gtk3/metadata.xml new file mode 100644 index 000000000000..1db67d7ed56f --- /dev/null +++ b/media-libs/libcanberra-gtk3/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <maintainer type="project"> + <email>sound@gentoo.org</email> + <name>Gentoo Sound project</name> + </maintainer> +</pkgmetadata> diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest index 19003363cad2..fafc63b8cc52 100644 --- a/media-libs/libcanberra/Manifest +++ b/media-libs/libcanberra/Manifest @@ -2,4 +2,5 @@ AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f28 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 EBUILD libcanberra-0.30-r7.ebuild 2498 BLAKE2B 725ac6409ec1079218ea2f15c6d18eb7e024bdd53bc58514247cfd72eb959d7a6c46df6125ddebe2b4770966ca7a5e2ddfa8483ccf17941e54ad3dc9db5ce338 SHA512 857715b1aa992baa2313188419f19f09457d8c36cf25fadf22b4918a0269856b06fcc800680b07e28602705c7816e373aacb089c57c3e34165c4387dd2538140 +EBUILD libcanberra-0.30-r8.ebuild 1811 BLAKE2B 7ab896c8febbcd4eb465d2215ac420a4cfbf1f8c5976b2018cb569b427ec1b7ce5aee5500e7f3abcfdb0456c0901fadec3c49adacda55d32177600a207efb17d SHA512 916c7c70b33e16d3a61db043e020368c520d66c3baf34d7224bf51a96ca1c2152dbede324a8eff9724330cdbf00cb6897d623845f7efd7fe2b74b8f8b61094f6 MISC metadata.xml 1744 BLAKE2B 26312a41cefdc053215cb2a6ff704a3934f806df80d340a7766f9994ffb07118ed2647ead627197ffc8810627c00e220eec683e987bcb374b626c5508c70d7f2 SHA512 423e9ad57ce8d636c2d05b802c9cb6391d2794eeb9924009ae265c7de68165af664964c3a4f6b435bb88ffe5f37cd5d4f55addc62e1ff1b9e073c75817f0ea13 diff --git a/media-libs/libcanberra/libcanberra-0.30-r8.ebuild b/media-libs/libcanberra/libcanberra-0.30-r8.ebuild new file mode 100644 index 000000000000..9e70735bd7e5 --- /dev/null +++ b/media-libs/libcanberra/libcanberra-0.30-r8.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool multilib-minimal systemd + +DESCRIPTION="Portable sound event library" +HOMEPAGE="https://0pointer.de/lennart/projects/libcanberra/" +SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="alsa gstreamer oss pulseaudio tdb udev" + +DEPEND=" + dev-libs/libltdl:0[${MULTILIB_USEDEP}] + media-libs/libvorbis[${MULTILIB_USEDEP}] + alsa? ( + media-libs/alsa-lib:=[${MULTILIB_USEDEP}] + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) ) + gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) + tdb? ( sys-libs/tdb:=[${MULTILIB_USEDEP}] ) +" +RDEPEND="${DEPEND} + x11-themes/sound-theme-freedesktop" # Required for index.theme wrt #323379 +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +REQUIRED_USE="udev? ( alsa )" + +src_prepare() { + default + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --docdir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable alsa) + $(use_enable oss) + $(use_enable pulseaudio pulse) + $(use_enable gstreamer) + --disable-gtk + --disable-gtk3 + $(use_enable tdb) + $(use_enable udev) + --disable-lynx + --disable-gtk-doc + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi; then + ln -s "${S}"/gtkdoc/html gtkdoc/html || die + fi +} + +multilib_src_install() { + # Disable parallel installation until bug #253862 is solved + emake DESTDIR="${D}" -j1 install +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/media-libs/libdisplay-info/Manifest b/media-libs/libdisplay-info/Manifest index bedfcf89b085..e8d769e3fed0 100644 --- a/media-libs/libdisplay-info/Manifest +++ b/media-libs/libdisplay-info/Manifest @@ -1,5 +1,5 @@ DIST libdisplay-info-0.1.1.tar.xz 76864 BLAKE2B 262f275a61efefaa57ec48558c4b9f9dd9cb6d8012e50a9873e10a593e1b03e2cc37c2d690be392f26ded171be9dcc8a7e80139129d2b4d85ebc7f9ef0eedaf9 SHA512 95c199211504af96816d92ec8e531bea993dd5d4a2935f1977f1e665b924b1628df25b81cd20da29543d008a8e6d757bdbceb09c74e031c0c213d60be9a10d7a DIST libdisplay-info-0.2.0.tar.xz 95280 BLAKE2B bcfec916c1f30204e5e0af9e3e57a5ef9929c09912a5c1302fbfb76b54208ad4b96fe1c972afe1814c5762f9f78b0ff093f2249ee0dbf6f1b30202722bd05449 SHA512 6e910b832860d920a4be298a2b6925f701654bd7cdd8b3457e64663c25caa20a74b81b91f71878b9e7f5f70c5c067235f0c99293650231920c67d1241a61e1fb EBUILD libdisplay-info-0.1.1.ebuild 638 BLAKE2B 2377f2e2160d5fbaa0e68d89c45826731925ce2ca0caf827926be1e36aa38c8808981759e33e04a8c5254f0e5b26fa6003e922f297afc1fce0ef89c1e45147b3 SHA512 c62506b8ce12d7180c4ff9cb38b91d9d9123ef4b38266a55a634bcb2eb278a0915fc57189a6d061559d2093f86f0a9ffc9c32824224d17eb67538cc87f07da7d -EBUILD libdisplay-info-0.2.0.ebuild 558 BLAKE2B deebd396189da4b3113e996d4eacd1761f6013fb70e894a933535907b6e701951272baeddd89201da0cd7b44c21e4065b2d5ffcb9b39f0c5f5e25a568b7036e3 SHA512 024940429819adf78e96465a24bba22057bc5e6abeb9a4459a785f301e5c2237c32e9a7f4bc93dd28e9c7e1135d3f97a31dc777c7559ce874b4db1ff344a3b7d +EBUILD libdisplay-info-0.2.0.ebuild 563 BLAKE2B 2f2c5ba0d27f33b18fd1014d16f1c6ea150dad28bd70f6cf4deb8ac8b56bb5fa3daf1790e7b4c668ee27e9d69fcc9db2d7f831684ba1e55cc16081f3f506b4fe SHA512 a9324478c76b6c36c1ab2d78eb0694130b33d201bdc138db476fa189291ef0d089590f9aa9cd5db7e329961de1ed5f39bd578e4c78c7dc8569c8b6ad61dba48f MISC metadata.xml 349 BLAKE2B 0a82833d63b02c6572b7ee005a433ab4768fc3b6b4f6af5ef1bcbb2651d48bf8638cb32994c12370347302f0b8fb66e17b85b188177e1df8bb98e0a2bc65f920 SHA512 e5c06e09ec11cf204a2cf82176778d0fac91c658813d20e7da4e6dbb80ba6b2e27eb4a12b1daa244dceee894c24e9617c313a2d07732f5ca8ee2aa79cc162cf5 diff --git a/media-libs/libdisplay-info/libdisplay-info-0.2.0.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.2.0.ebuild index 0f71c25d22ab..bd3f41f33877 100644 --- a/media-libs/libdisplay-info/libdisplay-info-0.2.0.ebuild +++ b/media-libs/libdisplay-info/libdisplay-info-0.2.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/download LICENSE="MIT" SLOT="0/2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" RDEPEND="sys-apps/hwdata" DEPEND="${RDEPEND}" diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest index d99dbc4f0fc4..0965e1ebcdec 100644 --- a/media-libs/libepoxy/Manifest +++ b/media-libs/libepoxy/Manifest @@ -1,6 +1,6 @@ AUX libepoxy-1.5.10-libopengl-fallback.patch 1270 BLAKE2B bd3c68b2cb3392c5ebb552877f14a354e5b3dbd7d16ceaf7865a2f52a918b0ad04de006123d8244c77a3a6e1c37d2453e4eda93d866305285e1f21646c8bc622 SHA512 97118315c590391e71302bbf14db45f53ca21f0ca69f1557d3484ad484d002c12b5d86a3b28250fd0030d9d5aed7b362c4f27a2bc7fe3857733540f0e2259f1b AUX libepoxy-1.5.10-use-opengl.pc-without-x.patch 590 BLAKE2B cef810cccd2133045a60bb5d6e812f048402f1ad65b3befaca34b14950df60b5b7fa732de09eec1a998782ecf846d6863432713b62a29ee6b6ed25b1c2e1cd77 SHA512 567e3f838e62fb607e3cb4f15a5694ffe2407f575acfc1198b15f042fdaef333a05cd3dda28204fad8224967da13c62d87d2ea073c38f1f239d9e0ac7d520dd7 DIST libepoxy-1.5.10.tar.gz 332078 BLAKE2B d56b45a8fc38901fdb23c50b569a667fce8ca289103a8d7ca19f96a76c75d3c2ff9d6959ed2ed47bd64806add95dafe42dc85dfc5bc60af14b5500b70070e008 SHA512 6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee -EBUILD libepoxy-1.5.10-r3.ebuild 1133 BLAKE2B ea9f4766b1bb70be146ea749a5d74cfe3124413e150a61e05c0818ae30d8243505056b277927a2912ff09d87b692308fca8e94b7ae157b0aad1c3534e4c3a0ec SHA512 3213643d35f8079dcc70a03c8f11fd045f9318e7ef6724eab572c5de81d855daf1ef3969ec4684c4a1c9dfa6bc1a2e747860052fb5a979cc74872f0577dcfc39 -EBUILD libepoxy-9999.ebuild 1145 BLAKE2B b458260fbeedb4276036ce8bc66716a7770aac7f200db72ad3bc3aef58537db22f6f63461ea53f482313485f4a3f3bde652687f450dd9b7b71ce293899e76497 SHA512 52e9d10fec1b6874426662513d64b80fa601c5f31970c9c85cff0ad5099115cb436abaf061de9747951f70b170cf0c079e1961cb0dfee592f62d3dbfc034a007 +EBUILD libepoxy-1.5.10-r3.ebuild 1133 BLAKE2B 9c91830b98ee2aea37b2ad2cccf6cff00f25c12d2daae52b6545315ba5bffdce8b79c617c9e223c0f0f8e564ead3d0559b5c9446f41fba364f74bac063a358f4 SHA512 7549c94aa1126c4c8de39cfd7ae2edd8fc09a868bf94f1bbdb9c7134b8b54910106152cfbd9d302241b4fb48b11989b605294edbe032ab30c3ad2c253862f9ea +EBUILD libepoxy-9999.ebuild 1145 BLAKE2B 39ad3b70fba6a7085fe4fc5346e309ebb39a9cfe94b863888d0f5d492e9b2e8f0d299836f0da5e7218744ffc2dcb619a150b8bfc8fc1adbcae31822a8b4bc4ec SHA512 3f49a0215d2045db2000a200da496f7da40c2eb84efcd2488168cad0440ab772e71296d898de85f1e5000ed049f97d259149a2a0e4338d1c9703d71166eb6c57 MISC metadata.xml 315 BLAKE2B b5522d4c4122abee9842af3c21d8d8be42c0b451d27f7c7e9f2e1de21d23c936a177fd150329f9d4e1e35b6cd5bfd58178bc01298fbb3bb6ac94d475c9eade9e SHA512 7c2c9fc4ef59a4041aba0363cfd2a0c46123818294d5dfa69438fe9049458d4091035a6247465b9cc7c4660cc3085cc5899e351e74ed8208859446203228e52b diff --git a/media-libs/libepoxy/libepoxy-1.5.10-r3.ebuild b/media-libs/libepoxy/libepoxy-1.5.10-r3.ebuild index dd492c3dbbc5..25409031ee3c 100644 --- a/media-libs/libepoxy/libepoxy-1.5.10-r3.ebuild +++ b/media-libs/libepoxy/libepoxy-1.5.10-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE='xml(+)' inherit meson-multilib python-any-r1 virtualx diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild index 9595496ab525..7b4135df050b 100644 --- a/media-libs/libepoxy/libepoxy-9999.ebuild +++ b/media-libs/libepoxy/libepoxy-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE='xml(+)' inherit meson-multilib python-any-r1 virtualx diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest index 34fcf2a7a4ff..ff1e4aa2e761 100644 --- a/media-libs/libffado/Manifest +++ b/media-libs/libffado/Manifest @@ -1,5 +1,8 @@ AUX libffado-2.4.7-fix-config-load-crash.patch 555 BLAKE2B bac518fa7d80dece2c5fa728e05910096d0da458afda9618b0b174521899e686ba060c9a9edec138506d279f1e799ad0c5bdd9925cb91129ca35d55cd632a15c SHA512 28c95fb7a5701c387066db7356aad52b3b33e9e5cad948b9ea578f3826e999d1552b0c1baa0c3f63748828e927137f4143c1dbd0d28db480aadb92446a0288db AUX libffado-2.4.8-python3.12.patch 2722 BLAKE2B b9d65ea9dd9026d968e732454e4c90ed5bce577b3d262c501e24e38a8957eec7fb6541afb7edcbda1e381096b0686a0f1592e29478d8134c0f74ede775e8f5b4 SHA512 a1ac171048531573de77388dbf3a4cea4babeca71e30e77bba5ebdfeb6e45852af5376bc91bbbc5dfc69fe06f50cf0a25233e21ea6a7fb54a96e5473503f6bab +AUX libffado-2.4.9-fix-config-load-crash.patch 527 BLAKE2B 8451b5085d805277fa62081157e1ecf2692ff7aed200553941e595cb567fa1c247f365e81439f70d1ce6d164aad514c6aa04dd03360770df3c456f790c2f4c06 SHA512 fffe5817298d7a59ec0c29d5970cae07ddb0b796618a6e440be606aa7d79b329a9e19d47c3d70aa483d66f723cef9abf967f8d202b102b158b75add2f2afa440 DIST libffado-2.4.8.tgz 1237955 BLAKE2B 14b83d55fc9a7b33c888b893c808f8419292fefaa2c2239b4b51c2b84070a584ea72821c8469bb8d965a9a5e6473b6fcfb5e85f4eecd2d424e3167322f8abb81 SHA512 fbbcd30640c55315f2e65fc6c07afc71a77dd2c9d1b6127ee55cd17e76511ad5f0563135e52397dbf113fb0d5925021a38780f231409bdd920da52e6c1ce3acc +DIST libffado-2.4.9.tgz 1229651 BLAKE2B ec8300066d47d685aa701316efa6831f05d678c509de341d1b74551bf8a3f04b59dcd80d592e2111670212d4056bd1c150cc23dbf43a797a915bf65ae441c85e SHA512 0a0c61cf9339ab542c85eaefbe017b7613f716ae0ed08d11a37782dd7ef5815b18256c5d1b9240f077c9f59bbf4b4878019cefbd6cab78140477bcad6a9d3e44 EBUILD libffado-2.4.8.ebuild 2983 BLAKE2B a5cab924afdc3d6f9471fe44aab4df478f94c0addb615546e9ad2017ef380a9ce0274be4c56d6ad0ed651a0e1ff6ff96d907d49c9c491873ec1ee50a0045e5cd SHA512 9c98f9a814109026ae2ea72364d9ddb1c59c80666319779c37172125aec762027dddd2de4a402626642f499e0fa9dbb48e0e7af45f83b0bc3b650cbf75f6e632 +EBUILD libffado-2.4.9.ebuild 2962 BLAKE2B 5937c5c848370d4e48eeb4d3834924aa93c35ac042df345ffc55aaee9d00af4939832ab61a300e1eb13493649aa1f2b2e12cb9af0667f0ba406ff475cae53436 SHA512 4fc8f79a2956d68b0a7b90aaa9ba738de4d617855b2a174ceeb144974263265dc754e988120584069708b456605c45acd85d450bddef5e1f2c5b281c0453db6d MISC metadata.xml 344 BLAKE2B a7d2c27caa7e9fa72716534c406145b94bd8a13eadf57d06ea8e3148339857311bd7e8f0434edbf8a70a5e7bfec1726425e1d16734841b056caeee7754471666 SHA512 30d31f76c73ff218fa34e5f9d442e2366082bf4697038c804c093cac0e22720341691b732bf653466f8e5fc7e734c11b08a02cef7dd2a4bd93635968e2c29447 diff --git a/media-libs/libffado/files/libffado-2.4.9-fix-config-load-crash.patch b/media-libs/libffado/files/libffado-2.4.9-fix-config-load-crash.patch new file mode 100644 index 000000000000..db28ec831281 --- /dev/null +++ b/media-libs/libffado/files/libffado-2.4.9-fix-config-load-crash.patch @@ -0,0 +1,12 @@ +--- a/support/mixer-qt4/ffado/mixer/globalmixer.py ++++ b/support/mixer-qt4/ffado/mixer/globalmixer.py +@@ -96,8 +96,7 @@ class GlobalMixer(QWidget): + @pyqtSlot() + def on_txtNickname_returnPressed( self ): + if self.nickname.canChangeValue(): +- asciiData = self.txtNickname.text().toAscii() +- self.nickname.setText( asciiData.data() ) ++ self.nickname.setText( self.txtNickname.text().encode('utf-8') ) + else: + self.txtNickname.setText( self.nickname.text() ) + diff --git a/media-libs/libffado/libffado-2.4.9.ebuild b/media-libs/libffado/libffado-2.4.9.ebuild new file mode 100644 index 000000000000..47aacae4960b --- /dev/null +++ b/media-libs/libffado/libffado-2.4.9.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..13} ) + +inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal xdg + +DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces" +HOMEPAGE="http://www.ffado.org" + +if [[ "${PV}" = "9999" ]]; then + inherit subversion + ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}" +else + SRC_URI="http://www.ffado.org/files/${P}.tgz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2 GPL-3" +SLOT="0" +IUSE="debug qt5 test-programs" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + virtual/pkgconfig +" +CDEPEND="${PYTHON_DEPS} + dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}] + >=dev-libs/dbus-c++-0.9.0-r5 + dev-libs/libconfig:=[cxx,${MULTILIB_USEDEP}] + media-libs/alsa-lib + media-libs/libiec61883[${MULTILIB_USEDEP}] + sys-apps/dbus + sys-libs/libavc1394[${MULTILIB_USEDEP}] + sys-libs/libraw1394[${MULTILIB_USEDEP}] + qt5? ( + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/PyQt5[dbus,${PYTHON_USEDEP}] + ') + x11-misc/xdg-utils + )" +DEPEND="${CDEPEND}" +RDEPEND="${CDEPEND}" + +PATCHES=( + "${FILESDIR}/libffado-2.4.9-fix-config-load-crash.patch" +) + +myescons() { + local myesconsargs=( + PREFIX="${EPREFIX}/usr" + LIBDIR="${EPREFIX}/usr/$(get_libdir)" + MANDIR="${EPREFIX}/usr/share/man" + UDEVDIR="$(get_udevdir)/rules.d" + CUSTOM_ENV=true + DETECT_USERSPACE_ENV=false + DEBUG=$(usex debug) + PYPKGDIR="$(python_get_sitedir)" + # ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly + # -fomit-frame-pointer is added also which can cripple debugging. + # we set flags from portage instead + ENABLE_OPTIMIZATIONS=false + # This only works for JACK1>=0.122.0 or JACK2>=1.9.9. + ENABLE_SETBUFFERSIZE_API_VER=force + ) + if multilib_is_native_abi; then + myesconsargs+=( + BUILD_MIXER=$(usex qt5 true false) + BUILD_TESTS=$(usex test-programs) + ) + else + myesconsargs+=( + BUILD_MIXER=false + BUILD_TESTS=false + ) + fi + escons "${myesconsargs[@]}" "${@}" +} + +src_prepare() { + default + + # Bug #808853 + cp "${BROOT}"/usr/share/gnuconfig/config.guess admin/ || die "Failed to update config.guess" + + # Always use Qt5 + sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die + + # Bugs #658052, #659226 + sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die + + multilib_copy_sources +} + +multilib_src_compile() { + tc-export CC CXX + myescons +} + +multilib_src_install() { + myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install +} + +multilib_src_install_all() { + einstalldocs + + python_fix_shebang "${D}" + python_optimize "${D}" + + if use qt5; then + newicon "support/xdg/hi64-apps-ffado.png" "ffado.png" + newmenu "support/xdg/org.ffado.FfadoMixer.desktop" "ffado-mixer.desktop" + fi +} + +pkg_postinst() { + xdg_icon_cache_update + udev_reload +} + +pkg_postrm() { + xdg_icon_cache_update + udev_reload +} diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 0a14f6785d35..035d6ef74ecb 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,5 +1,4 @@ AUX libgphoto2-2.5.31-c99.patch 1231 BLAKE2B 161b4fceaca4f61a86f6957802c36d9566a67c554748b0d2fc6a77863bd3d420bcbbdaadc96ac54cc886ec80cb046d0e541dcd014bec99f55361914de96127d8 SHA512 f91f12e2809ef1ac6a5f01563d678f00d2dbb32880bcbf6ef7593887e8f41e7f8c4349c5f814ab56340a3e9df3825fae126716aa6ad06c80621558e7871371f1 DIST libgphoto2-2.5.31.tar.xz 6322264 BLAKE2B 9003769bf7726b205f6466e2332d1b144e2e1f2ac190c23f93200ec761597d08a7925e0a16dc65f66c9ca47f0c7e7a563c1cd5ada5cdf528bc605538cf67d80e SHA512 1061a676488aff2cad12a5ee49742be6d18750221ef808d69116763c2b357d38c1372db62933dfa8fd8411758acb97b8e3a40a5d4f37b8c563e981fd4ae4bb1f -EBUILD libgphoto2-2.5.31-r1.ebuild 6335 BLAKE2B 84a4752d932552755e96486100034ceefcb94be0c49b91dcb60dfd7406638e79f3bef370e75b9542cb774d30970bf6855e20fc7ae4e3f4dbd02ca74f090ceb84 SHA512 f53427fd5c8cac68c7c8bc0ad54de8c65ca7776309f0a8f9f84d7a70789b068c2bb124412a749fde6550c6019c9c8e69ff5fabb1a0aadf27fc042b8693805b9b -EBUILD libgphoto2-2.5.31-r2.ebuild 6201 BLAKE2B 1577a7982425f5ea981382d19b9867c6e439361de0691fe4802fb8476bcf34d8f67a87989463dee30de537647740e7d77270e333c4dcc0370df2ebe0479da993 SHA512 ee0c57b7d7467c65f22fd25e44e2b1c51214dcba34f1c3879d9dea820238c5a3a341424e6361ae985a9d87c6324fc7a431c094c7a93c457660ea3b8ea3040e98 +EBUILD libgphoto2-2.5.31-r2.ebuild 6194 BLAKE2B 1b767cbd04e21b597b1544af5e96894cd1b0e0e806086d1f728e859b6914921e27bfa194451099ceb9a6f6cd8a245eaeee1665eb06a6944a5c4a76cf3a1e8535 SHA512 912fa1706faf8c289eafa276be58b4ecc2253409bc4f84629a11f0e65d06e147ee9cdefbaea6db6c9a14acf6bd082e61411cb37289a3eaf432917a36ec08d0d3 MISC metadata.xml 458 BLAKE2B 944547ab787583b1cd6678e3183a3f6cd76cf95461fb05758887ccfd41ceb8fc0bf7278fe786fd36fe2eee3664876fe4692d849a88bff58c3707e57f256b67b0 SHA512 a6c0af734aa579d486cb4f707f84b6b6beb26121092ced9976d05a6428a8096f79591b842d3ad906e5cb76ea1c8cd2bc2d21d587d6cb03041cc3ba72905f76be diff --git a/media-libs/libgphoto2/libgphoto2-2.5.31-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.31-r1.ebuild deleted file mode 100644 index c61c326f275d..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.5.31-r1.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO -# 1. Track upstream bug --disable-docs does not work. -# https://sourceforge.net/p/gphoto/bugs/643/ - -EAPI=8 -inherit autotools multilib-minimal udev - -DESCRIPTION="Library that implements support for numerous digital cameras" -HOMEPAGE="http://www.gphoto.org/" -SRC_URI="https://downloads.sourceforge.net/gphoto/${P}.tar.xz" - -LICENSE="GPL-2" - -# FIXME: should we also bump for libgphoto2_port.so soname version? -SLOT="0/6" # libgphoto2.so soname version - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc examples exif gd jpeg nls serial" - -# By default, drivers for all supported cameras will be compiled. -# If you want to only compile for specific camera(s), set CAMERAS -# environment to a space-separated list (no commas) of drivers that -# you want to build. -IUSE_CAMERAS=" - adc65 agfa_cl20 aox ax203 - barbie - canon casio_qv clicksmart310 - digigr8 digita dimagev dimera3500 directory - enigma13 - fuji - gsmart300 - hp215 - iclick - jamcam jd11 jl2005a jl2005c - kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 - largan lg_gsm - mars mustek - panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 - ricoh ricoh_g3 - samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z - toshiba_pdrm11 topfield tp6801 -" - -for camera in ${IUSE_CAMERAS}; do - IUSE="${IUSE} +cameras_${camera}" -done - -# libgphoto2 actually links to libltdl -RDEPEND=" - acct-group/plugdev - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - net-misc/curl[${MULTILIB_USEDEP}] - dev-libs/libltdl:0[${MULTILIB_USEDEP}] - >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] - cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] ) - cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] ) - exif? ( >=media-libs/libexif-0.6.21-r1[${MULTILIB_USEDEP}] ) - gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-build/gtk-doc-am - app-alternatives/lex - >=sys-devel/gettext-0.19.1 - virtual/pkgconfig - doc? ( app-text/doxygen ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gphoto2-port-config - /usr/bin/gphoto2-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.31-c99.patch -) - -pkg_pretend() { - if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then - einfo "No camera drivers will be built since you did not specify any." - fi -} - -src_prepare() { - default - - # Handle examples ourselves - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ - || die "examples sed failed" - - eautoreconf # For configure.ac patching -} - -multilib_src_configure() { - local myconf - use doc || myconf=( ac_cv_path_DOXYGEN=no ) - - # Upstream doesn't default to --enable-option-checking due having another - # configure in libgphoto2_port/ that also needs to be checked on every bump - # - # Serial port uses either lockdev or ttylock, but we don't have ttylock - # --with-doc-dir needed to prevent duplicate docs installation, bug #586842 - ECONF_SOURCE=${S} \ - econf \ - --cache-file="${BUILD_DIR}"/config.cache \ - --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --disable-docs \ - --disable-gp2ddb \ - $(use_enable nls) \ - $(use_with exif libexif auto) \ - $(use_with gd) \ - $(use_with jpeg) \ - $(use_enable serial) \ - $(use_enable serial lockdev) \ - --with-libusb=no \ - --with-libusb-1.0=auto \ - --disable-ttylock \ - --with-camlibs=${cameras} \ - --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ - --with-rpmbuild=$(type -P true) \ - udevscriptdir="$(get_udevdir)" \ - "${myconf[@]}" -} - -src_configure() { - local cameras - local cam - local cam_warn=no - for cam in ${IUSE_CAMERAS} ; do - if use "cameras_${cam}"; then - cameras="${cameras},${cam}" - else - cam_warn=yes - fi - done - - if [ "${cam_warn}" = "yes" ]; then - [ -z "${cameras}" ] || cameras="${cameras:1}" - einfo "Enabled camera drivers: ${cameras:-none}" - einfo "Upstream will not support you if you do not compile all camera drivers first" - else - cameras="all" - einfo "Enabled camera drivers: all" - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen doc/Doxyfile || die "Documentation generation failed" - fi -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete || die - - einstalldocs - dodoc TESTERS MAINTAINERS - - if use examples; then - docinto examples - dodoc examples/README examples/*.c examples/*.h - fi - - # FIXME: fixup autoconf bug #???? - if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then - rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" - fi - # end fixup - - local udev_rules cam_list - udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules" - cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list" - - if [ -x "${ED}"/${cam_list} ]; then - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" - # Let libgphoto2 find its camera-modules - export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}" - - einfo "Generating UDEV-rules ..." - mkdir -p "${ED}"/${udev_rules%/*} - echo -e "# do not edit this file, it will be overwritten on update\n#" \ - > "${ED}"/${udev_rules} - "${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \ - || die "failed to create udev-rules" - else - eerror "Unable to find print-camera-list" - eerror "and therefore unable to generate hotplug usermap." - eerror "You will have to manually generate it by running:" - eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}" - fi - -} - -pkg_postinst() { - if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to access your camera." - fi - - local old_udev_rules="${EROOT}"/etc/udev/rules.d/99-libgphoto2.rules - if [[ -f ${old_udev_rules} ]]; then - rm -f "${old_udev_rules}" - fi - - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild index 5a84139c4e99..afb3be44733a 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild @@ -17,7 +17,7 @@ LICENSE="GPL-2" # FIXME: should we also bump for libgphoto2_port.so soname version? SLOT="0/6" # libgphoto2.so soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" # By default, drivers for all supported cameras will be compiled. # If you want to only compile for specific camera(s), set CAMERAS @@ -41,7 +41,7 @@ IUSE_CAMERAS=( pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 - soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z + soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z toshiba_pdrm11 topfield tp6801 ) diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest index 3a94b9564ca4..66d1cf65627a 100644 --- a/media-libs/libheif/Manifest +++ b/media-libs/libheif/Manifest @@ -4,8 +4,8 @@ DIST libheif-1.17.6.tar.gz 1433302 BLAKE2B 937a1ddfd86c4d50a609e24d00c07e0d1924a DIST libheif-1.18.1.tar.gz 1524386 BLAKE2B 07c01c273460618d56b9259c2930da34632fffdcc2338480277e678ab173126bc9d6882a33dc459ed7cdacd7e636ff8d13c406c76c046afc47166609e9595942 SHA512 0b37b834882af8368fc550e75245f4cf487c71a041833ba5e7887155e289e9c2058b41724524091347f297cfdec45b537796a97f4c43531aecf9f0a099753f41 DIST libheif-1.18.2.tar.gz 1525096 BLAKE2B 667a68f324f89b2274ea837ec8d40ada5450dce79f2b8d9e8ba365fe5f02d4222195109519380a6d38c4ebca929575e58c3a8e517aed27a2696d67db3e287556 SHA512 8fd47dbc8e31fdb6a972c852bc4e78440492ee3dd769e139f28ad489ccc23e6cf42a90cd23b16405fa30df3c7c43c78b2b65d5ca3ffb449bf06789b457ed3072 EBUILD libheif-1.15.2-r1.ebuild 2058 BLAKE2B 4769aaea2e7165a43dc8761d944ff77df1ca87ed6fe4bef4f291075db39c44b151f46198e1e74683072ad3a26aced9f259a71db8a5512cf74cec047c1750073b SHA512 108ed5a9a7ab77110dc53189ae90f245672f39e76784678cb007b560b8284e862ae4142cd6abf484bdfb0029c41bfdec9aa5c352fa9ba1439d39fb3cdd63af96 -EBUILD libheif-1.17.6.ebuild 2260 BLAKE2B 801416c69d5893ccd22ba87003e14a01991c34fe34158489bb74bdabc3fb8e884466e6e9acd0d83efdd4f73f3a99b1e7050466972ee564e0b71de2544156234a SHA512 888ab7c3e4336aae325fe6c0d344bc213b6009522f31eef490d884a3e7d97d38b8d188abaee017dccedbd69821499027664263ce43d4aac4d0a063dd274f8522 -EBUILD libheif-1.18.1.ebuild 2394 BLAKE2B f9c698929ecab311ac0839b36bbc4f52dddea68d47096207c2087c058d8f53e42993cb55acdf6f03bb48b8186e113c158b9182c882bb3cee86bd95b022f11809 SHA512 dc9690c1ab290b68cdc29cb2be5d5d48e4c1c287ca14f97693b3fdff2acfef14683867aef02ca50df5b3520f3e757fc1a69605f964bbe47eb0b6dc7ef0679bd5 -EBUILD libheif-1.18.2.ebuild 2249 BLAKE2B 02d8b9b176afd5a143d7cf63df8e0477f988f6b45d967292db77cffd6a3f5949627ef9dc6f2b14616202fe84af1a399ccf6cdff4a37f184b94c72369492665f5 SHA512 eeb4448259a555d941fcb23c321e757cd7d0176829a2f2442e7aec4d0d03eef8d74fa9367401ee24e6b9f0096255383cc4e70d3054220c020f24134fff95a95c +EBUILD libheif-1.17.6.ebuild 2319 BLAKE2B 9219564f6b6870e015066fc06f3605bd64dd1d7a080d40b0d64dab3389d745f84484c62614af6c670a13276a227867e285aea95501a03690131b21ffe2caa79d SHA512 b9cd4e6e9f59ebfba627256cf76beeeec98aac9ed6469d7f5e2ca6c8f47dc676eb040d4c3b92b79bc7859740700a3599538bfba3c35f5f5d0f512084acbc50c0 +EBUILD libheif-1.18.1.ebuild 2450 BLAKE2B 9ff052a4ccb45bccb19f55a50150916f6f52872069de37db1598a238363375def6490582054f2e5144083f07a9734a326382fdaac22d4c298d769caa00e364e6 SHA512 55a7de237ddb7a4f95204da919193d4bab22033295058a9c11e1b134a461a5a61ab0c917aa18d2320fa43aac8973a082e7fa31e0968b697d7260d40077f16a79 +EBUILD libheif-1.18.2.ebuild 2311 BLAKE2B 4cd64d8994c530ba8620ad9b67c0bf45319389b5747560f15e75adfa458b7cce592ec4b2037762b007b5b193bccf18fd4cdf69ad638fd04178d6e4443fc588e7 SHA512 08403582c04871da764be41711801329d43952f54e6d0d3c851458dadf75e6a94619acf5145356aad4d50c127615cfb8a25a4a2610e2f4ab72f6bc3f5988de10 EBUILD libheif-9999.ebuild 2394 BLAKE2B f9c698929ecab311ac0839b36bbc4f52dddea68d47096207c2087c058d8f53e42993cb55acdf6f03bb48b8186e113c158b9182c882bb3cee86bd95b022f11809 SHA512 dc9690c1ab290b68cdc29cb2be5d5d48e4c1c287ca14f97693b3fdff2acfef14683867aef02ca50df5b3520f3e757fc1a69605f964bbe47eb0b6dc7ef0679bd5 MISC metadata.xml 809 BLAKE2B f26844fa79747ac286a0130cb8cb2b4f0e771ed7fa3f9fe29a3fbd71876902c868dc32305f928cedbb88dcadab3c07cb4f85c647369adc904c7c9c463dd05343 SHA512 754ef9004dc664cca658bfbd0392fce837557efe1b92aefe198dd529cb388048f49e37648c7338829d6ecd87ea953efd0f66895191aea7bd39730c2f7240f032 diff --git a/media-libs/libheif/libheif-1.17.6.ebuild b/media-libs/libheif/libheif-1.17.6.ebuild index 7f802231d9b5..7e7142cf23cc 100644 --- a/media-libs/libheif/libheif-1.17.6.ebuild +++ b/media-libs/libheif/libheif-1.17.6.ebuild @@ -56,6 +56,8 @@ src_prepare() { ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die fi + sed -e '/Werror/d' -i CMakeLists.txt || die # bug 936466 + cmake_src_prepare multilib_copy_sources diff --git a/media-libs/libheif/libheif-1.18.1.ebuild b/media-libs/libheif/libheif-1.18.1.ebuild index b5c9b73f88d0..a5eebc81ee22 100644 --- a/media-libs/libheif/libheif-1.18.1.ebuild +++ b/media-libs/libheif/libheif-1.18.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86" fi DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" @@ -58,6 +58,8 @@ src_prepare() { ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die fi + sed -e '/Werror/d' -i CMakeLists.txt || die # bug 936466 + cmake_src_prepare multilib_copy_sources diff --git a/media-libs/libheif/libheif-1.18.2.ebuild b/media-libs/libheif/libheif-1.18.2.ebuild index 1aea405a52d6..eb8d3c1b497c 100644 --- a/media-libs/libheif/libheif-1.18.2.ebuild +++ b/media-libs/libheif/libheif-1.18.2.ebuild @@ -24,7 +24,7 @@ RESTRICT="!test? ( test )" BDEPEND=" test? ( - dev-cpp/catch + <dev-cpp/catch-3 dev-lang/go ) " @@ -55,6 +55,8 @@ src_prepare() { ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die fi + sed -e '/Werror/d' -i CMakeLists.txt || die # bug 936466 + cmake_src_prepare multilib_copy_sources diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest index c66b247b4ce3..4324caf5e282 100644 --- a/media-libs/libiptcdata/Manifest +++ b/media-libs/libiptcdata/Manifest @@ -1,3 +1,3 @@ DIST libiptcdata-1.0.5.tar.gz 593779 BLAKE2B 7e5226a289fed5c2f4b662efaa693a8b38e95ac34bc1365af05d1af649be876d3e5b58fecea4818255879bd7518aa482cb623540601fb3c8065acd428439a29c SHA512 64ef44b1e639890004f31d5d42844ba25ed558f0a118f1dad9bc3f4dcad2457e51b825a13df849659b0e15afc78f528f330b03be94cdf156bd95b62dc419494a -EBUILD libiptcdata-1.0.5-r1.ebuild 1622 BLAKE2B 0a9773eb10ddb5880c59933dfa8fd7e89804c94e284aa0258f60c967627361ebf7e4cb97ef477122cd39a4c24696c1ade6a230c4987fe05462553222501e041f SHA512 70a9668d945772196559242c003644ff0e8512d5ec32be2f152f3f6fd50a898b012479f30e3dfcb19c23ee9b2e082118ec21926a0a8d40894b25270ca6da0a73 +EBUILD libiptcdata-1.0.5-r1.ebuild 2045 BLAKE2B 42d8485c06e3178fed1e68490c0cc4693f1ef63bbfe96cbcd3b0924e74b0d38910c5fa71faca25f55a35894e3ce4114157fe395020d3347cdcd054ccb5376445 SHA512 aa9d5b54834f581e7582faa4dda461071a22ba40db1ad5d11876927b3b0f77c78261e24be0ae692a5e847dd273c3a4e4424a884a9d9341cfe8ac765ec3c4f83c MISC metadata.xml 948 BLAKE2B 2eb9fc81cf1795cfc57e9b89e5880a3f34b21937bc41e802ab09d3fd508ad9e9c67a6c621558e2cf56683a4641b8160a3cfac3ff6ea578ee12e7543f73e1d9e1 SHA512 8dbf6854415f937c99f88fd1c1159acbc94a40b992c8eeaf5edb855a7830d4d11ea8ae9929e2af3e3d11c8ce5c7163e723110fad5f15259d5a21b7451fbaa9ac diff --git a/media-libs/libiptcdata/libiptcdata-1.0.5-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.5-r1.ebuild index 6f51a051ba3e..d043c92b131f 100644 --- a/media-libs/libiptcdata/libiptcdata-1.0.5-r1.ebuild +++ b/media-libs/libiptcdata/libiptcdata-1.0.5-r1.ebuild @@ -41,6 +41,13 @@ src_prepare() { eautoreconf if use python; then cd python || die + # Bug #936589: compiling from inside the 'python' sub-directory + # might set that as the top source directory, and not ${S}, but + # "${S}/libiptcdata" is required to find headers and libraries. + # Symbolic linking "../libiptcdata" is a possible fix. Another + # way is adding in python/setup.py, under iptcdata's Extension, + # "include_dirs=['..']" and "library_dirs=['../libiptcdata']". + ln -s "../${PN}" . || die distutils-r1_src_prepare fi } diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index c199dd4c510b..bedc5f242f13 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -1,9 +1,8 @@ -AUX libjpeg-turbo-3.0.0-tests.patch 4077 BLAKE2B 437adbca7b2689508fbe8e025a1d30b706984e082167c855164bcb250829b9231a29df2117db0cb006f86e9ca9e29ece85707e2047f60483da40ef58c6d7d026 SHA512 c17c81ab4130bcb193ecc0754d00916d53ce6be9cdf6f04f6457c125951263c3a085d2baf440ec988feaf5fc45b593db59def096b3f988e9b704690394e2923e DIST libjpeg-turbo-2.1.5.1.tar.gz 2264936 BLAKE2B 9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff SHA512 86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6 -DIST libjpeg-turbo-3.0.0.tar.gz 2799663 BLAKE2B 9a4b74aad81c2999ab7f3cd7d8695e1132edda141f4cc8a57e671f42cad4ac16b66b0f19cf4b874b61a82c008287ad88cd81d85547c195ed30456e29cb505285 SHA512 2307a2e240faf5b3119cdc5cf6a0255813d74591d4a4201fd2374940683cb9de90cb5926367e633f3624b27edd292209c7cd3c38d64522716e83fc81361289b4 DIST libjpeg-turbo-3.0.3.tar.gz 2832827 BLAKE2B 9d141dadd0dce970bf857b51352c57a8e15180438abd7d6d66f9dfd24e23889add8c6c89120b84026e40ab61611516b0567984bd1db37e9c45b41917cf32e9a6 SHA512 7c3a6660e7a54527eaa40929f5cc3d519842ffb7e961c32630ae7232b71ecaa19e89dbf5600c61038f0c5db289b607c2316fe9b6b03d482d770bcac29288d129 +DIST libjpeg-turbo-3.0.4.tar.gz 2400356 BLAKE2B cf951582ce7cdf0dce39075bb1cc58f6a61fa0bdaca4874a4f06a03d2cd11775bc626c8d391d4fc76574d302a781ba47e5c90e2aa2d6a21a8b8d06712437e241 SHA512 04d37d65131f7ab8586507fe6520452e791e9b8d72a08cf52f81279450b4c6b8a5b49ff3e14e358d3c32cb5666b6d4576d1e16895af8213a1761464de5dc9d31 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 EBUILD libjpeg-turbo-2.1.5.1.ebuild 3143 BLAKE2B a2a52f599228482c18199be582ac774913ec7071a51a1c0c9817a37521493379fa80697d093046f169b2accc73b136ec3e5d07c94c0619d91300943077da41b4 SHA512 0bdfb6ff0eaf030243f17eb68cb53a12586efef9c24b91f3761ff7d2f0bf5b8d15151ba041d1fb392d9cb8f0a2ebd20639d0523757ac6a146b7c1653b2364e28 -EBUILD libjpeg-turbo-3.0.0.ebuild 3176 BLAKE2B 9068311e0a0d3b107bea23eaa0b541616d7b5a60bd3a1add16beeed27c5045472f24d2da04cbe027196d21c4e1193ddc623c795a191d55d85019bd0da4ae7e8c SHA512 7d301418522bb497fc4e41f0eeeeeee2fea5601bda5ea94403367879b87bb76f86a8fa8a61a47a6e4ed52cdbefc560365078dc166aaaa1e7a02521ff5d643168 -EBUILD libjpeg-turbo-3.0.3-r1.ebuild 3250 BLAKE2B 867d428562de2ce0bc6b24d93e31ddf28110efd95e2da4ebe2bca4b0c9ce018ad548bafa2adbf0c67ee61aa43179960412df40c3ea9a9b1c8acc557d58307cab SHA512 949fe473f815605b0dada2f2f0701406f9d50535b6d7f6eae1b6dc8fbe2b566fac45400988366749e48000c1426fe4eb876fff02700ea246592253aa7dea8a6c +EBUILD libjpeg-turbo-3.0.3-r1.ebuild 3243 BLAKE2B 5a98b29e31f1751e4eba39e7aea75b66a9d29878f9e80633242e1818d7ae280f2cd2c5224bec2928cdb939b03b9dfd8d2555258719fd3b554f76cefb995717e3 SHA512 d82b9c94d2c156ad1514e5deb38fd24edc914289a6caa0c86ce6b63970fbaa2f10ed4c60b3f5c2a1c7316997c0463f4a7f2e03819e4bceaca6c432510d749f6d +EBUILD libjpeg-turbo-3.0.4.ebuild 3250 BLAKE2B 867d428562de2ce0bc6b24d93e31ddf28110efd95e2da4ebe2bca4b0c9ce018ad548bafa2adbf0c67ee61aa43179960412df40c3ea9a9b1c8acc557d58307cab SHA512 949fe473f815605b0dada2f2f0701406f9d50535b6d7f6eae1b6dc8fbe2b566fac45400988366749e48000c1426fe4eb876fff02700ea246592253aa7dea8a6c MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1 diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch deleted file mode 100644 index 303223fdd6b3..000000000000 --- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch +++ /dev/null @@ -1,97 +0,0 @@ -https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705 -https://github.com/libjpeg-turbo/libjpeg-turbo/commit/035ea386d1b6a99a8a1e2ab57cc1fc903569136c - -From 035ea386d1b6a99a8a1e2ab57cc1fc903569136c Mon Sep 17 00:00:00 2001 -From: DRC <information@libjpeg-turbo.org> -Date: Thu, 6 Jul 2023 12:04:22 -0400 -Subject: [PATCH] Build: Fix regression test concurrency issues - -- The example-*bit-*-decompress test must run after the - example-*bit-*-compress test, since the latter generates - testout*-example.jpg. - -- Add -static to the filenames of all output files generated by the - "static" regression tests, to avoid conflicts with the "shared" - regression tests. - -- Add the PID to the filenames of all files generated by the tjunittest - packed-pixel image I/O tests. - -- Check the return value of MD5File() in tjunittest to avoid a segfault - if the file doesn't exist. (Prior to the fix described above, that - could occur if two instances of tjunittest ran concurrently from the - same directory with the same -bmp and -precision arguments.) - -Fixes #705 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1004,7 +1004,7 @@ foreach(libtype ${TEST_LIBTYPES}) - - if(sample_bits EQUAL 12) - set(tjbench tjbench12) -- set(testout testout12) -+ set(testout testout12${suffix}) - - set(MD5_PPM_GRAY_TILE 2f799249148b1a9d0e61fa4408f6c397) - set(MD5_PPM_420_8x8_TILE b25684e1af37be504ee3fd137757353f) -@@ -1024,7 +1024,7 @@ foreach(libtype ${TEST_LIBTYPES}) - set(MD5_PPM_444_TILE 2f571a032e4dbc8ef40f75219d336b0b) - else() - set(tjbench tjbench) -- set(testout testout) -+ set(testout testout${suffix}) - - set(MD5_PPM_GRAY_TILE 2c3b567086e6ca0c5e6d34ad8d6f6fe8) - set(MD5_PPM_420_8x8_TILE efca1bdf0226df01777137778cf986ec) -@@ -1160,7 +1160,7 @@ foreach(libtype ${TEST_LIBTYPES}) - set(cjpeg cjpeg12) - set(djpeg djpeg12) - set(jpegtran jpegtran12) -- set(testout testout12) -+ set(testout testout12${suffix}) - - set(TESTORIG testorig12.jpg) - set(MD5_JPEG_RGB_ISLOW 9d7369207c520d37f2c1cbfcb82b2964) -@@ -1222,7 +1222,7 @@ foreach(libtype ${TEST_LIBTYPES}) - set(cjpeg cjpeg) - set(djpeg djpeg) - set(jpegtran jpegtran) -- set(testout testout) -+ set(testout testout${suffix}) - - set(TESTORIG testorig.jpg) - set(MD5_JPEG_RGB_ISLOW 1d44a406f61da743b5fd31c0a9abdca3) -@@ -1632,6 +1632,8 @@ foreach(libtype ${TEST_LIBTYPES}) - add_test(example-${sample_bits}bit-${libtype}-decompress - ${CMAKE_CROSSCOMPILING_EMULATOR} example${suffix} decompress - ${EXAMPLE_12BIT_ARG} ${testout}-example.jpg ${testout}-example.ppm) -+ set_tests_properties(example-${sample_bits}bit-${libtype}-decompress -+ PROPERTIES DEPENDS example-${sample_bits}bit-${libtype}-compress) - add_test(example-${sample_bits}bit-${libtype}-decompress-cmp - ${CMAKE_CROSSCOMPILING_EMULATOR} ${MD5CMP} ${MD5_PPM_EXAMPLE_DECOMPRESS} - ${testout}-example.ppm) ---- a/tjunittest.c -+++ b/tjunittest.c -@@ -977,8 +977,8 @@ static int doBmpTest(const char *ext, int width, int align, int height, int pf, - THROW("Could not allocate memory"); - initBitmap(buf, width, pitch, height, pf, bottomUp); - -- SNPRINTF(filename, 80, "test_bmp%d_%s_%d_%s.%s", precision, pixFormatStr[pf], -- align, bottomUp ? "bu" : "td", ext); -+ SNPRINTF(filename, 80, "test_bmp%d_%s_%d_%s_%d.%s", precision, pixFormatStr[pf], -+ align, bottomUp ? "bu" : "td", getpid(), ext); - if (precision == 8) { - TRY_TJ(handle, tj3SaveImage8(handle, filename, (unsigned char *)buf, width, - pitch, height, pf)); -@@ -990,6 +990,10 @@ static int doBmpTest(const char *ext, int width, int align, int height, int pf, - width, pitch, height, pf)); - } - md5sum = MD5File(filename, md5buf); -+ if (!md5sum) { -+ printf("\n Could not determine MD5 sum of %s\n", filename); -+ retval = -1; goto bailout; -+ } - if (strcasecmp(md5sum, md5ref)) - THROW_MD5(filename, md5sum, md5ref); - - diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3-r1.ebuild index eaa93b62b48a..1819d640e226 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3-r1.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )" SLOT="0/0.2" if [[ $(ver_cut 3) -lt 90 ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" fi IUSE="cpu_flags_arm_neon java static-libs" diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.4.ebuild index c1b081629167..eaa93b62b48a 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.4.ebuild @@ -6,16 +6,16 @@ EAPI=8 inherit cmake-multilib java-pkg-opt-2 DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" -HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/" +HOMEPAGE="https://libjpeg-turbo.org/ https://github.com/libjpeg-turbo/libjpeg-turbo" SRC_URI=" - https://downloads.sourceforge.net/${PN}/${P}.tar.gz + https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${PV}/${P}.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz " -LICENSE="BSD IJG ZLIB" +LICENSE="BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )" SLOT="0/0.2" if [[ $(ver_cut 3) -lt 90 ]] ; then - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" fi IUSE="cpu_flags_arm_neon java static-libs" @@ -42,10 +42,6 @@ BDEPEND=" MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) -PATCHES=( - "${FILESDIR}"/${P}-tests.patch -) - src_prepare() { local FILE ln -snf ../debian/extra/*.c . || die @@ -64,6 +60,7 @@ src_prepare() { multilib_src_configure() { if multilib_is_native_abi && use java ; then + export JAVAFLAGS="$(java-pkg_javac-args)" export JAVACFLAGS="$(java-pkg_javac-args)" export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" fi diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index 0ff030e2176a..d735814e0996 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -1,15 +1,10 @@ -AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf692821028e16f97272f751176ef22126151e8edf18e2c7d9da88d9bc8334cd4737d36037a5a04eb7360a41fde39605db62942c52e62c SHA512 4f8cd6f2a70077b8e52b084a4c76f5a029e3e13e578d28bb2d9d3470ae89fa6867d541bacd079bd55b76eb17a1c2f3d845715fc0d4c9e2a199618d8a6871d1a1 -AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d -AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466 DIST libjxl-0.10.3.tar.gz 1912351 BLAKE2B 4432ecf34ac03d9ce8fc814835c7ee31fcc1e516b95e347dcb201a6996e1ffaadbd2e78a6a235ee1c4ff5121af495b8bc621e6738e2d03a8eb1639fb397e5246 SHA512 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4 DIST libjxl-0.11.0.tar.gz 1873614 BLAKE2B 60f038c35f921e1d6cfaab62ec92c15fa8b0bb9369724bdbaf25fb72559670de6f2e86bf1fb7d37158e1d046d46d20610b574e2288f86d4bae52fdc2c51e3b76 SHA512 a3648a5f046cae36b3272c46525d002d490f781f44647d4d8318f0b773dd9b7902582ced5636af3489f1d6a44e3baf8ad2e5ab47d26869d16b01607d90e14053 DIST libjxl-0.8.3.tar.gz 1612441 BLAKE2B d1c3b108c67d0a3a63ce50cdc7305b6853b182ec6c210d499e15120fbb858dada23997a4a0eb545f936e02230ed773506b066f24e19cce1f99aedaafd2bd7803 SHA512 f7fb4b2b0fd2459bec86918371369e80de59549c8dc24ff5c83546f564e54c81ea6a72720af151e3f9b64ef326f3ec8a5a6e0023b7fe2de14b056e501af579ef -DIST libjxl-0.9.3.tar.gz 1873236 BLAKE2B eb3811ef4fc64bb5df2e06b6b86cbc1b5dbe6eb9728e5ad5a8b791be57359eb63442722cdf629b006be518bf575409b93758d7ec0376a596de4405fb7686b7f2 SHA512 8aace2d8c0ece9db64a1620a10581ddc5a450543db64d44f864eaa5d3b8b3f0466c501fed5d58abdbf6eb5f90af25f6370c33718847bd070e851a02b560f541e DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384 EBUILD libjxl-0.10.3.ebuild 2934 BLAKE2B 9588ef46515e1f5103be1bdc7c68fb985abd57a8b306ca1662e4d24dafcfd2b055318a74758047388d34b24ee9b0fbd09101900d425723901ef5ab6a935a2d0c SHA512 c20972786f697752c3d4cc414409e29c5d67169f3f10bc6b719a1614d8ff7323d3c52b9bb3297d3300ede30b98ce525fb5cab9c36fcce9fb0e717e780a1ecb24 -EBUILD libjxl-0.11.0.ebuild 2939 BLAKE2B 34f7e780c1617fc617cc84740d41a95a6929ae4f80f53d45bd192a7b17ff8e79f22856671f24314a0857565d42700386082d219941d9b1dc8d973d9908d461a0 SHA512 b1f1774022ed70673b16d4d82ece9e7125aa57de8324d1d755b616f9ab1a75ae492cd22f2d74c8d5076c5b4f30510318a50af2dfb5832ee1fa643b2dbeab31ee +EBUILD libjxl-0.11.0.ebuild 2934 BLAKE2B 9588ef46515e1f5103be1bdc7c68fb985abd57a8b306ca1662e4d24dafcfd2b055318a74758047388d34b24ee9b0fbd09101900d425723901ef5ab6a935a2d0c SHA512 c20972786f697752c3d4cc414409e29c5d67169f3f10bc6b719a1614d8ff7323d3c52b9bb3297d3300ede30b98ce525fb5cab9c36fcce9fb0e717e780a1ecb24 EBUILD libjxl-0.8.3.ebuild 2560 BLAKE2B d08dfc2ad15d2b1a8bd72dc392d297d4a45411b582616c30f3ee8ab5611281b9873c9839e0e7d953fef2598300cd97e8bfad98197355176964a2a73ab88c7f88 SHA512 1f248077a8e03b0aa94afc75fd9ce28007d04e6237a0d3fa92e14faa6acd764f98e45282657bedd73e16fec3f343f979df352a428c6bc9c4683a39f570ab151a -EBUILD libjxl-0.9.3.ebuild 2996 BLAKE2B a6aef6912df3ec3ddca870b15296b3ae356a1617b6b7cf26a5525108d6aaeee10793d99d84f058b27ea59b0c7c0283fc4ead75780b7db60af674ad4722bdbcb8 SHA512 6bfa8dd8c1add61bfe13c3793713e98bfc5bf8f2ed43c3289424357e8a16a7475ca3081694fa5c6ca279594fd353a2561aabb46ffb2336eb7b10cdca2c7717f2 EBUILD libjxl-9999.ebuild 2608 BLAKE2B e4247be931c67d10fa9e200bc113731a940678547be3743a282087dc09b1afe1bee0063ec0d090f60c3860d4542d210f50fdc762263f2609f6fedcb10df058f3 SHA512 63b91932054fd351b091daa652b0f000ad7675e48cb489e4b52da4d99991066dc501d8814b02c2b005e5211f032fe7f6dee1b53944fc239b7bbadd46ee143339 MISC metadata.xml 1029 BLAKE2B 4c5ef3d7aca316b497d964b1afcee9f71b165545691182c3818ef4f9a8bc7f10fdbed36a8bd58b0051b1f9851018a11efa3e9f7b57c5ec935435e16bd26b6036 SHA512 a3129f77efc640e78a2f1fa481fb6363249be74e74aabccb51970ec101808db95a326deeecfa557b669cfb2bf26622fc7dbcbe7624a0315d770e697bc3734296 diff --git a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch deleted file mode 100644 index 43448a01c473..000000000000 --- a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://bugs.gentoo.org/908939 -https://github.com/libjxl/libjxl/issues/2433 -https://github.com/libjxl/libjxl/pull/2596 - -From 6a5cd1ff847e7b18ba8b87fcc11ada17dccb0692 Mon Sep 17 00:00:00 2001 -From: Sami Boukortt <sboukortt@google.com> -Date: Thu, 22 Jun 2023 12:26:25 +0200 -Subject: [PATCH] Make sure to read the rendering intent before the CICP tag - -The code that reads the CICP tag exits the function if it succeeds, but -it should not skip reading the rendering intent, so make sure to have -already done it by that point. ---- - lib/jxl/enc_color_management.cc | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/lib/jxl/enc_color_management.cc b/lib/jxl/enc_color_management.cc -index 752e3e02c0..2b519d152e 100644 ---- a/lib/jxl/enc_color_management.cc -+++ b/lib/jxl/enc_color_management.cc -@@ -982,6 +982,14 @@ Status ColorEncoding::SetFieldsFromICC() { - Profile profile; - JXL_RETURN_IF_ERROR(DecodeProfile(context, icc_, &profile)); - -+ const cmsUInt32Number rendering_intent32 = -+ cmsGetHeaderRenderingIntent(profile.get()); -+ if (rendering_intent32 > 3) { -+ return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32); -+ } -+ // ICC and RenderingIntent have the same values (0..3). -+ rendering_intent = static_cast<RenderingIntent>(rendering_intent32); -+ - static constexpr size_t kCICPSize = 12; - static constexpr auto kCICPSignature = - static_cast<cmsTagSignature>(0x63696370); -@@ -993,14 +1001,6 @@ Status ColorEncoding::SetFieldsFromICC() { - return true; - } - -- const cmsUInt32Number rendering_intent32 = -- cmsGetHeaderRenderingIntent(profile.get()); -- if (rendering_intent32 > 3) { -- return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32); -- } -- // ICC and RenderingIntent have the same values (0..3). -- rendering_intent = static_cast<RenderingIntent>(rendering_intent32); -- - SetColorSpace(ColorSpaceFromProfile(profile)); - if (cmsGetColorSpace(profile.get()) == cmsSigCmykData) { - cmyk_ = true; diff --git a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch deleted file mode 100644 index af9345867473..000000000000 --- a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://bugs.gentoo.org/908939 -https://github.com/libjxl/libjxl/issues/2433 -https://github.com/libjxl/libjxl/pull/2617 - -From d9637bd803bf9fadc00aa01cea7becfff1e00e1f Mon Sep 17 00:00:00 2001 -From: Sami Boukortt <sboukortt@google.com> -Date: Mon, 26 Jun 2023 15:06:17 +0200 -Subject: [PATCH] Fix decode_test with lcms2 - -Co-authored-by: Zoltan Szabadka <szabadka@google.com> -Co-authored-by: Luca Versari <veluca@google.com> ---- - lib/jxl/decode_test.cc | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/lib/jxl/decode_test.cc b/lib/jxl/decode_test.cc -index 44ead99ec6..bbb7bda39c 100644 ---- a/lib/jxl/decode_test.cc -+++ b/lib/jxl/decode_test.cc -@@ -3734,13 +3734,18 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data, - jxl::Span<const uint8_t>(codestream.data(), codestream.size())); - ASSERT_EQ(br.ReadFixedBits<16>(), 0x0AFF); - jxl::CodecMetadata metadata; -- EXPECT_TRUE(ReadSizeHeader(&br, &metadata.size)); -- EXPECT_TRUE(ReadImageMetadata(&br, &metadata.m)); -+ ASSERT_TRUE(ReadSizeHeader(&br, &metadata.size)); -+ ASSERT_TRUE(ReadImageMetadata(&br, &metadata.m)); - streampos->basic_info = - add_offset(br.TotalBitsConsumed() / jxl::kBitsPerByte); - metadata.transform_data.nonserialized_xyb_encoded = metadata.m.xyb_encoded; -- EXPECT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data)); -- EXPECT_TRUE(br.JumpToByteBoundary()); -+ ASSERT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data)); -+ if (metadata.m.color_encoding.WantICC()) { -+ jxl::PaddedBytes icc; -+ ASSERT_TRUE(jxl::ReadICC(&br, &icc)); -+ ASSERT_TRUE(metadata.m.color_encoding.SetICCRaw(std::move(icc))); -+ } -+ ASSERT_TRUE(br.JumpToByteBoundary()); - bool has_preview = metadata.m.have_preview; - while (br.TotalBitsConsumed() < br.TotalBytes() * jxl::kBitsPerByte) { - FramePositions p; -@@ -3750,7 +3755,7 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data, - frame_header.nonserialized_is_preview = true; - has_preview = false; - } -- EXPECT_TRUE(ReadFrameHeader(&br, &frame_header)); -+ ASSERT_TRUE(ReadFrameHeader(&br, &frame_header)); - p.header_end = - add_offset(jxl::DivCeil(br.TotalBitsConsumed(), jxl::kBitsPerByte)); - jxl::FrameDimensions frame_dim = frame_header.ToFrameDimensions(); -@@ -3760,7 +3765,7 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data, - frame_header.passes.num_passes, /*has_ac_global=*/true); - std::vector<uint64_t> section_offsets; - std::vector<uint32_t> section_sizes; -- EXPECT_TRUE(ReadGroupOffsets(toc_entries, &br, §ion_offsets, -+ ASSERT_TRUE(ReadGroupOffsets(toc_entries, &br, §ion_offsets, - §ion_sizes, &groups_total_size)); - EXPECT_EQ(br.TotalBitsConsumed() % jxl::kBitsPerByte, 0); - size_t sections_start = br.TotalBitsConsumed() / jxl::kBitsPerByte; diff --git a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch b/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch deleted file mode 100644 index 06c1498f3fea..000000000000 --- a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0bfdf5c5429dbb866142bd75e4877794dc723b25 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com> -Date: Mon, 15 Jan 2024 17:18:33 +0100 -Subject: [PATCH] plugins: use JPEGXL_TEST_DATA_PATH instead of hard-coded - path. - ---- - plugins/gdk-pixbuf/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/gdk-pixbuf/CMakeLists.txt b/plugins/gdk-pixbuf/CMakeLists.txt -index 7b53b98c665..12c1a83753e 100644 ---- a/plugins/gdk-pixbuf/CMakeLists.txt -+++ b/plugins/gdk-pixbuf/CMakeLists.txt -@@ -74,7 +74,7 @@ if(BUILD_TESTING AND NOT CMAKE_CROSSCOMPILING) - COMMAND - ${XVFB_PROGRAM_PREFIX} $<TARGET_FILE:pixbufloader_test> - "${CMAKE_CURRENT_SOURCE_DIR}/loaders_test.cache" -- "${CMAKE_SOURCE_DIR}/testdata/jxl/blending/cropped_traffic_light.jxl" -+ "${JPEGXL_TEST_DATA_PATH}/jxl/blending/cropped_traffic_light.jxl" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - set_tests_properties(pixbufloader_test_jxl PROPERTIES SKIP_RETURN_CODE 254) diff --git a/media-libs/libjxl/libjxl-0.11.0.ebuild b/media-libs/libjxl/libjxl-0.11.0.ebuild index 3c160e17d651..28d788eb5bc6 100644 --- a/media-libs/libjxl/libjxl-0.11.0.ebuild +++ b/media-libs/libjxl/libjxl-0.11.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc x86" IUSE="+gdk-pixbuf gif jpeg openexr +png test" REQUIRED_USE="test? ( png )" RESTRICT="!test? ( test )" diff --git a/media-libs/libjxl/libjxl-0.9.3.ebuild b/media-libs/libjxl/libjxl-0.9.3.ebuild deleted file mode 100644 index d2a844f6cf81..000000000000 --- a/media-libs/libjxl/libjxl-0.9.3.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib gnome2-utils - -# This changes frequently. Please check the testdata submodule when bumping. -TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc" -DESCRIPTION="JPEG XL image format reference implementation" -HOMEPAGE="https://github.com/libjxl/libjxl/" -SRC_URI=" - https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - test? ( - https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz - -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz - ) -" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc x86" -IUSE="+gdk-pixbuf gif jpeg openexr +png test" -REQUIRED_USE="test? ( png )" -RESTRICT="!test? ( test )" - -DEPEND=" - app-arch/brotli:=[${MULTILIB_USEDEP}] - >=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}] - >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] - gdk-pixbuf? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - ) - gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - openexr? ( media-libs/openexr:= ) - png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${DEPEND} - >=x11-misc/shared-mime-info-2.2 -" -DEPEND+=" - test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.1-backport-pr3143.patch" -) - -multilib_src_configure() { - local mycmakeargs=( - -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_COVERAGE=OFF - -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_WARNINGS_AS_ERRORS=OFF - - -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) - -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) - - -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_ENABLE_VIEWERS=OFF - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON - -DJPEGXL_FORCE_SYSTEM_GTEST=ON - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON - -DJPEGXL_ENABLE_DOXYGEN=OFF - -DJPEGXL_ENABLE_MANPAGES=OFF - -DJPEGXL_ENABLE_JNI=OFF - -DJPEGXL_ENABLE_JPEGLI=OFF - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF - -DJPEGXL_ENABLE_TCMALLOC=OFF - -DJPEGXL_ENABLE_EXAMPLES=OFF - -DBUILD_TESTING=$(usex test ON OFF) - ) - - if use test; then - mycmakeargs+=( - -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" - ) - fi - - if multilib_is_native_abi; then - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=ON - -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) - -DJPEGXL_ENABLE_PLUGINS=ON - -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) - -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF - -DJPEGXL_ENABLE_PLUGIN_MIME=OFF - ) - else - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=OFF - -DJPEGXL_ENABLE_OPENEXR=OFF - -DJPEGXL_ENABLE_PLUGINS=OFF - ) - fi - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install - - find "${ED}" -name '*.a' -delete || die -} - -pkg_postinst() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest index 69317ec33c6d..66d87d8755f3 100644 --- a/media-libs/libopenmpt/Manifest +++ b/media-libs/libopenmpt/Manifest @@ -1,7 +1,7 @@ DIST libopenmpt-0.6.6+release.autotools.tar.gz 1554516 BLAKE2B 21e2fc4252431235608a52d3a321e26eae5d45f2328ff3e3604d84c537d72e07d72346c504901b000af04dfc52b1dd91c79f576be4331ea8685e534a174b61cd SHA512 b634c556f13dc51d1008f4216936a9b7cab25a6fb0d5218da0b692ec848de21905ed1981223ac9ecdebea9ce6c5376e91ff92e1655dd0be491fce0114e3230bf -DIST libopenmpt-0.7.7+release.autotools.tar.gz 1660204 BLAKE2B 4b6ee75036c97ac2dce7e66776b36df09847db2c482cb22b052569385c06eb954d1cfae5cb00d415a6b18fd11663b2af43c94361dc9c0c84595c0d530e2bb355 SHA512 88d68bd32e696c01c070abd7156645c2969d389d6fb660f4f45d9e5e16ff9c25c3084d30cef208578080ee8a2da5c6045e5b1d93db7e2c456d42b91daaa02199 +DIST libopenmpt-0.7.10+release.autotools.tar.gz 1671289 BLAKE2B 62bd4a1bcd9685fdb92c270687b71609a23986941e301ad17cc37ca5f6b5b76fa1a8f425b2e68603bb29bfa34c3c1caea98faea1d95004f87943b2bed6b7c9a0 SHA512 e5f02b045bc1449791ec43a32216c4c4231edff88b3bda07283c9768118bce3a1f50c2535dbe38a21eb12016294e3b5823ef2f32f2f1e21d40fafe188bad783d DIST libopenmpt-0.7.9+release.autotools.tar.gz 1669833 BLAKE2B 9ba6af6df794583748336cc977b20d7bdb3f8d75e32d32a420c5e137511352ea5ec41b31beb7b0df78376dcb0e3a8160a1c527b6f4575b61b945a9f93252fe84 SHA512 e0928d3dc439c3ed7296b97dc8b8e255db22bfd91fd3bc73d0bdca8262a5cb26dff0ba89e508a4443ebe34c34fc880b202a758a11fde31b75e1ebd5725819414 EBUILD libopenmpt-0.6.6.ebuild 1560 BLAKE2B 649dbcde7c2bc9aabf1b50f6d7e232e1173f6669e9b73afb34b9cf6273783f52193dda79aa52d54fc0e502fe3a978bbba79bf04c631d2141b91c8d456e8ec4ac SHA512 35cea07a2a46d8f316455e5115e6388b601bb5fe8218a4460e4b523e4401b8b771d2d1149fbb5f97462bd8361ea842034040d80a40ed91166056f24273288bb0 -EBUILD libopenmpt-0.7.7.ebuild 1565 BLAKE2B bf355c4e8df835d7e1c575b2159b71841167042547a51405eff6b8eafe0e9d1a40a1d53684800769bd35744230bfc62d19bcebff4943c77cee60bc75513ee86b SHA512 59e0ac9f28dbf891e6bb02971682fa669af730f7e99c5ccb6d3b357f6fb4d08e33bbed1ac466c18990685ad15edce9b083027eda2b49efb4b49562598886da24 +EBUILD libopenmpt-0.7.10.ebuild 1565 BLAKE2B bf355c4e8df835d7e1c575b2159b71841167042547a51405eff6b8eafe0e9d1a40a1d53684800769bd35744230bfc62d19bcebff4943c77cee60bc75513ee86b SHA512 59e0ac9f28dbf891e6bb02971682fa669af730f7e99c5ccb6d3b357f6fb4d08e33bbed1ac466c18990685ad15edce9b083027eda2b49efb4b49562598886da24 EBUILD libopenmpt-0.7.9.ebuild 1565 BLAKE2B bf355c4e8df835d7e1c575b2159b71841167042547a51405eff6b8eafe0e9d1a40a1d53684800769bd35744230bfc62d19bcebff4943c77cee60bc75513ee86b SHA512 59e0ac9f28dbf891e6bb02971682fa669af730f7e99c5ccb6d3b357f6fb4d08e33bbed1ac466c18990685ad15edce9b083027eda2b49efb4b49562598886da24 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181 diff --git a/media-libs/libopenmpt/libopenmpt-0.7.7.ebuild b/media-libs/libopenmpt/libopenmpt-0.7.10.ebuild index 03b0016c8652..03b0016c8652 100644 --- a/media-libs/libopenmpt/libopenmpt-0.7.7.ebuild +++ b/media-libs/libopenmpt/libopenmpt-0.7.10.ebuild diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest index 05d238fd9d4f..7f856fcbcf79 100644 --- a/media-libs/libopenraw/Manifest +++ b/media-libs/libopenraw/Manifest @@ -1,39 +1,4 @@ AUX libopenraw-0.3.7-slibtool.patch 605 BLAKE2B 0369ca04439c0b69548079dc6ce69fd562bb3bcdb15ec2f76eafb76260846af16bbd33c60aed89967b1bd29b4cccd6ec7985b101b7af43c8dc0160569404c385 SHA512 7ee3505a2690777218b558b1016d19e00d63153cfa4a2fdb125327fb0a1f59224703b0af16329936e08e7fca65e615a840cd61e4d24f246dc89d329e1b0c5593 -DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68 -DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00 -DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 -DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3 -DIST bitreader-0.3.2.crate 10778 BLAKE2B ba442703e2cfaf0c1b30ad80263ead5e34066df8a2575dfa81fde0f989a498d1bebaa623c74e48bf1a89140498b4cff9ee231c85239b8c146e9dc5fb8de608ea SHA512 2feb9fff54b91c042c988e3b46d587ad1c2433aba07336208f4d4075d8764ed6d1f8fb6c048276eadabb6c1426fa3a6e56cf2bfecfaa8563084bfa4f5e56763d -DIST byteorder-1.2.2.crate 18909 BLAKE2B 69b23142053a738768028a9b28935461d5f12e1ac8849e30a007e7f223efe81004c4815ba13b92fa9e23867d32867810d889586f4d70bd5bac3280dfa5a6eb51 SHA512 b3b0aa23f0d6a5023fbc8571e73cb7aabd8148f9dcba8da9aad49cabf97dabbbb3a05764cd3604edbd00ecb56ee0695cd30a67d9d51264539169e400d7bbc478 -DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 -DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049 -DIST fallible_collections-0.4.4.crate 48989 BLAKE2B 2d1805b5095f607048ef30341cb00bd50539b03920b84ffef75d1ce13decf730889c84617c5d7866403c6a8d121e5076ada9d13eb0d18b7b29be6d8ce7440d2e SHA512 1d91ee35dac5de7d80a57c30342f60cc99b5e5109a93c4b86d97eef99d96855282ad1756c3d65f9a275c0ee6e596d1eb589bd9f3c53135f3b4dbcea57cce1424 -DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1 -DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c -DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b -DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c -DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44 -DIST libopenraw-0.1.3.tar.xz 452020 BLAKE2B 7779039046eaaeff437d81a6504a2082ef88d6b44185a99469dad7df4f8eff9ba3f4f168ef0b630923f3f210930e26c454ac318c7278b676d39210e6c3eeb2a2 SHA512 54f0b151f572086ed2551d05f2700cb2a4e3aeea26a26fe49f137cd0819411c289944f07626a643a902196fd9ff7c8daf8987b0ba821f6045554aeda3854bde2 -DIST libopenraw-0.3.3.tar.xz 570284 BLAKE2B 3c0902e4d525aab919e8856041c563c4a56a58db70771b24d3c12bc9db268bb0a7a32a9a64604dcf6d1719c632663bea8e1d9c94c160ba3468466f333598ab93 SHA512 8c4894a0119c7f58fe965002b69cb2caa0c5b9d2e3656dddc0da0c07674290b155d50338a3f4b62e4faccaa908028ecf4c26a80b8a95d51638bf4bd7bec6c9e1 -DIST libopenraw-0.3.6.tar.xz 2536224 BLAKE2B 675e31773db55d00843779f7e42b11f51b2060e6a9cc30e70b0cc34da6821241616e9e6f2f4f9d441464760643ef124e857b732ba3752ecae40b69753ca4911b SHA512 be6de3b264145297801513bccc49f18684242db71fcbdbc288132b05b805d9c0e1f194db3baab3f233ca3ca98df865bcc4f0b41812afbd5b3957843026293536 DIST libopenraw-0.3.7.tar.xz 2536380 BLAKE2B 22aacfb085c59fa4b763abc3454839812327d1b6506b2e531783b0529ca3a5e24605a010e6c510d942741d4f0afc208ca626bdef1a93ad42fbf0f5c1e347f5cb SHA512 0781e9377100e954f8a7f020da537ec2af033b23341a7944fc346a973fecb463ed29b375275ae8b4bd6f40721ee4f12480729df80337d57cac30627e084594d1 -DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 -DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa -DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8 -DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093 -DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f -DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634 -DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee -DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a -DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 -DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f -DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 -DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd -DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -EBUILD libopenraw-0.1.3.ebuild 979 BLAKE2B 3f10ed9e814efb4c2a1def276cb2120f05c7db324fda8a05992a25b08b1c9785ffe29ca0c818979112a1665668f5d2a1dd35343b23c930f86a030cd8bc8af199 SHA512 516ddac3199e5a57387c08dc2b42faebf25f58bc19f3a4951dfb55b95f381e14bcc9c1d1780084485ceb33dc402e8d85ce3408b13dcd5c9c7b38cbe6ab83a855 -EBUILD libopenraw-0.3.3.ebuild 1694 BLAKE2B dc43a94dd64d896f4ebfdd04e4945c0400b51dfa307252d693332f4532a3f24c319b8f292d430a708bfc5489fc7cbfed7ef6fd4aa244fe7e786df279e312cecd SHA512 6ab151224863c7089e185f0d60e7ec3e25823dcb6edce79aff293f3468617b3a8c18f25f79ee976466252cdfbbd6a9a3b1e3522494d4e9b1de6f2a6b77b0fe65 -EBUILD libopenraw-0.3.6.ebuild 1180 BLAKE2B ed9db5aa48db8b021d819757185d2eb12484d625164669ad828747d4366de33a1727a54018b2a5dbb0ad1a2300ec36d267bc7efba27f0eb1e079bdbeaa25bd15 SHA512 1ad5d05934499a757ab52ae4100e297475de68bc4ac1cdec6173d3cba6cb33ceb13e884cdf0e5bc4a7eacfa8d521a3930b331a1cdc7d42a6dc42108999854377 -EBUILD libopenraw-0.3.7.ebuild 1301 BLAKE2B bfd7ca97de5f37e0f9c9ac43ca0eec1182128dab658d7aaf0949fbb2baf3c6907d1bb6c199365ec29218a2ce481e9618b56f388f65993feb5986963bf74a572f SHA512 bc83004f78f2a5ab961dc1943adb6b427701d640467fe3ddb608decbfb11b605aaddbafa7fb648305417c36787b85f76fc3249f63cf5fdce703a6542086b182e +EBUILD libopenraw-0.3.7.ebuild 1294 BLAKE2B 2475135c9c6f47dd0901546acccc9290541ab25bf83c5dac29163e47e3216904e5849feb16a40ec7b6310e3f3bf3a1822a857b209e0afabd1c290e4d585d3b2d SHA512 92c7b1c4dffefca22431cf92a0abb9c81f8c976fb475f394b1cb3b61aeb361f6e64a0a217a7b7d71fdce438458e67656fe0bf6e4c545a13bb30fdd6e6a770972 MISC metadata.xml 327 BLAKE2B 535d53760f8b1440558a02aecb8ab27244d3583ded3843a38a8d418ae8a8a55859c08901a6fae91f8d63e7848a173e3e40b7ff168a0f86c710e53bcbe87f4161 SHA512 26f6a6a430380b878feabd5a692aed4cf6994701e935fda0f986b0b071702846389f8ada8f0c666f35a5107484879d7dce9f81b866081b0b06a1df1d02125cdb diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild deleted file mode 100644 index 467e59fcf3e7..000000000000 --- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome2-utils - -DESCRIPTION="RAW image formats decoding library" -HOMEPAGE="https://libopenraw.freedesktop.org/" -SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.xz" - -LICENSE="GPL-3 LGPL-3" -SLOT="0/7" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="gtk test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libxml2 - virtual/jpeg:0 - gtk? ( - dev-libs/glib:2 - >=x11-libs/gdk-pixbuf-2.24.0:2 - ) -" -DEPEND="${RDEPEND} - dev-libs/boost -" -BDEPEND=" - virtual/pkgconfig - test? ( net-misc/curl ) -" - -src_configure() { - econf \ - --with-boost="${EPREFIX}"/usr \ - --disable-static \ - $(use_enable gtk gnome) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - use gtk && gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gtk && gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libopenraw/libopenraw-0.3.3.ebuild b/media-libs/libopenraw/libopenraw-0.3.3.ebuild deleted file mode 100644 index 68753f784fc6..000000000000 --- a/media-libs/libopenraw/libopenraw-0.3.3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Run cargo-build or cargo fetch in lib/mp4 to get this list -CRATES=" -ahash-0.7.6 -aho-corasick-0.7.18 -atty-0.2.14 -autocfg-1.0.0 -bitreader-0.3.2 -byteorder-1.2.2 -cfg-if-0.1.10 -cfg-if-1.0.0 -env_logger-0.8.4 -fallible_collections-0.4.4 -getrandom-0.2.7 -hashbrown-0.11.2 -hermit-abi-0.1.8 -humantime-2.1.0 -libc-0.2.126 -log-0.4.17 -memchr-2.5.0 -num-traits-0.2.15 -once_cell-1.12.0 -regex-1.5.6 -regex-syntax-0.6.26 -static_assertions-1.1.0 -termcolor-1.1.3 -version_check-0.9.4 -wasi-0.11.0+wasi-snapshot-preview1 -winapi-0.3.8 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -" - -inherit cargo gnome2-utils - -DESCRIPTION="RAW image formats decoding library" -HOMEPAGE="https://libopenraw.freedesktop.org/" -SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.xz" -SRC_URI+=" $(cargo_crate_uris)" - -LICENSE="GPL-3 LGPL-3" -SLOT="0/9" -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="gtk test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libxml2 - media-libs/libjpeg-turbo:= - gtk? ( - dev-libs/glib:2 - >=x11-libs/gdk-pixbuf-2.24.0:2 - ) -" -DEPEND=" - ${RDEPEND} - dev-libs/boost -" -BDEPEND=" - virtual/pkgconfig - test? ( net-misc/curl ) -" - -src_configure() { - econf \ - --with-boost="${EPREFIX}"/usr \ - $(use_enable gtk gnome) -} - -src_compile() { - # Avoid cargo_src_compile - default -} - -src_test() { - # Avoid cargo_src_test - default -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - use gtk && gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gtk && gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libopenraw/libopenraw-0.3.6.ebuild b/media-libs/libopenraw/libopenraw-0.3.6.ebuild deleted file mode 100644 index 47b0d0c24b6d..000000000000 --- a/media-libs/libopenraw/libopenraw-0.3.6.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" " -inherit cargo gnome2-utils - -DESCRIPTION="RAW image formats decoding library" -HOMEPAGE="https://libopenraw.freedesktop.org/" -SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.xz" - -# MPL-2.0 for mp4parse (https://gitlab.freedesktop.org/libopenraw/libopenraw/-/issues/15) -LICENSE="GPL-3 LGPL-3 MPL-2.0" -SLOT="0/9" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="gtk test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libxml2 - media-libs/libjpeg-turbo:= - gtk? ( - dev-libs/glib:2 - >=x11-libs/gdk-pixbuf-2.24.0:2 - ) -" -DEPEND=" - ${RDEPEND} - dev-libs/boost -" -BDEPEND=" - virtual/pkgconfig - test? ( net-misc/curl ) -" - -src_configure() { - econf \ - --with-boost="${EPREFIX}"/usr \ - $(use_enable gtk gnome) -} - -src_compile() { - # Avoid cargo_src_compile - default -} - -src_test() { - # Avoid cargo_src_test - default -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - use gtk && gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gtk && gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libopenraw/libopenraw-0.3.7.ebuild b/media-libs/libopenraw/libopenraw-0.3.7.ebuild index f31d6215774d..cbe9f9abf592 100644 --- a/media-libs/libopenraw/libopenraw-0.3.7.ebuild +++ b/media-libs/libopenraw/libopenraw-0.3.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.xz" # MPL-2.0 for mp4parse (https://gitlab.freedesktop.org/libopenraw/libopenraw/-/issues/15) LICENSE="GPL-3 LGPL-3 MPL-2.0" SLOT="0/9" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="gtk test" RESTRICT="!test? ( test )" diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest index 01648d1e8005..a02e04d0725f 100644 --- a/media-libs/libplacebo/Manifest +++ b/media-libs/libplacebo/Manifest @@ -1,8 +1,9 @@ AUX libplacebo-5.229.1-llvm-libunwind.patch 418 BLAKE2B 0042bc6404de57fbbb814ebc91bb51ee5a6bb279a960af81bd2bc71b9eb092c0ee183e31614a892d26508516dd550837a6d5c8038512e8f8e899cddf1236f600 SHA512 b6a40675f0ea5b6e36fb47b56e08dc1ec7425ff8193dfd92aeccd3830da91b77410b9f5792b233b630bdd7422993d6d0f22b82761e29d17336357bb47c89bc48 AUX libplacebo-5.229.1-python-executable.patch 699 BLAKE2B 5c3f1afb2e8a8992bd411cd73e600254e76722788049a9c1eb44a5677f19214f3066685a16d30e679f38ddbb929f60721d38cfb679d3d803d46585153f3ef2ba SHA512 0f7e169fcb261a3229c24c6cc4a2bdc59a68c3dd97327f5b34495b801c43f4ae34d4f48f9456c07b1e444b4b74f06796534fbe450fa421fe6cf260842928ec1e +AUX libplacebo-7.349.0-glslang-1.3.296.patch 506 BLAKE2B 42db4aa183b53599605840c3ea1b8920b4b7d7f2593226664cbcdb7f2939d82c02e86c8d33d9107555166fc68d9f94122bb35ea0f8c49c8a3fdca1cf6e352986 SHA512 16c2cbd9517905be4b1ed5de31473aa247f06a73577b08af2d046dbdc57a4d01f11020d5b3bb386e12352254df702292dddf46153014d798e2cdb0c47f907982 DIST fast_float-5.2.0.tar.gz 84800 BLAKE2B 39133eda20acd5f1f049e8040815a67aee588ab93be4953bde3b9227fb691e099581ef79b12b740437b78a9b4c9007762b44d9726ca07505ad5cb51394d8e3fd SHA512 c703c7cba3c69775317c66a62ce145646fd7d3d063124501e3d6a7deebb8c62c14a2ccdffed18de2d73d9d3a8ba2061ef1d34cc780ee0b6d607935d5f1b1de81 DIST libplacebo-glad-2.0.4.tar.gz 599932 BLAKE2B 788d2b70222fd09eea02515bdf3cbc147540631bf35fe39f12aa21fdbabf3d229f4234a430217dfaf3363934b8be12dd6a19871049a7b117deb8260ec69f8c67 SHA512 328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7 DIST libplacebo-v7.349.0.tar.bz2 701309 BLAKE2B 6d0b546776c0326ab8305e7e12341b13e560e1ef53600913ece82341c762cdd466fd2d172781c769e59a57058769d5c0e48ca408ba0c2c7f936459bba6fb4212 SHA512 2e8cec7928aaafaaf9825cbacfb4758024ff04e40b98061fc6f178225647c90344e5aad23b02d82483062dbccf966a7d0178075151cefc6abaef1890f2b0c128 -EBUILD libplacebo-7.349.0.ebuild 3371 BLAKE2B f84a8328836f14c5aaf4a1afa7cc1a32a062e90436f48b43213437e5015f5c3fc4d9d082d62fae3cb7f6286ac6c1622938d2d16f60aca2b215c9f8220404f45c SHA512 031e0452b3851dc51df1e58f2cb8c98cc4103bc25e1f2394a15bc912fc1aa53363775f3fe999d5ccd5df24186468293d4886159ad8d4832ec8280ca3b9071c75 -EBUILD libplacebo-9999.ebuild 3376 BLAKE2B 85147a110104e6eb7f64124593727debe32601b8a2b332ee245285613ef998251de0b14e2bb980b011c59c9c5576ed752f154c0c1934bedb850ee34381081c2f SHA512 56f6898e8bce6c7fee264e3632e6dca609730eab51ed0ca2a6089520729741664765e81ad35fc999994d6b6a86fcddbf238d965864348a7c49e30cf6811432c5 +EBUILD libplacebo-7.349.0.ebuild 3422 BLAKE2B 72d17b3aa2b2a18eacfcbfebdef8dc008c06daafb3697af4e07643f1a335d462d3a2f8e4d2d47012ae6ecb7bcafc22ed0fd280dc636fadd0c03233f1a241765c SHA512 3454a2d4566d2767561140c16f81b0f4ef4b3859b0f34abde6614317ef59b9f6de8ad62d0f407b3b61cefe7a3bda7228d60c1b45c1a5b46569bb1d2cd750e2bb +EBUILD libplacebo-9999.ebuild 3427 BLAKE2B 00512ed5649f77d3544f0a9a12f0ef777d48da36d9d00cc612589d9a90748df20102cad4a451de7e3894705ee162b320be14a33b6f2d25bce8f5b5d0db7b514c SHA512 ee4f0e8359449c94821484084d9b69e9c055abbd42a8bbddfa4698799caa2d2e5b6beafe37f111fc5162636b24c20ebfbaa54cfb533e958130038a8466c6ad9c MISC metadata.xml 794 BLAKE2B 7611ec1c500c2aeff415b9bda5b7a8f64df1e005972902eacc6fe25f84c8c68089041c0015e6ee82062eab9ae0127f502068a116ac01b6f9bbf4269ff8bf1987 SHA512 a8173a71e13137f432bef3b490b05c2e2899a935ed33259b21c488976deb78a860d09a81c8778e23f0b5eb42d02bcfe8a1867da98f4f29713864c21d463c0667 diff --git a/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch b/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch new file mode 100644 index 000000000000..81af061634b5 --- /dev/null +++ b/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch @@ -0,0 +1,16 @@ +Quick workaround for libSPIRV seemingly having became a stub in glslang-1.3.296 + +https://bugs.gentoo.org/941968 + +TODO?: rather than worry with the constant issues with glslang, should likely +always force shaderc -- it's also what upstream prefers by default and so the +glslang paths are hardly tested. +--- a/src/glsl/meson.build ++++ b/src/glsl/meson.build +@@ -39,4 +39,5 @@ + + glslang_deps += spirv ++ glslang_deps += cxx.find_library('glslang', required: required, static: static) + + if static + diff --git a/media-libs/libplacebo/libplacebo-7.349.0.ebuild b/media-libs/libplacebo/libplacebo-7.349.0.ebuild index 9d16436f4759..7899dff069c5 100644 --- a/media-libs/libplacebo/libplacebo-7.349.0.ebuild +++ b/media-libs/libplacebo/libplacebo-7.349.0.ebuild @@ -71,6 +71,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch "${FILESDIR}"/${PN}-5.229.1-python-executable.patch + "${FILESDIR}"/${PN}-7.349.0-glslang-1.3.296.patch ) python_check_deps() { diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild index 1831a83708b6..ecef342f645d 100644 --- a/media-libs/libplacebo/libplacebo-9999.ebuild +++ b/media-libs/libplacebo/libplacebo-9999.ebuild @@ -71,6 +71,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch "${FILESDIR}"/${PN}-5.229.1-python-executable.patch + "${FILESDIR}"/${PN}-7.349.0-glslang-1.3.296.patch ) python_check_deps() { diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest index da408d6e3156..e556a8dd6265 100644 --- a/media-libs/libprojectm/Manifest +++ b/media-libs/libprojectm/Manifest @@ -1,6 +1,8 @@ DIST libprojectm-3.1.12.tar.gz 52831726 BLAKE2B f9a9ecf8fc55b49e664a61a5c0ca3eef745b00390d5dd3b1549d6d68985c246834d35adb96ab8595e2bf78997c4688096c7931a6be54ea9d867bfdbe5a427832 SHA512 6d265280f3e3e952686ebf77afd8b083669e9ab81d2d9d122168d47747c367ff3b17ab682cc041e4ac9cee9607b7393b5dcb067deac95fcbb97d63a9656912a5 DIST libprojectm-4.1.1.tar.gz 47988154 BLAKE2B 47fd71d857f307ea09c87d36102662423d1df4d62f36f23373fcba36760312bd4e4d11408a3f4820b5caedd2e31bfd0dfc1e551c1bf27eb0ba33149f8ea13ebe SHA512 af38913e56d46ed15118b2dccd2701f9bf043bb3103f58ad2ebbfaffc60c3ed4e1b0eb3d8f922bdffb0001acfa5e3d23633a4903250fd00ede0dede1e6e1ba47 +DIST libprojectm-4.1.2.tar.gz 47980796 BLAKE2B 2932c96645916c715971c0fc2237791a1ca28295738e7433b9e856b303ab5c2beee48419c36ae65913537f2b65f2f7bd390875efa46e965faf9f4568b44c66e3 SHA512 4a8181dd5e41a9f8c0d8e3b105c5fd2d8638c7029a1054e75fbf6b7e5222740d179db37b7bd79147d4a34dce8360ce7b0eaa6c0c90af96bc8e8c557d8a496aff EBUILD libprojectm-3.1.12-r2.ebuild 1430 BLAKE2B b258d36deab18db1cd795941e9f8314974d33504e0b7b8c2fb0caa3e892f1f475eefa85df17689c9b7404899170b4b250a0d01512351d91672690caac1e8c34e SHA512 2ccc4cc5912c88cbf6460f76d7beffa2f5c0cedb9fe2142a00d1e597bed23f94d2db03b8a7b7b6f89890789a3cfb7adc095a450c39c32e4ee152a6d34a24e400 EBUILD libprojectm-4.1.1-r1.ebuild 1100 BLAKE2B 8accd611b0b2a28c747b87f1fbf159f35f1a23a51a695f330f0616fac484aaa1988435f8bb1eed6d6c67d544600ded9e104ac489a5fb205b22608a8c6c90c9a3 SHA512 ff616dba9d6e179d0939ebf6cb2b3243d0b33d668bc89386b7ad6089dd9648d486ebc65d17a95ed07049fef76ba078d4dcfaa556f75aa16cd5464dcbf4d9a70a +EBUILD libprojectm-4.1.2.ebuild 1107 BLAKE2B 3becb7095e128e72ffefe14d186c9f6a3ea9ab4f3f0c6b4d7795811b39df15ab350be26968312f441ab2e56609889d6225570e34847510f757add590f4fe6442 SHA512 450fe7c191016c180f63b1b9c0b6dab2dc130599c47ae4c28b199123656c340ebca16118aa1e2f4ac9d6aa843d0babf931d17433faa407ac0c851c3bcdef2015 EBUILD libprojectm-9999.ebuild 1107 BLAKE2B 3becb7095e128e72ffefe14d186c9f6a3ea9ab4f3f0c6b4d7795811b39df15ab350be26968312f441ab2e56609889d6225570e34847510f757add590f4fe6442 SHA512 450fe7c191016c180f63b1b9c0b6dab2dc130599c47ae4c28b199123656c340ebca16118aa1e2f4ac9d6aa843d0babf931d17433faa407ac0c851c3bcdef2015 MISC metadata.xml 537 BLAKE2B 10a5d33fab64136cfe13e98831827ac21db70fc50262f89b88c0e444981b951695788a939e902c57ed3ccb69a740d8743a3bdca465bc51be0c14f28adb107242 SHA512 648699f222528a76e343792d819e69ff933e3e2d96fe4b38148b4053ad38ac684c4917ce62636abaaee8b3093837af09448e1a7e65cfcd928606295bcc0a36b4 diff --git a/media-libs/libprojectm/libprojectm-4.1.2.ebuild b/media-libs/libprojectm/libprojectm-4.1.2.ebuild new file mode 100644 index 000000000000..404241093774 --- /dev/null +++ b/media-libs/libprojectm/libprojectm-4.1.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="A graphical music visualization plugin similar to milkdrop" +HOMEPAGE="https://github.com/projectM-visualizer/projectm" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git" + inherit git-r3 +else + MY_PV="${PV/_/-}" + SRC_URI="https://github.com/projectM-visualizer/projectm/releases/download/v${MY_PV}/libprojectM-${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + S="${WORKDIR}/libprojectM-${MY_PV}" +fi + +LICENSE="LGPL-2" +SLOT="4" +IUSE="gles2-only static-libs" + +RDEPEND=" + media-libs/glm + media-libs/libglvnd[X(+)] +" + +DEPEND="${RDEPEND}" + +multilib_prc_prepare() { + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_SDL_UI=OFF + -DENABLE_CXX_INTERFACE=OFF + -DENABLE_GLES=$(usex gles2-only) + -DENABLE_SYSTEM_GLM=ON + -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) + ) + + cmake_src_configure +} + +multilib_src_install_all() { + default +} diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest index 77d5095a7061..7e6bf0103a8b 100644 --- a/media-libs/libqaccessibilityclient/Manifest +++ b/media-libs/libqaccessibilityclient/Manifest @@ -1,6 +1,3 @@ -AUX libqaccessibilityclient-0.5.0-memleak.patch 607 BLAKE2B f661045001090cfe8bca6d53afd6b26f7822f77e0d20ba1193c633571a95349a3a74e3e57ea70d7226c739e465762328c6c6f98b16ff72531b48859614e998a1 SHA512 6a8ebee0bec2bba48b637522e828070c136649620c4b5773a9638305f2fc88b7353c9a7f09bcab4a242ca190c15e8004291d34f7ace9ec650059b81d081872e1 -DIST libqaccessibilityclient-0.5.0.tar.xz 107288 BLAKE2B 1d2208adfba72d55818f25cb46901097ded51784fdfe6fafd02927f09edf4cdb285a767e174d64278cd87e907d943648856e67c7ffcffc6f7ca0082cfbf2d19c SHA512 560526596e490b19263b3a6fb77b06e69611b34865a8fe18c593348fdeba22c1afd2b6ac44bee15ad94d402996e113c41dd7fa601f815559957729e18d9d9537 DIST libqaccessibilityclient-0.6.0.tar.xz 92812 BLAKE2B 333b88003e53369c2a31955995688f7ce74c53695c392b2b4d3e2b7d312dd014617162c99d0d2c64ff4dacf8a1ed47b5f5b7ddb2ee8e8753ec212957db8d8467 SHA512 d8752b020e0f7c85dd885d2c313b2dc5a97892c9913eb430aa405b6e391e84b827abc7fcc1f9e36fee2216713cab1be41fc148ce612ed9ae3e164c5d52e2419a -EBUILD libqaccessibilityclient-0.5.0-r1.ebuild 786 BLAKE2B c962472c1513796b950fb6eb70ee4506e97645f894a32564cb04e990bd95a027d8fe9760acdb104ef554029eb40cec926d76e00b78ba940b89d77803e39eca8b SHA512 a7db183d79effefa8a84a7bb18c2488278ef421680b7d52f66655c1cddd76d1ffbc4f1ec1bdcea0359cf6e0d0d50c2204b8ac9ecd5151c382a5e06a3792e3c06 EBUILD libqaccessibilityclient-0.6.0.ebuild 699 BLAKE2B 67f7df57bde443e26d7aee36270e857477aa8e53e4e9fb64a88e5fbe7830c98b38bdd8cb6d156044e3c5823fafd796beb0ee39100017e0199d4f77935908a7d6 SHA512 43c5cb85606158e30f9a4e76be156cdf160e2aa108f7da06065c0aca39855f5888d94f6bdce97ab3ebf3682921328ff015d4be843f513caf7d78c8e939095606 MISC metadata.xml 395 BLAKE2B 538aa83daab942d1e06d11b44e519d69d6082600eea8e3800d1f3c2f90e3aa120f46711bd27b969ed88a022fbebf4cd3ec33d75af9b9e139c816fed9d8dbacad SHA512 9718e57485b7731432060c34bfd382afb9889881253182218ba8c505a742b2162b0c7e50e4a41e0e3ca56e9ca1516650cc06f06ef12f736e35b62ac1c3bd0646 diff --git a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.5.0-memleak.patch b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.5.0-memleak.patch deleted file mode 100644 index 68ef226b8480..000000000000 --- a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.5.0-memleak.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2c708c513131cd710fb5ba30ddaab0f4ce6a44a3 Mon Sep 17 00:00:00 2001 -From: Laurent Montel <montel@kde.org> -Date: Wed, 29 Nov 2023 07:59:25 +0100 -Subject: [PATCH] Fix mem leak - ---- - src/qaccessibilityclient/registry.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qaccessibilityclient/registry.cpp b/src/qaccessibilityclient/registry.cpp -index bea73d0..4a32cf4 100644 ---- a/src/qaccessibilityclient/registry.cpp -+++ b/src/qaccessibilityclient/registry.cpp -@@ -19,6 +19,7 @@ Registry::Registry(QObject *parent) - - Registry::~Registry() - { -+ delete d->m_cache; - delete d; - } - --- -GitLab - diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.5.0-r1.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.5.0-r1.ebuild deleted file mode 100644 index dab8d138d72a..000000000000 --- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.5.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_KDEINSTALLDIRS="false" -ECM_TEST="true" -ECM_EXAMPLES="true" -QTMIN=5.15.9 -inherit ecm kde.org - -DESCRIPTION="Library for writing accessibility clients such as screen readers" -HOMEPAGE="https://community.kde.org/Accessibility -https://invent.kde.org/libraries/libqaccessibilityclient" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -LICENSE="LGPL-2.1" -SLOT="5" -IUSE="" - -# tests require DBus -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-memleak.patch" ) diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest index 5f42e5532683..9250b8a24f23 100644 --- a/media-libs/libraw/Manifest +++ b/media-libs/libraw/Manifest @@ -2,5 +2,5 @@ AUX libraw-0.21.1-CVE-2023-1729.patch 810 BLAKE2B 23388d0f1fe99d6d7641a6d871da51 DIST LibRaw-0.21.1.tar.gz 1638461 BLAKE2B 5db9a02f6854b90acf5e22419e2bc5470118140173be38cb520cc03553a328cad86d97ebda62c149622e045325ce82dcc34df40b5f700c319929c10fc43fdc9e SHA512 8d11df0be2af5fd8a8251f150ccd59103319606f52effff541ee43e97ceb64f1a00a02bba7b730aedd0c1c705c1e465793c8a2a52769712c1102af7f5534dd5d DIST LibRaw-0.21.2.tar.gz 1639305 BLAKE2B 8ff6cbc205335bdf12bfdfb77e390cf45f6e7a3dfcc0e6cc5ea759ac3a7b11d9f8a89c19218f779951dd8b1d96c779cb1d502c4691ee11cdccd83c27f09c6bf8 SHA512 ba7839d8eb5f999982c7b89f89f63387d7fee82054d7edcc2698924e268559b561230e329a0c669bd6f7c075983da6c054a6d63fad49ab3c1e2e9edc653b2bae EBUILD libraw-0.21.1-r1.ebuild 1591 BLAKE2B 7792f988d7d10432a542b1b8bb21df462c194f22d3fe3dfc94dfb0956e95cf6688289661d7d35aa78b1b27fcaa9404e5fc945a364507fc0e6d7f621b92c70005 SHA512 817c48c94871d791ae104e0813f27553a86166cb47ca56b8358c2d29a9b969f083bcde567eecbd3bb326415598403fd9b9ea6028fe23caca52650d45dd25c24e -EBUILD libraw-0.21.2.ebuild 1546 BLAKE2B 3129a8a4bd1ad6e87bad4164072ffa670e487ea92f84fb1c332b82cebabd474bbf7ab0a750e6402f12b52ad360a53e678e7b945bbc4ab62cb40b4c66ed6fdac2 SHA512 efc3b2071afbe582841bca86af4cac87b621f37ad1a81b6b7dd57a4dd42b7c6347c141915b53ef7934df9742b91748dc2d30206a20e1931a4acc1f8cb5fde0db +EBUILD libraw-0.21.2.ebuild 1539 BLAKE2B e408564c5289ce5762383de0c07b728f381517e8919a5f65f6b8096bece55c6354aa83f98a326d35342cae27da46329c3c8426c88937c97a24a6e557a8a40a92 SHA512 8640d8ef53fb18569e4415385a99ece24d97c49822861187d2733ea38334201426aa1dc2d5accfeaaf797afbcaec99146aeea58bf40558eb528db9ba0f130310 MISC metadata.xml 277 BLAKE2B 173d0b654a315fbeb39d77d02381d4acddceb0ea54baf2cdd2026b6cf5665299dc2944e68ae103181620df1e27a53cf82279e54b7e5f497ee1fd1e06db4e4556 SHA512 e2e9247845f55db13088ad027b4c056c7a070e1ab9a7bb74faed666347d646ba28ad121bfb38e3995844518f0a2583e1a51f6b3ca49295639157f98728444fda diff --git a/media-libs/libraw/libraw-0.21.2.ebuild b/media-libs/libraw/libraw-0.21.2.ebuild index 676d9ba112b9..500650195963 100644 --- a/media-libs/libraw/libraw-0.21.2.ebuild +++ b/media-libs/libraw/libraw-0.21.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ LICENSE="LGPL-2.1 CDDL" # SONAME isn't exactly the same as PV but it does correspond and # libraw has unstable ABI across releases. SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="examples jpeg +lcms openmp zlib" RDEPEND=" diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index be086b3134dc..822d890d1917 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,14 +1,7 @@ AUX libsdl2-2.0.16-static-libs.patch 2118 BLAKE2B 836fabd17be1520ad76baaf92a0ad357093bc08a5c1767edb1c81c9099fd27aadbf0525ab0666a560a3c728983f425864f1f513693801a8fa50edde5d32a3703 SHA512 f578e5ab1852705cfad4bf8b4a8aa36fb34637f3b26b83a9821716d08fc1152d7ea18daea623f540c860cd7a7566c4b8902b2cac2ae6d541e36e7bd15363d58a AUX libsdl2-2.28.5-fix-libdecor-0.2.patch 1195 BLAKE2B cd07f864e8091796d20ade4f4fd9c62bd61d684da62e1639260b4737bf083f0828bcba116dc45f2db81dc3117853660e8fcaf143ffb192b6b30f41099d3aa256 SHA512 4291d5f8ca2370698ddb795c77673b110f802ab9c8c19213064b5e1268b5a92262b4cd065cf96c277a28ff319e8562ba6b7e74f5c53f0a60e22502d1b1b8fb03 DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d -DIST SDL2-2.30.2.tar.gz 7426565 BLAKE2B 258084c6965281951b78619d7ebcd80b0f6873f54ded93d35b6b898f0533fef9a29bef4a8babe53df50bc589b0565b3a3b1378a930b43fdce575c4a5baa70864 SHA512 19316bb4c483a8c4be2140b70d906b7767beabada481873217a9207bd41e79c1854a837e1394325f59795da010f5344f791a7973a846b8189e3f9b662f408aca -DIST SDL2-2.30.3.tar.gz 7425677 BLAKE2B 9918723bc3a0bc3abfc6d47b4fc7eeabcafdc9925ee93e4f31b3637e843a5b060ae61aef9b93743340a9df914248cff510e5d38e758e032b5ed4df9eed587746 SHA512 75ddea9ac3c2130e9f6036b4718dbe3d9d1b40dab3cd48d3d488d5a397dd0c226c0573bf18d82eb41498800accf045e259d2ae305f069fad7b34e47a017f2372 -DIST SDL2-2.30.6.tar.gz 7524883 BLAKE2B 9e253d107c2af7ff0f7f67968be2cffc2358fbabd26d4ec46454a11ac53b64ac24a620947601901e43e470ad6b2bb89e273d04c9c2de12c6ab1dd6a4f78733ff SHA512 c73fd0b52e77d248a5dc2808a660ded9e708b87f68f677970da71e9b4a25ec60cf52f319b8b014ced7c9363560f2360262c04551a895f0f83ee62c3feeafba47 DIST SDL2-2.30.7.tar.gz 7525092 BLAKE2B a494ca856f43009957f62ef4e5d401777c2d1f8518e4cc1a1b9fc9a2efedc5031b9cb5e2965aeb7347821310153cf3abc4c898dd493962fb268c5c55081ed7c3 SHA512 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16 -EBUILD libsdl2-2.28.5-r1.ebuild 7379 BLAKE2B bee43fbb9ad9c3c6f6e00b3fd6a676752a15bf26ab048a8ccd19f3e748fe2d4d81e45221e6aae22393619b4635bdf740da4320ece30c08b65c78d792aa4cbf89 SHA512 bd9a7071534a6d26444881b7def89475cfe61da16478b5da866729d8307ee8866b21c4e9f05ebcb1ef3a9ec5b15fd04c952eaf27a89678102c8435999ef334a2 -EBUILD libsdl2-2.28.5-r2.ebuild 7510 BLAKE2B 15ac19b073daea2b2d53160bbdfa2e8878645068fd86d348d615780235e45f954b108d110ace545c2afc95f50c96a02cbe785dd2c9e4411aeae09d1439a5393f SHA512 7749ffd5d9ff05adcc75f7d014dc7dd831719c2959af02a2594f487adb62e728ece3be7135dca24d5a2cf1ecbade7fc9e2551625878af472564b954267bf4540 -EBUILD libsdl2-2.30.2-r1.ebuild 5727 BLAKE2B a2ce997a892fd0367f0cf071482812eed493bf28ba9d60371bef81530953f92664b03a808d2ce18d9467b37683f3f3ddd280fb158474f0c29f805122e1f1cc12 SHA512 a01760065e8c8cd14716712e112f4858c97bf2ffdf1d483940fe4aef393344788157e6fa36e66539e87075d4332a5d0e7b68dfeadb1746e0f7ec8b4155cd876d -EBUILD libsdl2-2.30.3.ebuild 5863 BLAKE2B befe8071ed3f6029d3e9746e44e5f8a189e7cf092429e8004ab72791a004098d386a63e8aa07885f2068b87d43390c8e1ab7b77c428cf6561cb4d5388a49d7cc SHA512 0c2a8b08a5a68cf40b6273be083c8f47308985083e07ab5cc989d083fdd188f984b84a4afeb3e4d3583d381be70939f86fec56caef9a52fcd7fe11c615dc991c -EBUILD libsdl2-2.30.6.ebuild 5863 BLAKE2B befe8071ed3f6029d3e9746e44e5f8a189e7cf092429e8004ab72791a004098d386a63e8aa07885f2068b87d43390c8e1ab7b77c428cf6561cb4d5388a49d7cc SHA512 0c2a8b08a5a68cf40b6273be083c8f47308985083e07ab5cc989d083fdd188f984b84a4afeb3e4d3583d381be70939f86fec56caef9a52fcd7fe11c615dc991c -EBUILD libsdl2-2.30.7.ebuild 5863 BLAKE2B befe8071ed3f6029d3e9746e44e5f8a189e7cf092429e8004ab72791a004098d386a63e8aa07885f2068b87d43390c8e1ab7b77c428cf6561cb4d5388a49d7cc SHA512 0c2a8b08a5a68cf40b6273be083c8f47308985083e07ab5cc989d083fdd188f984b84a4afeb3e4d3583d381be70939f86fec56caef9a52fcd7fe11c615dc991c -MISC metadata.xml 1945 BLAKE2B 0f4c4a1526296bfbef001169c45626f0393cfcb6f5003d3d644c1ff1ef0197fdd38ddc2f16f1c1590ef895448bd6aa85ea3619a31487609d9ea2569077decd64 SHA512 d25c6e3b2cf3055f2faf71d926d5ad01c5b528f1349284dc3097607015ed93c70116223db0078d8ae764b598bc13a99f1b82cebe1e65206ea737508bdede12df +EBUILD libsdl2-2.28.5-r3.ebuild 7506 BLAKE2B 06e0b8e280cb2c4da429e9e06751b8da6022a41d795ee71fdd6c01a7da33e4c3de78a3a53f416e57cf045b9a0695b4693ad0983f55ea02b98463a289773976f1 SHA512 bffadfe4c58b2df3b6f3bb31192a04b83061cf7899299388281525690f6cc0897ce10f5c20f2059223b8f3e4829ec0c044a7c3deba87fbae76204f9f57f2a58d +EBUILD libsdl2-2.30.7-r1.ebuild 5814 BLAKE2B a2dd4ae457ae52536e692ed9ae65812c6340774981314461fc3b0ca13c53e44118219172b099beda7c5e4aa0d56f1c830467d20ea9b40f6d0a6cce339fc10967 SHA512 3f6ee245d6aec67c89b882dbce0109ea9deda77696e10e03d1bc325441afa8b590b4a8acf3b6741169765e33b6821a63774e316b37071b6c3efb93e65fd2d714 +MISC metadata.xml 1942 BLAKE2B 89c75b0790ba1e8c489c4d4d9fca4451a863068a4f75e5b97b408d7aba35fd9ba6ec5a855465588f5c143f09380835b89b637b8fb1e09c6b2391a79ed69144b9 SHA512 9e37d24a408b748fef53884442fe5ac5db548657675e23571705680b157cadcb584a059d7f066765fb68e80bf2ba247b2a01cfa095a465aa9dbf03db0e1c4334 diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild deleted file mode 100644 index b69885b0dec7..000000000000 --- a/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic multilib-minimal - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://www.libsdl.org/" -SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" - -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - alsa? ( sound ) - fcitx4? ( dbus ) - gles1? ( video ) - gles2? ( video ) - haptic? ( joystick ) - ibus? ( dbus ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - sndio? ( sound ) - vulkan? ( video ) - wayland? ( gles2 ) - xscreensaver? ( X ) -" - -COMMON_DEPEND=" - virtual/libiconv[${MULTILIB_USEDEP}] - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fcitx4? ( app-i18n/fcitx:4 ) - gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] ) - gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2(+)] ) - ibus? ( app-i18n/ibus ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - kms? ( - >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND=" - ${COMMON_DEPEND} - vulkan? ( media-libs/vulkan-loader ) -" -DEPEND=" - ${COMMON_DEPEND} - ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - test? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.16-static-libs.patch -) - -src_prepare() { - default - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - if ! use vulkan - then - sed -i '/testvulkan$(EXE) \\/d' "test/Makefile.in" || die - fi - - # SDL seems to customize SDL_config.h.in to remove macros like - # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from - # being reintroduced. - # https://bugs.gentoo.org/764959 - AT_NOEAUTOHEADER="yes" AT_M4DIR="${BROOT}/usr/share/aclocal acinclude" \ - eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - if use ibus; then - local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include" - fi - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-system-iconv - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads pthreads) - --enable-timers - --enable-file - --enable-loadso - --enable-cpuinfo - --enable-assembly - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_sse ssemath) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_3dnow 3dnow) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable oss) - $(use_enable alsa) - --disable-alsa-shared - $(use_enable jack) - --disable-jack-shared - --disable-esd - $(use_enable pipewire) - --disable-pipewire-shared - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable libsamplerate) - --disable-libsamplerate-shared - --disable-werror - $(use_enable nas) - --disable-nas-shared - $(use_enable sndio) - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - --disable-libdecor - $(use_enable video_cards_vc4 video-rpi) - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable X video-x11-xfixes) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable aqua video-cocoa) - --disable-video-directfb - --disable-fusionsound - --disable-fusionsound-shared - $(use_enable kms video-kmsdrm) - --disable-kmsdrm-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - $(use_enable gles1 video-opengles1) - $(use_enable gles2 video-opengles2) - $(use_enable vulkan video-vulkan) - $(use_enable udev libudev) - $(use_enable dbus) - $(use_enable fcitx4 fcitx) - $(use_enable ibus) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ac_cv_header_libunwind_h=no - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if use test; then - # Most of these workarounds courtesy Debian - # https://salsa.debian.org/sdl-team/libsdl2/-/blob/debian/latest/debian/rules - local mytestargs=( - --x-includes="/usr/include" - --x-libraries="/usr/$(get_libdir)" - SDL_CFLAGS="-I${S}/include" - SDL_LIBS="-L${BUILD_DIR}/build/.libs -lSDL2" - ac_cv_lib_SDL2_ttf_TTF_Init=no - CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" - ) - - mkdir "${BUILD_DIR}/test" || die - cd "${BUILD_DIR}/test" || die - ECONF_SOURCE="${S}/test" econf "${mytestargs[@]}" - fi -} - -multilib_src_compile() { - emake all V=1 - use test && emake -C test all V=1 -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -multilib_src_test() { - LD_LIBRARY_PATH="${BUILD_DIR}/build/.libs" emake -C test check V=1 -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - # Do not delete the static .a libraries here as some are - # mandatory. They may be needed even when linking dynamically. - find "${ED}" -type f -name "*.la" -delete || die - - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild index 23b8259aee87..3f7518518e08 100644 --- a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild +++ b/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild @@ -15,11 +15,11 @@ LICENSE="ZLIB" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" +IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver" RESTRICT="!test? ( test )" REQUIRED_USE=" alsa? ( sound ) - fcitx4? ( dbus ) + fcitx? ( dbus ) gles1? ( video ) gles2? ( video ) haptic? ( joystick ) @@ -38,7 +38,7 @@ COMMON_DEPEND=" virtual/libiconv[${MULTILIB_USEDEP}] alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fcitx4? ( app-i18n/fcitx:4 ) + fcitx? ( app-i18n/fcitx:* ) gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] ) gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2(+)] ) ibus? ( app-i18n/ibus ) @@ -206,7 +206,7 @@ multilib_src_configure() { $(use_enable vulkan video-vulkan) $(use_enable udev libudev) $(use_enable dbus) - $(use_enable fcitx4 fcitx) + $(use_enable fcitx fcitx) $(use_enable ibus) --disable-directx --disable-rpath diff --git a/media-libs/libsdl2/libsdl2-2.30.2-r1.ebuild b/media-libs/libsdl2/libsdl2-2.30.2-r1.ebuild deleted file mode 100644 index 8ed1fef4584e..000000000000 --- a/media-libs/libsdl2/libsdl2-2.30.2-r1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://www.libsdl.org/" -SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - alsa? ( sound ) - fcitx4? ( dbus ) - gles1? ( video ) - gles2? ( video ) - haptic? ( joystick ) - ibus? ( dbus ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - sndio? ( sound ) - test? ( static-libs ) - vulkan? ( video ) - wayland? ( gles2 ) - xscreensaver? ( X ) -" - -COMMON_DEPEND=" - virtual/libiconv[${MULTILIB_USEDEP}] - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - ibus? ( app-i18n/ibus ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - kms? ( - >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND=" - ${COMMON_DEPEND} - fcitx4? ( app-i18n/fcitx:4 ) - gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] ) - gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] ) - vulkan? ( media-libs/vulkan-loader ) -" -DEPEND=" - ${COMMON_DEPEND} - gles1? ( media-libs/libglvnd ) - gles2? ( media-libs/libglvnd ) - ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - test? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -src_prepare() { - cmake_src_prepare - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die -} - -src_configure() { - use custom-cflags || strip-flags - - local mycmakeargs=( - -DSDL_STATIC=$(usex static-libs) - -DSDL_SYSTEM_ICONV=ON - -DSDL_GCC_ATOMICS=ON - -DSDL_AUDIO=$(usex sound) - -DSDL_VIDEO=$(usex video) - -DSDL_JOYSTICK=$(usex joystick) - -DSDL_HAPTIC=$(usex haptic) - -DSDL_POWER=ON - -DSDL_FILESYSTEM=ON - -DSDL_PTHREADS=$(usex threads) - -DSDL_TIMERS=ON - -DSDL_FILE=ON - -DSDL_LOADSO=ON - -DSDL_ASSEMBLY=ON - -DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec) - -DSDL_SSEMATH=$(usex cpu_flags_x86_sse) - -DSDL_MMX=$(usex cpu_flags_x86_mmx) - -DSDL_3DNOW=$(usex cpu_flags_x86_3dnow) - -DSDL_SSE=$(usex cpu_flags_x86_sse) - -DSDL_SSE2=$(usex cpu_flags_x86_sse2) - -DSDL_SSE3=$(usex cpu_flags_x86_sse3) - -DSDL_OSS=$(usex oss) - -DSDL_ALSA=$(usex alsa) - -DSDL_ALSA_SHARED=OFF - -DSDL_JACK=$(usex jack) - -DSDL_JACK_SHARED=OFF - -DSDL_ESD=OFF - -DSDL_PIPEWIRE=$(usex pipewire) - -DSDL_PIPEWIRE_SHARED=OFF - -DSDL_PULSEAUDIO=$(usex pulseaudio) - -DSDL_PULSEAUDIO_SHARED=OFF - -DSDL_ARTS=OFF - -DSDL_LIBSAMPLERATE=$(usex libsamplerate) - -DSDL_LIBSAMPLERATE_SHARED=OFF - -DSDL_WERROR=OFF - -DSDL_NAS=$(usex nas) - -DSDL_NAS_SHARED=OFF - -DSDL_SNDIO=$(usex sndio) - -DSDL_SNDIO_SHARED=OFF - -DSDL_DISKAUDIO=$(usex sound) - -DSDL_DUMMYAUDIO=$(usex sound) - -DSDL_WAYLAND=$(usex wayland) - -DSDL_WAYLAND_SHARED=OFF - -DSDL_RPI=OFF - -DSDL_X11=$(usex X) - -DSDL_X11_SHARED=OFF - -DSDL_X11_XSCRNSAVER=$(usex xscreensaver) - -DSDL_COCOA=$(usex aqua) - -DSDL_DIRECTFB=OFF - -DSDL_FUSIONSOUND=OFF - -DSDL_KMSDRM=$(usex kms) - -DSDL_KMSDRM_SHARED=OFF - -DSDL_DUMMYVIDEO=$(usex video) - -DSDL_OPENGL=$(usex opengl) - -DSDL_OPENGLES=$(use gles1 || use gles2 && echo ON || echo OFF) - -DSDL_VULKAN=$(usex vulkan) - -DSDL_LIBUDEV=$(usex udev) - -DSDL_DBUS=$(usex dbus) - -DSDL_IBUS=$(usex ibus) - -DSDL_DIRECTX=OFF - -DSDL_RPATH=OFF - -DSDL_VIDEO_RENDER_D3D=OFF - -DSDL_TESTS=$(usex test) - ) - cmake-multilib_src_configure -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -src_test() { - unset SDL_GAMECONTROLLERCONFIG SDL_GAMECONTROLLER_USE_BUTTON_LABELS - cmake-multilib_src_test -} - -multilib_src_install_all() { - rm -r "${ED}"/usr/share/licenses/ || die - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/libsdl2-2.30.6.ebuild b/media-libs/libsdl2/libsdl2-2.30.6.ebuild deleted file mode 100644 index a3648ce7571c..000000000000 --- a/media-libs/libsdl2/libsdl2-2.30.6.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://www.libsdl.org/" -SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - alsa? ( sound ) - fcitx4? ( dbus ) - gles1? ( video ) - gles2? ( video ) - haptic? ( joystick ) - ibus? ( dbus ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - sndio? ( sound ) - test? ( static-libs ) - vulkan? ( video ) - wayland? ( gles2 ) - xscreensaver? ( X ) -" - -COMMON_DEPEND=" - virtual/libiconv[${MULTILIB_USEDEP}] - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - ibus? ( app-i18n/ibus ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - kms? ( - >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] - gui-libs/libdecor[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND=" - ${COMMON_DEPEND} - fcitx4? ( app-i18n/fcitx:4 ) - gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] ) - gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] ) - vulkan? ( media-libs/vulkan-loader ) -" -DEPEND=" - ${COMMON_DEPEND} - gles1? ( media-libs/libglvnd ) - gles2? ( media-libs/libglvnd ) - ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - test? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -src_prepare() { - cmake_src_prepare - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die -} - -src_configure() { - use custom-cflags || strip-flags - - local mycmakeargs=( - -DSDL_STATIC=$(usex static-libs) - -DSDL_SYSTEM_ICONV=ON - -DSDL_GCC_ATOMICS=ON - -DSDL_AUDIO=$(usex sound) - -DSDL_VIDEO=$(usex video) - -DSDL_JOYSTICK=$(usex joystick) - -DSDL_HAPTIC=$(usex haptic) - -DSDL_POWER=ON - -DSDL_FILESYSTEM=ON - -DSDL_PTHREADS=$(usex threads) - -DSDL_TIMERS=ON - -DSDL_FILE=ON - -DSDL_LOADSO=ON - -DSDL_ASSEMBLY=ON - -DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec) - -DSDL_SSEMATH=$(usex cpu_flags_x86_sse) - -DSDL_MMX=$(usex cpu_flags_x86_mmx) - -DSDL_3DNOW=$(usex cpu_flags_x86_3dnow) - -DSDL_SSE=$(usex cpu_flags_x86_sse) - -DSDL_SSE2=$(usex cpu_flags_x86_sse2) - -DSDL_SSE3=$(usex cpu_flags_x86_sse3) - -DSDL_OSS=$(usex oss) - -DSDL_ALSA=$(usex alsa) - -DSDL_ALSA_SHARED=OFF - -DSDL_JACK=$(usex jack) - -DSDL_JACK_SHARED=OFF - -DSDL_ESD=OFF - -DSDL_PIPEWIRE=$(usex pipewire) - -DSDL_PIPEWIRE_SHARED=OFF - -DSDL_PULSEAUDIO=$(usex pulseaudio) - -DSDL_PULSEAUDIO_SHARED=OFF - -DSDL_ARTS=OFF - -DSDL_LIBSAMPLERATE=$(usex libsamplerate) - -DSDL_LIBSAMPLERATE_SHARED=OFF - -DSDL_WERROR=OFF - -DSDL_NAS=$(usex nas) - -DSDL_NAS_SHARED=OFF - -DSDL_SNDIO=$(usex sndio) - -DSDL_SNDIO_SHARED=OFF - -DSDL_DISKAUDIO=$(usex sound) - -DSDL_DUMMYAUDIO=$(usex sound) - -DSDL_WAYLAND=$(usex wayland) - -DSDL_WAYLAND_SHARED=OFF - -DSDL_WAYLAND_LIBDECOR=$(usex wayland) - -DSDL_WAYLAND_LIBDECOR_SHARED=OFF - -DSDL_RPI=OFF - -DSDL_X11=$(usex X) - -DSDL_X11_SHARED=OFF - -DSDL_X11_XSCRNSAVER=$(usex xscreensaver) - -DSDL_COCOA=$(usex aqua) - -DSDL_DIRECTFB=OFF - -DSDL_FUSIONSOUND=OFF - -DSDL_KMSDRM=$(usex kms) - -DSDL_KMSDRM_SHARED=OFF - -DSDL_DUMMYVIDEO=$(usex video) - -DSDL_OPENGL=$(usex opengl) - -DSDL_OPENGLES=$(use gles1 || use gles2 && echo ON || echo OFF) - -DSDL_VULKAN=$(usex vulkan) - -DSDL_LIBUDEV=$(usex udev) - -DSDL_DBUS=$(usex dbus) - -DSDL_IBUS=$(usex ibus) - -DSDL_CCACHE=OFF - -DSDL_DIRECTX=OFF - -DSDL_RPATH=OFF - -DSDL_VIDEO_RENDER_D3D=OFF - -DSDL_TESTS=$(usex test) - ) - cmake-multilib_src_configure -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -src_test() { - unset SDL_GAMECONTROLLERCONFIG SDL_GAMECONTROLLER_USE_BUTTON_LABELS - cmake-multilib_src_test -} - -multilib_src_install_all() { - rm -r "${ED}"/usr/share/licenses/ || die - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/libsdl2-2.30.3.ebuild b/media-libs/libsdl2/libsdl2-2.30.7-r1.ebuild index a3648ce7571c..c625970b60e5 100644 --- a/media-libs/libsdl2/libsdl2-2.30.3.ebuild +++ b/media-libs/libsdl2/libsdl2-2.30.7-r1.ebuild @@ -13,13 +13,13 @@ S="${WORKDIR}/${MY_P}" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86" -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver" +IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test udev +video vulkan wayland X xscreensaver" RESTRICT="!test? ( test )" REQUIRED_USE=" alsa? ( sound ) - fcitx4? ( dbus ) + fcitx? ( dbus ) gles1? ( video ) gles2? ( video ) haptic? ( joystick ) @@ -76,7 +76,7 @@ COMMON_DEPEND=" " RDEPEND=" ${COMMON_DEPEND} - fcitx4? ( app-i18n/fcitx:4 ) + fcitx? ( app-i18n/fcitx:* ) gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] ) gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] ) vulkan? ( media-libs/vulkan-loader ) @@ -127,7 +127,6 @@ src_configure() { -DSDL_HAPTIC=$(usex haptic) -DSDL_POWER=ON -DSDL_FILESYSTEM=ON - -DSDL_PTHREADS=$(usex threads) -DSDL_TIMERS=ON -DSDL_FILE=ON -DSDL_LOADSO=ON diff --git a/media-libs/libsdl2/libsdl2-2.30.7.ebuild b/media-libs/libsdl2/libsdl2-2.30.7.ebuild deleted file mode 100644 index a3648ce7571c..000000000000 --- a/media-libs/libsdl2/libsdl2-2.30.7.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="https://www.libsdl.org/" -SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - -IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - alsa? ( sound ) - fcitx4? ( dbus ) - gles1? ( video ) - gles2? ( video ) - haptic? ( joystick ) - ibus? ( dbus ) - jack? ( sound ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - sndio? ( sound ) - test? ( static-libs ) - vulkan? ( video ) - wayland? ( gles2 ) - xscreensaver? ( X ) -" - -COMMON_DEPEND=" - virtual/libiconv[${MULTILIB_USEDEP}] - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - ibus? ( app-i18n/ibus ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - kms? ( - >=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - nas? ( - >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.20[${MULTILIB_USEDEP}] - gui-libs/libdecor[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND=" - ${COMMON_DEPEND} - fcitx4? ( app-i18n/fcitx:4 ) - gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] ) - gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] ) - vulkan? ( media-libs/vulkan-loader ) -" -DEPEND=" - ${COMMON_DEPEND} - gles1? ( media-libs/libglvnd ) - gles2? ( media-libs/libglvnd ) - ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - test? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/doxygen - media-gfx/graphviz - ) - wayland? ( >=dev-util/wayland-scanner-1.20 ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h - /usr/include/SDL2/SDL_platform.h - /usr/include/SDL2/begin_code.h - /usr/include/SDL2/close_code.h -) - -src_prepare() { - cmake_src_prepare - - # Unbundle some headers. - rm -r src/video/khronos || die - ln -s "${ESYSROOT}/usr/include" src/video/khronos || die -} - -src_configure() { - use custom-cflags || strip-flags - - local mycmakeargs=( - -DSDL_STATIC=$(usex static-libs) - -DSDL_SYSTEM_ICONV=ON - -DSDL_GCC_ATOMICS=ON - -DSDL_AUDIO=$(usex sound) - -DSDL_VIDEO=$(usex video) - -DSDL_JOYSTICK=$(usex joystick) - -DSDL_HAPTIC=$(usex haptic) - -DSDL_POWER=ON - -DSDL_FILESYSTEM=ON - -DSDL_PTHREADS=$(usex threads) - -DSDL_TIMERS=ON - -DSDL_FILE=ON - -DSDL_LOADSO=ON - -DSDL_ASSEMBLY=ON - -DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec) - -DSDL_SSEMATH=$(usex cpu_flags_x86_sse) - -DSDL_MMX=$(usex cpu_flags_x86_mmx) - -DSDL_3DNOW=$(usex cpu_flags_x86_3dnow) - -DSDL_SSE=$(usex cpu_flags_x86_sse) - -DSDL_SSE2=$(usex cpu_flags_x86_sse2) - -DSDL_SSE3=$(usex cpu_flags_x86_sse3) - -DSDL_OSS=$(usex oss) - -DSDL_ALSA=$(usex alsa) - -DSDL_ALSA_SHARED=OFF - -DSDL_JACK=$(usex jack) - -DSDL_JACK_SHARED=OFF - -DSDL_ESD=OFF - -DSDL_PIPEWIRE=$(usex pipewire) - -DSDL_PIPEWIRE_SHARED=OFF - -DSDL_PULSEAUDIO=$(usex pulseaudio) - -DSDL_PULSEAUDIO_SHARED=OFF - -DSDL_ARTS=OFF - -DSDL_LIBSAMPLERATE=$(usex libsamplerate) - -DSDL_LIBSAMPLERATE_SHARED=OFF - -DSDL_WERROR=OFF - -DSDL_NAS=$(usex nas) - -DSDL_NAS_SHARED=OFF - -DSDL_SNDIO=$(usex sndio) - -DSDL_SNDIO_SHARED=OFF - -DSDL_DISKAUDIO=$(usex sound) - -DSDL_DUMMYAUDIO=$(usex sound) - -DSDL_WAYLAND=$(usex wayland) - -DSDL_WAYLAND_SHARED=OFF - -DSDL_WAYLAND_LIBDECOR=$(usex wayland) - -DSDL_WAYLAND_LIBDECOR_SHARED=OFF - -DSDL_RPI=OFF - -DSDL_X11=$(usex X) - -DSDL_X11_SHARED=OFF - -DSDL_X11_XSCRNSAVER=$(usex xscreensaver) - -DSDL_COCOA=$(usex aqua) - -DSDL_DIRECTFB=OFF - -DSDL_FUSIONSOUND=OFF - -DSDL_KMSDRM=$(usex kms) - -DSDL_KMSDRM_SHARED=OFF - -DSDL_DUMMYVIDEO=$(usex video) - -DSDL_OPENGL=$(usex opengl) - -DSDL_OPENGLES=$(use gles1 || use gles2 && echo ON || echo OFF) - -DSDL_VULKAN=$(usex vulkan) - -DSDL_LIBUDEV=$(usex udev) - -DSDL_DBUS=$(usex dbus) - -DSDL_IBUS=$(usex ibus) - -DSDL_CCACHE=OFF - -DSDL_DIRECTX=OFF - -DSDL_RPATH=OFF - -DSDL_VIDEO_RENDER_D3D=OFF - -DSDL_TESTS=$(usex test) - ) - cmake-multilib_src_configure -} - -src_compile() { - multilib-minimal_src_compile - - if use doc; then - cd docs || die - doxygen || die - fi -} - -src_test() { - unset SDL_GAMECONTROLLERCONFIG SDL_GAMECONTROLLER_USE_BUTTON_LABELS - cmake-multilib_src_test -} - -multilib_src_install_all() { - rm -r "${ED}"/usr/share/licenses/ || die - dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md - use doc && dodoc -r docs/output/html/ -} diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml index a96219c59be3..5388257b6225 100644 --- a/media-libs/libsdl2/metadata.xml +++ b/media-libs/libsdl2/metadata.xml @@ -24,7 +24,7 @@ Perl, PHP, Pike, Python, and Ruby. </longdescription> <use> - <flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag> + <flag name="fcitx">Enable support for <pkg>app-i18n/fcitx</pkg></flag> <flag name="gles1">include OpenGL ES 1.0 support</flag> <flag name="haptic">Enable the haptic (force feedback) subsystem</flag> <flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag> diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest index 03a8ae84d1d9..c098bd3ff70b 100644 --- a/media-libs/libsfml/Manifest +++ b/media-libs/libsfml/Manifest @@ -4,7 +4,6 @@ AUX libsfml-2.6.0-supress-werror.patch 1618 BLAKE2B af0be020c1548bb793c332be85ae DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 DIST libsfml-2.6.0.tar.gz 25493305 BLAKE2B 205db3aa9fa197dbc29c8b3a74c09651fb9ca8e60bf18e385b8ecfa350d85b31ab33b6d2e61b6cdcfdc3caf77a8af37cbe97445e871b6e688359b320a12a3cea SHA512 aac734e8b0e16936c0238ec792c922923545ec6cf06576bc70004fa1920cd05b4c5e56fbc8a77b650bbe6e202adc39df1d30509dbce95778d04338917a38a87a DIST libsfml-2.6.1.tar.gz 25499153 BLAKE2B 0e4251d7aade5a596e9d0afdaa86d843fb5ba3ca63fc4f9dccb2e7db70aa8ae253af30dba68d57dd6869a6142818575e6fd843005a6e54fe186b20b573ad8f63 SHA512 b376d3b00277ed60d107fe1268c210749b3aafcee618a8f924b181a9b476e92b9cb9baddecf70a8913b5910c471d53ea0260a876ad7b2db2b98b944d9f508714 -EBUILD libsfml-2.5.1-r1.ebuild 1489 BLAKE2B b22f411f47d211359144a01586e20af399087487eff021e64d0f8b6a50bc7f0ae9a79dbe1033344e565e8ad6363f77f09f1fed63a1ad7fd893237252f4fa3f07 SHA512 56ac969741ea920d64edde1b7249605790151d01839f66d1ed343df1dd31e325a02c0f5fb5a7b0f4da3bb61eac3b1ea1399494b915101b5043c56f470b0b413c EBUILD libsfml-2.5.1-r2.ebuild 1533 BLAKE2B 1aed471d3d5d6090d1fed261ba85335c294648eb5d727f5d440842ba038479eb13b46a7be5549851407ea0ace87c4e15266c4700c686804cdae5511e7c858d0d SHA512 d5f281d020e0e006a64c0c72442bbf415bab26315f819d0828967514711b71844e50748bdecd20ef93e38c5059df7f7b802de5b54b218367613b610694dc810b EBUILD libsfml-2.6.0.ebuild 1535 BLAKE2B bd71c06068cb95b3dab8164120b24d546f397933b4654851edb2e50d9ea2c1551e3972b57eb48af786dbe7cbc4cd8f1179d9f977af6b0e603bb1d12b58f6dbbe SHA512 27a71be7c35fdcae83b9ca92c6eec35a87a0e8fef02839fd4edf3bb3c055692517fc7e8a7c813f01e741b05ecc798b3cb81597b2206c824c42233ed8fb1411b4 EBUILD libsfml-2.6.1.ebuild 1537 BLAKE2B 04ad774940fb0cfc99032ed61d888b7886be11969f66e284a2f81d896dd6c8e816605340eeb96ac3896f173c9146788ba93752ba436d28dab0c377bb9e4d94d8 SHA512 25aa08f1f5a43409aa628309f4e16a6c9430e11bb88b2e203ac975782ef74d507ce34bdf84f60bdbc0d1b1060bd0b863f4d30053a5b295d56a9fc92c9344deb4 diff --git a/media-libs/libsfml/libsfml-2.5.1-r1.ebuild b/media-libs/libsfml/libsfml-2.5.1-r1.ebuild deleted file mode 100644 index 4855c128c89a..000000000000 --- a/media-libs/libsfml/libsfml-2.5.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Simple and Fast Multimedia Library (SFML)" -HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML" -SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="debug doc examples" - -RDEPEND=" - media-libs/flac:= - media-libs/freetype:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libogg - media-libs/libvorbis - media-libs/openal - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libxcb - x11-libs/xcb-util-image - kernel_linux? ( virtual/libudev:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-text/doxygen ) -" - -DOCS=( changelog.md readme.md ) - -S="${WORKDIR}/SFML-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-musl-1.2.3-nullptr.patch -) - -src_prepare() { - sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \ - doc/CMakeLists.txt || die - - find examples -name CMakeLists.txt -delete || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSFML_BUILD_DOC=$(usex doc) - -DSFML_INSTALL_PKGCONFIG_FILES=TRUE - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/cmake/Modules - doins cmake/SFMLConfig.cmake.in - doins cmake/SFMLConfigDependencies.cmake.in - - if use examples ; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - fi -} diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest index 8800af90402f..371d4f7e5389 100644 --- a/media-libs/libshumate/Manifest +++ b/media-libs/libshumate/Manifest @@ -1,7 +1,9 @@ DIST libshumate-1.1.3.tar.xz 299644 BLAKE2B f07a583e1fd142a0601c725840e84397ed04962f828cbc15217dcdc0d767015664a06252879416e9422cb32154406dae2742ffb511404c5923ce9acab7efae0c SHA512 163cce5c9aca2f3c52da3ecb3b4a651798e314d38a145ed4c69b0510303c72a0934c24084036ca2dfaab8b008753a37f7116b0bd2907cddc78a2aceee4f847d2 DIST libshumate-1.1.4.tar.xz 299700 BLAKE2B 1f60b0807d99c8ea675be2ca85ada1929c51aa1a5f27bb5565ddba062626c4bde447f95ad4b7e02b6d3f57af1365501e64b5bca18dc566b3bf0ae1f47d5c638f SHA512 f2bb90255a43fbdf9b17bd69260c9054378959900adbc26db9b7417f98595f1d5c9221db4f31b78a546f7bd30d95175f4210fc7db11db6704d7de4c9ad000619 DIST libshumate-1.2.2.tar.xz 321216 BLAKE2B f0f26798fc9a32707d5e669c0af5396ddcdff0bea9f93150f29751ab952f72bfed457f105ea0835d3b31fbb3d66934139e1a6a06e1d056d47bf2f270cc32b23c SHA512 9e1f3f26aa591ac681ccd4613ae921f4e3f3863bacd0a0dc3be56f52749135d6c035535111808d18929d5be2a6461a47739e586f20081f485bb992b4e0a22c3a +DIST libshumate-1.2.3.tar.xz 321768 BLAKE2B 42349a0d96d35972cf5440470983792ffe897aa0d3e8a1cd7435f1a0ecd870142d33fa28f4e5cc559cd9adba66dbd6ab1bf57d10aa5cfb4934dd3b67ae4983c6 SHA512 4f56e51b72a63d89d6b159dc002617866abd388cb6c3a092107bc5751728c99466f8c36e8086bb39b22b3d91de28f840e9d28fc29dba0b94bafd643950fee8ec EBUILD libshumate-1.1.3.ebuild 1608 BLAKE2B 7ba44ffb6b282e97b5c25fa9eaeaf09d8ea0448664b8d9e1a3e646f0a4c130af9ff83f5f0fdebcbe3030a80ce0fbff7827f5d2a2085e023bd49172360f6e6353 SHA512 c9f976ad26fdf93d058c64100f9db65fd9f9242fa146a7f551dec1ea5749a22581d2a51518689daf7800ed1be173cc77b5cf88852546c7e2f23c5ae7831c7f0e EBUILD libshumate-1.1.4.ebuild 1611 BLAKE2B 5dc2303798124fa9f570b592951c3b7820cde4847c4e7d1d6ae6877c7a811088597bc8fa4e5c40083c487afb38d78035a27c22dfe5c2d532a2329a61a226623a SHA512 25a71dfb501c443f83bc1486bf7fa6532eb04d28401bce4f54bbaae83cfd7d43660ebe2fa7d8e5565590332cd5712f181c8b1a8488080bccf3f3b50a02b8d0f6 EBUILD libshumate-1.2.2.ebuild 1399 BLAKE2B 007218fb1c6fb00949ba4b63af434f7329f087813f8b3f04b712a2f945d6cda1da0bf8315545e299cae676f2dfe95cf21d402be3c02f1c0900371624ff5c3832 SHA512 7c83e5ba08fbf90b73be399b875c5d83ed7378145a26738f83f4b6762a1c94b2e7e572e0c2ca222e0f6cb21b144cdbfa8faf0ca117327118645b23aa01a5c854 +EBUILD libshumate-1.2.3.ebuild 1399 BLAKE2B 007218fb1c6fb00949ba4b63af434f7329f087813f8b3f04b712a2f945d6cda1da0bf8315545e299cae676f2dfe95cf21d402be3c02f1c0900371624ff5c3832 SHA512 7c83e5ba08fbf90b73be399b875c5d83ed7378145a26738f83f4b6762a1c94b2e7e572e0c2ca222e0f6cb21b144cdbfa8faf0ca117327118645b23aa01a5c854 MISC metadata.xml 445 BLAKE2B 58a069a9ded7b8fab96c93fd3b11e1fd7b4ae4a58966f5bbeedb560547005a56f62167bc31aa5c05ca68f1855e12c2d915825922d5b6504e359893e0786579a5 SHA512 3e5352258641f4a9e6722777971cc3fb02359e831708c1749f2d77c7b15d147adbf54097d311435f5220cd49bab9e298b3379f4a59c0f4563a6706f608343299 diff --git a/media-libs/libshumate/libshumate-1.2.3.ebuild b/media-libs/libshumate/libshumate-1.2.3.ebuild new file mode 100644 index 000000000000..425d110b1dd0 --- /dev/null +++ b/media-libs/libshumate/libshumate-1.2.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson vala virtualx + +DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libshumate" + +LICENSE="LGPL-2.1+" +SLOT="1.0/1" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" +REQUIRED_USE="gtk-doc? ( introspection )" + +IUSE="gtk-doc +introspection sysprof vala" + +RDEPEND=" + >=dev-libs/glib-2.74.0:2 + >=x11-libs/cairo-1.4 + >=dev-db/sqlite-1.12:3 + >=gui-libs/gtk-4:4 + >=net-libs/libsoup-3.0:3.0 + introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) + >=dev-libs/json-glib-1.6.0[introspection?] + dev-libs/protobuf-c +" +DEPEND="${RDEPEND} + sysprof? ( dev-util/sysprof-capture:4 ) +" +BDEPEND=" + gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) + vala? ( $(vala_depend) ) +" + +src_configure() { + local emesonargs=( + $(meson_use introspection gir) + $(meson_use vala vapi) + $(meson_use gtk-doc gtk_doc) + -Ddemos=false # only built, not installed + -Dvector_renderer=true + $(meson_feature sysprof) + ) + meson_src_configure +} + +src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' +} + +src_install() { + meson_src_install + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html || die + mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/html/libshumate-1.0 || die + fi +} diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest index ee59e4dfd721..dbecd089d079 100644 --- a/media-libs/libsidplayfp/Manifest +++ b/media-libs/libsidplayfp/Manifest @@ -1,3 +1,9 @@ +DIST libsidplayfp-2.10.0.tar.gz 811416 BLAKE2B 5d81c1c74eccb5b4e176a82e1232eed7a5687bd6dd5c22b0941d414be438db54f0d303bb0c26445404beb94f9d01cf78ec57983e8a11dd265ec6f94947a71b2b SHA512 ebffc99d04e4e5ef309636c08105b42150c5b707bcb6ecd196ee6956f301ae152efdfdd86b14276e31a0936d97cc534caec4e2281249df6ba7571926a1daffeb +DIST libsidplayfp-2.10.1.tar.gz 812511 BLAKE2B 7c4a8c276a0adf75f96cebaf7931f314bdc097df8e682d2894b9903b574e2a6dd5d9b6619243aceb3458e70d29041c4549aaefe45fb37bb9312333d5d03322f8 SHA512 b8a15b34b0c834b037fc35ae9c968505322f9fb4971313ca59a0a8d22e31580354e18fda530246c0086079a9f9ff40e9c54f93279831817dc377fa9c9894bb20 +DIST libsidplayfp-2.11.0.tar.gz 813488 BLAKE2B 6bb8f37e5272c166ba5fe804395c676becb366fbf2adff0831236eaa46f889811f9173f99a7b0e67f986dfbc8e58b4957b27a39c7b7da2571a7014776bc92c1b SHA512 5f8c32d6964cdd651db0718b8f02d7fcbf829c58ed15bc8fa07f5cc0a452954ec93b041f54641744b597a8e67b6c723df6031b00685231e931f6388c294ea172 DIST libsidplayfp-2.9.0.tar.gz 807772 BLAKE2B 9ec5066a69f912c4183e98c4883875b646c9f6150ab4bd3c8d9a7110a9c75529cdb6f8aeac8d379ecacf2c0ec6181a8ee13ff93bcc53f296b8900b0e6c8d5281 SHA512 3d6b0b6ab5155da3ae4cface17a2fe85deb1dd8ab8076dba60f04e5df78b10dc9b756b408734a1012e254d3d24d8cfcf15b562fdb1f28edd756a5d63719595b0 +EBUILD libsidplayfp-2.10.0.ebuild 686 BLAKE2B e6c4af395d77de009ea3b72eb327f060b4e56a32bd4f69a3129e03b585531ca7e44fe67824ab1db1acf10758e5a79c64d382bc20837890865c820dd3efc04e2e SHA512 56cdbb7859d095a63d1881de04bf07a91166652f39e0a720e5862a1832ade762236d13404f585cd8e98bd6088c4d1a0624b1db9cd41251b456d9b8dc3021668e +EBUILD libsidplayfp-2.10.1.ebuild 687 BLAKE2B 89257d5934cd9327850f3719e4fa316f15b3d124c722a7b026689e099a12faa3eca8ecbd8bba245043ea15603ea223aea103986df2fa495982e09a11347c23bc SHA512 faa54ae1b2098e9f988edda7fa3dcaebfe9dd1af6d44e26dbcccf228e06bc980d14a387f4c1d361c6dea462c921f789fc214a9c86f00650c747f1f382d4b7538 +EBUILD libsidplayfp-2.11.0.ebuild 687 BLAKE2B 89257d5934cd9327850f3719e4fa316f15b3d124c722a7b026689e099a12faa3eca8ecbd8bba245043ea15603ea223aea103986df2fa495982e09a11347c23bc SHA512 faa54ae1b2098e9f988edda7fa3dcaebfe9dd1af6d44e26dbcccf228e06bc980d14a387f4c1d361c6dea462c921f789fc214a9c86f00650c747f1f382d4b7538 EBUILD libsidplayfp-2.9.0.ebuild 685 BLAKE2B dae51274f54b5fd7a13c1ae93a7421f1c19e00c65f06e91df328db88ab33d39dc13d2eb9926e6c422827054d62db69f6be80d75e0c311f5b56ac6ece4d90f6ff SHA512 b993aa6da66d5f33c3bec51b6b1e5565bcea2b862e61cdb8021f6a1dce403fed5ae28945d260efdcbb86a81c4a84b58f3ef3b3f6601d43032241cae59a652794 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f diff --git a/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild new file mode 100644 index 000000000000..309628b09148 --- /dev/null +++ b/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library for the sidplay2 fork with resid-fp" +HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/" +SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/6" +KEYWORDS="~amd64 ~hppa ~riscv x86" +IUSE="static-libs" + +src_prepare() { + default + # fix automagic. warning: modifying .ac triggers maintainer mode. + sed -i -e 's:doxygen:dIsAbLe&:' configure || die +} + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libsidplayfp/libsidplayfp-2.10.1.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.10.1.ebuild new file mode 100644 index 000000000000..bc7c3460f07e --- /dev/null +++ b/media-libs/libsidplayfp/libsidplayfp-2.10.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library for the sidplay2 fork with resid-fp" +HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/" +SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/6" +KEYWORDS="~amd64 ~hppa ~riscv ~x86" +IUSE="static-libs" + +src_prepare() { + default + # fix automagic. warning: modifying .ac triggers maintainer mode. + sed -i -e 's:doxygen:dIsAbLe&:' configure || die +} + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libsidplayfp/libsidplayfp-2.11.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.11.0.ebuild new file mode 100644 index 000000000000..bc7c3460f07e --- /dev/null +++ b/media-libs/libsidplayfp/libsidplayfp-2.11.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library for the sidplay2 fork with resid-fp" +HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/" +SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/6" +KEYWORDS="~amd64 ~hppa ~riscv ~x86" +IUSE="static-libs" + +src_prepare() { + default + # fix automagic. warning: modifying .ac triggers maintainer mode. + sed -i -e 's:doxygen:dIsAbLe&:' configure || die +} + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest index 379a20de0a50..f8bc31e48cb1 100644 --- a/media-libs/libsndfile/Manifest +++ b/media-libs/libsndfile/Manifest @@ -1,5 +1,5 @@ DIST libsndfile-1.2.2.tar.xz 730760 BLAKE2B bc8e49983d9ad9dfd98984e2ffef501c6f576480e556e9f9ef91c7d597524cc1bb8baed15dfef8e239f72c42136c524117029eb8271f3a2c9d607fee490279b5 SHA512 a6e3ea3ac5d91befaa99f6a31a3fac44e7b7c11f1de4698167317a461d5a19a2651d47486a920b34400f18367b4f6173bf0c1c9ba80eb682cece1b5beee352a0 -EBUILD libsndfile-1.2.2-r2.ebuild 1767 BLAKE2B 1580dfb079773e1f1b766dbd50f3c6666acd8713c8dd2887fe1c46e8c41c817e7d43652d686a599bd21776dfb7e82a70b04de296db2168cfe849a3080619f44a SHA512 589b92d1773031b5aa1d7c4f0240564b0638d089f8404f72425a992dd0b79a7b8301e7d05754924108beed0ee86ce94283aa0ca445cecbd90294f28f4cd32f3e +EBUILD libsndfile-1.2.2-r2.ebuild 1767 BLAKE2B ee09c452b9c799774df5391e9cb00a87812632629c6adfddb3a881a9fc00fdf25e9cde12e81ea7b7d32a1c7717beb2d6152ad3ac1da9e9ffac3bce1a0a9e8cf7 SHA512 9b3ea342bfc5481267bb22785156993d00cdf67198e1aff746ca4aec8b9b448e603274efc6ab039f97736062de0510bf789c00125d5f239d4f88f9ed976ab8a2 EBUILD libsndfile-1.2.2.ebuild 1762 BLAKE2B fb968771efb509e9b7414d2bf915695cc4ce71a57c9bf393ad13390fe1e99f9b2e82abb5bf4d4c8a97f0e6341b3531681cfc0ad3549b325a9329296bba1a5105 SHA512 e9429bc4dc4a1ebb659a83c5b7e3c2b37f7744e5a569957bb6408b11098dc9aa1dc3e0d7035e66880931954cc0eb5cddc19760804c05c2219148d8d2192e2fe3 -EBUILD libsndfile-9999.ebuild 1774 BLAKE2B 9b3ee63d6a430cc95e29cb43b394933626a64289e1b72283feb94f1a132d044a085774dea84a65602fbcb580539d4ed9c5ff050810bd64ddf6aacbd86df23360 SHA512 66bac6da4ad6a9a21beaaea1ed8f8e03b5b09aed1fe21833376913e230ad59e9da229bf4ef10d494aeee83ff2278232886347a10ae5b50c67e3c9aae3bf826d6 +EBUILD libsndfile-9999.ebuild 1774 BLAKE2B a9963d47b497aa510a1d6a3fb3ddf4c679ede3655d21cb1f34c7c40e4f4ea3c6d77c113d166d14be5631e0dae4fcc74376d72af59ef161f0e46b7513fdea0b05 SHA512 a4bcfec322f5c51b3a18eea870c6ca9306d7fdfaf6c962364ea1e032fe995a90088ef1fd097c9468f602c801ca98d87bcb69e086ba1e869ee93d8c0ed04bfd3a MISC metadata.xml 413 BLAKE2B 744bb13f39bb333b397c4d00ca7f59ff8d6155992bc9991fe50345a456a9bbd5a059dc0bd6d6478cf04991f53aeabc409896d44bc0e963945ecf99ac260ebd0e SHA512 dfbac91e8bd390ed1cb504180418ace1c4becf34fa7306effc78f1d188e1fa7cbf20418c9eef67ab10c9479240c7fa576ad76e263a16e7133e15c83596bf2f2e diff --git a/media-libs/libsndfile/libsndfile-1.2.2-r2.ebuild b/media-libs/libsndfile/libsndfile-1.2.2-r2.ebuild index 5d0ec2b0eb7b..dc08adbb90a0 100644 --- a/media-libs/libsndfile/libsndfile-1.2.2-r2.ebuild +++ b/media-libs/libsndfile/libsndfile-1.2.2-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild index 41c8a8824a00..d75e3910471e 100644 --- a/media-libs/libsndfile/libsndfile-9999.ebuild +++ b/media-libs/libsndfile/libsndfile-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest index c9783d910596..785c44b9a267 100644 --- a/media-libs/libtgvoip/Manifest +++ b/media-libs/libtgvoip/Manifest @@ -1,5 +1,5 @@ DIST libtgvoip-2.4.4_p20221208.tar.gz 1098020 BLAKE2B 6f1eae38e4396ca3b88ab4337176a6076d5f9008b2a865cd286265a9b73d83d44c2cc6828b65dcb580a897a19badeab502395e2128a15c276ae796ac1ab0da68 SHA512 62243629890b1c13f1dbbffae4f82964a0fe23d2071852730674ccbef31126c6e205cfa526f07ba1549ef8eae31e371fb4335ce5f95fd649560bee2b3b530e64 DIST libtgvoip-2.4.4_p20240706.tar.gz 1089879 BLAKE2B 0b0b83d4c43b18ab6af0cfd2795887180c4cb89d2b4ca22680a472e61c4908a4d2634fcb14677702bc9dc10e0df8d61029e0d361aa53303940cfbec36516afee SHA512 80d09c3e2a02461a2e71855ef086d453c4a95829c8183c7768f390bef82ab2124a3059931a043704e010d5e9ca512ee3001eb054dd3903f84ab51970e52e2ef4 EBUILD libtgvoip-2.4.4_p20221208-r1.ebuild 1590 BLAKE2B acd78346ce651d81b37c5aa9aebdef2fc0aa08d11279f948a28bad7488542c4e4911ef462a90e03f7064de3f27b7a42faf96d5a1be36154bfb74609efbc7535e SHA512 58dad0923ce053873c4a16e67871d4bd35ec1ae1833d1dc3792fbb480e7829c09ca8797c39e5b8e2e28513db42e82e9de51a1e4d7082b18806c622b9fb8f6a3a -EBUILD libtgvoip-2.4.4_p20240706.ebuild 1591 BLAKE2B 1811a79497aee8bcda032cdfa2aba5bc458a2fd826b94fc996a66ed3209b3f10709ca70c312247504bcfe40486a5c63a0e5a1736f62b6644c7c83ca397b8c1a7 SHA512 ab6d334ab4ac2de1b266a3cbb130321cffc9d1a47972b579d426d2a6295bde8d222889394e2f27351662dfb759662bf453db5e28a3f07dc3651a4d749a2df78d +EBUILD libtgvoip-2.4.4_p20240706.ebuild 1590 BLAKE2B 090db21bd07e7f4c3ded7f8d8d16ebbfeabbb584f28df8f1435dfecdea0f34e4980ce66830e57074c54933b3adfc146641aff7ab4a23c5bf5ab749b77e88964a SHA512 d8505e3e189fb892cde264c31b4db0db474f3c0423fb55de88c58d4652351bd34f360886aec641058662ba1372b766d421f9b3214233961c24d26fe35b6a7102 MISC metadata.xml 633 BLAKE2B 53413d3bf4124e2d415bd0851deac01649bdf5f44069805a8e8904b93a0ad731df46169813955670aafedb6630a6fe7102b5954339df59435aafa6a6a35bd954 SHA512 96a69dcfd9e0b615fefb8ea9a8715ad2a2d4c62ce59e725434de3fe42889bb93c2b4ac1fbd2d20a23be62c9a59ca70e93f883247a83f344ff9abde2970cd4e50 diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20240706.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20240706.ebuild index 3032ed6833b6..755ad2bcff63 100644 --- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20240706.ebuild +++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20240706.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}" LICENSE="Unlicense" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv" IUSE="+dsp +alsa pulseaudio" DEPEND=" diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest index f54920db5b64..38d272b090d5 100644 --- a/media-libs/libv4l/Manifest +++ b/media-libs/libv4l/Manifest @@ -1,9 +1,3 @@ -AUX libv4l-1.26.0-meson.patch 3156 BLAKE2B c0b91160b4a065458e2889a196671f4fe083fa44c0061c00ecb1f272274af5edc00780bbe74003a03264a3d50ca5af010f4c75ce574547a1d39a09ebf1f72ec1 SHA512 f20f72ac9edc1ac188b838975dac7f5a64fb37910c6e714003121355a587bc6610e70a355fceb15839051ca9ca5042695e83ee424b1238e8159e0ffdb971e878 -AUX libv4l-1.26.1-libcxx.patch 1681 BLAKE2B 7a9caceeb658b11161ceffd62337b7415688cc52498a6ee710c392f812dc3489b9fc670116e11a077f1d3a6e31be51dadd7d2f3e94e4cd9fa52b5109a4fb379b SHA512 c9750908a19454ea31b8a8167350c375040acbcde75c798062d712d9d5cb17d87175beb4c10abcab20fa6f13a21cf2bfd1b809c34ee42ee7166d4dfb02a18ae0 -DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170 -DIST v4l-utils-1.26.1.tar.xz 1192312 BLAKE2B 84a6b5737447fa332b64af8fdc2ecb308865528bc16487e55a4ccc00a76288239432b299ab2225829530db9158b0449f64e2e1c3fb782c7495da55ea8e7a171a SHA512 a3b12b311977afec410db8b430696e923a24e04f003a5891cc77ddeb667d0b98666a06d31a439c95ce57d9e9c9c2593c5e9dd9e7cf2be002adb95db5b8f00ac8 DIST v4l-utils-1.28.1.tar.xz 1246516 BLAKE2B a68728ab6802754cd766453375e212624ee731a7fc9b0d0da6a4c62ce19e75968c5bdbefa33d2977d439a23f36f5c8ff83efc44dae65eed206a31ef19ea57363 SHA512 6493c97f59af5fe0ffa4bb815ebac4531f5ea2b0612c2035c7f00a888ce686ee0aeeaef982553ff9ad6441c39dac63e6c718b1bedb0541cb2ce2e3c2f91ab12f -EBUILD libv4l-1.22.1.ebuild 1468 BLAKE2B bfe49d217e1d1ec17547901214eb71885a7b4be6a4dc94f053972aa64fd8acf8adf2b3d8220783af0ac5e7ba097c722b1fe93595d2c40d06e981566dc32b03ec SHA512 b504673cd46681dc536a1a619e8d2dbccf657e94447704cfa954bb8717f2bef86c995425ce7d114f185379b2b1618316609ec6f53c590d4ce0268800a4f94654 -EBUILD libv4l-1.26.1.ebuild 3294 BLAKE2B 1c822547a8979d0f5edf251aaebee42f3207ca1872ebd3c28ace2046087452c9c4fd3c6c012fbd2f20bb048344418b5d3402580438a89402e6fed280832cc103 SHA512 1155eaeae4099db837ce4fdeab51c95c36d3df4f630d4fb7044a18ac2b731f0eccbd1764aaee3e9e5f5d5b5baa90924bd0168cd1be7f95b9620dc67f5bd74d67 -EBUILD libv4l-1.28.1.ebuild 3605 BLAKE2B 1b444f0c40b03d3968600285df688cb8e0c0b985fec4c9e5a3046ff4db9e5ef7be9e250dd9d68cd492d36e10606a13b763b55ac7428848e2d8539a5d0f02f31a SHA512 f0e6152d572fa452b39724f6e463bfb871cf843e98d1b5b01928604500b5a2cc130bf30d2733fbdb4588163084ab65427d2af4e3878a60ca615e899163e1b567 +EBUILD libv4l-1.28.1.ebuild 3598 BLAKE2B d38f1844f81f599eb41347f34cf38df98d143fa6b1311a5826625ab63e4fb05d61861efe2c0f23d2ddfa1db2c72039c024da1f9383b785740552dedf89299aae SHA512 6ce3214faa068901c3cf0572d130be59743ec7416f74974900062c678d42b14d83744f4d2282d1f58e9e91331a2f94de48cc9d473f5f95f07ef16086022fe7bc MISC metadata.xml 1333 BLAKE2B 980117d95da191d35287e97e99c1add4231438d0e5f763cd576bd9bf79ce894297bd32252b8e73a1356d14be66dde09ef0ae3307a0e856554cb024569eee63ee SHA512 da28f9574865217098fb8602d7860131e58b7c16501bef840814a3ef7870a5565795151c8b574ecc895c9614400b5ac5b444430fd147dabea0f747174d6ae7a0 diff --git a/media-libs/libv4l/files/libv4l-1.26.0-meson.patch b/media-libs/libv4l/files/libv4l-1.26.0-meson.patch deleted file mode 100644 index 9f8384033865..000000000000 --- a/media-libs/libv4l/files/libv4l-1.26.0-meson.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 11ca2682040d14ba1a3d65e95a6f0dfded5e4365 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Tue, 12 Dec 2023 13:39:21 +0000 -Subject: [PATCH 1/2] meson: Fix building with -Dv4l-utils=false - -ir_bpf_enabled was referenced without being defined. ---- - meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/meson.build b/meson.build -index ab632976..7495a9c2 100644 ---- a/meson.build -+++ b/meson.build -@@ -358,6 +358,8 @@ subdir('lib') - if get_option('v4l-utils') - subdir('utils') - subdir('contrib') -+else -+ ir_bpf_enabled = false - endif - - subdir('doc') --- -2.42.1 - -From 15343c83e43805223c098e4c5efe9e176343e801 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Tue, 12 Dec 2023 13:59:13 +0000 -Subject: [PATCH 2/2] meson: Allow documentation directory to be specified with - -Ddocdir - -This is needed by Gentoo Linux QA. - -Signed-off-by: James Le Cuirot <chewi@gentoo.org> ---- - doc/meson.build | 2 +- - meson.build | 5 +++++ - meson_options.txt | 2 ++ - 3 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/doc/meson.build b/doc/meson.build -index 8f4437e7..4b23c3de 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -20,7 +20,7 @@ doxygen_install_dirs = [] - doxygen_output = [] - if get_option('doxygen-html') - doxygen_output += 'html' -- doxygen_install_dirs += get_option('datadir') / 'doc' / '@0@'.format(meson.project_name()) -+ doxygen_install_dirs += docdir - endif - if get_option('doxygen-man') - doxygen_output += 'man' -diff --git a/meson.build b/meson.build -index 7495a9c2..0348b43b 100644 ---- a/meson.build -+++ b/meson.build -@@ -289,6 +289,11 @@ if udevdir == '' - udevdir = '/lib/udev' - endif - -+docdir = get_option('docdir') -+if docdir == '' -+ docdir = get_option('datadir') / 'doc' / '@0@'.format(meson.project_name()) -+endif -+ - qt5_opengl_test = ''' - #define GL_GLEXT_PROTOTYPES - #define QT_NO_OPENGL_ES_2 -diff --git a/meson_options.txt b/meson_options.txt -index 2fa046c0..53cf832f 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -32,6 +32,8 @@ option('v4l2-ctl-stream-to', type : 'boolean', - description : 'Enable use of --stream-to in v4l2-ctl') - - # Directories -+option('docdir', type : 'string', -+ description : 'Set documentation directory') - option('gconvsysdir', type : 'string', - description : 'Set system gconv directory (default is to autodetect)') - option('libv4l1subdir', type : 'string', value : 'libv4l', --- -2.42.1 - -From 8927b2e98efa070999fdf2c3c61825e672044ffd Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Mon, 1 Jan 2024 22:05:34 +0000 -Subject: [PATCH] meson: Fix missing v4l2gl dependency on argp - -Signed-off-by: James Le Cuirot <chewi@gentoo.org> ---- - contrib/test/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/contrib/test/meson.build b/contrib/test/meson.build -index 29b51df6..48ee67b1 100644 ---- a/contrib/test/meson.build -+++ b/contrib/test/meson.build -@@ -107,6 +107,7 @@ if dep_gl.found() and dep_glu.found() and dep_x11.found() - ) - - v4l2gl_deps = [ -+ dep_argp, - dep_gl, - dep_glu, - dep_libv4l2, --- -2.43.0 - diff --git a/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch b/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch deleted file mode 100644 index 5b5eea83bc9a..000000000000 --- a/media-libs/libv4l/files/libv4l-1.26.1-libcxx.patch +++ /dev/null @@ -1,58 +0,0 @@ -From c7ef1a55bb6accb708a4e09d71028b904b07e49e Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Wed, 7 Feb 2024 22:48:59 +0000 -Subject: [PATCH] v4l2-compliance: Fix building against libc++ - -v4l2-test-time32-64.cpp included compiler.h, which checks -_LIBCPP_VERSION. This only works against libc++ when a C++ header has -already been included, which wasn't the case here. - -The <version> header is the C++20 method of defining _LIBCPP_VERSION, -but for older versions, <ciso646> works as an alternative, so include -that in compiler.h. - -compiler.h is for C as well as C++ though, so use __cplusplus to check -for a C++ compiler before including <ciso646>. - -Signed-off-by: James Le Cuirot <chewi@gentoo.org> ---- - include/compiler.h | 27 ++++++++++++--------------- - 1 file changed, 12 insertions(+), 15 deletions(-) - -diff --git a/include/compiler.h b/include/compiler.h -index 5ad54f41..169247a8 100644 ---- a/include/compiler.h -+++ b/include/compiler.h -@@ -1,17 +1,14 @@ --#ifdef _LIBCPP_VERSION --#define fallthrough _LIBCPP_FALLTHROUGH() -+#if !defined(__cplusplus) || __cplusplus < 201103L -+ #define fallthrough ((void)0) - #else -- --#if __cplusplus >= 201103L -- --#ifdef __clang__ --#define fallthrough [[clang::fallthrough]] --#else --#define fallthrough [[gnu::fallthrough]] --#endif // __clang__ -- --#else --#define fallthrough ((void)0) -- -+ #include <ciso646> -+ #ifdef _LIBCPP_VERSION -+ #define fallthrough _LIBCPP_FALLTHROUGH() -+ #else -+ #ifdef __clang__ -+ #define fallthrough [[clang::fallthrough]] -+ #else -+ #define fallthrough [[gnu::fallthrough]] -+ #endif // __clang__ -+ #endif // _LIBCPP_VERSION - #endif // __cplusplus --#endif // _LIBCPP_VERSION --- -2.43.0 - diff --git a/media-libs/libv4l/libv4l-1.22.1.ebuild b/media-libs/libv4l/libv4l-1.22.1.ebuild deleted file mode 100644 index f87601a2e925..000000000000 --- a/media-libs/libv4l/libv4l-1.22.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools linux-info multilib-minimal - -MY_P="v4l-utils-${PV}" - -DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package" -HOMEPAGE="https://git.linuxtv.org/v4l-utils.git" -SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2" - -LICENSE="LGPL-2.1+" -SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="dvb jpeg" - -RDEPEND=" - dvb? ( virtual/libudev[${MULTILIB_USEDEP}] ) - !elibc_glibc? ( sys-libs/argp-standalone ) - jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) - !media-tv/v4l2-ctl - !<media-tv/ivtv-utils-1.4.0-r2 -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - CONFIG_CHECK="~SHMEM" - linux-info_pkg_setup -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # Hard disable the flags that apply only to the utils. - ECONF_SOURCE=${S} \ - econf \ - --disable-static \ - $(use_enable dvb libdvbv5) \ - --disable-qv4l2 \ - --disable-qvidcap \ - --disable-v4l-utils \ - $(use_with jpeg) \ - $(use_with dvb libudev) -} - -multilib_src_compile() { - emake -C lib -} - -multilib_src_install() { - emake -j1 -C lib DESTDIR="${D}" install -} - -multilib_src_install_all() { - dodoc ChangeLog README.lib* TODO - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libv4l/libv4l-1.26.1.ebuild b/media-libs/libv4l/libv4l-1.26.1.ebuild deleted file mode 100644 index 6a97e52ec66d..000000000000 --- a/media-libs/libv4l/libv4l-1.26.1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info meson-multilib systemd udev xdg - -MY_P="v4l-utils-${PV}" - -DESCRIPTION="v4l-utils libraries and optional utilities" -HOMEPAGE="https://git.linuxtv.org/v4l-utils.git" -SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="bpf doc dvb jpeg qt5 tracer +utils" - -REQUIRED_USE=" - bpf? ( utils ) - qt5? ( utils ) - tracer? ( utils ) -" - -RDEPEND=" - dvb? ( virtual/libudev[${MULTILIB_USEDEP}] ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - utils? ( - !elibc_glibc? ( sys-libs/argp-standalone ) - bpf? ( - dev-libs/libbpf:= - virtual/libelf:= - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5[-gles2-only(-),-gles2(-)] - dev-qt/qtwidgets:5 - media-libs/alsa-lib - virtual/opengl - ) - tracer? ( dev-libs/json-c:= ) - virtual/libudev - ) - !<media-tv/v4l-utils-1.26 -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig - bpf? ( sys-devel/clang:*[llvm_targets_BPF] ) - doc? ( app-text/doxygen ) - utils? ( - dev-lang/perl - qt5? ( dev-qt/qtcore:5 ) - ) -" - -# Not really prebuilt but BPF objects make our QA checks go crazy. -QA_PREBUILT="*/rc_keymaps/protocols/*.o" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.26.0-meson.patch - "${FILESDIR}"/${PN}-1.26.1-libcxx.patch -) - -check_llvm() { - if [[ ${MERGE_TYPE} != binary ]] && use bpf; then - local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}} - ${clang} -target bpf -print-supported-cpus &>/dev/null || - die "${clang} does not support the BPF target. Please check LLVM_TARGETS." - fi -} - -pkg_pretend() { - has_version -b sys-devel/clang && check_llvm -} - -pkg_setup() { - check_llvm - CONFIG_CHECK="~SHMEM" linux-info_pkg_setup -} - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_feature bpf) - -Dgconv=disabled - $(meson_feature jpeg) - $(meson_feature dvb libdvbv5) - $(meson_native_use_feature qt5 qv4l2) - $(meson_native_use_feature qt5 qvidcap) - $(meson_native_use_feature tracer v4l2-tracer) - $(meson_native_use_bool utils v4l-utils) - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - -Dudevdir="${EPREFIX}$(get_udevdir)" - $(meson_native_use_feature doc doxygen-doc) - $(meson_native_use_bool doc doxygen-html) - $(meson_native_use_bool doc doxygen-man) - ) - meson_src_configure -} - -multilib_src_install_all() { - dodoc ChangeLog README.lib* TODO - - if use utils; then - dodoc README.md - newdoc utils/dvb/README README.dvb - newdoc utils/libv4l2util/TODO TODO.libv4l2util - newdoc utils/libmedia_dev/README README.libmedia_dev - newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance - fi -} - -pkg_postinst() { - xdg_pkg_postinst - use utils && udev_reload - - if use utils && [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then - ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so" - ewarn "you may need to take action to avoid breakage. See" - ewarn "https://bugs.gentoo.org/767175 for more details." - fi -} - -pkg_postrm() { - xdg_pkg_postrm - use utils && udev_reload -} diff --git a/media-libs/libv4l/libv4l-1.28.1.ebuild b/media-libs/libv4l/libv4l-1.28.1.ebuild index 1f7dd58a4506..0baeeb18e021 100644 --- a/media-libs/libv4l/libv4l-1.28.1.ebuild +++ b/media-libs/libv4l/libv4l-1.28.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1+" SLOT="0/0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="bpf doc dvb jpeg qt5 qt6 tracer +utils" REQUIRED_USE=" diff --git a/media-libs/libva-intel-driver/Manifest b/media-libs/libva-intel-driver/Manifest index bc2093b85d7f..36d8fc0410ce 100644 --- a/media-libs/libva-intel-driver/Manifest +++ b/media-libs/libva-intel-driver/Manifest @@ -1,4 +1,5 @@ +AUX 2.4.1-Make-wl_drm-optional.patch 1929 BLAKE2B 7e157bfb8b2c968376b9fc2b77718b29c8e1f25a1156bd793e0076b85c582897ccdb6b79fe6cc60b08fb5f2526e47fe04c97c6f1e28a3af468a739d90c6ba7b7 SHA512 b6d5a711b782eca3da786711f7b1d0c0b0c6d42d11723bcc0b1fc6f017bef289acf7d41b68ffb294d9e7f1bc616d36c7da5e155f77bcf36f963d3bc0ba84fe7a DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f -EBUILD libva-intel-driver-2.4.1-r4.ebuild 1432 BLAKE2B 80fee8c5f431ad22d7bf8c1c6e87329683f5c94be2e93615945d310d792bdca76d4af1a57e1f0e57678320436367cf4b1f30433103be6a89a1734d05bec977bd SHA512 5e80f6d6d1587649952d06b59c513960d0786985102f5c7f6e986afccd1fbdd0fb74c4d012ef4417d7546a17ad4ae6c171c68bd93bc6f1ae7d5dc92dff3bac71 -EBUILD libva-intel-driver-9999.ebuild 1434 BLAKE2B 187b9f9c37d5e17fddf9669e112b869ce7054836e40186902f7d4740c0e6b381468f6bab4879b79a4f0d5ccd0973faaec51698c4cb8bfc4bab801feac757e6ce SHA512 3869a58a3a4a76e9c58cebf2a8ce55862eabc3da676617b3183cd59fc9d6d39a661db872b7e82cc6f9a0caa61928700a6a309da1d2ab5abc0e4d6907f073dfed +EBUILD libva-intel-driver-2.4.1-r6.ebuild 1489 BLAKE2B a90ef26136bedd66bb0c2872ab435261b2c5bc1b33a109dddb6ba38beb33b5fe20d9f85dc4919a782bc16391f46f2a802fd7bc5563cbcc767dd08a3a9a149934 SHA512 357d55f29462c32f00b5e6447105272dc890189566aa079a452df18cc04ef5ddc94b2e1af059f598d0427dd92d410a490ad857fec3df15c65f911d1e416e7df8 +EBUILD libva-intel-driver-9999.ebuild 1430 BLAKE2B 3f2e55226880954c276cdebd7c948831f31d3e0727352e3eab3e541989658cd5d322f9a619d72c71d4f1b0a442e463d5ded478dbf2eeafaa5171694385e0d794 SHA512 951abbb09f09e281e30969e1576b5a522abee02a492e848364b2cb79b650b3a17865e0443b1dba55a3c1c5a921e88f03a562a0c0f343c67a73fe1f4f6bb78337 MISC metadata.xml 490 BLAKE2B 1a66bd19f05f0c21849b8fe57ffc8f8e153af9a963e045b0c23050734a4aa506b920b91fb4606306f0850514df4465ef6f448042c0c339b61f75d7d6904e0ce7 SHA512 5bf8d70288c3b63678f6adafbf0a3284385e9122e4acf50455741e0472dd8fe1b8eb6d41ea92056cb2da462c31aa812b061297427dc9de1853539dbf762d7cef diff --git a/media-libs/libva-intel-driver/files/2.4.1-Make-wl_drm-optional.patch b/media-libs/libva-intel-driver/files/2.4.1-Make-wl_drm-optional.patch new file mode 100644 index 000000000000..4cc3ee2017c4 --- /dev/null +++ b/media-libs/libva-intel-driver/files/2.4.1-Make-wl_drm-optional.patch @@ -0,0 +1,52 @@ +https://bugs.gentoo.org/941253 +https://github.com/intel/intel-vaapi-driver/pull/566 + +From 1c3c43371d45e1d072faa9a5cd850c1722a06569 Mon Sep 17 00:00:00 2001 +From: Simon Ser <contact@emersion.fr> +Date: Mon, 11 Mar 2024 23:48:17 +0100 +Subject: [PATCH] Make wl_drm optional + +Don't error out when vtable->wl_interface is NULL. + +Fetching wl_drm_interface from libEGL used to work but doesn't +anymore: it's now a private symbol (wayland-scanner private-code). +--- + src/i965_output_wayland.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c +index a6120b7..a002cae 100644 +--- a/src/i965_output_wayland.c ++++ b/src/i965_output_wayland.c +@@ -154,7 +154,7 @@ registry_handle_global( + struct va_wl_output * const wl_output = i965->wl_output; + struct wl_vtable * const wl_vtable = &wl_output->vtable; + +- if (strcmp(interface, "wl_drm") == 0) { ++ if (strcmp(interface, "wl_drm") == 0 && wl_vtable->drm_interface) { + wl_output->wl_drm_name = name; + wl_output->wl_drm = registry_bind(wl_vtable, wl_output->wl_registry, + name, wl_vtable->drm_interface, +@@ -472,6 +472,7 @@ i965_output_wayland_init(VADriverContextP ctx) + + wl_vtable = &i965->wl_output->vtable; + ++ /* drm_interface is optional */ + if (vtable->wl_interface) + wl_vtable->drm_interface = vtable->wl_interface; + else { +@@ -483,9 +484,8 @@ i965_output_wayland_init(VADriverContextP ctx) + } + + dso_handle = i965->wl_output->libegl_handle; +- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), +- libegl_symbols)) +- goto error; ++ dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), ++ libegl_symbols); + } + + i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME); +-- +2.45.2 + diff --git a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r6.ebuild index 4a0de8f43ac2..824e056d80f1 100644 --- a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild +++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="intel-vaapi-driver" if [[ ${PV} = *9999* ]] ; then # Live ebuild @@ -40,8 +40,12 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PV}-Make-wl_drm-optional.patch +) + src_prepare() { - eapply_user + default sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die eautoreconf } diff --git a/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild index f59da31c7a3b..0ab23b553cf4 100644 --- a/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild +++ b/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="intel-vaapi-driver" if [[ ${PV} = *9999* ]] ; then # Live ebuild @@ -41,7 +41,7 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" src_prepare() { - eapply_user + default sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die eautoreconf } diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest index d9407803cba1..1ee742be44ed 100644 --- a/media-libs/libva-intel-media-driver/Manifest +++ b/media-libs/libva-intel-media-driver/Manifest @@ -1,18 +1,8 @@ AUX libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch 1530 BLAKE2B 732af31ff06fc92c7fa5375e767dfbcf52805baa52a71f26b9b2b9687eda9fe60cf9b618030040e5595aba24c9c781eb26243a257a2f025f2427a1a9d2cbafa4 SHA512 eeba11f6c4922c909aef909f145213418c32e28c19bab9b5c6051e51de9482562f1229f2236f1ed0e7365d59359827c889cabc7f81566205e47152bcea380313 AUX libva-intel-media-driver-23.3.4_testing_in_src_test.patch 2497 BLAKE2B 5db90e062447461d7310dc039f8969abd9618142b85b18d7b98dace6ef144df386f3cec3e3a1540588781ef1b92c7b6b276d8bddf30199cb0ff36dc3d7d88b3d SHA512 5a7b10a740e62c8729449d5f1d255621e5dadf944c3c9e13f8c8598c8e11c9b44b59844106825cc22d1fc30846e84539254a4c5b1295c5291638943cd314ca88 -DIST intel-media-24.1.5.tar.gz 25834293 BLAKE2B 076731a57c7fbf6776df393c631e8abda7e07679b5babb28a8973b9919ce6522b3bfa92f9a1fcb173714a2c7dedec79a791a8e94d3e1962df072d1b2157692b9 SHA512 9c8121345f23153361f6458b638938896c42542c80efb0490847aa04c873a0726199985318ee6691f240def12d4f18e804971040dc1284b0cd46287756bb61ba -DIST intel-media-24.2.5.tar.gz 25860224 BLAKE2B 2d2cfe9b72a1271e98deae9b80321c4953e2dfa73db80156d09352f2420081fda4ece0f4d98a4cd9c36217a8808d4816451d041fcb4f46979efaa3c8ae1d84e5 SHA512 f283cf4b6536e2c05df9c169958668ab7ee96291473a203dfd2fe79888e297b0b12f2b75ea9dba988335139fc7a63c1d2a4908a5a7d2c68b807fa131cb29b7b4 -DIST intel-media-24.3.0.tar.gz 27035846 BLAKE2B cb1d8764f532234c8f853d8918f33be2ad31d807fc7b128acb2551e62004d3e8a431bbb7c38e534c0ad5b5f0c2e4e1917da0ea8e242d5785088e2a6a4ef9bc2d SHA512 2e9c21c93e8d842aef7785195c7c6ad4fceb384eccb79e4108d7305cd2ba9ce34e9785ecd227345ede1135678da61259d325f074e1e9c8d08b29da107f96bfdc -DIST intel-media-24.3.1.tar.gz 27087463 BLAKE2B 0c8519e5976e51cb6c854363f23f30bb98ea4a6e47a66e196a18a174ebde89bb71d36d21aa58a39f5dd3da76d225bd8902c1e983865ab1831dac3f7368d476fa SHA512 557fb40dcb409304f3209e0409d208648629f10bdeb2d9f4fe17f3c581bcc05c71d00cc9331c1d498e1981607b7fff7e4cad20a8f88b5b3605c7a606a5648828 -DIST intel-media-24.3.2.tar.gz 27086020 BLAKE2B 3a0dab661cd837075321657f495cd4c09e0226218fa64780777ba85d89a94624d69f383647c12786dcf776da2e04993882dbdeabe03cd9d15e1084dc7fc08042 SHA512 a6a29b07870b1f8288b01f100089026a68e6ca55908f00b1e3d1b579e29f96969f91c948eea2410a982588e8e47ad73ed3b8184acafb645811c5922e76cc0442 -DIST intel-media-24.3.3.tar.gz 27534326 BLAKE2B ab4adb5aded35387ead884cb385f1ce5dffa3a19d00e85095536077d4318e09e260f227b004a16a50faaaac735cb44ff3e7427bf2dba84c0415cd11107de9793 SHA512 73c637677216e3bb145b002d1ce5a4e799cfd0e33656152b8e12e290e893487131e49c01b31573e7b978da89cdb7d5663a1a6c6ad43ae3897e1778569f0c313f DIST intel-media-24.3.4.tar.gz 27623962 BLAKE2B 0f4eb4321db0b3f1ce05461d0321777918dbb7ac1e28dc916040ca252441c7682650c6af0224588c445ccb06cc1c28b8d5ff47b7a0b271e83b1a97cf3af6e67d SHA512 015915b4265fafa5cb619ac69e1cbd3f17ac22fc51dcb9455782cad097dd494c28cdcc9c4c184c739216b419a5b1ec5730ee19d9dedfc83e20761803a3e89d81 -EBUILD libva-intel-media-driver-24.1.5.ebuild 1512 BLAKE2B cf3863f914dca4ca54c2d52455cd2e278e4fa9570743fae517bef623d94d6202a10ef583c724193d0a3fcb169064f2efc4e09c0d0581dd24428fa6ac27f305ee SHA512 ed937550ae0e8944c8e0dc3f76177150bf0fb45e06a193cd410b4d9d6643446f298c1ebcf6b315c7192f6fc342465abce823d01dc0a7667b7336dc012d1925c3 -EBUILD libva-intel-media-driver-24.2.5.ebuild 1512 BLAKE2B 00765470710b756802dc192aa5b9b77f634f1b4235e3d40d31132d1c967d41b8e9cb72c9c3736889a34d1bf7ffd3eae773ca1cad83edb02d129cd9c85534ecf2 SHA512 e8304cf4980d87fa4686d95de0a93e3d365f9a79050f7aaf9be9099ec88518cbb79956c2c11b597791b7a333eb900bca71d8c75d47d377e2a34cb5e42a915163 -EBUILD libva-intel-media-driver-24.3.0.ebuild 1513 BLAKE2B 12f5e2300d3fc0560a6bdbf73d15c3fe54eb71973912c93b089ad6700741f5dd2e180751d75c9f487462d3dd8ded18565c9268f1ed01118d0a8ddae2d2d345db SHA512 51fe6b32460a5d35466aceea3cdee22438bb0d4d2ecb1ea292158c4bf03db0c0e65d5333b1b228a0a92c8660b4e948559c761d240bcd00f5cd8636413d969c1a -EBUILD libva-intel-media-driver-24.3.1-r1.ebuild 1513 BLAKE2B 4df7c3752b76041c049c93e1ca8c91a9dde58bf604409966a3dd83d0cf27c3c4db27e8e27e3e08b239f61cd20649c3feecb4e3e4ec7fb46718f17610ab37c486 SHA512 fc9361487126961ea9eb3b8e0778aee066dd27f12e6961f7204b54338f80f490103483fd3aa3dafdbf3f391a7488bc8c27976571cf1fecb2c7a41778ce85f23b -EBUILD libva-intel-media-driver-24.3.2.ebuild 1513 BLAKE2B 4df7c3752b76041c049c93e1ca8c91a9dde58bf604409966a3dd83d0cf27c3c4db27e8e27e3e08b239f61cd20649c3feecb4e3e4ec7fb46718f17610ab37c486 SHA512 fc9361487126961ea9eb3b8e0778aee066dd27f12e6961f7204b54338f80f490103483fd3aa3dafdbf3f391a7488bc8c27976571cf1fecb2c7a41778ce85f23b -EBUILD libva-intel-media-driver-24.3.3.ebuild 1513 BLAKE2B 4df7c3752b76041c049c93e1ca8c91a9dde58bf604409966a3dd83d0cf27c3c4db27e8e27e3e08b239f61cd20649c3feecb4e3e4ec7fb46718f17610ab37c486 SHA512 fc9361487126961ea9eb3b8e0778aee066dd27f12e6961f7204b54338f80f490103483fd3aa3dafdbf3f391a7488bc8c27976571cf1fecb2c7a41778ce85f23b -EBUILD libva-intel-media-driver-24.3.4.ebuild 1513 BLAKE2B 4df7c3752b76041c049c93e1ca8c91a9dde58bf604409966a3dd83d0cf27c3c4db27e8e27e3e08b239f61cd20649c3feecb4e3e4ec7fb46718f17610ab37c486 SHA512 fc9361487126961ea9eb3b8e0778aee066dd27f12e6961f7204b54338f80f490103483fd3aa3dafdbf3f391a7488bc8c27976571cf1fecb2c7a41778ce85f23b +DIST intel-media-24.4.2.tar.gz 27670782 BLAKE2B a89df89b15cb800fd9e90e8ffaee6ee76cdaa3b97d49feacb0c40e2ff7ac44db38dd2ef4fd65b25bdc4450d95c20559b1a9cb3f87e9f7916568ef7fdea631685 SHA512 63f68c2fec1608082b5e1892b7f0cfadbd9e7c2ccacf681e2e596d020d15dbd8dd95bbff353cf7e987dc9a2638b498594b42c36b366ba9bc8cdf5795f38b23fe +EBUILD libva-intel-media-driver-24.3.4.ebuild 1512 BLAKE2B fbcaa3d74924d108719352a39e427cf67ac308f16c2241b72075651beebfb1a6b121c96f9c4e3866a5ebd5cbdafeee42f1cfa2cb01f76516bf86326133c99e67 SHA512 c24ac146c9bbd37b715697adfba21a486f3887197dde0d5bbd5362acdeddf88a540492b1d60720c96b3461da03b56b9b7de372f515b48898291f69b371ebbff0 +EBUILD libva-intel-media-driver-24.4.2.ebuild 1512 BLAKE2B f1b378ac51d69df8397517fe2d7429a93ff5e437748118686b9c2ad7c80d729093904569ae7ae1c2912c3a877525f21e59b6c3d518bf5effe431dc48dc4df9f8 SHA512 0f0eafab51e79227278db7286a8591c4e856f233336455299fdf4ef9542b69f3b32d50d4e0d260598d3a912a079aa8ed51b095c9e2c7683f2e0f5820c4937ece EBUILD libva-intel-media-driver-9999.ebuild 1513 BLAKE2B 12f5e2300d3fc0560a6bdbf73d15c3fe54eb71973912c93b089ad6700741f5dd2e180751d75c9f487462d3dd8ded18565c9268f1ed01118d0a8ddae2d2d345db SHA512 51fe6b32460a5d35466aceea3cdee22438bb0d4d2ecb1ea292158c4bf03db0c0e65d5333b1b228a0a92c8660b4e948559c761d240bcd00f5cd8636413d969c1a MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370 diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.1.5.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.1.5.ebuild deleted file mode 100644 index 724fb1822753..000000000000 --- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.1.5.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - MY_PV="${PV%_pre}" - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${MY_PV}" - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="amd64" - fi -fi - -DESCRIPTION="Intel Media Driver for VA-API (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" - -LICENSE="MIT BSD redistributable? ( no-source-code )" -SLOT="0" -IUSE="+redistributable test X" - -RESTRICT="!test? ( test )" - -DEPEND=">=media-libs/gmmlib-22.3.14:=[${MULTILIB_USEDEP}] - >=media-libs/libva-2.20.0[X?,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch - "${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch -) - -multilib_src_configure() { - # https://github.com/intel/media-driver/issues/356 - append-cxxflags -D_FILE_OFFSET_BITS=64 - - local mycmakeargs=( - -DMEDIA_BUILD_FATAL_WARNINGS=OFF - -DMEDIA_RUN_TEST_SUITE=$(usex test) - -DBUILD_TYPE=Release - -DPLATFORM=linux - -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) - -DENABLE_NONFREE_KERNELS=$(usex redistributable) - -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now - ) - local CMAKE_BUILD_TYPE="Release" - cmake_src_configure -} diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.2.5.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.2.5.ebuild deleted file mode 100644 index 4acc0837e7aa..000000000000 --- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.2.5.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - MY_PV="${PV%_pre}" - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${MY_PV}" - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="amd64" - fi -fi - -DESCRIPTION="Intel Media Driver for VA-API (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" - -LICENSE="MIT BSD redistributable? ( no-source-code )" -SLOT="0" -IUSE="+redistributable test X" - -RESTRICT="!test? ( test )" - -DEPEND=">=media-libs/gmmlib-22.3.20:=[${MULTILIB_USEDEP}] - >=media-libs/libva-2.21.0[X?,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch - "${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch -) - -multilib_src_configure() { - # https://github.com/intel/media-driver/issues/356 - append-cxxflags -D_FILE_OFFSET_BITS=64 - - local mycmakeargs=( - -DMEDIA_BUILD_FATAL_WARNINGS=OFF - -DMEDIA_RUN_TEST_SUITE=$(usex test) - -DBUILD_TYPE=Release - -DPLATFORM=linux - -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) - -DENABLE_NONFREE_KERNELS=$(usex redistributable) - -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now - ) - local CMAKE_BUILD_TYPE="Release" - cmake_src_configure -} diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.0.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.0.ebuild deleted file mode 100644 index 343e7ed8c609..000000000000 --- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - MY_PV="${PV%_pre}" - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${MY_PV}" - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~amd64" - fi -fi - -DESCRIPTION="Intel Media Driver for VA-API (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" - -LICENSE="MIT BSD redistributable? ( no-source-code )" -SLOT="0" -IUSE="+redistributable test X" - -RESTRICT="!test? ( test )" - -DEPEND=">=media-libs/gmmlib-22.3.20:=[${MULTILIB_USEDEP}] - >=media-libs/libva-2.21.0[X?,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch - "${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch -) - -multilib_src_configure() { - # https://github.com/intel/media-driver/issues/356 - append-cxxflags -D_FILE_OFFSET_BITS=64 - - local mycmakeargs=( - -DMEDIA_BUILD_FATAL_WARNINGS=OFF - -DMEDIA_RUN_TEST_SUITE=$(usex test) - -DBUILD_TYPE=Release - -DPLATFORM=linux - -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) - -DENABLE_NONFREE_KERNELS=$(usex redistributable) - -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now - ) - local CMAKE_BUILD_TYPE="Release" - cmake_src_configure -} diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.1-r1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.1-r1.ebuild deleted file mode 100644 index bc3be02793b7..000000000000 --- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.1-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - MY_PV="${PV%_pre}" - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${MY_PV}" - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~amd64" - fi -fi - -DESCRIPTION="Intel Media Driver for VA-API (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" - -LICENSE="MIT BSD redistributable? ( no-source-code )" -SLOT="0" -IUSE="+redistributable test X" - -RESTRICT="!test? ( test )" - -DEPEND=">=media-libs/gmmlib-22.3.20:=[${MULTILIB_USEDEP}] - >=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch - "${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch -) - -multilib_src_configure() { - # https://github.com/intel/media-driver/issues/356 - append-cxxflags -D_FILE_OFFSET_BITS=64 - - local mycmakeargs=( - -DMEDIA_BUILD_FATAL_WARNINGS=OFF - -DMEDIA_RUN_TEST_SUITE=$(usex test) - -DBUILD_TYPE=Release - -DPLATFORM=linux - -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) - -DENABLE_NONFREE_KERNELS=$(usex redistributable) - -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now - ) - local CMAKE_BUILD_TYPE="Release" - cmake_src_configure -} diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.3.ebuild deleted file mode 100644 index bc3be02793b7..000000000000 --- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -else - MY_PV="${PV%_pre}" - SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" - S="${WORKDIR}/media-driver-intel-media-${MY_PV}" - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~amd64" - fi -fi - -DESCRIPTION="Intel Media Driver for VA-API (iHD)" -HOMEPAGE="https://github.com/intel/media-driver" - -LICENSE="MIT BSD redistributable? ( no-source-code )" -SLOT="0" -IUSE="+redistributable test X" - -RESTRICT="!test? ( test )" - -DEPEND=">=media-libs/gmmlib-22.3.20:=[${MULTILIB_USEDEP}] - >=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch - "${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch -) - -multilib_src_configure() { - # https://github.com/intel/media-driver/issues/356 - append-cxxflags -D_FILE_OFFSET_BITS=64 - - local mycmakeargs=( - -DMEDIA_BUILD_FATAL_WARNINGS=OFF - -DMEDIA_RUN_TEST_SUITE=$(usex test) - -DBUILD_TYPE=Release - -DPLATFORM=linux - -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) - -DENABLE_NONFREE_KERNELS=$(usex redistributable) - -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now - ) - local CMAKE_BUILD_TYPE="Release" - cmake_src_configure -} diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.4.ebuild index bc3be02793b7..68e5df8b6f80 100644 --- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.4.ebuild +++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.4.ebuild @@ -16,7 +16,7 @@ else SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" S="${WORKDIR}/media-driver-intel-media-${MY_PV}" if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~amd64" + KEYWORDS="amd64" fi fi diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.2.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.2.ebuild index bc3be02793b7..42f6583e9710 100644 --- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.2.ebuild +++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.2.ebuild @@ -29,7 +29,7 @@ IUSE="+redistributable test X" RESTRICT="!test? ( test )" -DEPEND=">=media-libs/gmmlib-22.3.20:=[${MULTILIB_USEDEP}] +DEPEND=">=media-libs/gmmlib-22.5.0:=[${MULTILIB_USEDEP}] >=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}] " RDEPEND="${DEPEND}" diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest index c8905e77bd0e..878714f19147 100644 --- a/media-libs/libva/Manifest +++ b/media-libs/libva/Manifest @@ -1,7 +1,4 @@ -AUX libva-2.21.0-no-undefined-version.patch 1686 BLAKE2B 91423e339768f6efcd1a3704dd697c53f0e9459477cc2e967e12642d28ec46b27b98440ab7119764981e0cee2410112af2b6597f9e3c7c8e61340d20d1202d49 SHA512 da0aa0a288cc434f3ad143fc5f375d76ec8ea9125befb2f7eb628da0c4e95ddc833a167eff69fa9e2653a8e379fbb8cce80c27eccbd9d8ccc368280dbb485123 -DIST libva-2.21.0.tar.gz 281515 BLAKE2B bd430162b07987d8982d8f81296e94623efea68624f34b7e159ebefeb37a2b062f2c0d809e16e76c172d6c2df11b59691174fb9a1d65d0938949ac2a025b746c SHA512 93654bb892e0e269d7682a1344fe6f7298432d1f2b347396c63aa1bd84ac0f707af34950a93098fe86a9bc8986fc9f97f75f0f15d8495ffd2caf8cf0eed9612c DIST libva-2.22.0.tar.gz 301705 BLAKE2B b438c95613628b8eb1150238016bafdf2ef33fc01ed78742cd50768238cedf5475752a6dd7413ee217961a705abcd7628219ddf3f13c5aa77015b6bbb4e77929 SHA512 cd633e5e09eac1ed10f1fc12b0f664f836e0eda9e47c17e1295b746cfd643a18fd0564a06a148ced3cf1e2321aa4d21275918bcf8c717d3981e98a598179f370 -EBUILD libva-2.21.0.ebuild 1645 BLAKE2B 51e1e15f5aa4e42650b6967d404f04cabfd9a56bb55aee81ef998e23be2a42580c4bb1a7546b0f0ceb1b923ad2b0656a31390a1c8df8cb595263235d4cec394b SHA512 65810a2e5cdf56d0ba0556e87ecf586016eab7692d58e996a1a9cec59abc8a8e8e710acf8027d05a770c74bbdbeca305c43aab5b9d25df9825ec0e4c38a2068f EBUILD libva-2.22.0.ebuild 1577 BLAKE2B 1730caf550103f827e0c08225d692249fa4b75cd0cef49208b5aa3fe045109525ef56f38b0ead5f430ef77c96db1140da5314176c271532f53c6fab6fffe2310 SHA512 df534a65df7fda86c2f12406cd8d8096067553021e2b7157d9003d0b791c35402ea0c4322ce4d230bec0cd3e2a9e45658bd1ad56df6138d0ea61d354cbd81fdd EBUILD libva-9999.ebuild 1544 BLAKE2B 9a11667941f748b7de6ee372496a659d71d32f409b98e8a77e922fbff6b2a1852828c9f2674e45a2570783d42a4e92a04ad26949afde51fc3ecabe4a2d0deee9 SHA512 4463670469882e5e3e56c0f92bbb7c375ee6bf0e7ead0306f717b0e8f96ac21d5e1ba8b0922df18909fb5002224b4dfba32981b6a48aa926b45dfc64b82b53a0 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0 diff --git a/media-libs/libva/files/libva-2.21.0-no-undefined-version.patch b/media-libs/libva/files/libva-2.21.0-no-undefined-version.patch deleted file mode 100644 index 007540bdb535..000000000000 --- a/media-libs/libva/files/libva-2.21.0-no-undefined-version.patch +++ /dev/null @@ -1,46 +0,0 @@ -From https://github.com/intel/libva/commit/17e07d17ba723a6b5822390afacdd3ccd976ecd2 Mon Sep 17 00:00:00 2001 -From: Violet Purcell <vimproved@inventati.org> -Date: Sun, 1 Oct 2023 16:34:19 -0400 -Subject: [PATCH] va: Fix -Wl,--version-script check with LLD 17 - -LLD 17 uses --no-undefined-version by default, so the check currently -fails due to vaCreateSurface being undefined. This commit replaces that -check with a generic check in the top level meson.build, using the -conftest.syms file. - -Signed-off-by: Violet Purcell <vimproved@inventati.org> ---- /dev/null -+++ b/conftest.syms -@@ -0,0 +1,6 @@ -+VERSION_1 { -+ global: -+ main; -+ local: -+ *; -+}; ---- a/meson.build -+++ b/meson.build -@@ -87,6 +87,12 @@ dl_dep = cc.find_library('dl', required : false) - WITH_DRM = not get_option('disable_drm') and (host_machine.system() != 'windows') - libdrm_dep = dependency('libdrm', version : '>= 2.4.60', required : (host_machine.system() != 'windows')) - -+ld_supports_version_script = cc.links( -+ 'int main() { return 0; }', -+ name : '-Wl,--version-script', -+ args : ['-shared', '-Wl,--version-script,' + '@0@/@1@'.format(meson.current_source_dir(), 'conftest.syms')] -+) -+ - WITH_X11 = false - if get_option('with_x11') != 'no' - x11_dep = dependency('x11', required : get_option('with_x11') == 'yes') ---- a/va/meson.build -+++ b/va/meson.build -@@ -60,7 +60,7 @@ libva_sym_arg = '-Wl,-version-script,' + '@0@/@1@'.format(meson.current_source_d - - libva_link_args = [] - libva_link_depends = [] --if cc.links('', name: '-Wl,--version-script', args: ['-shared', libva_sym_arg]) -+if ld_supports_version_script - libva_link_args = libva_sym_arg - libva_link_depends = libva_sym - endif diff --git a/media-libs/libva/libva-2.21.0.ebuild b/media-libs/libva/libva-2.21.0.ebuild deleted file mode 100644 index 55ff808ff96f..000000000000 --- a/media-libs/libva/libva-2.21.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson-multilib optfeature - -DESCRIPTION="Video Acceleration (VA) API for Linux" -HOMEPAGE="https://01.org/linuxmedia/vaapi" - -if [[ ${PV} = *9999 ]] ; then - inherit git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/libva" -else - SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1)" -IUSE="wayland X" - -RDEPEND=" - >=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}] - wayland? ( - >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - x11-libs/libxcb:=[${MULTILIB_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - wayland? ( dev-util/wayland-scanner ) - virtual/pkgconfig -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/va/va_x11.h - /usr/include/va/va_dri2.h - /usr/include/va/va_dricommon.h -) - -PATCHES=( - "${FILESDIR}/libva-2.21.0-no-undefined-version.patch" -) - -multilib_src_configure() { - local emesonargs=( - -Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers" - -Ddisable_drm=false - -Dwith_x11=$(usex X) - -Dwith_glx=no - -Dwith_wayland=$(usex wayland) - -Denable_docs=false - ) - meson_src_configure -} - -pkg_postinst() { - optfeature_header - optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver - optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver -} diff --git a/media-libs/libvpl-tools/Manifest b/media-libs/libvpl-tools/Manifest index 50aef8798b9b..d5d61e2f683d 100644 --- a/media-libs/libvpl-tools/Manifest +++ b/media-libs/libvpl-tools/Manifest @@ -1,3 +1,5 @@ DIST libvpl-tools-1.1.0.tar.gz 1282378 BLAKE2B 4565c5f4c3c7128a925882877f432ac4618ea8d3df05ec308cb6d6b0201fd94953597ce42f1e90dec73ad02612c74afa9deea1a68116436f78204f92ecfeb1e8 SHA512 2aa1e8bca981018bfd09a1500062f468364e7dac51c8643c08103ad3adf791e67b718bec01388143f95e2b1d47eac0cab8a31100574124fae825e8272d4fc87e +DIST libvpl-tools-1.2.0.tar.gz 1294249 BLAKE2B 8a9e8db303d7b0632c7a0e8b03fa1ebff79dedbe581e185824f731415fb3bb9bc58712551ccea9354d0f8b04755efc222c27d1b1e9f6a34d7fd1982d89bb4dd5 SHA512 e44e752aec48673ff93c7d6eaa9363150607e299008b5df6bed2a6373355c37483d68d703b2e45586ff6062a83ef87fabbd70c034926389873bb3470b1712bc4 EBUILD libvpl-tools-1.1.0.ebuild 1452 BLAKE2B a0c97021b9c754fc4eb87751a6ad864f860cb4a5cba03bd4cccba32276d2ff3565de5d96e79164f902124e1b5eb84361c00374120debfaf08f9408d2ede3f842 SHA512 825af6d9303878c98c884ee82ae4f36f50a923796ede7f451e22b2600c1a5dfe3716af6572163c961ea546493a846ec7ab36fd976baef68984ddac80601022a8 -MISC metadata.xml 405 BLAKE2B c982a523bf698ab07b871f4c15d1b5b690721dadeddf845c3dacfdaf8c9335b66df03b12b0d90ad684843e0ca1af0d92ef73c40ae6d93380c5bb580d718bc7ec SHA512 809830c4eed32d149a73ce87f9a1de441335cd5adb7ec9649873954af1eceb7635402eda79cbc9ec39162c8875455309d29d9da16caaf6e683f13de21534a69f +EBUILD libvpl-tools-1.2.0.ebuild 1452 BLAKE2B a0c97021b9c754fc4eb87751a6ad864f860cb4a5cba03bd4cccba32276d2ff3565de5d96e79164f902124e1b5eb84361c00374120debfaf08f9408d2ede3f842 SHA512 825af6d9303878c98c884ee82ae4f36f50a923796ede7f451e22b2600c1a5dfe3716af6572163c961ea546493a846ec7ab36fd976baef68984ddac80601022a8 +MISC metadata.xml 406 BLAKE2B a51913d776770d6192fe37ec59cbc616d0e4c0a15129f0a9e218f6ef8d62ee62ddbfdccf226d65a8835651eac1085215e8f308b3ab10f6c18db55c9874ac7ee3 SHA512 279e30f67ae55687bbeec0458da3145d3bc2212b01f0e5b2acddb45ac9da2429799473190716c2d275b55f321d2caf356e49a7b145e070f8f000b79f31bce6e1 diff --git a/media-libs/libvpl-tools/libvpl-tools-1.2.0.ebuild b/media-libs/libvpl-tools/libvpl-tools-1.2.0.ebuild new file mode 100644 index 000000000000..60f9e36be1fe --- /dev/null +++ b/media-libs/libvpl-tools/libvpl-tools-1.2.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Intel Video Processing Library tools" +HOMEPAGE="https://github.com/intel/libvpl-tools/" +SRC_URI="https://github.com/intel/libvpl-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="dri +drm opencl test +vaapi wayland X" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + dri? ( X ) + opencl? ( X ) + vaapi? ( drm ) + wayland? ( vaapi ) + X? ( vaapi ) +" + +RDEPEND=" + drm? ( x11-libs/libdrm[video_cards_intel] ) + opencl? ( virtual/opencl ) + vaapi? ( media-libs/libva[X?,wayland?,drm(+)?] ) + wayland? ( + dev-libs/wayland + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + ) + x11-libs/libpciaccess + >=media-libs/libvpl-2.11.0:= +" + +DEPEND="${RDEPEND} + wayland? ( + dev-libs/wayland-protocols + ) +" + +BDEPEND="virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DBUILD_TESTS="$(usex test)" + + -DBUILD_EXPERIMENTAL="$(usex X)" + -DTOOLS_ENABLE_X11="$(usex X)" + -DTOOLS_ENABLE_SCREEN_CAPTURE="$(usex X)" + -DTOOLS_ENABLE_RENDER="$(usex X)" + -DTOOLS_ENABLE_OPENCL="$(usex opencl)" + + -DENABLE_DRI3="$(usex dri)" + -DENABLE_DRM="$(usex drm)" + -DENABLE_VA="$(usex vaapi)" + -DENABLE_WAYLAND="$(usex wayland)" + -DENABLE_X11="$(usex X)" + + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + ) + cmake_src_configure +} diff --git a/media-libs/libvpl-tools/metadata.xml b/media-libs/libvpl-tools/metadata.xml index 33d1f718149c..2b3db8e02799 100644 --- a/media-libs/libvpl-tools/metadata.xml +++ b/media-libs/libvpl-tools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>andrewammerlaan@gentoo.org</email> diff --git a/media-libs/libvpl/Manifest b/media-libs/libvpl/Manifest index 6133f2f9db48..ef56521eccb0 100644 --- a/media-libs/libvpl/Manifest +++ b/media-libs/libvpl/Manifest @@ -1,5 +1,5 @@ -DIST libvpl-2.11.0.tar.gz 11372299 BLAKE2B b9e95505468d8771ba9fa29c3024db2f3d2ad78d2be62c7b405c8cfd29cd5601ee10445de4ffb42c27c412760192c7505b6fb94391dddadf5118d5c785b8df74 SHA512 9b6be42fbf6c8ac48b6f04607b6c6acea7ba0ef8434b323cb1d307ac4e917144351ae9f64d2f8c5f9a5668b8623557e231b0aaf0d579cc9718c6113c37f81804 DIST libvpl-2.12.0.tar.gz 11398775 BLAKE2B e1f0a59f7261dae399eae39318b0c9c9fc671a013c4b7442af34025dce981112f6d254e39f1de432e4f4f155d00148ec9c89652e05734e1ba9cfd6e14f54d4c0 SHA512 4a9f0272684c896ca8a11c316fe05f7ea60c0cd402b0b474a90523f5aca1a16cffac84d89758c27d837ca6e7ac68b82d6aec028ee7aa237626a2194709f48782 -EBUILD libvpl-2.11.0.ebuild 1261 BLAKE2B ba5b407e308945f7d6eb0919641d153181bc358571e353b17c3e14925624687ab432a610f044d941731d2ae1d3b21358f189f3697cdd8260820293f8123a4cbc SHA512 8e346e1b0757b1fe16b9897a659e90e2148e2981b3c1b53aff51712af8b16666c4860aefeadf9666e73f4faa6bad2f35a056cff7e34762a7a60733e114e4fd0a +DIST libvpl-2.13.0.tar.gz 12952887 BLAKE2B e90bb3a99127b07dc29c9bf8ea2411f4b360344e11050c1e5821840eed9a54c0d73d88aabf425dbda7313b95e416f5323ee535b9c5e5f11d76c4e0465e1ca16e SHA512 22b9f409a9b8ed551847e1b5a94d0c48502b5fbf68ec28021ba36d3f851ef83896205977e6b7f52c102f747a8fbc793424181ecd7edaf6058a39dc15b78d19cd EBUILD libvpl-2.12.0.ebuild 1261 BLAKE2B ba5b407e308945f7d6eb0919641d153181bc358571e353b17c3e14925624687ab432a610f044d941731d2ae1d3b21358f189f3697cdd8260820293f8123a4cbc SHA512 8e346e1b0757b1fe16b9897a659e90e2148e2981b3c1b53aff51712af8b16666c4860aefeadf9666e73f4faa6bad2f35a056cff7e34762a7a60733e114e4fd0a -MISC metadata.xml 419 BLAKE2B f0a67c2ef81927f664289847a3432021bc314b91e5544b046865388bd6c73defce5142e7308bc14b06b4c1fd081a12cb8991cd92e3a81849da3dad497ff73a93 SHA512 73b088bdb91a03118fee1e04ef2c403be4e50cd5460d67fdfef370e7f57dd5aab91364f0d002208fd1e2c48f9dee2bb8fe439f26410b750e231d1c01f0139589 +EBUILD libvpl-2.13.0.ebuild 1261 BLAKE2B ba5b407e308945f7d6eb0919641d153181bc358571e353b17c3e14925624687ab432a610f044d941731d2ae1d3b21358f189f3697cdd8260820293f8123a4cbc SHA512 8e346e1b0757b1fe16b9897a659e90e2148e2981b3c1b53aff51712af8b16666c4860aefeadf9666e73f4faa6bad2f35a056cff7e34762a7a60733e114e4fd0a +MISC metadata.xml 420 BLAKE2B 3d5c85cb32d1d36cc0a7f441c0866cd9837904573eeb770cec279122371674a02102f63e0527ba5016d5a79bcc820a16f507f4223d382c0c6104c32aec1ab6ba SHA512 7030bed7af7f4def92005e1076557797f9a30aecb370b89f0ae34a57e6f109cf05b920efc975c6f240f978612d73bf1e471f5ea3efd8b989ed9b271b8f3d6810 diff --git a/media-libs/libvpl/libvpl-2.11.0.ebuild b/media-libs/libvpl/libvpl-2.13.0.ebuild index 915dea848836..915dea848836 100644 --- a/media-libs/libvpl/libvpl-2.11.0.ebuild +++ b/media-libs/libvpl/libvpl-2.13.0.ebuild diff --git a/media-libs/libvpl/metadata.xml b/media-libs/libvpl/metadata.xml index 3414bc8c7e63..05f41feab7a7 100644 --- a/media-libs/libvpl/metadata.xml +++ b/media-libs/libvpl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>media-video@gentoo.org</email> diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest index aedde2f91fd6..e2e01daa07d0 100644 --- a/media-libs/libvpx/Manifest +++ b/media-libs/libvpx/Manifest @@ -9,5 +9,5 @@ DIST libvpx-testdata-1.14.0.tar.xz 571257860 BLAKE2B 88cbd11dc4078fcb586d1d2f0d7 EBUILD libvpx-1.13.1-r1.ebuild 4270 BLAKE2B 3d2ca7743b74f9f487396050cadf3179f6523df609118f440354ea9d56acf0d1e4720aefbbdc42106b5af5035c096433263b514abd14869107c19407a74c9ee1 SHA512 5bbb949393b4e4d13300b6f041cdcbd2bd9c64e5c18dd49c938da39621071d776012e8115d0cc773cda2ba28e0736b30530a3970982fadcd728ff2563aa3ccd1 EBUILD libvpx-1.13.1.ebuild 4214 BLAKE2B ec80e24deda66b631cc59a1b6d586821676ef86ff22b8f64cce41493c7d48bf41b785651d49dfaba41d3f39429dabc35a30193cf8d9d95c80d6d40cd1556f6c7 SHA512 e0feb91d2de295c18a1e9215bffe1f7fa9851292c602fff06fb98e0f6818bd781c8d13e3ba4c4b9ce58c58c61736c0da213138148fe29a5f29aa5230f6f21a39 EBUILD libvpx-1.14.0.ebuild 4365 BLAKE2B 53a52cb3f75c4bf57577de21f0fbaad393b8edfbb27aab47a1ec1048c6012b6939c5b4d39baeca8741d1975baef05069ff9fa02447db6b15f106dd0ef389fa45 SHA512 734ee75b86e93baf7a2ec89bd6889a99e55eec6327cbed514b7650e08433c689e956bd06e3ab5b7ac46094fe4edb550fad3382c2259946f84aba4fbc418eb91d -EBUILD libvpx-1.14.1.ebuild 3936 BLAKE2B 8f09182c43e39cf19561e09088621d0ac4521b4c215e47fe2f5720a27c0d212601ba0a38b5f06dfb38aaafbc81c87daacec8f2ee8373296cc8224e299fb007d7 SHA512 9e69527aa7241a4e8b5fb378555415afb315cc2cda8ea017c2c3263ed5878e3725af6e91fc1b6eb9e840fe438563ce49adb16b65d9eb2d95895b5c09e9cc93d6 +EBUILD libvpx-1.14.1.ebuild 3931 BLAKE2B 7e494857688c2c4681427e0eb4005bc215b18cc38223b14f42a2ec68430107607688d190a0c61dcb07c2c03a589513b2d2af5a49dc676712730a2e7fd864e447 SHA512 04554811ddfabb8b69173b342e694b49c52dfddd43169ecb0a7548b6c950e38b510f9b9f7727473442b3235e9a2d8330b6452e7764f7cd47980f25002e321f01 MISC metadata.xml 655 BLAKE2B 00bcc63009898b794c7e142cd83096f779758e0d5ce274d10f97cc08f4b98f929719c01898d64137aa125c7628bb991fb128d07a490e7e7b029be6f1041e28ac SHA512 0d2dd46ed564109ca5cd841b41ccc30ddb45e5c0e416624b7e8c0895d67217cfcc71cba0d13ab96af2a898add5f1cf8feb44b6a015ff8487668055c0f288e9fc diff --git a/media-libs/libvpx/libvpx-1.14.1.ebuild b/media-libs/libvpx/libvpx-1.14.1.ebuild index c7ab10320695..6c7c7c866c64 100644 --- a/media-libs/libvpx/libvpx-1.14.1.ebuild +++ b/media-libs/libvpx/libvpx-1.14.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/9" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads" REQUIRED_USE="test? ( threads )" RESTRICT="!test? ( test )" diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest index bfac700546de..1c2d3f63eb00 100644 --- a/media-libs/libwebp/Manifest +++ b/media-libs/libwebp/Manifest @@ -2,5 +2,5 @@ AUX libwebp-1.2.3-libpng-pkg-config.patch 1894 BLAKE2B 80c19e65b1f913fdf0e9dd37c DIST libwebp-1.3.2.tar.gz 4162949 BLAKE2B 12b3ff3aa9952dd32ce13656146556d5efb6a66860249a8676721980aee10253a1b0335685a769d995e9954cd305190a8ed1878ba4fefce9dcaf41a3976f9e3d SHA512 2b624d2ecfbff6b4db2719e38f146722638ae262acd96327073a04451dd05fb27ef70c5681187821d251df728a6be7e89209c861c561a13bfb786495a830bc20 DIST libwebp-1.4.0.tar.gz 4281370 BLAKE2B 022cef190284b69af781718a82b28ee9806d7e6b1e642ee0833e608f64f691ef918a83e99db02335fb9f60d24d6f0cfc58e7e05e99a3f13d2118719d40a71722 SHA512 1217363fbb5c860b17c2ba4612f240f121c74ced6e3e58e8aa61252a9022f59893c5874bfa433cc50a7e65bac1ae2bfa99fa2cede070183b7a467f148cebb0bd EBUILD libwebp-1.3.2.ebuild 1935 BLAKE2B 12ac912001515b9aa5ac40cc369f2faded63929b7c606730330f647b82584f782d6911d3a3035f7f8e915f5e1c345b4fa28376b30c5e2a80dea678cbafb69eea SHA512 08e0fffa59f18415cb58573f782bbe4d438eaa6a92bbaa0e156622b6fcd522962ba2655a7f822cb20b1ff596e8711855d5de89c6956fec608db3530a489bc515 -EBUILD libwebp-1.4.0.ebuild 1943 BLAKE2B 3ca1f1f0922eb0844dd5ecce39f61624fe51f10050f2aa4e09fb9a1bff7a62eccf070cb8df8fd9876c98e0ac8994a6f58da7546bd812f9d5bb794c6dfea0f99b SHA512 e9f4a4402279c913d0906fd7fef144fc62e42972e47729f4f018565e13d959347e752ba0fd9065f6a4db660ca9bbfd00aad730b41b3841eae3dddba06246a713 +EBUILD libwebp-1.4.0.ebuild 1936 BLAKE2B dfec6a72ab74dc0fbb85c616fb36bb7d62ade8de46db6e8f595619eada37019e43aa040d8a35c8ff9cac6d9e248d9e931968e22bba21cff320f890a86e576d32 SHA512 aea1bac3678c246232f0250366d5efa0ffd46daba631565062c274b8a792f421ff504d96ece258590683771a3f94043d9a8b8dea2f95a780573ead5e4275d7f5 MISC metadata.xml 442 BLAKE2B 3700315ba8872e208756f663236158c42f967eab7bec9b440b238b14f76357fe7721e571b7c11d79fff0f8df90f9ad35504cef3f6dc2803b8e5394ac0e3ea437 SHA512 5fceda7410ea654e3d9297f3adcad43b99c298b436ec5d77a9396259b61a0c9dd2945b98f7fa7d0b7d38622e14bf82bcfbbbdc18f011f0b949ae61a9a8794800 diff --git a/media-libs/libwebp/libwebp-1.4.0.ebuild b/media-libs/libwebp/libwebp-1.4.0.ebuild index 58fccb2e7a4b..288198fd97fa 100644 --- a/media-libs/libwebp/libwebp-1.4.0.ebuild +++ b/media-libs/libwebp/libwebp-1.4.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/7" # subslot = libwebp soname version if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff" diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest index 25e3dfcea655..e40d1212026f 100644 --- a/media-libs/lilv/Manifest +++ b/media-libs/lilv/Manifest @@ -1,3 +1,3 @@ DIST lilv-0.24.24.tar.xz 105684 BLAKE2B 4228248e8dbee228cee193e259d95b2e66f9f2e3516702dfad0dc126273076230274538c32a857ae9ad8a58545bbf48e7791254441dd4d6e537715de9e5e5be6 SHA512 93a3842a5e000a9c59bf3493c2c10df35a803a7edf6cff09f43e155a7e83d0c7c81bc24a6243828dc141d30187c3f60ef9799f319f72e5b6c3e2d022de757185 -EBUILD lilv-0.24.24.ebuild 1703 BLAKE2B a4392e1b67ac2d966b7d18f7432711033502af1a2c86cc00fc9c161b6666ba615ff990fcad73ad9e7c5258cb2c7541de9697c60c9af962c6b3256364c9459c5e SHA512 a78691cce2a5f914c0ddd144e6449fbdec90bb218ac2fbb7952e22b8d8ec85840f220fd37b1d7adb879c7d713c34b28f09bcc7eed817f5a02d5a56d4459ba219 +EBUILD lilv-0.24.24.ebuild 1703 BLAKE2B c1aab919df9d199c15a08f9a9ebadcaf1a3bfa4869730f87b47d56b6b58a380ffc3e7d635c678c3e5f5ed017063008a63f2909051365642fb562d4fe23ea9ab9 SHA512 40e062b9ef6255bd8056f094f411f8115ca00cc0af180427b677ff3d247bf71f82ee3157e56897418e3c28fafdc03ee7096b3c708ee7d26300019b7b51e5d878 MISC metadata.xml 694 BLAKE2B 95d755914e68f4f5f1a3b5e04bea2cdb2cb2068d03e83f5d4dfba74e72b124e3db964c634c9f092e1f7201798ad405724a9d29190ce2086f39a9e674bdab8d2e SHA512 671fc5f358b6e5bf4ea212af706ea6c4695f399866050d9822c05dea0f8467c8b8f207887615397a7e686f399be809ab31367dfeb1a6ad62ff2680480d591f47 diff --git a/media-libs/lilv/lilv-0.24.24.ebuild b/media-libs/lilv/lilv-0.24.24.ebuild index 8182ce59414c..792fd76eb41e 100644 --- a/media-libs/lilv/lilv-0.24.24.ebuild +++ b/media-libs/lilv/lilv-0.24.24.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..13} ) PYTHON_REQ_USE='threads(+)' inherit meson-multilib python-single-r1 diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest index 2b5a27eef14e..7bcca193bfda 100644 --- a/media-libs/lv2/Manifest +++ b/media-libs/lv2/Manifest @@ -1,5 +1,5 @@ AUX lv2-1.18.10-tests-optional.patch 1245 BLAKE2B 1b77b64a9b613bf2299cb4bfc8f53f360a2c4b12754809ea38dca5f4d40c0a3cc636ce16131f50fbb1730af535de96749873cde7e34ecceb1c055ef614aad70c SHA512 000fe518c276d3e25558ccf76a9fd34ac4fb8c5222b94a8d47fb517496a5020963b02136b398116776e66d25920672dd57f1c3d88cbc7cfc7bc26107367aea93 AUX lv2-1.18.6-add-missing-lv2.h.patch 401 BLAKE2B 36380468184705a7f0076e293af0c69c60815676046749f2c6bf41c8e0ad747115c673671d67bfc2882d9782288f9b7627b9dafadb023063bc478bbfa0c7c86d SHA512 bdc404792a522c2bca25ca243c469a4d109b253a761d32981055469314b23e3bb470c60b46d75b6ee1f077c7d978b51dfb2d95671cdb1eb6fd83aad01c6df4d6 DIST lv2-1.18.10.tar.xz 237380 BLAKE2B 72f9bc50ebac5d71279e0616bb1eb3c2a6748a28ff68988294135b18c7adc68c46a52b4698faf79f633768bf850d5052128a9f84b90aa9b5f9a56721acaf04c3 SHA512 ab4bcf593f633b1ed16c0eb6aa4525458a00655ef9c87619bf85eaa966f8fd094a8e871b825f679e0d97923f8bbbf11841ff467022390ca2f1a5b5f66ccd5d1b -EBUILD lv2-1.18.10-r1.ebuild 1905 BLAKE2B 0e0c4e3276156750f096085fc6597e2fa241c87db8e796ebaca766afd9da637ee6aa7dd8759b8b7991093499c502e09911833e136431bad573406ae2e1beae46 SHA512 9550138fbe1baa7bc7ec97fc506e5bf2f97c46838ec8e32a9aff2404ce90bd4c52966ee8d174551bd29aaf6addb19eb7fd36c339297f7a8c4564bced4f4d33b3 +EBUILD lv2-1.18.10-r1.ebuild 1905 BLAKE2B 997bf71cf80035fa0e21bc39b7d0a5ae1cceeea2a743bab3969d124f8f78fa3b9e9817348b546ef26a07d7135ef2fa548f104c67bb2b64fe9e5fcda619af87e6 SHA512 63d11de9abc6647816b0a2b940c6af8b8fd544e90a8e7859adc66b322164e97dfef64627f88bffc61ffea076e38a88a606c4a5ca09e5ef4a31b5cdd379858a2a MISC metadata.xml 466 BLAKE2B dadec1c479bf528c62768913e86892f085a1879288abe0b55dcab28ec54583629445c38efce1deb20cfcfdeeb1d6989e10295c8c2014874b83e742e08db26089 SHA512 bfa47b7b47c935f8d2ff2f9d99fd56bb1cc5e98467d18636e73dc59e4ed7f0fa795c05e0bfd27a3146bfe615b4254c67960b06465989dd3d9524894b1063c63c diff --git a/media-libs/lv2/lv2-1.18.10-r1.ebuild b/media-libs/lv2/lv2-1.18.10-r1.ebuild index aecf02501555..1c8eea2dfd03 100644 --- a/media-libs/lv2/lv2-1.18.10-r1.ebuild +++ b/media-libs/lv2/lv2-1.18.10-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE='threads(+)' inherit meson-multilib python-single-r1 diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 24fd81d42b8b..9d8623d7bd0e 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,5 +1,8 @@ DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d SHA512 890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01 DIST mesa-24.2.3.tar.xz 29465732 BLAKE2B 3c480bd9f5948ae4d66a833cfc059b1b872fca989296a070deaa46aeb72298eaca6a3fa9d13574859623cec4a6af978f44d2c9562b9757be2257364c27600be6 SHA512 7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44 +DIST mesa-24.2.4.tar.xz 29510040 BLAKE2B a0a977e5032e1c9a5b59dc9212d50b6f023fb9d42d325e692a3c680e77a06e2ccd66843b9eaeeadbf3614b65798c5c4649fb0bb74f134334e662ee9dd47ac21f SHA512 f0f1c23591cce85966efaf3988afdb14b64ceb7216b3994e8fc50e8ddc62c35a84b2013285c84080d963aec2afb94dac345f5f00e7ccf9ae7e9ab3f5b9ba0bcb +DIST mesa-24.2.5.tar.xz 29534380 BLAKE2B 6ea7303b7e762a3f32ebbccd53a47f28ab6b6919850f55fffc5be10ab2873a206d9f78ef3a2c32c55f6ab94d2886104b9c96f2140fdb7d4c1ac67650d3521441 SHA512 9f202907dc4e7f1063c32882b2c9a3ab34c4d83de1c9ef4dd171043b87b110bfd7e7a3d6e3632ed768e024ef18b97181c4f6bc377cc7d3eb609dd96ebf6a783e +DIST mesa-24.2.6.tar.xz 29568568 BLAKE2B e49fc85c8a61315d86b253b7dd8052a1e46ea99d5188cf930c833317898c51b7b413286f57a53af3c2b1bb147ce2541ea80279ee9e237deeb499729bb7fd8381 SHA512 830a40d38200ff8b2a6bd949e1ac3bf4edc887a10d9aa92285007d138079e1fafb3568f658e777e7894e95b5ce75d2bd6836b0473fa70d32270005e482b1a2da DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434 @@ -7,7 +10,10 @@ DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d7 DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 -EBUILD mesa-24.1.7.ebuild 13726 BLAKE2B e9eba330a72bf2ec9c2952b000f9a6a6ac3e3c52cb818b43dcb9922e19fa349c6365824bbcef10656e5c8c54cf42b3ee0aed9217475d6f47061dab913b12e230 SHA512 ff861f7fc740ee83fdebc1aa6ec6e15feca240bbf34dfa76f6db2ee8e4869338bc55bc3309dc81adc947e9adad3765ea2ce6c0fff6949617b5763785a8766b7b -EBUILD mesa-24.2.3.ebuild 13659 BLAKE2B 32d44100cd4ce9aebfee04282dfa5737af9d474b5910689e653ecce82cec0d4178a1940f139a84c66e91dfa3f741a758747238f60719fa45b5fedd15701ddd0e SHA512 015e393fe9052adba524343f3b0831a60bb1c9fa690ec11eb77d15563ac360e9b9c5cb78c87c7d43e230052c07a1e7cd5c21b5fe89420978a1094cf6ba60ac41 -EBUILD mesa-9999.ebuild 13487 BLAKE2B e06b11a3614044d274aef59e5c53869c54dcfcca5262fa95d7e4259cc70c16ed007eead41f078c4aede32f94c31efac8bda6af0f4245e6b8b6ddd4155eba1a28 SHA512 72f16fce51dc9e660647932bf3755d2dd5698914aade06d8c7815f73615c7c130a47134e9b9d90d2b1d3bded8670a961294b994c5ad40ea7bbe9f29b35a5edcb +EBUILD mesa-24.1.7.ebuild 13660 BLAKE2B e94987284b4be2c8030f619a527d3b71f619db647ecacdf3316f7b0892f42faf5790fe491051c3b56c53fe494748244b7d6e1ae9732b4642759045370bec2ec3 SHA512 1955c9012fbb3b193ac0308a3a96510378ee122a309f43d5cd41a5fa167068a533ad05664a38fd362c414f8679b78c86c95e06519166e98fd9ffe9193c65be93 +EBUILD mesa-24.2.3.ebuild 13593 BLAKE2B d5bf49de60cc31698f6f80726f29248ed0be82586a6a99d90de07888a65f2864a34a29214f8b085f906ca3d10f0b710b1b01c1e828e5c16e1753fc43bc101380 SHA512 400a78f879b0ed486ae9e784ed7c54dceb508d61e6059b30131481eafa72f7491f7203236fdb559e41f2f17620f20569003ec88c5758fea4a2993d45c0feffaf +EBUILD mesa-24.2.4.ebuild 13593 BLAKE2B d5bf49de60cc31698f6f80726f29248ed0be82586a6a99d90de07888a65f2864a34a29214f8b085f906ca3d10f0b710b1b01c1e828e5c16e1753fc43bc101380 SHA512 400a78f879b0ed486ae9e784ed7c54dceb508d61e6059b30131481eafa72f7491f7203236fdb559e41f2f17620f20569003ec88c5758fea4a2993d45c0feffaf +EBUILD mesa-24.2.5.ebuild 13593 BLAKE2B d5bf49de60cc31698f6f80726f29248ed0be82586a6a99d90de07888a65f2864a34a29214f8b085f906ca3d10f0b710b1b01c1e828e5c16e1753fc43bc101380 SHA512 400a78f879b0ed486ae9e784ed7c54dceb508d61e6059b30131481eafa72f7491f7203236fdb559e41f2f17620f20569003ec88c5758fea4a2993d45c0feffaf +EBUILD mesa-24.2.6.ebuild 13593 BLAKE2B d5bf49de60cc31698f6f80726f29248ed0be82586a6a99d90de07888a65f2864a34a29214f8b085f906ca3d10f0b710b1b01c1e828e5c16e1753fc43bc101380 SHA512 400a78f879b0ed486ae9e784ed7c54dceb508d61e6059b30131481eafa72f7491f7203236fdb559e41f2f17620f20569003ec88c5758fea4a2993d45c0feffaf +EBUILD mesa-9999.ebuild 13421 BLAKE2B 2a8a549aac4ccf56daf6e3b9ee0b44aa24a35d0980a39b694466096c5d0f9c0745b046a34913393c928e3270310124529b1cb5332c7087fd601cfd0711f570d8 SHA512 4a156c67ccd3a33c7be3055f8bbed80389e6f717ad305f22e670e4aa00b03b62e99c13755e04db826deb0b87b9767d61aae53d9c40681da37deb2cf13f221fda MISC metadata.xml 1303 BLAKE2B 348e84a15156bd8ae4634c1866f83f1b283b77f8478e66e57dd3f047a6346d1cc67a7c808ce159b82d292dfab62e8b6c4d17cefcae7aea6fa38739667947258b SHA512 448c3d73ded90117f38cec7c80eead4bdac1599c563798c91c96bca8543b9db2e5c2a06f26f9b7496af085a964aff51ed8b0882aa88f18404b64447de2f65598 diff --git a/media-libs/mesa/mesa-24.1.7.ebuild b/media-libs/mesa/mesa-24.1.7.ebuild index 21a8ac3b80e2..af5ee095a972 100644 --- a/media-libs/mesa/mesa-24.1.7.ebuild +++ b/media-libs/mesa/mesa-24.1.7.ebuild @@ -8,7 +8,7 @@ LLVM_OPTIONAL=1 CARGO_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain MY_P="${P/_/-}" @@ -303,7 +303,7 @@ multilib_src_configure() { local emesonargs=() # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 - tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto + filter-lto local platforms use X && platforms+="x11" diff --git a/media-libs/mesa/mesa-24.2.3.ebuild b/media-libs/mesa/mesa-24.2.3.ebuild index f6e781d20e57..a58a2652340e 100644 --- a/media-libs/mesa/mesa-24.2.3.ebuild +++ b/media-libs/mesa/mesa-24.2.3.ebuild @@ -8,7 +8,7 @@ LLVM_OPTIONAL=1 CARGO_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..13} ) -inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain MY_P="${P/_/-}" @@ -307,7 +307,7 @@ multilib_src_configure() { local emesonargs=() # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 - tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto + filter-lto local platforms use X && platforms+="x11" diff --git a/media-libs/mesa/mesa-24.2.4.ebuild b/media-libs/mesa/mesa-24.2.4.ebuild new file mode 100644 index 000000000000..a58a2652340e --- /dev/null +++ b/media-libs/mesa/mesa-24.2.4.ebuild @@ -0,0 +1,490 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +CARGO_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain + +MY_P="${P/_/-}" + +CRATES=" + syn@2.0.68 + proc-macro2@1.0.86 + quote@1.0.33 + unicode-ident@1.0.12 + paste@1.0.14 +" + +inherit cargo + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI=" + https://archive.mesa3d.org/${MY_P}.tar.xz + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi + +# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files, +# but there are "stale" distfiles on the mirrors with the wrong names. +# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}" +SRC_URI+=" + ${CARGO_CRATE_URIS} +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +LICENSE="MIT SGI-B-2.0" +SLOT="0" + +RADEON_CARDS="r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} + d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl + vivante vmware zink" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + cpu_flags_x86_sse2 d3d9 debug +llvm + lm-sensors opencl +opengl osmesa +proprietary-codecs selinux + test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa +zstd" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + d3d9? ( + || ( + video_cards_freedreno + video_cards_intel + video_cards_nouveau + video_cards_panfrost + video_cards_r300 + video_cards_r600 + video_cards_radeonsi + video_cards_vmware + video_cards_zink + ) + ) + llvm? ( ${LLVM_REQUIRED_USE} ) + vulkan-overlay? ( vulkan ) + video_cards_lavapipe? ( llvm vulkan ) + video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_zink? ( vulkan opengl ) + video_cards_nvk? ( vulkan video_cards_nouveau ) + vdpau? ( X ) + xa? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}] + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + $(llvm_gen_dep " + sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + opencl? ( + dev-util/spirv-llvm-translator:\${LLVM_SLOT} + sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + ) + ") + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3 + dev-libs/libclc[spirv(-)] + >=dev-util/spirv-tools-1.3.231.0 + virtual/libelf:0= + ) + vaapi? ( + >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] ) + video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) + video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +DEPEND="${RDEPEND} + video_cards_d3d12? ( >=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] ) + valgrind? ( dev-debug/valgrind ) + wayland? ( >=dev-libs/wayland-protocols-1.34 ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=virtual/rust-1.62.0 + >=dev-util/bindgen-0.58.0 + ) + >=dev-build/meson-1.4.1 + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + dev-python/pyyaml[\${PYTHON_USEDEP}] + ") + video_cards_intel? ( + ~dev-util/intel_clc-${PV} + dev-libs/libclc[spirv(-)] + $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") + ) + vulkan? ( + dev-util/glslang + video_cards_nvk? ( + >=dev-util/bindgen-0.68.1 + >=dev-util/cbindgen-0.26.0 + >=virtual/rust-1.74.1 + ) + ) + wayland? ( dev-util/wayland-scanner ) +" + +QA_WX_LOAD=" +x86? ( + usr/lib/libglapi.so.0.0.0 + usr/lib/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + unpack ${MY_P}.tar.xz + fi + + # We need this because we cannot tell meson to use DISTDIR yet + pushd "${DISTDIR}" >/dev/null || die + mkdir -p "${S}"/subprojects/packagecache || die + local i + for i in *.crate; do + ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die + done + popd >/dev/null || die +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_lavapipe && + ! use video_cards_nouveau && + ! use video_cards_nvk && + ! use video_cards_panfrost && + ! use video_cards_radeonsi && + ! use video_cards_v3d && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl" + fi + fi + + # VA + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1 + if use llvm && use vulkan && use video_cards_intel && use amd64; then + python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 + fi +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + use llvm && llvm-r1_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + bin/symbols-check.py || die # bug #830728 +} + +multilib_src_configure() { + local emesonargs=() + + # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 + filter-lto + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_freedreno || + use video_cards_intel || # crocus i915 iris + use video_cards_nouveau || + use video_cards_panfrost || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_vmware || # svga + use video_cards_zink; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_intel || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + gallium_enable !llvm softpipe + gallium_enable llvm llvmpipe + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + if use llvm && use opencl; then + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst + emesonargs+=( + $(meson_native_true gallium-rusticl) + -Drust_std=2021 + ) + fi + + if use vulkan; then + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel intel_hasvk + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_panfrost panfrost + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + vulkan_enable video_cards_vc4 broadcom + vulkan_enable video_cards_virgl virtio + if use video_cards_nvk; then + vulkan_enable video_cards_nvk nouveau + if ! multilib_is_native_abi; then + echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini" + emesonargs+=( + --native-file "${T}"/rust_fix.ini + ) + fi + fi + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + if use opengl && use X; then + emesonargs+=(-Dglx=dri) + else + emesonargs+=(-Dglx=disabled) + fi + + if [[ "${ABI}" == amd64 ]]; then + emesonargs+=($(meson_feature video_cards_intel intel-rt)) + fi + + use debug && EMESON_BUILDTYPE=debug + + emesonargs+=( + $(meson_use test build-tests) + -Dshared-glapi=enabled + -Ddri3=enabled + -Dexpat=enabled + $(meson_use opengl) + $(meson_feature opengl gbm) + $(meson_feature opengl gles1) + $(meson_feature opengl gles2) + $(meson_feature opengl glvnd) + $(meson_feature opengl egl) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dintel-clc=$(usex video_cards_intel system auto) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure + + if ! multilib_is_native_abi && use video_cards_nvk; then + sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die + fi +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/mesa/mesa-24.2.5.ebuild b/media-libs/mesa/mesa-24.2.5.ebuild new file mode 100644 index 000000000000..a58a2652340e --- /dev/null +++ b/media-libs/mesa/mesa-24.2.5.ebuild @@ -0,0 +1,490 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +CARGO_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain + +MY_P="${P/_/-}" + +CRATES=" + syn@2.0.68 + proc-macro2@1.0.86 + quote@1.0.33 + unicode-ident@1.0.12 + paste@1.0.14 +" + +inherit cargo + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI=" + https://archive.mesa3d.org/${MY_P}.tar.xz + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi + +# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files, +# but there are "stale" distfiles on the mirrors with the wrong names. +# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}" +SRC_URI+=" + ${CARGO_CRATE_URIS} +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +LICENSE="MIT SGI-B-2.0" +SLOT="0" + +RADEON_CARDS="r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} + d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl + vivante vmware zink" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + cpu_flags_x86_sse2 d3d9 debug +llvm + lm-sensors opencl +opengl osmesa +proprietary-codecs selinux + test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa +zstd" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + d3d9? ( + || ( + video_cards_freedreno + video_cards_intel + video_cards_nouveau + video_cards_panfrost + video_cards_r300 + video_cards_r600 + video_cards_radeonsi + video_cards_vmware + video_cards_zink + ) + ) + llvm? ( ${LLVM_REQUIRED_USE} ) + vulkan-overlay? ( vulkan ) + video_cards_lavapipe? ( llvm vulkan ) + video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_zink? ( vulkan opengl ) + video_cards_nvk? ( vulkan video_cards_nouveau ) + vdpau? ( X ) + xa? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}] + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + $(llvm_gen_dep " + sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + opencl? ( + dev-util/spirv-llvm-translator:\${LLVM_SLOT} + sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + ) + ") + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3 + dev-libs/libclc[spirv(-)] + >=dev-util/spirv-tools-1.3.231.0 + virtual/libelf:0= + ) + vaapi? ( + >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] ) + video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) + video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +DEPEND="${RDEPEND} + video_cards_d3d12? ( >=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] ) + valgrind? ( dev-debug/valgrind ) + wayland? ( >=dev-libs/wayland-protocols-1.34 ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=virtual/rust-1.62.0 + >=dev-util/bindgen-0.58.0 + ) + >=dev-build/meson-1.4.1 + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + dev-python/pyyaml[\${PYTHON_USEDEP}] + ") + video_cards_intel? ( + ~dev-util/intel_clc-${PV} + dev-libs/libclc[spirv(-)] + $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") + ) + vulkan? ( + dev-util/glslang + video_cards_nvk? ( + >=dev-util/bindgen-0.68.1 + >=dev-util/cbindgen-0.26.0 + >=virtual/rust-1.74.1 + ) + ) + wayland? ( dev-util/wayland-scanner ) +" + +QA_WX_LOAD=" +x86? ( + usr/lib/libglapi.so.0.0.0 + usr/lib/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + unpack ${MY_P}.tar.xz + fi + + # We need this because we cannot tell meson to use DISTDIR yet + pushd "${DISTDIR}" >/dev/null || die + mkdir -p "${S}"/subprojects/packagecache || die + local i + for i in *.crate; do + ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die + done + popd >/dev/null || die +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_lavapipe && + ! use video_cards_nouveau && + ! use video_cards_nvk && + ! use video_cards_panfrost && + ! use video_cards_radeonsi && + ! use video_cards_v3d && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl" + fi + fi + + # VA + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1 + if use llvm && use vulkan && use video_cards_intel && use amd64; then + python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 + fi +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + use llvm && llvm-r1_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + bin/symbols-check.py || die # bug #830728 +} + +multilib_src_configure() { + local emesonargs=() + + # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 + filter-lto + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_freedreno || + use video_cards_intel || # crocus i915 iris + use video_cards_nouveau || + use video_cards_panfrost || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_vmware || # svga + use video_cards_zink; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_intel || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + gallium_enable !llvm softpipe + gallium_enable llvm llvmpipe + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + if use llvm && use opencl; then + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst + emesonargs+=( + $(meson_native_true gallium-rusticl) + -Drust_std=2021 + ) + fi + + if use vulkan; then + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel intel_hasvk + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_panfrost panfrost + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + vulkan_enable video_cards_vc4 broadcom + vulkan_enable video_cards_virgl virtio + if use video_cards_nvk; then + vulkan_enable video_cards_nvk nouveau + if ! multilib_is_native_abi; then + echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini" + emesonargs+=( + --native-file "${T}"/rust_fix.ini + ) + fi + fi + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + if use opengl && use X; then + emesonargs+=(-Dglx=dri) + else + emesonargs+=(-Dglx=disabled) + fi + + if [[ "${ABI}" == amd64 ]]; then + emesonargs+=($(meson_feature video_cards_intel intel-rt)) + fi + + use debug && EMESON_BUILDTYPE=debug + + emesonargs+=( + $(meson_use test build-tests) + -Dshared-glapi=enabled + -Ddri3=enabled + -Dexpat=enabled + $(meson_use opengl) + $(meson_feature opengl gbm) + $(meson_feature opengl gles1) + $(meson_feature opengl gles2) + $(meson_feature opengl glvnd) + $(meson_feature opengl egl) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dintel-clc=$(usex video_cards_intel system auto) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure + + if ! multilib_is_native_abi && use video_cards_nvk; then + sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die + fi +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/mesa/mesa-24.2.6.ebuild b/media-libs/mesa/mesa-24.2.6.ebuild new file mode 100644 index 000000000000..a58a2652340e --- /dev/null +++ b/media-libs/mesa/mesa-24.2.6.ebuild @@ -0,0 +1,490 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +CARGO_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain + +MY_P="${P/_/-}" + +CRATES=" + syn@2.0.68 + proc-macro2@1.0.86 + quote@1.0.33 + unicode-ident@1.0.12 + paste@1.0.14 +" + +inherit cargo + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI=" + https://archive.mesa3d.org/${MY_P}.tar.xz + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi + +# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files, +# but there are "stale" distfiles on the mirrors with the wrong names. +# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}" +SRC_URI+=" + ${CARGO_CRATE_URIS} +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +LICENSE="MIT SGI-B-2.0" +SLOT="0" + +RADEON_CARDS="r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} + d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl + vivante vmware zink" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + cpu_flags_x86_sse2 d3d9 debug +llvm + lm-sensors opencl +opengl osmesa +proprietary-codecs selinux + test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa +zstd" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + d3d9? ( + || ( + video_cards_freedreno + video_cards_intel + video_cards_nouveau + video_cards_panfrost + video_cards_r300 + video_cards_r600 + video_cards_radeonsi + video_cards_vmware + video_cards_zink + ) + ) + llvm? ( ${LLVM_REQUIRED_USE} ) + vulkan-overlay? ( vulkan ) + video_cards_lavapipe? ( llvm vulkan ) + video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_zink? ( vulkan opengl ) + video_cards_nvk? ( vulkan video_cards_nouveau ) + vdpau? ( X ) + xa? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}] + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + $(llvm_gen_dep " + sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + opencl? ( + dev-util/spirv-llvm-translator:\${LLVM_SLOT} + sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}] + ) + ") + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3 + dev-libs/libclc[spirv(-)] + >=dev-util/spirv-tools-1.3.231.0 + virtual/libelf:0= + ) + vaapi? ( + >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] ) + video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) + video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +DEPEND="${RDEPEND} + video_cards_d3d12? ( >=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] ) + valgrind? ( dev-debug/valgrind ) + wayland? ( >=dev-libs/wayland-protocols-1.34 ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=virtual/rust-1.62.0 + >=dev-util/bindgen-0.58.0 + ) + >=dev-build/meson-1.4.1 + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + dev-python/pyyaml[\${PYTHON_USEDEP}] + ") + video_cards_intel? ( + ~dev-util/intel_clc-${PV} + dev-libs/libclc[spirv(-)] + $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") + ) + vulkan? ( + dev-util/glslang + video_cards_nvk? ( + >=dev-util/bindgen-0.68.1 + >=dev-util/cbindgen-0.26.0 + >=virtual/rust-1.74.1 + ) + ) + wayland? ( dev-util/wayland-scanner ) +" + +QA_WX_LOAD=" +x86? ( + usr/lib/libglapi.so.0.0.0 + usr/lib/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + unpack ${MY_P}.tar.xz + fi + + # We need this because we cannot tell meson to use DISTDIR yet + pushd "${DISTDIR}" >/dev/null || die + mkdir -p "${S}"/subprojects/packagecache || die + local i + for i in *.crate; do + ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die + done + popd >/dev/null || die +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_lavapipe && + ! use video_cards_nouveau && + ! use video_cards_nvk && + ! use video_cards_panfrost && + ! use video_cards_radeonsi && + ! use video_cards_v3d && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl" + fi + fi + + # VA + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_nouveau && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_virgl; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1 + if use llvm && use vulkan && use video_cards_intel && use amd64; then + python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 + fi +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + use llvm && llvm-r1_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + bin/symbols-check.py || die # bug #830728 +} + +multilib_src_configure() { + local emesonargs=() + + # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 + filter-lto + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_freedreno || + use video_cards_intel || # crocus i915 iris + use video_cards_nouveau || + use video_cards_panfrost || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_vmware || # svga + use video_cards_zink; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_nouveau || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_virgl; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_intel || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + gallium_enable !llvm softpipe + gallium_enable llvm llvmpipe + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + if use llvm && use opencl; then + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst + emesonargs+=( + $(meson_native_true gallium-rusticl) + -Drust_std=2021 + ) + fi + + if use vulkan; then + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel intel_hasvk + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_panfrost panfrost + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + vulkan_enable video_cards_vc4 broadcom + vulkan_enable video_cards_virgl virtio + if use video_cards_nvk; then + vulkan_enable video_cards_nvk nouveau + if ! multilib_is_native_abi; then + echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini" + emesonargs+=( + --native-file "${T}"/rust_fix.ini + ) + fi + fi + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + if use opengl && use X; then + emesonargs+=(-Dglx=dri) + else + emesonargs+=(-Dglx=disabled) + fi + + if [[ "${ABI}" == amd64 ]]; then + emesonargs+=($(meson_feature video_cards_intel intel-rt)) + fi + + use debug && EMESON_BUILDTYPE=debug + + emesonargs+=( + $(meson_use test build-tests) + -Dshared-glapi=enabled + -Ddri3=enabled + -Dexpat=enabled + $(meson_use opengl) + $(meson_feature opengl gbm) + $(meson_feature opengl gles1) + $(meson_feature opengl gles2) + $(meson_feature opengl glvnd) + $(meson_feature opengl egl) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dintel-clc=$(usex video_cards_intel system auto) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "all" "all_free") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure + + if ! multilib_is_native_abi && use video_cards_nvk; then + sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die + fi +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index f213fe761cb9..477f8e886fcc 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -8,7 +8,7 @@ LLVM_OPTIONAL=1 CARGO_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..13} ) -inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs +inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain MY_P="${P/_/-}" @@ -306,7 +306,7 @@ multilib_src_configure() { local emesonargs=() # bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140 - tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto + filter-lto local platforms use X && platforms+="x11" diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 07aeb7e7718f..615041cda6c0 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,8 +1,9 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f -AUX mlt-7.24.0-musl-build-fix.patch 3927 BLAKE2B a8d0d2a5597745cfb078477fd0118e77159723a4628d9272d0891c98c2f8f9aa495ee06b1f5717f612e6045dbc35b38bd7652de18141aa020459e835c5eb63a9 SHA512 19861879d68becd2122d4ad8b81b4017f2df671c12e245888496a0b079b9856d1ac4f5c8af6246b5b35be2e2766bd29d2cce4a9659e92bfd86dbf925e096a774 +AUX mlt-7.28.0-fix-32bit.patch 3262 BLAKE2B 6842c442669b0abb1af2ef60892ee8cb494d7888bb21cab42dc4314fcba14f7cc0fef3ef7fc2f19e885d4ac76d58d0229e1ee5326ba6b45d4366bc5337160616 SHA512 498b19bd031fb384ff2786ab5a2a3e54c76a2913510ab4af7f8cda3b2063ac44cde45dea7006e8e8a53cfa430fe77567384047d979bd2ef075f2a6029a6de334 DIST mlt-7.24.0.tar.gz 1662552 BLAKE2B f6e83b3c3fd9e3bf64366a6f6165b1839003b0fd058e1368e0648e011eff6da1a9af9fa7652aff032bc4ed4465be4648b5f1ae25fc102397aa9ae2d19981643a SHA512 a9e7fd5dc04152e523456bad244416b4fdeb5961ee7cadb816dd1393277d1d801200db595dcd28e520d76e6b2caca17e65c39b0256beb7c42a58ef241b85471d -EBUILD mlt-7.24.0-r1.ebuild 4130 BLAKE2B 0696093d54eae8edc8384eebd59c8e16d67a8ca5f5e8048736d64de6a5ab4c6f22e02ec0dffd2522f3c41df32a898246bc90c3aa1e8a393cb6c88628a75a8032 SHA512 c57a92b98196d6574279872041a1144899d04e6a9acc125141f686772094a861684bc99794e161bef592dcfcf141b5623c7926caa1f94c61542d8b64f46716a0 +DIST mlt-7.28.0.tar.gz 1713069 BLAKE2B 5f9ec615324cd2095131a57b9dc0f79138d48eaa91b62574a028370be2d1c7ec6818ee2b5a9c123d35ec73993c8b2271c8dec4f039273a8443c2674c31e86fbf SHA512 a252da56b668968e56a7b0e81283b0b8e0ec8cd28502e3ab6e0aff67e22620ba61bf4feb88134e0d483884e31f2d18efe2d60b6badf0b6ffae4ad26ee646baf9 EBUILD mlt-7.24.0.ebuild 4077 BLAKE2B 751b8720dba5aa2df8ce12cde88604983b25887b88abf4b8c8a7a97d0546993383d6a0112d73ca7f5641cf668e0b3c5d88248e32ff86073c2308e083dc5b2690 SHA512 f797e0200874a6ac284fee89abd7634b5c6b7710e170765cc0bb3884d6302af5ce796acd9a7d281b8a82b4d3b096ce35b2320882bc3d21517ae6b8b05b04838a +EBUILD mlt-7.28.0.ebuild 4124 BLAKE2B 96c09c95f49d7a1c5cb2c4fc53e31c7f927dd5e0bf2ffe43a6f22e3fd76d337f9df50f8176fdb4b2e42bb1a1d8ea7ef252be6dc570f427cc137a267de599df0e SHA512 329b283671796a02eace44f9d00b01d3520c76b5ede5bc29ef2c28a6d5c115a529e42551f6eb085b8557c78b651ad279555e30d5e5e45ecabe165d2c4b2b194c MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd diff --git a/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch b/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch deleted file mode 100644 index 7349c5dc1a9d..000000000000 --- a/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://github.com/mltframework/mlt/pull/1009 -From: Brahmajit Das <brahmajit.xyz@gmail.com> -Date: Sat, 27 Jul 2024 14:51:47 +0000 -Subject: [PATCH 1/1] Fix building on musl libc - -Not every Linux distribution uses GLibc, hence the code under -``` -\#if defined(__linux__) || defined(__GLIBC__) -``` -is not evaluated properly on non GLibc Linux distributions resulting in -build errors such as: - -``` -/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c: In function 'mlt_properties_set_lcnumeric': -/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c:154:22: error: assignment to 'mlt_locale_t' {aka 'struct __locale_struct *'} from incompatible pointer type 'char *' [-Wincompatible-pointer-types] - 154 | list->locale = strdup(locale); - | ^ -/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c: In function 'mlt_properties_get_lcnumeric': -/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c:186:16: error: assignment to 'const char *' from incompatible pointer type 'mlt_locale_t' {aka 'struct __locale_struct *'} [-Wincompatible-pointer-types] - 186 | result = list->locale; - | ^ -[11/173] /usr/bin/x86_64-pc-linux-musl-gcc -DPREFIX_DATA=\"/usr/share/mlt-7\" -DPREFIX_LIB=\"/usr/lib/mlt-7\" -Dmlt_EXPORTS -I/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/.. -O2 -march=x86-64 -pipe -pipe -frecord-gcc-switches -fno-diagnostics-color -fmessage-length=0 -std=gnu11 -fPIC -mmmx -msse -msse2 -MD -MT src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -MF src/framework/CMakeFiles/mlt.dir/mlt_property.c.o.d -o src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -c /var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c -FAILED: src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -/usr/bin/x86_64-pc-linux-musl-gcc -DPREFIX_DATA=\"/usr/share/mlt-7\" -DPREFIX_LIB=\"/usr/lib/mlt-7\" -Dmlt_EXPORTS -I/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/.. -O2 -march=x86-64 -pipe -pipe -frecord-gcc-switches -fno-diagnostics-color -fmessage-length=0 -std=gnu11 -fPIC -mmmx -msse -msse2 -MD -MT src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -MF src/framework/CMakeFiles/mlt.dir/mlt_property.c.o.d -o src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -c /var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c -/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c: In function 'time_clock_to_frames': -/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c:331:31: error: passing argument 2 of 'setlocale' from incompatible pointer type [-Wincompatible-pointer-types] - 331 | setlocale(LC_NUMERIC, locale); - | ^~~~~~ - | | - | mlt_locale_t {aka struct __locale_struct *} -In file included from /var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.h:34, - from /var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c:28: -/usr/include/locale.h:55:23: note: expected 'const char *' but argument is of type 'mlt_locale_t' {aka 'struct __locale_struct *'} - 55 | char *setlocale (int, const char *); -``` - -Reported on Gentoo Linux with musl libc. -Please refer bug: https://bugs.gentoo.org/936747 for more details. - -Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> ---- a/src/framework/mlt_property.h -+++ b/src/framework/mlt_property.h -@@ -30,7 +30,7 @@ - #include <sys/param.h> - #endif - --#if defined(__linux__) || defined(__GLIBC__) -+#if defined(__GLIBC__) - #include <locale.h> - typedef locale_t mlt_locale_t; - #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 900506) --- -2.45.2 - diff --git a/media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch b/media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch new file mode 100644 index 000000000000..a56dffe2c75d --- /dev/null +++ b/media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch @@ -0,0 +1,101 @@ +From 6f533e7b8999bc4017c1a6685bf2baea6570d44c Mon Sep 17 00:00:00 2001 +From: Dan Dennedy <dan@dennedy.org> +Date: Tue, 24 Sep 2024 09:47:46 -0700 +Subject: [PATCH 1/3] fix #1020 Mlt::Producer::set_creation_time() not exported + on i686 + +--- + src/mlt++/mlt++.vers | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mlt++/mlt++.vers b/src/mlt++/mlt++.vers +index 1934decd..c47f017a 100644 +--- a/src/mlt++/mlt++.vers ++++ b/src/mlt++/mlt++.vers +@@ -540,7 +540,8 @@ MLTPP_6.14.0 { + "Mlt::Service::set_profile(mlt_profile_s*)"; + "Mlt::Playlist::reorder(int const*)"; + "Mlt::Transition::connect(Mlt::Service&, int, int)"; +- "Mlt::Producer::set_creation_time(long)"; ++# "Mlt::Producer::set_creation_time(long)"; ++ _ZN3Mlt8Producer17set_creation_timeE[lx]; + "Mlt::Producer::get_creation_time()"; + }; + } MLTPP_6.10.0; +-- +2.46.1 + + +From 2072c6b3596854f1a7165d7ddd5994204e741db8 Mon Sep 17 00:00:00 2001 +From: Dan Dennedy <dan@dennedy.org> +Date: Tue, 24 Sep 2024 10:00:51 -0700 +Subject: [PATCH 2/3] fix mlt++.vers #1020 + +--- + src/mlt++/mlt++.vers | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mlt++/mlt++.vers b/src/mlt++/mlt++.vers +index c47f017a..2d8c1dda 100644 +--- a/src/mlt++/mlt++.vers ++++ b/src/mlt++/mlt++.vers +@@ -540,10 +540,10 @@ MLTPP_6.14.0 { + "Mlt::Service::set_profile(mlt_profile_s*)"; + "Mlt::Playlist::reorder(int const*)"; + "Mlt::Transition::connect(Mlt::Service&, int, int)"; +-# "Mlt::Producer::set_creation_time(long)"; +- _ZN3Mlt8Producer17set_creation_timeE[lx]; + "Mlt::Producer::get_creation_time()"; + }; ++# "Mlt::Producer::set_creation_time(long)"; ++ _ZN3Mlt8Producer17set_creation_timeE[lx]; + } MLTPP_6.10.0; + + MLTPP_6.18.0 { +-- +2.46.1 + + +From 63953cf7338181c82eb6eb9f93c8c9a11aaee5f7 Mon Sep 17 00:00:00 2001 +From: Dan Dennedy <dan@dennedy.org> +Date: Tue, 24 Sep 2024 10:55:16 -0700 +Subject: [PATCH 3/3] fix Mlt::Properties::set(int64_t) symbol version + +Related to #1020 +--- + src/mlt++/mlt++.vers | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/mlt++/mlt++.vers b/src/mlt++/mlt++.vers +index 2d8c1dda..19300de3 100644 +--- a/src/mlt++/mlt++.vers ++++ b/src/mlt++/mlt++.vers +@@ -310,7 +310,6 @@ MLTPP_0.8.8 { + "Mlt::Properties::set(char const*, char const*)"; + "Mlt::Properties::set(char const*, double)"; + "Mlt::Properties::set(char const*, int)"; +- "Mlt::Properties::set(char const*, long)"; + "Mlt::Properties::set(char const*, void*, int, void (*)(void*), char* (*)(void*, int))"; + "Mlt::Properties::set_lcnumeric(char const*)"; + "Mlt::Properties::setup_wait_for(char const*)"; +@@ -414,6 +413,8 @@ MLTPP_0.8.8 { + "Mlt::Transition::Transition(Mlt::Transition&)"; + "Mlt::Transition::Transition(mlt_transition_s*)"; + }; ++# "Mlt::Properties::set(char const*, int64_t)"; ++ _ZN3Mlt10Properties3setEPKc[lx]; + + local: *; + }; +@@ -542,7 +543,7 @@ MLTPP_6.14.0 { + "Mlt::Transition::connect(Mlt::Service&, int, int)"; + "Mlt::Producer::get_creation_time()"; + }; +-# "Mlt::Producer::set_creation_time(long)"; ++# "Mlt::Producer::set_creation_time(int64_t)"; + _ZN3Mlt8Producer17set_creation_timeE[lx]; + } MLTPP_6.10.0; + +-- +2.46.1 + diff --git a/media-libs/mlt/mlt-7.24.0-r1.ebuild b/media-libs/mlt/mlt-7.28.0.ebuild index f29e65ccd11d..65b63e9a0624 100644 --- a/media-libs/mlt/mlt-7.24.0-r1.ebuild +++ b/media-libs/mlt/mlt-7.28.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-single-r1 cmake flag-o-matic DESCRIPTION="Open source multimedia framework for television broadcasting" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0/7" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 qt6 rtaudio rubberband sdl test vdpau vidstab xine xml" +IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt6 rtaudio rubberband sdl test vdpau vidstab xine xml" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -38,22 +38,18 @@ DEPEND=" virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) - opencv? ( >=media-libs/opencv-4.5.1:=[contrib] ) + opencv? ( + >=media-libs/opencv-4.5.1:=[contrib] + || ( + media-libs/opencv[ffmpeg] + media-libs/opencv[gstreamer] + ) + ) opengl? ( media-libs/libglvnd media-video/movit ) python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/libexif - x11-libs/libX11 - ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[gui,network,opengl,widgets,xml] @@ -93,7 +89,8 @@ PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch "${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch - "${FILESDIR}"/${PN}-7.24.0-musl-build-fix.patch + # in git master, https://github.com/mltframework/mlt/issues/1020 + "${FILESDIR}"/${P}-fix-32bit.patch ) pkg_setup() { @@ -119,29 +116,31 @@ src_configure() { -DCLANG_FORMAT=OFF -DGPL=ON -DGPL3=ON - -DBUILD_TESTING=$(usex test) + -DMOD_QT=OFF + -DMOD_GLAXNIMATE=OFF -DMOD_KDENLIVE=ON + -DMOD_PLUS=ON -DMOD_SDL1=OFF - -DMOD_SDL2=$(usex sdl) + -DMOD_SOX=OFF + -DMOD_SPATIALAUDIO=OFF # TODO: package libspatialaudio + -DUSE_LV2=OFF # TODO + -DUSE_VST2=OFF # TODO -DMOD_AVFORMAT=$(usex ffmpeg) - -DMOD_PLUS=ON -DMOD_FREI0R=$(usex frei0r) -DMOD_GDK=$(usex gtk) -DMOD_JACKRACK=$(usex jack) -DMOD_RESAMPLE=$(usex libsamplerate) -DMOD_OPENCV=$(usex opencv) - -DMOD_SPATIALAUDIO=OFF # TODO: package libspatialaudio -DMOD_MOVIT=$(usex opengl) - -DMOD_QT=$(usex qt5) - -DMOD_GLAXNIMATE=$(usex qt5) -DMOD_QT6=$(usex qt6) -DMOD_GLAXNIMATE_QT6=$(usex qt6) -DMOD_RTAUDIO=$(usex rtaudio) -DMOD_RUBBERBAND=$(usex rubberband) + -DMOD_SDL2=$(usex sdl) + -DBUILD_TESTING=$(usex test) -DMOD_VIDSTAB=$(usex vidstab) -DMOD_XINE=$(usex xine) -DMOD_XML=$(usex xml) - -DMOD_SOX=OFF ) # TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2 diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest index 978b747a2935..8c5102bee860 100644 --- a/media-libs/nas/Manifest +++ b/media-libs/nas/Manifest @@ -1,10 +1,7 @@ -AUX nas-1.9.2-asneeded.patch 374 BLAKE2B a142f505190214db4f235ef8ec6283029c127b9b3c313b2405e6222a6f3d6d89931066d64a71b350b289ed07bed198bbc71a862396ef77d3fb5e7a2426b5abad SHA512 ad9275577d2e10f5201556e21f6251065d392a9620c475e1451b673fa62dc50ac8e45248862a802a70cd0efb19ad67205b50e05df1588f91ef854e66860334a3 -AUX nas-1.9.4-libfl.patch 349 BLAKE2B ee8d3ec8859fc47c87bf5d9a40cc2b468c136983a6b8dfb22d4c6469630b5dae92d3ec382ff7afc5ac2f94435ac8208059f90313a03700c4da7b93a19e34c05c SHA512 e4291fce8199f4340b969da6e2742e26ef6589e71ecc947a0fb1d68b9f995ae7dd514ad98232a4c11d1ebc7ea0ab3ea95674893fedbae7626c97c06c9ba88459 AUX nas-1.9.5-gcc14-build-fix.patch 3319 BLAKE2B d72a07e751b176e76b97791cf0eb551ed4e6ce7cfb290ca41ec69fa07573894bc383e4db34a67858e731e197e056ac24ce81a790332538474afcffa8f29ed880 SHA512 f29e77ef52a923787017a9451fcf83ffb63612bfd06aef403ac6e9ce1caa7502bd2a96c8135366fa29e37ad2c94e5f942b130a2a26121339e975be70b8dbdf5a AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468 DIST nas-1.9.5-patches.tar.xz 7788 BLAKE2B 54172eba6547b0890cdef7b87a38b7d85bf05ffbec2d459da6b66b48ce7e627a9c7a4c4d4550729d0c4acd3de99a0299d57d2cc75ecea74f745764f284a9d0e7 SHA512 dce3e68c3018aa0553b4c48baa66e37db4db54ed33aad388902e2b05c9dcc6e696b69b1c00f9adbcfddcd262ed65758ea5897a13856315edd522297814df0899 DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466 SHA512 051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a EBUILD nas-1.9.5-r2.ebuild 2840 BLAKE2B 5441216b57405922f9da42a044277d1daa73c03a8a9f2fb0877c46fcafdd67fcc799126e816cc8b4f04b2ac39671ae6ad648837d7dea8626c3a64596a1e627dd SHA512 d08b93af96c7378fef365293e63034282df199646e10ec8d477717a739a65cea856ba5ebc6806b4c8a15d451d115686a2a1c95f337a2a0efed2a779c61ae1e77 -EBUILD nas-1.9.5.ebuild 2622 BLAKE2B 1ef6cfc481d73c5620b217ed607c55bb3cce04d9c852e479736bc57e479c592f8a4b7574c0d6496602c6e2caa47d68f3c9e04950edbc91fb699b44e5c5b39b15 SHA512 594de84867720c3db6ca3a0c8425e79757ab8ace2238b10dfe547a9aee8a7791b9bf6823dc44e4ea30605356ffc3f1f26e7a32232eabb498ab3cb8ea6e71357e MISC metadata.xml 327 BLAKE2B 61fd2aff2796ecff70b16eb84bc90e9242cc3b08d8fb8fff9eb702310ad248ed2c0946fa3f974a420684ad9db4c47f871111ec1170e7d44eca89f263ce533f80 SHA512 bc1d1fa01d3ae21da48bc805c5f822cdff2f14f6a9c6c1ad5ee65063c265bd1c62efb3f45746fe9d1cbf55ff742c7812113f94068a47907042952016067310a7 diff --git a/media-libs/nas/files/nas-1.9.2-asneeded.patch b/media-libs/nas/files/nas-1.9.2-asneeded.patch deleted file mode 100644 index 8c588be136f2..000000000000 --- a/media-libs/nas/files/nas-1.9.2-asneeded.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=247761 - ---- a/config/NetAudio.tmpl -+++ b/config/NetAudio.tmpl -@@ -162,7 +162,7 @@ - - AUDIODEPLIBS = $(DEPAULIB) $(DEPXTOOLLIB) $(DEPXLIB) - #ifndef WIN32 -- AUDIOLIBS = $(AULIB) $(XTOOLLIB) $(XLIB) -lm -+ AUDIOLIBS = $(AULIB) $(XTOOLLIB) $(XAUTHLIB) $(XLIB) -lm - #else /* WIN32 */ - AUDIOLIBS = $(AULIB) - #endif /* WIN32 */ diff --git a/media-libs/nas/files/nas-1.9.4-libfl.patch b/media-libs/nas/files/nas-1.9.4-libfl.patch deleted file mode 100644 index cea30f46ba69..000000000000 --- a/media-libs/nas/files/nas-1.9.4-libfl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pur nas-1.9.4-orig/server/Imakefile nas-1.9.4/server/Imakefile ---- a/server/Imakefile 2013-04-27 02:41:06.000000000 +0200 -+++ b/server/Imakefile 2017-03-14 18:58:27.445311356 +0100 -@@ -57,7 +57,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/ - - # endif - #else -- SYSLIBS = -+ SYSLIBS = $(LEXLIB) - #endif - - #ifdef NetBSDArchitecture diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild deleted file mode 100644 index 87a1fe0d13fc..000000000000 --- a/media-libs/nas/nas-1.9.5.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib multilib-minimal toolchain-funcs - -DESCRIPTION="Network Audio System" -HOMEPAGE="https://radscan.com/nas.html" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - -LICENSE="HPND MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" -IUSE="doc static-libs" - -RDEPEND=" - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau[${MULTILIB_USEDEP}] - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt[${MULTILIB_USEDEP}]" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - app-text/rman - app-alternatives/yacc - app-alternatives/lex - sys-devel/gcc - x11-misc/gccmakedep - riscv? ( x11-misc/xorg-cf-files ) - >=x11-misc/imake-1.0.8-r1" - -DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.9.2-asneeded.patch" - "${FILESDIR}/${PN}-1.9.4-libfl.patch" -) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - # Need to run econf so that config.guess is updated - pushd config || die - econf - popd || die - - local cpp=($(get_abi_CHOST ${DEFAULT_ABI})-gcc $(get_abi_CFLAGS) -E) #884203 - CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-${cpp[*]}}" \ - xmkmf -a || die -} - -multilib_src_compile() { - # EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2 - local emakeopts=( - AR="$(tc-getAR) cq" - AS="$(tc-getAS)" - CC="$(tc-getCC)" - CDEBUGFLAGS="${CFLAGS}" - CXX="$(tc-getCXX)" - CXXDEBUFLAGS="${CXXFLAGS}" - EXTRA_LDOPTIONS="${LDFLAGS}" - LD="$(tc-getLD)" - MAKE="${MAKE:-gmake}" - RANLIB="$(tc-getRANLIB)" - SHLIBGLOBALSFLAGS="${LDFLAGS}" - WORLDOPTS= - ) - - if multilib_is_native_abi ; then - # dumb fix for parallel make issue wrt #446598, Imake sux - emake "${emakeopts[@]}" -C server/dia all - emake "${emakeopts[@]}" -C server/dda/voxware all - emake "${emakeopts[@]}" -C server/os all - else - sed -i \ - -e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \ - Makefile || die - fi - - emake "${emakeopts[@]}" -} - -multilib_src_install() { - # ranlib is used at install phase too wrt #446600 - emake RANLIB="$(tc-getRANLIB)" \ - DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \ - install install.man -} - -multilib_src_install_all() { - einstalldocs - if use doc; then - docinto doc - dodoc doc/{actions,protocol.txt,README} - docinto pdf - dodoc doc/pdf/*.pdf - fi - - mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die - - newconfd "${FILESDIR}"/nas.conf.d nas - newinitd "${FILESDIR}"/nas.init.d nas - - if ! use static-libs; then - rm -f "${D}"/usr/lib*/libaudio.a || die - fi -} diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index b684e41b7205..6df83c710a13 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -4,10 +4,11 @@ AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68 AUX netpbm-11.6.1-incompatible-pointer-types.patch 514 BLAKE2B 0ea8a3c50838776ee645e61accc13645a690dc7e75cde2c33afd1ac7f07abbcb85a97b7e113217af12617ec5ad314eca0324c7bfbe7beb445aee85de47649ffb SHA512 a3a46607904c8ff9757f0a136aa2336382033760bc69bcca5a5d7662ca824f9a7d4281fe3996efc57456c3b30ddf7319fb70a1cb950ef974507f82340a226abb +AUX netpbm-11.7.2-lto.patch 2699 BLAKE2B 51da4abfa35da594597eb1091f8f3ade875491d428231215f91ff3d637826db6310f2c8f7bf59cb62d025cde170dc247fadedd90dedc5049f68f61d02adbfc0e SHA512 809d1b86d436534219936959037e5c4c17761b4c0e464eb968fdc961f68d5a3d2a60974f52e330fa49b8933aa1bfc486515e019b2bc0d15bbc525b9c4f852eb2 DIST netpbm-11.2.10.tar.xz 3782160 BLAKE2B 22dab865106f48a83992ff780a3a3cb26e7fd279b4e22f622a5f6459f90aecf70ce85ce65fd9f14ebe9a148a92ac2b0eb35ca95b0feb88dc0cbe24d11921e4d3 SHA512 baa12b1aa5d66967d900f3d92ebd9cdf2bc936389fd943b995ed863b9f57977bdb6c1e92588252b6219d26d06085b7ea5e3400f1d9be688cb538c807b84293bf -DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1 -DIST netpbm-11.7.1.tar.xz 3805692 BLAKE2B af7d9374c0dbea1b77a02bb9ea371dd46faac4225cef179d5076ae3f41115b681728267a9cc84c8544f0217647206648242499043b15cf9e076f1c5e41c134ec SHA512 7a07a0d959944a95c51853d9a5392302de00ebd0c18a9039ceeaf4b398bf796c9079aa8c0c46865f4b19628c1bda29b60c9efec4ee7b7968db82ba3e83f5c079 -EBUILD netpbm-11.2.10.ebuild 7112 BLAKE2B a5aa490176c0b511a3b11c20cd05bc68171448348283c84c1e7a1c998503c0d4fded30b7a34f23089994a8543e3ed5116301885fee00a22924f5ff4be93614fc SHA512 aba9627a905f1546fe8e1afed27ed02df556aaaf871e646686b4a9e88f51f3f8ad46abdc5feae1d0fb0cedfb67a891ffc2c364d85e96526c7a94fc987b3711fc -EBUILD netpbm-11.2.9-r1.ebuild 7104 BLAKE2B eec9a81b43abeb3877d1913c4daacae40773b23b64b1a1060b8a136b147af9669dfa9baca38f63519df283da9f9cf330f407077429446f99fb06383367b2f749 SHA512 85a09d2c0eb97d80c193d57c5302d21367f08d380ba00d5a91cfa55b01370f28b1e392ba0aeeedc282d4bafd4bf2dfa4cf685a377fe615d7d1d47c1169217a53 -EBUILD netpbm-11.7.1.ebuild 6900 BLAKE2B 290567ddd75d93365cfdc6b7d9afa14540199877642a1210c421ac53ec0f8094f9bc098011c83c23ac9356c4cdff9eb746faa18063201a4ba13777fba8c056ad SHA512 7ab008a76c9b44c299478f451c7e8ddaef79d527abdd501fcb3f0d70fa02db326b527b135afeaaafe962bf4b2fa4474c6746644da52e6c1a41e5e70f33b9c97d +DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b +DIST netpbm-11.8.1.tar.xz 3804004 BLAKE2B ed107d258a85c720de178a3e6488ad1b435135ec50227bb1e4ce9f3665a882a382c3a3e858e49055f88ee9bba6026b390291ad211a82299d03f41addaf93e7f9 SHA512 e4b1e8d7468fcd0233e50861e890669c788f95924edb6b6256f93b53d2ab16b7fd2c2099ca238b409fba7c764e51d54a9fbdbb22bb3bb1acf8296afdb807bd4f +EBUILD netpbm-11.2.10.ebuild 7104 BLAKE2B addce69f99b8cb02ebfe5a8459c36b37268dd43f398d82e09818f61971c797c73ab16c5056137e98edcc960fe7d10d1ce7051fe37c87d3d0957a6d2d683abe99 SHA512 8ae6233266f5c82d568fcdf2f463a38aedcf5dc9ae3ecb91fbddb3e23574ac9ef5e0ce278cc9c4e1ba9f177d62f8730f102ada68c072bccc6e1fdf8a19cae85c +EBUILD netpbm-11.2.11.ebuild 7144 BLAKE2B f53c655ee59bc346f458f7e9929a9cfacf25ace7603c32d4daf6d81e0f96c4308f3c93a1db1a1a890f9e60dd07b15678de2f6eb8d0de93195815328d766402ce SHA512 1b65778d839924756429479534a4a01bac2c17b9ba4976d30a2b2b2e8d77275f4e4621882809d29cd1cb3f493802a550d2aa3bb52865f4a633b063f468194878 +EBUILD netpbm-11.8.1.ebuild 6939 BLAKE2B 773de213668f7e8c7c4e4243e4b5b4b38b4c7beba97d09bd4047c8a5b0b5122eb4ebca492f5a28f777555d3ee05891bfb1294c770f1f8b763461906354275194 SHA512 b6131f9c1c808d2cccdaa9476c0a02307e0efbde8991a7ab25f8bbf0f6b04c4fd52936ac013e3f2977171d261019187d9f7c466156c63abc970ee6c3afed1c22 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80 diff --git a/media-libs/netpbm/files/netpbm-11.7.2-lto.patch b/media-libs/netpbm/files/netpbm-11.7.2-lto.patch new file mode 100644 index 000000000000..b3e47fbcdcd4 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-11.7.2-lto.patch @@ -0,0 +1,58 @@ +https://bugs.gentoo.org/940328 + +--- a/converter/ppm/ppmtompeg/mpeg.c ++++ b/converter/ppm/ppmtompeg/mpeg.c +@@ -97,7 +97,7 @@ + /* important -- don't initialize anything here */ + /* must be re-initted anyway in GenMPEGStream */ + +-extern int IOtime; ++extern time_t IOtime; + extern boolean resizeFrame; + extern int outputWidth, outputHeight; + int gopSize = 100; /* default */ +@@ -431,7 +431,7 @@ + boolean const childProcess, + boolean const remoteIO, + MpegFrame ** const bFramePP, +- int * const IOtimeP, ++ time_t * const IOtimeP, + unsigned int * const framesReadP) { + /*---------------------------------------------------------------------------- + Get Frame 'frameNum', which is a B frame related to previous reference +@@ -480,7 +480,7 @@ + struct inputSource * const inputSourceP, + boolean const remoteIo, + boolean const childProcess, +- int * const IOtimeP, ++ time_t * const IOtimeP, + BitBucket * const wholeStreamBbP, + const char * const outputFileName, + unsigned int * const framesReadP, +@@ -653,7 +653,7 @@ + const char * const inputConversion, + MpegFrame * const pastRefFrameP, + unsigned int * const framesReadP, +- int * const ioTimeP, ++ time_t * const ioTimeP, + bool * const endOfStreamP) { + /*---------------------------------------------------------------------------- + Read the next frame from Standard Input and add it to the linked list +@@ -804,7 +804,7 @@ + const char * const inputConversion, + MpegFrame ** const framePP, + unsigned int * const framesReadP, +- int * const ioTimeP) { ++ time_t * const ioTimeP) { + + /* This needs to be modularized. It shouldn't issue messages about + encoding GOPs and B frames, since it knows nothing about those. +@@ -913,7 +913,7 @@ + const char * const slaveConversion, + const char * const inputConversion, + unsigned int * const framesReadP, +- int * const ioTimeP) { ++ time_t * const ioTimeP) { + /*---------------------------------------------------------------------------- + Get frame with number 'frameNumber' as *frameP. + diff --git a/media-libs/netpbm/netpbm-11.2.10.ebuild b/media-libs/netpbm/netpbm-11.2.10.ebuild index c6199bf3f6c3..85aa017b7bfb 100644 --- a/media-libs/netpbm/netpbm-11.2.10.ebuild +++ b/media-libs/netpbm/netpbm-11.2.10.ebuild @@ -8,7 +8,7 @@ inherit flag-o-matic multilib toolchain-funcs # Upstream has 3 flavors of netpbm: super stable, stable and advanced. # They only provide a tarball for super stable, but super stable is a bit lagging. # So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" -# and the advanced branch of their svn (currently versions 11.7.yy) on SLOT "0/advanced". +# and the advanced branch of their svn (currently versions 11.8.yy) on SLOT "0/advanced". # The stable branch is stabilized according to usual Gentoo rules, while the # advanced branch will not be stabilized. # A detailed explanation is here https://netpbm.sourceforge.net/release.html @@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" SLOT="0/stable" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" # app-text/ghostscript-gpl is really needed for postscript diff --git a/media-libs/netpbm/netpbm-11.2.9-r1.ebuild b/media-libs/netpbm/netpbm-11.2.11.ebuild index 556244652106..984edcd8b37c 100644 --- a/media-libs/netpbm/netpbm-11.2.9-r1.ebuild +++ b/media-libs/netpbm/netpbm-11.2.11.ebuild @@ -8,7 +8,7 @@ inherit flag-o-matic multilib toolchain-funcs # Upstream has 3 flavors of netpbm: super stable, stable and advanced. # They only provide a tarball for super stable, but super stable is a bit lagging. # So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" -# and the advanced branch of their svn (currently versions 11.6.yy) on SLOT "0/advanced". +# and the advanced branch of their svn (currently versions 11.8.yy) on SLOT "0/advanced". # The stable branch is stabilized according to usual Gentoo rules, while the # advanced branch will not be stabilized. # A detailed explanation is here https://netpbm.sourceforge.net/release.html @@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" SLOT="0/stable" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" # app-text/ghostscript-gpl is really needed for postscript @@ -59,6 +59,7 @@ PATCHES=( "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch "${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch + "${FILESDIR}"/netpbm-11.7.2-lto.patch ) netpbm_libtype() { diff --git a/media-libs/netpbm/netpbm-11.7.1.ebuild b/media-libs/netpbm/netpbm-11.8.1.ebuild index 65bc56ebbe9d..31d10bb8169f 100644 --- a/media-libs/netpbm/netpbm-11.7.1.ebuild +++ b/media-libs/netpbm/netpbm-11.8.1.ebuild @@ -8,7 +8,7 @@ inherit flag-o-matic multilib toolchain-funcs # Upstream has 3 flavors of netpbm: super stable, stable and advanced. # They only provide a tarball for super stable, but super stable is a bit lagging. # So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable" -# and the advanced branch of their svn (currently versions 11.7.yy) on SLOT "0/advanced". +# and the advanced branch of their svn (currently versions 11.8.yy) on SLOT "0/advanced". # The stable branch is stabilized according to usual Gentoo rules, while the # advanced branch will not be stabilized. # A detailed explanation is here https://netpbm.sourceforge.net/release.html @@ -58,6 +58,7 @@ PATCHES=( "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch + "${FILESDIR}"/netpbm-11.7.2-lto.patch ) netpbm_libtype() { diff --git a/media-libs/nvidia-vaapi-driver/Manifest b/media-libs/nvidia-vaapi-driver/Manifest index 5fa4a2fbeea7..8908598960e2 100644 --- a/media-libs/nvidia-vaapi-driver/Manifest +++ b/media-libs/nvidia-vaapi-driver/Manifest @@ -1,3 +1,5 @@ DIST nvidia-vaapi-driver-0.0.12.tar.gz 183420 BLAKE2B bf3d2f92a0a38d209d3108893664a7b28657657b432cd43a016442b2192c10850ea4278a2a4a02dd53ba759cef38f39d36bdfa934b1fc3a229aed1ff7f7e0a55 SHA512 e586107d840fbcbce3f4f4f4397188d7df2beaeb763ec0ceaae6f4edb2a5638abed388816796e0a0b0665087cfb09fce2a4d83a3cdfd2279edf6b1be278f2ab2 +DIST nvidia-vaapi-driver-0.0.13.tar.gz 184099 BLAKE2B 73d4b6a205e05450864150b66c47fb4e7c3938e8abaac980c2ad86801d64fa6324347d6541e517b0e44dc497543bc0b97e120f4c3993e4ad8e17d9e720ea4aba SHA512 5e389d4ebc873766d138ba329503d89d4d45c668c5f20ff89a86ed094b107d3f63aee4044c49a25e78975309015c4c8da204b0131e7173d8ad7f951bb4985fcc EBUILD nvidia-vaapi-driver-0.0.12.ebuild 976 BLAKE2B 82f4c9c145456e199240ce4ab0a60147297b0e7a7d457c4840f37af9d2ed27bc05b5d81002d97e201535896221947b50c5e2f3ab73908df028c36533ef010f8b SHA512 624a23b62e4fc5fa7b027cffcd3c17090476d7429778eb1e15a1a4b0d140a0133bce00e8013a61a5b276806e9ba4a3b3797b123c5fd20d7b7b9e259e8ab270b2 +EBUILD nvidia-vaapi-driver-0.0.13.ebuild 976 BLAKE2B 82f4c9c145456e199240ce4ab0a60147297b0e7a7d457c4840f37af9d2ed27bc05b5d81002d97e201535896221947b50c5e2f3ab73908df028c36533ef010f8b SHA512 624a23b62e4fc5fa7b027cffcd3c17090476d7429778eb1e15a1a4b0d140a0133bce00e8013a61a5b276806e9ba4a3b3797b123c5fd20d7b7b9e259e8ab270b2 MISC metadata.xml 600 BLAKE2B 780e519992c02718417c1de7ca5c966c4795088bb649d862277959602ea6744c3d78589dc70e5c3eaefc989f9afd7eccded785b7e6e253fc8ae591731634c596 SHA512 5c43e6438c06d5631837711047ca2ccaccda39871af1eaef5ff997a5c35c2ec9f86a0188f44e961095c44823b11847289d04e16575e6061d4c894762a81b1c63 diff --git a/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.13.ebuild b/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.13.ebuild new file mode 100644 index 000000000000..24f23d496823 --- /dev/null +++ b/media-libs/nvidia-vaapi-driver/nvidia-vaapi-driver-0.0.13.ebuild @@ -0,0 +1,32 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib + +DESCRIPTION="A VA-API implemention using NVIDIA's NVDEC" +HOMEPAGE="https://github.com/elFarto/nvidia-vaapi-driver" +SRC_URI="https://github.com/elFarto/nvidia-vaapi-driver/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="media-libs/gst-plugins-bad + media-libs/libglvnd + >=media-libs/libva-1.8.0 + >=x11-libs/libdrm-2.4.60" +DEPEND="${RDEPEND} + >=media-libs/nv-codec-headers-11.1.5.1" +BDEPEND="virtual/pkgconfig" + +pkg_postinst() { + # Source: https://github.com/elFarto/nvidia-vaapi-driver/blob/v0.0.12/src/backend-common.c#L13 + elog "If vaapi drivers fail to load, then make sure that you are" + elog "passing the correct parameters to the kernel." + elog "nvidia_drm.modeset should be set to 1." + + elog "Check the wiki page for more information: " + elog "https://wiki.gentoo.org/wiki/VAAPI" +} diff --git a/media-libs/oneVPL-cpu/Manifest b/media-libs/oneVPL-cpu/Manifest index a9c7d84bf105..9f9b1a7acd88 100644 --- a/media-libs/oneVPL-cpu/Manifest +++ b/media-libs/oneVPL-cpu/Manifest @@ -2,4 +2,4 @@ AUX oneVPL-cpu-2022.2.5-respect-user-flags.patch 416 BLAKE2B c0ba2a7d75ab2d4ce93 AUX oneVPL-cpu-2022.2.5-use-system-libs.patch 1884 BLAKE2B c13fecb58e2692ae53c531fe3ca4199a381f170712777d2df9f5ddd334481238f48666636dced8d39213187d9e162915b62c641d9015afe1a8326fcdcb724c88 SHA512 bffcfcc4b17145d1b1f0b608b1451d8438a77254c389ed4542c0b457b6064ad85b646605ac9cd2c176d9480aa1136412a728b172e8d2c642f8aae77ff9d18703 DIST oneVPL-cpu-2023.2.0.tar.gz 10140311 BLAKE2B eacd9bdc30939c7701453b6cff051de0fddf810792cd6f2db027342f7756fa289ddb2571fab920c87fa51b09241cbf65fd13cbcd3840080ba15917a90dd0e992 SHA512 1b2755e384c3cfb88e2046d02f4414a51485cbc6fa4ce9c9aa9b48c0eb21a96e49d21640bc259dc8b9dafa76afa4d1619c6660e0d1757fcd2625a27e46553328 EBUILD oneVPL-cpu-2023.2.0-r1.ebuild 1279 BLAKE2B 03f0fe2675ee09233ac9ceee5531fe863d135ef3d7fb94c7672e0d74a4fdffccb6212d6395627e9ab825d725249d7c1f97201ee9e7cc67680f283199972f75d4 SHA512 ac1d66b13b87865e3b22ed01f0cdf831b6eaae341fdabd505cd4b31ff8709dd8e696a20e3bc87a435ae63c1227621f35470ee945f355541c1a11064b312cc6ff -MISC metadata.xml 547 BLAKE2B 73fd4829c16a550eb94be6b2e6489982d27edaff3928d14b0334813162cb2c4a2dff6fed2157dea953f9c1e281be7a3e93ecf5be88396062ba9da412aa0a962a SHA512 095088cc5b289c89d9f6ccbb98464f62f892812d5b381c85173e6361b12104d26d008b902107be45aca7ccffeea9b4b5c1777c0c2b7ef819112d941a66c0f99f +MISC metadata.xml 548 BLAKE2B 8954d0afdfc5702cf05d643ce2b2c4d53fd469e2955b78bcf6356659a0130d8e0e0e5e8fb4195eaec5a29f6770c2dd3814099a8ee7e9a9f9db2e5bc977f051ed SHA512 880fe724cc67e62a57bb81c907c6cd00d07d418a1c87b3232be2fa03bb9113f957b511bcd52e23ce112e90d3077ce5a265123cce69ac0b7b306470b6b5e66ba9 diff --git a/media-libs/oneVPL-cpu/metadata.xml b/media-libs/oneVPL-cpu/metadata.xml index 567e19798957..5f0888255ad9 100644 --- a/media-libs/oneVPL-cpu/metadata.xml +++ b/media-libs/oneVPL-cpu/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>media-video@gentoo.org</email> diff --git a/media-libs/oneVPL-intel-gpu/Manifest b/media-libs/oneVPL-intel-gpu/Manifest index 48ad0a861d53..bc7084c6b5b1 100644 --- a/media-libs/oneVPL-intel-gpu/Manifest +++ b/media-libs/oneVPL-intel-gpu/Manifest @@ -1,5 +1,5 @@ -DIST oneVPL-intel-gpu-24.2.2.tar.gz 9059065 BLAKE2B 05ff0161fab1d7b3c55bfeeae0262f960136f04e75530d1b1fa7bf99cefc5c30f4041907d303c7197eefbf55e30d834e6cd7a15fe6216780e0aaead8585ff8e2 SHA512 47cdbcf39fddd7a54682b9d1dbeb210175fa052326b33664bc5b80f9dc073df333c9e21ae57db49781d494e49a199c6ffe2f90719041b09c5e5fa46922e3e159 DIST oneVPL-intel-gpu-24.2.5.tar.gz 9063523 BLAKE2B 1d993c5f8fc460323b3630af4068e49c8222c685288f32a3500d9bc646ef99ef1273854422d34831739bbe13750993a9f23b1a8e4ed827b28e0712422b06786f SHA512 a7aa37d27e4f2429634382d55074a014d96fa15ff2c5c40539f753888152f42dd46c9e5b0899021099091167f7a611016e79792ed8808935276adf34199113bf -EBUILD oneVPL-intel-gpu-24.2.2.ebuild 1183 BLAKE2B cfc4ed146226a96ff930e055b4cddd6507bcfce2bbb61127b6307345e50a8b00e221af3619bf8b5a463ea67bd218ba0cf504f8a21c3bdabd1bfc41c8a38ac57d SHA512 e22654acc930e24a9af91b9de320b555b16f4237130bfd84345a6810990ec59eff5d7f4fbd363327e971c4b44326e917b028117802e18c3e5998bf6578d82959 +DIST oneVPL-intel-gpu-24.3.4.tar.gz 9193620 BLAKE2B 9a1804bdf4ce8624bf57d38a7f0f349770ac743b50dc513fa2569bf233aabf3972d8bbd0081e00dbf2dc6e5127cdc4372b68b3b65c9b44f0dce67b4f29f1991e SHA512 586094dc531ff4ca952f6682a7a6148d77bca0beaaff7a8411d942ca23bd1c4e70969d4354b3afe65af92fdb42816cd93fe757c4dc21b52bafde14346ac6296a EBUILD oneVPL-intel-gpu-24.2.5.ebuild 1162 BLAKE2B 0bcadd31110f58587ba24c9fdd00a16d7f51045063748b9e14b7e67dbd34f9cae71c8e6bc78623d37196cbf1f97ebd86a18d29b1f418dd6dfd1d83f9d353bb91 SHA512 854ffae85a8d6ee5b33f5c9375a71be032f9886e1e3f72f41e21a09c43f425bd12ec1da595f8f748c8db2c68b110f58332eebf5e432389a25e66543db4d6e1e6 -MISC metadata.xml 423 BLAKE2B c6931732df601757fd545622f7bb00835b0f779a9cbca46dcf49a4cff74d3ede80163eb226c6f18073544864732a315fb067542d1347024104cc95e1f23a956c SHA512 2c731c3125ae435eb021268228d51dd61f6b4135bf402c8f9de0b55235067fe03a9677d9f90f65e75a7f73f9d8afec5711744a19b4aea83acc675ed1c8dc8112 +EBUILD oneVPL-intel-gpu-24.3.4.ebuild 1162 BLAKE2B 0bcadd31110f58587ba24c9fdd00a16d7f51045063748b9e14b7e67dbd34f9cae71c8e6bc78623d37196cbf1f97ebd86a18d29b1f418dd6dfd1d83f9d353bb91 SHA512 854ffae85a8d6ee5b33f5c9375a71be032f9886e1e3f72f41e21a09c43f425bd12ec1da595f8f748c8db2c68b110f58332eebf5e432389a25e66543db4d6e1e6 +MISC metadata.xml 424 BLAKE2B 6d47cedea33d41021a5f64c55351d8fa3d9935512041c3bc3b00501a21398d3632c77e64e9eb5e5a9fc2e32618542d6526ca4e15e91beb63f1c0f438023eca1a SHA512 312236d04f9e732d1dad3541eec7923f95a924d495f4536b447073eadffe4602efab83943ceb38ace6dc280ca6132d39495a828cb5af425eafa5421599f46179 diff --git a/media-libs/oneVPL-intel-gpu/metadata.xml b/media-libs/oneVPL-intel-gpu/metadata.xml index 6bcfa55e06ba..c0f2ce976d6d 100644 --- a/media-libs/oneVPL-intel-gpu/metadata.xml +++ b/media-libs/oneVPL-intel-gpu/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>media-video@gentoo.org</email> diff --git a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.2.2.ebuild b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.3.4.ebuild index bcc124a916dc..1e9794bab839 100644 --- a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.2.2.ebuild +++ b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.3.4.ebuild @@ -6,8 +6,8 @@ EAPI=8 inherit cmake DESCRIPTION="oneAPI Video Processing Library Intel GPU implementation" -HOMEPAGE="https://github.com/oneapi-src/oneVPL-intel-gpu" -SRC_URI="https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/intel/vpl-gpu-rt/" +SRC_URI="https://github.com/intel/vpl-gpu-rt/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/vpl-gpu-rt-intel-onevpl-${PV}" LICENSE="MIT" diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index f9a66ca29a09..944c7372ea6c 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -4,5 +4,5 @@ AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70 AUX opencollada-1.6.68-gcc13.patch 1263 BLAKE2B ecb12ae78a732d3e8a2d858d7a6ff1409e98f01dc23b94a376b9ceb3b76c076939054531a58781cfa378027f8bd5aa27c587185e66f80327a3d2d0e1981c85db SHA512 3b879549faf5261a30f141ea9a2b96701a4e02310156b602f47d507deadadc2db57e9f8ba20405d28f819d3886f9307d1e1736bc40b2cce62acd705dc86d63e8 AUX opencollada-1.6.68-werror.patch 445 BLAKE2B 8b397bf950c8240e95214221f4fcfe0379fae3f31ce4cf3fb989f7c6b89f5432cf655202daf570cd3a692c0dd00b4efbeaa3b7c06de81ab034ad994727e9f798 SHA512 8fe614fe475a1a8b06cfcee2aaa1a666e1b4b42cfeaf5053cb23bbf056fafba6cf2cb13262cdd812f80bb8a4a63365f94e81aebeddc6c8d53f00c7f366f4776c DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173 -EBUILD opencollada-1.6.68.ebuild 1968 BLAKE2B 4c7e06f75e153cca81f48efa37f3b4506299890f0ff004c293c28076711a1510237cfaecad986caf1ec85cf6e11f1f46502ee3ddae7a6277f33a1b760caaa21a SHA512 db237c5ebb556ac9f415e747b1ed445531da5f604ffe388b67e42da50a5c781de6c5533263db8f02f98dc86a3333c04741cb4a0d3266c5c6b617ccc33da656b2 +EBUILD opencollada-1.6.68.ebuild 1966 BLAKE2B 66e78c20f7516e734e428b1137995448eab41d69f64458b105800525d6b1a0998fb395ba8dec9ac1ea37839c99f9f3f581b3063671cb125622b1838684792077 SHA512 8f9db8c739b213ef804f11571da0e7d506326fc514e56abe72282594b508803098b5b7a05d175f98feb9e1a97843ac71faca4c35fde300670cc341f6d333019f MISC metadata.xml 490 BLAKE2B 6c081a065f22f1571dda44dd1cd343b22611d8bc3becd93c78f8251676e977e2281aa3ab7757e09846238ffb40815c607e0bebdcccc97679f6e889eac6074bb7 SHA512 4e4b508fb8f14c521ab49a50fab3696b2583ea8c3700d18fdd94e8d0b576e54d904df1b207440ca36dc4898b68abfbd4bed68b967a0d5d6673bdd9e431562ecf diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild index d11bbc826b9f..a6ea0264a82c 100644 --- a/media-libs/opencollada/opencollada-1.6.68.ebuild +++ b/media-libs/opencollada/opencollada-1.6.68.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${ LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +KEYWORDS="amd64 arm ~arm64 ppc64 x86" IUSE="static-libs" RDEPEND=" diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest index ab880daf62f6..ef39f51a5aea 100644 --- a/media-libs/opencolorio/Manifest +++ b/media-libs/opencolorio/Manifest @@ -3,15 +3,11 @@ AUX opencolorio-2.1.2-musl-strtol.patch 1041 BLAKE2B 58384b1a2a6e2778219909aaabe AUX opencolorio-2.2.1-adjust-python-installation.patch 864 BLAKE2B e4e68ec13d47648ca41dce07ea7302a218e784e0b2bd700456642708271763c05e1bc667cdd9338a94790ac23f9862f1301e1eb4680bdb5ff948baba7051e3db SHA512 91afc3a825dadca245b046b2fd63edba2ffb44759a124eb3c9665b88d890b0a6cb09c1bed2067adf974faf65dedfd8bddb901e15a80e2d6b1c3645c08a0a7c3e AUX opencolorio-2.2.1-support-doxygen-1.9.7.patch 5263 BLAKE2B 7d9ddd3db43dba04851bdd56f3395a7de85dcacf442feca787d4f129ca49de6941d02bbc44ff58ae8ce5d94d50665a32b2c8270d35abfe879c61f688cde39767 SHA512 254f8e9de92ab80b0b15bb2a828a57117eda2bb8781da312a2a53db8d720cf76424d235e95c55c0c57a458c7c53bab22cc1a4de3477320d85f88f5274e38e072 AUX opencolorio-2.2.1-support-minizip-ng-4.patch 3133 BLAKE2B f84abb93233d0834b1f1bd8066140db1120ddf1a1eeb95d340283ed5ef56bb598787d8a23cdc5b8acbbdc595d6850956c25e0a0f57139d872e45dd5469407d55 SHA512 d0c811f80978f8d08dccd94cd25b26b5fd9e8ba3bcb2cffa82426e9faea5e0afef46843128e297614d7e2fd0886bc9928ddb7e03b9b691fd03b05923693de8da -AUX opencolorio-2.3.0-fix-cxxflags.patch 868 BLAKE2B 0c0a553066f4901a48290be145bdd2d543b5b6afb3b2363227da4366e70ba5d9a803ffbe00f5d63e5ee5f4cfc292c9e4f79fdee5555b72bf6f3f3d0db80e80d0 SHA512 f272b547535691e5d4e73aa5c11bdb4e04ef06838b0e34153f08d0b742d8875f93dbf5c2502c2a54725b9b6c1e5caac795c5f69bd3d3b48cf6826f358889155a -AUX opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch 808 BLAKE2B aed4b9d8bf512e42578e239bfe9a60074cb812d5d8894fc489f535a709d1b755d1934cf1c556ee9a06b5fd199796f4f6defdb36b8f9df7503288fd4a7eb5db7c SHA512 cf5a4b007ab4a9c25f6f94caeb007a0f4f2d83203eca6a4b83b38abc9df08593eb10159194e9c399f5877a618acd4da355b8fb299f39a73d04a4c94a903dbecc AUX opencolorio-2.3.2-include-cstdint.patch 730 BLAKE2B 35df68ae92e99373f47a0aeba7425e27df851d63205af0c6343cfddeeb36331eab7a9b4a2eedafc13f52301232733160ba0fe0c338553bf0aae069b91c73a6fb SHA512 072c3ebc9d155c1ff389884871d098695dedcfcf3c339088f4b1888df83b0c6bbc8ea0e1bdd18f9e3d7d4d7f1d554ad72be6022552a57879e6c03badb7397e2d DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061 DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9 -DIST opencolorio-2.3.0.tar.gz 11406998 BLAKE2B 0e62e43de076a712f68b68b91c9908bc9050316e3500e0924fafb08a3356ce361953f49dfd1eb022eeada11e499653833a48a22a4ba593504617c1c61b16d488 SHA512 cdf20ca6c85b1d70244d8532d010344f1cf85be6a116d831e83ea04d7c47a961049691e6a241e9a7f632d864df57a4bccb68084e27187ec8a05f1fdf344824d7 DIST opencolorio-2.3.2.tar.gz 11443450 BLAKE2B 2573d2f229ba0349574d83883cd6534853164dc6a5866b203b65d4c0acbc54fc0aaf6ff4ecbec5506c6adafe48d57fb80a8b47c45b7b16e0c4ac94f5fbaffea3 SHA512 4c7547960623b058398a86d9c8335d31f2354a1ee7ba58fbc2d1ace698132b99e8f823c9b443a77545721da076569228f502f1f3f4deba44659571c6d12db133 EBUILD opencolorio-2.1.3.ebuild 3168 BLAKE2B 7e64eecf250f5f56b15dde6c7a283185f4bb95d939c771a98b0856eba91de18f02ae27ac354ef104c6eb515f79bfa49e5daa8b1f407347f3c1fb0706597a2261 SHA512 b5f4ec43b46270cc2b05875b722c70840822eb0a46f4b1fd6bcd781170a331d5ce9809aca4df1364666992059aba53ea6f20a4c88c6b2ac0015b2280c3bfd64d EBUILD opencolorio-2.2.1.ebuild 3705 BLAKE2B 59712f2546a5411902a98368ec6cf97921c12cb515ba555e2736deea90e643be2ab5b86f567b9158bf5fa75a040fb632e8c7b9a9f053fb6d74c42ca769380bdd SHA512 a419232dde52910c34ee7ecb6270a735e15c414754916ba6fad1495f4f14cff9714637b3cc6536828e955e2c0c794ecd23ead6eb17a2436740ab5eb577ccbd5f -EBUILD opencolorio-2.3.0.ebuild 4606 BLAKE2B d907b310540d7124b311e36e897078559e9fb16ad944a183af464f3d4e88b859eab8325fea18686e756763689b6af209a0a19745897298185e7df65f338c1d7b SHA512 03887551e7376d62c51ba548aeef9a30bf4501097c40bf6315c499ada08ab8154cbb1d1fd5c6725636074045a3b07ea80b43ee38ad4717fa9b345e82ced4b766 EBUILD opencolorio-2.3.2.ebuild 4876 BLAKE2B ba39476309537862701e5cc96d4a62ee2b4a02e42165fbe9865aabd94ef24b6de174e9b55f0b313e13757ba6f79fa63aefbdb785effc3daf8001c8d8680255c6 SHA512 fdbcd63ad2e0185a0b430c193b73b27df8b5ecc4628d939244d2e386afbc77121da1ffa274a71d06f19af8c74bb2df061607eb170e05eda36b5d44da4bffde83 MISC metadata.xml 792 BLAKE2B 6b94c1223e756ef3179ab3442c134bf7881400434332691bc693a36c8bceb4db609dd143afb6a18192c7bfaa9ccb72015c215e08b3bd65fbdb3ccc2fb3ff713d SHA512 c1b3d44b5ce24813b3e07074ba2fe40c3af89033dfbe5a372b130be26fcfeba9fa9c2a0d9e6a695972dc402979aa732df27fd3c6128a8f3a51fe926ecb73cb25 diff --git a/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch b/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch deleted file mode 100644 index cefae22a00e6..000000000000 --- a/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d69edd3ef411853cd780b75cf260295a39a8a49f Mon Sep 17 00:00:00 2001 -From: Eric Renaud-Houde <eric.renaud.houde@gmail.com> -Date: Wed, 20 Sep 2023 15:10:46 -0400 -Subject: [PATCH] Correctly reset CMAKE_CXX_FLAGS. - -Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> ---- - share/cmake/utils/CheckSupportSSE2.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/share/cmake/utils/CheckSupportSSE2.cmake b/share/cmake/utils/CheckSupportSSE2.cmake -index 8c929c7e9..6a07155de 100644 ---- a/share/cmake/utils/CheckSupportSSE2.cmake -+++ b/share/cmake/utils/CheckSupportSSE2.cmake -@@ -59,7 +59,7 @@ else() - message(STATUS "Performing Test COMPILER_SUPPORTS_SSE2 - Failed") - endif() - --set(CMAKE_REQUIRED_FLAGS "${_cmake_cxx_flags_orig}") -+set(CMAKE_CXX_FLAGS "${_cmake_cxx_flags_orig}") - unset(_cmake_cxx_flags_orig) - - if(__universal_build) diff --git a/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch b/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch deleted file mode 100644 index 924ed2092881..000000000000 --- a/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Bernd Feige <Bernd.Feige@gmx.net> -https://bugs.gentoo.org/914716#c12 - -Index: OpenColorIO-2.3.0/share/cmake/modules/Findyaml-cpp.cmake -=================================================================== ---- OpenColorIO-2.3.0.orig/share/cmake/modules/Findyaml-cpp.cmake -+++ OpenColorIO-2.3.0/share/cmake/modules/Findyaml-cpp.cmake -@@ -50,7 +50,12 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUA - endif() - - if(yaml-cpp_FOUND) -- get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION) -+ if(TARGET yaml-cpp::yaml-cpp) -+ # yaml-cpp >= 0.8 -+ get_target_property(yaml-cpp::yaml-cpp_LIBRARY yaml-cpp::yaml-cpp LOCATION) -+ else() -+ get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION) -+ endif() - else() - - # As yaml-cpp-config.cmake search fails, search an installed library diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild b/media-libs/opencolorio/opencolorio-2.3.0.ebuild deleted file mode 100644 index 220e58ca55f5..000000000000 --- a/media-libs/opencolorio/opencolorio-2.3.0.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake python-single-r1 virtualx - -DESCRIPTION="Color management framework for visual effects and animation" -HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO" -SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenColorIO-${PV}" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -# minizip-ng: ~arm ~arm64 ~ppc64 ~riscv -# osl: ~riscv -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -CPU_USE=( - x86_{avx,avx2,avx512f,f16c,sse2,sse3,sse4_1,sse4_2,ssse3} - # requires https://github.com/DLTcollab/sse2neon - # arm_neon -) -IUSE="apps ${CPU_USE[@]/#/cpu_flags_} doc opengl python test" -# TODO: drop opengl? It does nothing without building either the apps or the testsuite -REQUIRED_USE=" - apps? ( opengl ) - doc? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( opengl ) -" - -RDEPEND=" - dev-cpp/pystring - >=dev-cpp/yaml-cpp-0.7.0:= - dev-libs/expat - >=dev-libs/imath-3.1.5:= - sys-libs/minizip-ng - sys-libs/zlib - apps? ( - media-libs/lcms:2 - >=media-libs/openexr-3.1.5:= - ) - opengl? ( - media-libs/freeglut - media-libs/glew:= - media-libs/libglvnd - ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') - ) -" -DEPEND="${RDEPEND}" -# TODO: OSL tests would need OIIO, leading to a circular dependency. If OIIO -# isn't found this test will be skipped (automagic if found?) -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/doxygen - $(python_gen_cond_dep ' - dev-python/breathe[${PYTHON_USEDEP}] - dev-python/recommonmark[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-press-theme[${PYTHON_USEDEP}] - dev-python/sphinx-tabs[${PYTHON_USEDEP}] - dev-python/testresources[${PYTHON_USEDEP}] - ') - ) - opengl? ( - media-libs/freeglut - media-libs/glew:= - media-libs/libglvnd - ) -" -# test? ( -# >=media-libs/openimageio-2.2.14 -# >=media-libs/osl-1.11 -# ) -# " - -# Restricting tests, bugs #439790 and #447908 -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch" - "${FILESDIR}/${PN}-2.3.0-support-yaml-cpp-0.8.0.patch" - "${FILESDIR}/${PN}-2.3.0-fix-cxxflags.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # Avoid automagic test dependency on OSL, bug #833933 - # Can cause problems during e.g. OpenEXR unsplitting migration - cmake_run_in tests cmake_comment_add_subdirectory osl -} - -src_configure() { - # Missing features: - # - Truelight and Nuke are not in portage for now, so their support are disabled - # - Java bindings was not tested, so disabled - # Notes: - # - OpenImageIO or OpenEXR (default) is required for building ociodisplay and - # ocioconvert (USE opengl) - # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) - local mycmakeargs=( - "-DOCIO_BUILD_APPS=$(usex apps)" - "-DOCIO_BUILD_DOCS=$(usex doc)" - "-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)" - "-DOCIO_BUILD_GPU_TESTS=$(usex test)" - "-DOCIO_BUILD_JAVA=OFF" - "-DOCIO_BUILD_PYTHON=$(usex python)" - "-DOCIO_BUILD_TESTS=$(usex test)" - "-DOCIO_INSTALL_EXT_PACKAGES=NONE" - # allow the user to tell OCIO to display more information when searching and building the dependencies. - # "-DOCIO_VERBOSE=YES" - - "-DOCIO_USE_SIMD=ON" - ) - - if use amd64 || use x86 ; then - mycmakeargs+=( - "-DOCIO_USE_SSE2=$(usex cpu_flags_x86_sse2)" - "-DOCIO_USE_SSE3=$(usex cpu_flags_x86_sse3)" - "-DOCIO_USE_SSSE3=$(usex cpu_flags_x86_ssse3)" - "-DOCIO_USE_SSE4=$(usex cpu_flags_x86_sse4_1)" - "-DOCIO_USE_SSE42=$(usex cpu_flags_x86_sse4_2)" - "-DOCIO_USE_AVX=$(usex cpu_flags_x86_avx)" - "-DOCIO_USE_AVX2=$(usex cpu_flags_x86_avx2)" - "-DOCIO_USE_AVX512=$(usex cpu_flags_x86_avx512f)" - "-DOCIO_USE_F16C=$(usex cpu_flags_x86_f16c)" - ) - fi - - # requires https://github.com/DLTcollab/sse2neon - # if use arm || use arm64 ; then - # mycmakeargs+=( - # "-DOCIO_USE_SSE2NEON=$(usex cpu_flags_arm_neon)" - # ) - # fi - - use python && mycmakeargs+=( - "-DOCIO_PYTHON_VERSION=${EPYTHON/python/}" - "-DPython_EXECUTABLE=${PYTHON}" - "-DPYTHON_VARIANT_PATH=$(python_get_sitedir)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use doc; then - # there are already files in ${ED}/usr/share/doc/${PF} - mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die - rmdir "${ED}/usr/share/doc/OpenColorIO" || die - fi -} - -src_test() { - virtx cmake_src_test -} diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index e06b8275f150..071c31f9e559 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -1,39 +1,36 @@ AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d877624538a49654ec8cf63091f8d0251cd01cc14684f2f5264c295a149c4a5754a9336e1ad4d1760cc26471fd85a6f571404f7c8d540d SHA512 95f2043c286a7de33fb4718fc1e2ded1fd943b20a5c4cc0c3d7af84fc317e53e3aa6358a33e4781195f8a80904d6bc615171142cde5d30a83d16045d36f85826 AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653 +AUX opencv-4.10.0-26234.patch 2791 BLAKE2B b55dd5fe4d554a0be48cabd7009d476fd47aa63bb4142ebb2f5681a2cdf17d530bffcec31e795a3ec7dc3524b3a9496562f83ea2fa9939d431d8d794458a2e9f SHA512 55f767366ab478cad5c2a1b89ccb38a0dbe66fc2c3e04d2cef767bb8dd2c672c6c523eba2b4fb67c73001f1a223c2c1b831f1b951c45b48fc5d649686c1a4cdf +AUX opencv-4.10.0-cuda-fp16.patch 7482 BLAKE2B a38b32ccb262ba316e733f7464b279f006d44da7d3bac1f91ab10c844022979bff0aa509ec259d448bc2cc976a3a59ed03b18a163518e77ec72fe1010935a605 SHA512 57248a1296edb4b126fa5767c3c7251d4c11bceb8d73d7a8e3860d07679d782dceeca6277cbbf1573741ac948a0fba4eced94e978689cab1a145dff90e04932c +AUX opencv-4.10.0-cudnn-9.patch 1890 BLAKE2B 08c9fd05bc3eb41e5ad2e74e17acb9d5d8fd8707106b2ceb581eef9b03d3e550acd91263807eaf1a730eb66a0246a7c4c02d84c56962fb8df1be82c9ed1c4e69 SHA512 79fa74ac37dfe6af3fb6a9417881cd42f5caeb31745e0144d0ea58b6da1250fd741f2e1b554e2bdd990cd25887601247eb537efdbab32a26930fe07bc1784c7d +AUX opencv-4.10.0-dnn-explicitly-include-abseil-cpp.patch 1281 BLAKE2B e518599fd704c0551954af607ec76413fd599774994e347be3a723ca27f7c88ff669b3f61f841e9b614e22edb220ce844dc9b8d8c7484cd9c95ac4008ae07347 SHA512 9707e279358576270d24c0bc7e7e2d027c92a1897c9918a90b8b7641be2aaf8d4912dfd2bfa6c6c4fbf429dc3d6dde8b5cf1a6ed40d01154272d5f993e358463 +AUX opencv-4.10.0-tbb-detection.patch 1086 BLAKE2B bf24938e203dce880386e1f567ac02f42cc216e5955a6af57e7cfbfc4cb93bcc3759f32c0977464ab0d403426a40ae4be4e23a11960dd6b290fb4c7424098a62 SHA512 081aee59a9bac25538eba1cf9e95c2bf5d30cee535af55e0b9f51169025b20244fd370133b8bac0f6166d1a939ac806c1ff372d07d0fe1d067b7edf3f324ccc0 AUX opencv-4.4.0-disable-native-cpuflag-detect.patch 1218 BLAKE2B 06569f6b7d33eccb11cae74624a2cc7d7e1eb788145813509220dc8436d2380892392be8c4af03fec845f3eade74b6277985cf80e38785317b15f17890bcaa4c SHA512 3be60f7ee28e3b001ef0c791e3ce1c849ff6fa9fdb70731716668b2698eed9abb24ee3aead1dbc857ed68fc46a645c70a1e3831e8a3e5a5b1791aa06bd2f9ee1 AUX opencv-4.5.0-link-with-cblas-for-lapack.patch 726 BLAKE2B adbffd961c88229bf810e13fe20705352ff506a653c1d55bb0687c03d8daf9e05aed0f2ba9cd6e306c625837d6ddf64eeb99dc6cbf2b15fae833f4a7eea6aad0 SHA512 4c3108e304721c2cd78eb82f5d7bccc18831db5f47bc628a98ae6a37da389deef30e7e9b6dc5644e3bc0e0fafdd907dc37822a58a25555999698527d2ac364b0 -AUX opencv-4.8.0-arm64-fp16.patch 12222 BLAKE2B 18803d74cb57bbc303c8159ca69d24dcc47d00a314bfdababeadd3b85306d289c8b35a1106011086931396e0ab82d98964434d0c0eaa34c25451c766ca9b9199 SHA512 1d9d42a711a1ae0ec7f1f641a68271d4b36f6b8701997a05d65c633d3531cad75e4edbf71c4f80cc59a9a14baa8ddebf19081dc67b99898dce13da8e3746227e -AUX opencv-4.8.0-fix-cuda-12.2.0.patch 1920 BLAKE2B c43157c4859666a962fa40ed435aeab6b17ac01b9b67dbba0955fb7c009504b1780f5de2a40ee63db245cadf0da41b40fda0d7e06ad719071b12ba385f693ea2 SHA512 5ab0c15811748307971e8939a40c08c2c9cf3e38d2acafff72a3890f6d7c7133d8c7a087cf1a05b2dbe1907dd88911872c61c10f7638edb46ee679f658b265c6 -AUX opencv-4.8.1-ade-0.1.2a.tar.gz.patch 652 BLAKE2B 91b933513485c5e4a33b3711328f01752ea8f77bf26701744ff9a7d56f899227c1f5899dd68ec7050929c2068e2d5dc805533173543ac0ab5a5db827a6d075c3 SHA512 61267dae88ca1e9f5d99e6d57101c0a0a2df2bc5fc9f646d14953707f8c1f4fc9f58e7861b007f5970603f267f797c43cbc35e29aa66e343fcfa6e568750934e -AUX opencv-4.8.1-drop-python2-detection.patch 1041 BLAKE2B bd7c4f66b36d04b57a4493df1b00ee6700ed6f28464f2538bde62d2b2a3d29ebb82946a1765540e6977ce6ee111dc2f37c3419ee74536f9c55340ae2e550d48a SHA512 7e5e36fa1fc312a4c791c099618c73b2f4ed5810a66f4de4ead5d0f5917d60c191c55289538bf908bcfa45522939ddfac62505e79fbfb7c3ea046a2027b576ff -AUX opencv-4.8.1-eliminate-lto-compiler-warnings.patch 1241 BLAKE2B eead5a16616fd9afcced21180e8e336e32ad387ff4010c55e5edcf2f81f09244c4914c98ab0439911f5ab8df1f61527a83ff5f09db65743fc5266748fc8bf969 SHA512 b3907b9d9f96f107fd27189961fe1a15b5706f66524cf21ea342ed04eedfa21c08d7572001d3afb70c54a7bfef56093fd7f8ac7a5dd9ea768f1b0412b5658eec -AUX opencv-4.8.1-libpng16.patch 2299 BLAKE2B 2aa6e7c2e35106b5c9243ad04b55eff650dc5351d73eafa2d4f703e2a965992c2145ba80f32e5e3c8a35b2370f301cb716387d9366cfc729add455a734243f6d SHA512 35b5441e78e7f62e5965350e1eae3060f258be26ac27d5a8c723b18b14e381327bb202409dfa0915ee81903b4f5ca660abd689967119ee6b3eb3bdb32072be4f -AUX opencv-4.8.1-opencv_test.patch 724 BLAKE2B 0b56c5a7a9bd86c0d85b740284f00ecddecf2a36319565074cf23966599adf632747d67dac0dd55471a4110b157173849558920fe8cc2fa4b7126542eb546fac SHA512 a1ba01ce63f27fd8f3197860af5153940a4e751bb56cec2cd978ca3c1495da9ee9bac8e70187f1e6ef0a7d3585f8625f79753b10c41500344d35104b4f774795 -AUX opencv-4.8.1-protobuf-22.patch 6895 BLAKE2B 5f4f6d249f523de5722b628cd2233b0bb14ea2cd6fe72d221dfbdb5561a821c592d24a306022900b5efc6b71e8f135e4a537bd96d09756c8d5ccd29fad8b2a55 SHA512 63f43ea4e91726937aaa8b538d79503a3654f9a873d0398667c65e1c706ce1c591d64731970147ef82726fb2646817d439ca12b513616809e03794b57e8486ef -AUX opencv-4.8.1-python3_12-support.patch 1354 BLAKE2B 6f1e5c7b8c3ddd3bbbe3bc9f4123ef114312155cab5eec34e431574cbc7e564f1ac87152a8adf11af75d386b2701bf4f7c337eb1941a6c699170b400013d5683 SHA512 2638f1cfb638de73e5e8a46b415844961d02ae9f398d9748535ec392c410ece010b3ee8d82a6510a153879f213aa07008f445e1cfa1144e7fd9ffbfe13e94e82 AUX opencv-4.8.1-use-system-flatbuffers.patch 1522 BLAKE2B a9000e3269266cf9e85b6ba247fd977eb1c2e0bf771d0ba1432ba1f56802f72062402e55e7327e91085be870338e452ac08ec8a958d3cf51fdd9a8daf0cfee76 SHA512 50d7ee7de6513ea56974c598641c2d9edb7679f273f6313c1dd7e68ba667688ad50fd61691661702fab75ddfa1165cd96a52ebebd19c8c09116612c90c8b11d3 AUX opencv-4.8.1-use-system-opencl.patch 933 BLAKE2B 557448d74771f6b9fc8b2fa5af79e6287c1dbad9a6c5dabe520080c7481d033002164cbfdd5a767d3b4cc54ec1344423ea8a0bbbd13a873ca955d95787924d10 SHA512 1602b74e829cd8842efbe6535e91a426a88c9ae08280d863bc4150cbe2a9d3ebef02b2abe98ee470f26412bb6fca653529492bf54b87f4d53fe20f242ef03771 AUX opencv-4.9.0-ade-0.1.2d.tar.gz.patch 652 BLAKE2B 80b3d810e31a16413b67a0c0d64991c7fe699240ae67a50ecc7d926af33359eccb6aef52facbba1bea56723698e775f293c8cae57b504e76ec1e287d2c21b810 SHA512 dc88386c96ea882848a18d9336541e525a926d9c9d75c3e9d4dc667e03ea8fe85109f360a310c8ea602c643fcc4e4317b3af81c0f4e50f9057ee0588d433b020 AUX opencv-4.9.0-cmake-cleanup.patch 1298 BLAKE2B 22dd3a47a26bab6545956d24c685792fa2071678db5090377348bdfb6e70dde003db0354fdc6d0dd32f30d5db0cd5df3270080678257590ec7f84f309cd09f95 SHA512 14bea3b5711f66b08b34b9dc1246744ae6385b7ecaadab057e5702769049e8fb318cbed11390517899933c760c42a2f4b25d90d6eeafe11977274a1fef4bf62e AUX opencv-4.9.0-drop-python2-detection.patch 3270 BLAKE2B bbb4021592e61d1ca99b7c6182d89e7d1adfff7e3ebdb1e810ce7b957001111559968d244416deca4baca44463cef86148d0d0d48b1fd44d91dc9c17b40f5692 SHA512 2386169151d8b8242245f66e4aeb6445bc4dcfc0ff31768417dbc32c8dee0b94e935d1d00d0b40acaad448ef816643b5df563e0a01016913be90a2a0c8b4e7c0 +AUX opencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch 2348 BLAKE2B 347c194b26d177ea7e7465e51e9bd362e4f5f23c48fa2eff363a3895a6f45d80a09218ac25ec293a496c56156572a9b000583fe3788b94510a26986c8ba8ebce SHA512 0eb0db58e9fdab8e6cc4415a6430c1b80ed338a6dea8dfe21bd965eadcab9de2098b2ba094496784fc90d1648713f1af721cb7e849c049793a5159799fc128d6 AUX opencv_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch 1158 BLAKE2B c4b139198ac5c33974d6c4fac8ebcf288f15d9edf09e55b30e47071931abdf8924dc51c2d8cb27103edb3b815ba9f7e5ea334cfb1849be7b59ff4cd076f6771a SHA512 03d4442af9b98115126473cca0a9f581bd0c0e983b8d5b7f34fdd0ea7455d4a73163f853c80438f4390c5da4c7cc419c59c24643529df9eb4222915c80e654fe AUX opencv_contrib-4.8.1-rgbd.patch 477 BLAKE2B 0120e631199d7099bae437d459f0c950c3cbd11e5f0a900d687ca5aedf1d7602f7faa3be5ba1a9b3e0758f3fd70574450f97bd7429e447df7440d58326ceb99b SHA512 6fe2ef40bf26d40e4f52d84b17183f6e536b2fe51bf65266be6a59865def0b9c074aa5eff58a60d673afec776a7ba03acaba667c917b78751950b77f68759d96 AUX opencv_contrib-4.9.0-cuda-12.4.patch 2397 BLAKE2B 7333533f0818b04f5ec89b593f9bf7710aba496a2ba7a1688043818d4249d4a3d3e3f17c42456d2e5e0aaae728f0b9726f3943ce732f7307b0126adc68147da0 SHA512 442c97b3fbf48f0b5c1176a10b1bbcf7fccad369070b6be2a0e3e6dd2ccba88f0a7662360b108fc4d55b766d0563d5f7eef5a2fb7afa5212aac8cab73e9ad43c DIST NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz 8771 BLAKE2B f579960448bdaf57fbefd5e88002d8f6f4dbb828429b0f3a0112916c03039d4e4de65263eb8464a4d62924c1b77f0a61c2d93b7307657439bfbf7d59785f1533 SHA512 85dfdc52260f54f62c980508f4b6ab384e44200bd1c13761c4947f9a898c08f0faed2d734a85a4ba7a46f8788ed58ee89f12f61cee97881b69ba626bbd04f655 -DIST ade-0.1.2a.tar.gz 116737 BLAKE2B 9ac2af2f21aab8cb5d599e0b653bb6126642588e508f55e5fbfe5ce9607267f25e5187fd31ed69349064551c06e15b2ba548319708ed5f70e7761470775cc6e0 SHA512 d3ed210ff25f4c05393b0039cb4a73a6ceb8b42ba3d776e0469da2362899d3f76564cc6a06965b7de91f38517e1cd4ff4b18c00185d2b1a0af5a34ecf0d9dd44 DIST ade-0.1.2d.tar.gz 117027 BLAKE2B c544b769c7b289342a469950ed047fa13719bafba29aa41167b588cf4f24ed6e596159ec19b65e61e09519a461a5e82ac07d63e2ea493279ee182fe658810abb SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348 -DIST opencv-4.8.1.tar.gz 92006711 BLAKE2B 54728a37e3e8a528bd8d2e6df5963a996820a51160d05ac72b350234ce5372f99c037af96e13c55de1452e517fffb478c2335b9e1cbc07a36c78f99351eabd58 SHA512 b98d89b8e7b8ae8138bce00c5226816b761b53fbeb8f28ca516e08c5d130f216f9388a81785cd6684034530f768e097cbe12f19a9361f362b7d2048bfc427a65 -DIST opencv-4.8.1_contrib.tar.gz 59200293 BLAKE2B 8cf3ee60cb38a9fa2649013b9b4704022abe5cc65c331078dc7ea87028bc99df8b0de12f835905f5bb5c00a811f256754cac018ca8e02739ac5c6fe36aa4346d SHA512 e3df49e6a1411f55eebbc02f4534ddefabff961b4f63c69b21fe06ff3df894773a8643ab0cb123b83c2bdc8fa02698b332d3c243e8546c894e6c6c8ecaa65500 +DIST opencv-4.10.0.tar.gz 94993429 BLAKE2B f16de226337ce1dabda4a52ae03257b0570af0e6212102c483dce61f2bcee1549150d0016b6ea20bae5d8c838e12db3d54bcb9c2ec5d3164639cdd56818f0b1b SHA512 b4f7248f89f1cd146dbbae7860a17131cd29bd3cb81db1e678abfcfbf2d8fa4a7633bfd0edbf50afae7b838c8700e8c0d0bb05828139d5cb5662df6bbf3eb92c DIST opencv-4.9.0.tar.gz 92788647 BLAKE2B 257478b0f5e19abca5b3676767dacd40765c645eb455080160b8b9dc54e66fba4880200b483829fc9050bc3f9b3e815f8ee784d7b41261877784536778fe3c96 SHA512 1598ae59849e7805b3cbec5260bb501006f26edff452343b366b9262a0f48a6e09f4b2e760209cb677f2a64a7b22f4e70bc6195c104bcea74cc9fe04031d0292 DIST opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz 397901 BLAKE2B 9adbe14ee3a2c90b890be694aa80d65b67e23a23f47ccabee4564e31eb9857d717b5a751df32004cfa5d6a53a9e1d8ea8d8943b705a0eaea5ca741169e2222f6 SHA512 8a92555aed2ac8752818586ab9762dd96ec128c5465cb87e402f15b15d16f7d371b3de045ef7295526e9ef99ec817766bb685a21d24dba29c650cf44e384a4e3 DIST opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz 63301261 BLAKE2B 923dc944edfda4c292d42207290bee414bfe21998f6ffe341ea3b38b6f2f581f3a243653e2c1fd3fa86084068ad6e7acd5ca73ab43094aa15f124d379833a5d8 SHA512 68cce870da0846cbd12a093ec7896b510e34590dad2b91699be1df5d4f72d343f9789d54c45c1b801784f7e57e0e80b19ba65dd99855225da99b4193dae97aaa DIST opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz 920403 BLAKE2B 5f834e8ccef9d88d0650f8ae5d215a2d07d0a356aaad4de1622068e0b2a7def88fccc84bc4397f0182732e836fcd6e363ae25a2cdeaa4d458a7d8ef9afc81da5 SHA512 5611b9db40477759213ab35320570c198f1f224f92ca801ca3accd1f7620faf3d44f306e44abefd10be118acee9b56da643ca82abaa7c4d2102fe92e5b298a6e DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 BLAKE2B c13559569808db24105049e2081bc466c0e8b6dab58bcc69001e49ff82e03ec4701e25648b5e542b7df2c8e522abfbd82c9825e66c37d6a673847b41bf6effae SHA512 3fc44f12802aa1dad0b12372d53242ae2134a2d74ca0b6d8e4639551623426106781a41d77ebfce79ac625a49aec26b0d7425e0d31f09bab6a15e3d43caef8bc DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLAKE2B f1794cc8f8684501f670db3d720c02f35c57ebe91f276cc21dea1f1c1426740d03569143fec74380e941703b5086db5f013ca913fb296eda99559115fd53ca30 SHA512 07118b9d688bf0ff34a6e4ca1548006124d80d11e7b48f08c9e1910b64249b1dad0ace460f50adda0ecb69b90871fc59cc25f451570c63f7c6d6ba2b92d8801c +DIST opencv_contrib-4.10.0-3607.patch 29870 BLAKE2B cf43afbd24d0b32817e908c55ac3bf0d5da8b82b2c459bc04ef31414e16285eefe334c46eeee730bd3cad2bbec062f5bc212a82bd7f2ac83baca231d711545d4 SHA512 3fdd08cee6d7da8edf36411f30c8d6230ebd86a1c896a08f1dc86d3a0982e1f1f99797066722bc51ce4b1a60a2db55853c348441b3e6edc0d318fcb7bd5cf944 +DIST opencv_contrib-4.10.0.tar.gz 55387316 BLAKE2B 5d6f884817b6d45b86833fcab1e31cd0fd7be19885698e0aefe300fa570f93c446d7f564567cc08099d559a98a65e9c3dd0fd35ceeca7e0e9a1e56edc74a0fe9 SHA512 480df862250692a97ce6431cba00dbecb70332307a19c1c04aa9d7444e6e74ab4f8c798548dce76d2319a9877624b82e361fb22a71df14b996087ade448be501 DIST opencv_contrib-4.9.0.tar.gz 59803362 BLAKE2B e6b90e9bd462f96ef010490d45105d7125622d6c49912653c0d387568ae7109b1cbcac4cc0f52c1f997a45ed75923caea90bf4ad9336e689a56742b029789038 SHA512 ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043 +DIST opencv_extra-4.10.0.tar.gz 504349887 BLAKE2B 6e76860beb95cf00698980a19cfd2894e5bfe0d477d94352cbb2ff98688acbc1c404953cbc3baa95453588e7b9063175a067f24006c5d2719a6c75d15f2ef891 SHA512 1a581dad61bc1e5075af5afed2dd3d67793232a9e1219408448d08c518ae714cf0c4d5fec2c25791351a49a0d265fe051ea142b2170f82843e19e82f65abc8c6 DIST opencv_extra-4.9.0.tar.gz 502141517 BLAKE2B ed7351f29c6fb80d56d5ef383af68322fa805c7689132f7ca9bb43c9a1319c5876ce6d5c40d583c955eb255dd82b876c94ed42625cd71b13830ec94b2cc75dc2 SHA512 f05c1eaed491d15107c858af5b33d0d5856070dcb6f94491ba33a172b2f0caf34905eb5d1787e1247bc888626478647fce0db7f3ccbc6d6faba0ee43fd6b6bfa -EBUILD opencv-4.8.1-r2.ebuild 29152 BLAKE2B 26ed0294916f8062548587cc168c944aa178bcba5f2f84ceacf98e5a1380b8af8469fe6b0d201846d3678e4dba4e7647e9ee2efbed7e11a6b24ec0ed9417a06a SHA512 1cfae2b8cf6f2d975745bf4080627c1259a1c4131a688fd06e6f530b4edfa3376170f9486a1fadb1ee15aa932bb9abb27436bdd3a4c357ccf0502a756361fc31 -EBUILD opencv-4.9.0-r1.ebuild 34638 BLAKE2B 695e677013af934cf4920f69f0b0c8e3f60836ea80a39f8dd628a0431b8947f067fdc052b848d6c215511bf5661fbe9177c083815eb661bacdaeffb27a292da9 SHA512 255936aa5da242b54afdf2b8ee12a7038453d528e947fec2b113a72f620feb4f3f967fa57b0fe5c6a166d3cb8452be5a57b965f46cc7886c0fc1e123c9a7aeab -EBUILD opencv-4.9.0-r2.ebuild 35016 BLAKE2B 3abcc5d39b5495090ca92b569674efd5a3ac8ffaf847634791b3976bc86539c1d61191d9bc5006b786e625556787eda8b2bed4b4b0f9eb7e9e63f0ae37eac77f SHA512 62598531e0380a7b8bd2edc3592d66205d99a75c3e80da4041473e1d24a7d9c5b9f251061194eee96fb1bebf44635a41c7bc27f60dedb591a64ca6b7644c6229 -MISC metadata.xml 3718 BLAKE2B 44b00ff4bc94a19f6a1b68cfefb29ce9f1a4ee21ee999b72a258268893ede5274d863d3a6faa325e6f0522c078c6afae53c6de4c46d6ed5a083888e195f34276 SHA512 b6c2f0a27b84afcb576209a3bdc641e81323c01bcac9617086d79821e723ea3c9698e8f3c5db837d46da68e48b6d9d08bdd05977e22d58d6c7ad30fa7b965b52 +EBUILD opencv-4.10.0.ebuild 43066 BLAKE2B 4b74dc6fe689664807d20ca681f27076e5a84ce0be2b2549088b74c37173a720b1908b4e6a0afcfefeee7eb5f2931094962e5cade920258eedd26c5ae4e4f435 SHA512 c2622a81820061b4c7efd5e38659f3ccae7673ed581e877fee4e5fcf0b13df66454c470f7eac52eea1eea854ef873c2d44109bc852311fdd9890db4b87fd23bd +EBUILD opencv-4.9.0-r2.ebuild 35016 BLAKE2B 2f355e13f1a13e8d6b039ac8dea37fae80e3a6b3464406a668d809cbadb046b34afa022240fdfe474106543e28686b7b8746a391e06807bf8656ee0cdb657ae9 SHA512 f65508a457c94c903b045384f6afe23ee3730cd92321d959c51525a7e9e2c5b18b48a5c5d1c7fec3621af5d5aad28c09ad31311a46504a6ed340bb39bc15ce9a +MISC metadata.xml 3921 BLAKE2B 92f38794e008f13866e797ab3eeb3dbeffbba81412523f9c9590d3768e046565f651cf0c0b223c1a8b04a9ba38732dfecfeebc79b75a7c722af20cab03e22bd3 SHA512 088ea0cbfab7cdd3fa53fa1fd1907487e785159b5d443e4258a0470123587554c57eb4fb4cbebbb6fe610c03b002c5c45c1758f85ca699d6df97872a6e826e35 diff --git a/media-libs/opencv/files/opencv-4.10.0-26234.patch b/media-libs/opencv/files/opencv-4.10.0-26234.patch new file mode 100644 index 000000000000..fb155302af28 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.10.0-26234.patch @@ -0,0 +1,73 @@ +https://github.com/opencv/opencv/pull/26234 +From 6a4be763b2db5f26684204ddc7d06c02325c3917 Mon Sep 17 00:00:00 2001 +From: Zach Lowry <zachlowry@canvas-inc.com> +Date: Tue, 1 Oct 2024 14:16:54 -0500 +Subject: [PATCH 1/2] move the gcc6 compatibility check to occur on a + per-directory basis, rather than exclude all include paths when the list of + paths contains /usr/include + +--- + cmake/OpenCVUtils.cmake | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake +index 94f87d9a1200..bb20a22f0606 100644 +--- a/cmake/OpenCVUtils.cmake ++++ b/cmake/OpenCVUtils.cmake +@@ -353,23 +353,23 @@ function(ocv_target_include_directories target) + #ocv_debug_message("ocv_target_include_directories(${target} ${ARGN})") + _ocv_fix_target(target) + set(__params "") +- if(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND +- ";${ARGN};" MATCHES "/usr/include;") +- return() # workaround for GCC 6.x bug +- endif() +- set(__params "") + set(__system_params "") + set(__var_name __params) + foreach(dir ${ARGN}) + if("${dir}" STREQUAL "SYSTEM") + set(__var_name __system_params) + else() +- get_filename_component(__abs_dir "${dir}" ABSOLUTE) +- ocv_is_opencv_directory(__is_opencv_dir "${dir}") +- if(__is_opencv_dir) +- list(APPEND ${__var_name} "${__abs_dir}") ++ if(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND ++ "${dir}" MATCHES "/usr/include$") ++ # workaround for GCC 6.x bug + else() +- list(APPEND ${__var_name} "${dir}") ++ get_filename_component(__abs_dir "${dir}" ABSOLUTE) ++ ocv_is_opencv_directory(__is_opencv_dir "${dir}") ++ if(__is_opencv_dir) ++ list(APPEND ${__var_name} "${__abs_dir}") ++ else() ++ list(APPEND ${__var_name} "${dir}") ++ endif() + endif() + endif() + endforeach() + +From fc01b270ee657e7afc2657b7a9e15766aa36faf0 Mon Sep 17 00:00:00 2001 +From: Zach Lowry <zachlowry@canvas-inc.com> +Date: Wed, 2 Oct 2024 13:28:57 -0500 +Subject: [PATCH 2/2] use `dir MATCHES ...` without variable unpacking + +--- + cmake/OpenCVUtils.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake +index bb20a22f0606..5886f4f3cb33 100644 +--- a/cmake/OpenCVUtils.cmake ++++ b/cmake/OpenCVUtils.cmake +@@ -360,7 +360,7 @@ function(ocv_target_include_directories target) + set(__var_name __system_params) + else() + if(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND +- "${dir}" MATCHES "/usr/include$") ++ dir MATCHES "/usr/include$") + # workaround for GCC 6.x bug + else() + get_filename_component(__abs_dir "${dir}" ABSOLUTE) diff --git a/media-libs/opencv/files/opencv-4.10.0-cuda-fp16.patch b/media-libs/opencv/files/opencv-4.10.0-cuda-fp16.patch new file mode 100644 index 000000000000..ed0f128b99c5 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.10.0-cuda-fp16.patch @@ -0,0 +1,226 @@ +https://github.com/opencv/opencv/issues/25711 +https://github.com/opencv/opencv/pull/25880 + +From 5115dc62f8af616c6e75e4b3df3eb8f201298432 Mon Sep 17 00:00:00 2001 +From: Aliaksei Urbanski <aliaksei.urbanski@gmail.com> +Date: Tue, 9 Jul 2024 01:46:12 +0300 +Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20CUDA=20for=20old=20GPU?= + =?UTF-8?q?s=20without=20FP16=20support?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- a/modules/dnn/src/cuda4dnn/init.hpp ++++ b/modules/dnn/src/cuda4dnn/init.hpp +@@ -15,7 +15,7 @@ + + namespace cv { namespace dnn { namespace cuda4dnn { + +- void checkVersions() ++ inline void checkVersions() + { + // https://docs.nvidia.com/deeplearning/cudnn/developer-guide/index.html#programming-model + // cuDNN API Compatibility +@@ -44,19 +44,19 @@ namespace cv { namespace dnn { namespace cuda4dnn { + } + } + +- int getDeviceCount() ++ inline int getDeviceCount() + { + return cuda::getCudaEnabledDeviceCount(); + } + +- int getDevice() ++ inline int getDevice() + { + int device_id = -1; + CUDA4DNN_CHECK_CUDA(cudaGetDevice(&device_id)); + return device_id; + } + +- bool isDeviceCompatible() ++ inline bool isDeviceCompatible() + { + int device_id = getDevice(); + if (device_id < 0) +@@ -76,7 +76,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { + return false; + } + +- bool doesDeviceSupportFP16() ++ inline bool doesDeviceSupportFP16() + { + int device_id = getDevice(); + if (device_id < 0) +--- a/modules/dnn/src/registry.cpp ++++ b/modules/dnn/src/registry.cpp +@@ -18,6 +18,10 @@ + #include "backend.hpp" + #include "factory.hpp" + ++#ifdef HAVE_CUDA ++#include "cuda4dnn/init.hpp" ++#endif ++ + namespace cv { + namespace dnn { + CV__DNN_INLINE_NS_BEGIN +@@ -121,7 +125,8 @@ class BackendRegistry + if (haveCUDA()) + { + backends.push_back(std::make_pair(DNN_BACKEND_CUDA, DNN_TARGET_CUDA)); +- backends.push_back(std::make_pair(DNN_BACKEND_CUDA, DNN_TARGET_CUDA_FP16)); ++ if (cuda4dnn::doesDeviceSupportFP16()) ++ backends.push_back(std::make_pair(DNN_BACKEND_CUDA, DNN_TARGET_CUDA_FP16)); + } + #endif + + +From cfb2bc34acd7699707110523f067a7452a404206 Mon Sep 17 00:00:00 2001 +From: Alexander Smorkalov <alexander.smorkalov@xperience.ai> +Date: Tue, 9 Jul 2024 11:21:58 +0300 +Subject: [PATCH 2/3] Added CUDA FP16 availability check for target management. + +--- a/modules/dnn/src/cuda4dnn/init.hpp ++++ b/modules/dnn/src/cuda4dnn/init.hpp +@@ -56,9 +56,11 @@ namespace cv { namespace dnn { namespace cuda4dnn { + return device_id; + } + +- inline bool isDeviceCompatible() ++ inline bool isDeviceCompatible(int device_id = -1) + { +- int device_id = getDevice(); ++ if (device_id < 0) ++ device_id = getDevice(); ++ + if (device_id < 0) + return false; + +@@ -76,9 +78,11 @@ namespace cv { namespace dnn { namespace cuda4dnn { + return false; + } + +- inline bool doesDeviceSupportFP16() ++ inline bool doesDeviceSupportFP16(int device_id = -1) + { +- int device_id = getDevice(); ++ if (device_id < 0) ++ device_id = getDevice(); ++ + if (device_id < 0) + return false; + +@@ -87,9 +91,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { + CUDA4DNN_CHECK_CUDA(cudaDeviceGetAttribute(&minor, cudaDevAttrComputeCapabilityMinor, device_id)); + + int version = major * 10 + minor; +- if (version < 53) +- return false; +- return true; ++ return (version >= 53); + } + + }}} /* namespace cv::dnn::cuda4dnn */ +--- a/modules/dnn/src/net_impl_backend.cpp ++++ b/modules/dnn/src/net_impl_backend.cpp +@@ -10,6 +10,10 @@ + #include "backend.hpp" + #include "factory.hpp" + ++#ifdef HAVE_CUDA ++#include "cuda4dnn/init.hpp" ++#endif ++ + namespace cv { + namespace dnn { + CV__DNN_INLINE_NS_BEGIN +@@ -242,6 +246,16 @@ void Net::Impl::setPreferableTarget(int targetId) + #endif + } + ++ if (IS_DNN_CUDA_TARGET(targetId)) ++ { ++ preferableTarget = DNN_TARGET_CPU; ++#ifdef HAVE_CUDA ++ if (cuda4dnn::doesDeviceSupportFP16() && targetId == DNN_TARGET_CUDA_FP16) ++ preferableTarget = DNN_TARGET_CUDA_FP16; ++ else ++ preferableTarget = DNN_TARGET_CUDA; ++#endif ++ } + #if !defined(__arm64__) || !__arm64__ + if (targetId == DNN_TARGET_CPU_FP16) + { +--- a/modules/dnn/src/registry.cpp ++++ b/modules/dnn/src/registry.cpp +@@ -122,10 +122,24 @@ class BackendRegistry + #endif + + #ifdef HAVE_CUDA +- if (haveCUDA()) ++ cuda4dnn::checkVersions(); ++ ++ bool hasCudaCompatible = false; ++ bool hasCudaFP16 = false; ++ for (int i = 0; i < cuda4dnn::getDeviceCount(); i++) ++ { ++ if (cuda4dnn::isDeviceCompatible(i)) ++ { ++ hasCudaCompatible = true; ++ if (cuda4dnn::doesDeviceSupportFP16(i)) ++ hasCudaFP16 = true; ++ } ++ } ++ ++ if (hasCudaCompatible) + { + backends.push_back(std::make_pair(DNN_BACKEND_CUDA, DNN_TARGET_CUDA)); +- if (cuda4dnn::doesDeviceSupportFP16()) ++ if (hasCudaFP16) + backends.push_back(std::make_pair(DNN_BACKEND_CUDA, DNN_TARGET_CUDA_FP16)); + } + #endif +--- a/modules/dnn/test/test_common.hpp ++++ b/modules/dnn/test/test_common.hpp +@@ -211,7 +211,7 @@ class DNNTestLayer : public TestWithParam<tuple<Backend, Target> > + if ((!l->supportBackend(backend) || l->preferableTarget != target) && !fused) + { + hasFallbacks = true; +- std::cout << "FALLBACK: Layer [" << l->type << "]:[" << l->name << "] is expected to has backend implementation" << endl; ++ std::cout << "FALLBACK: Layer [" << l->type << "]:[" << l->name << "] is expected to have backend implementation" << endl; + } + } + if (hasFallbacks && raiseError) +--- a/modules/dnn/test/test_onnx_conformance.cpp ++++ b/modules/dnn/test/test_onnx_conformance.cpp +@@ -1008,7 +1008,7 @@ class Test_ONNX_conformance : public TestWithParam<ONNXConfParams> + if ((!l->supportBackend(backend) || l->preferableTarget != target) && !fused) + { + hasFallbacks = true; +- std::cout << "FALLBACK: Layer [" << l->type << "]:[" << l->name << "] is expected to has backend implementation" << endl; ++ std::cout << "FALLBACK: Layer [" << l->type << "]:[" << l->name << "] is expected to have backend implementation" << endl; + } + } + return hasFallbacks; + +From cc9178903daff229bc396db718bf347c4eafd33b Mon Sep 17 00:00:00 2001 +From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com> +Date: Wed, 10 Jul 2024 09:06:09 +0300 +Subject: [PATCH 3/3] Update modules/dnn/src/registry.cpp + +Co-authored-by: Aliaksei Urbanski <aliaksei.urbanski@gmail.com> +--- a/modules/dnn/src/registry.cpp ++++ b/modules/dnn/src/registry.cpp +@@ -132,7 +132,10 @@ class BackendRegistry + { + hasCudaCompatible = true; + if (cuda4dnn::doesDeviceSupportFP16(i)) ++ { + hasCudaFP16 = true; ++ break; // we already have all we need here ++ } + } + } + diff --git a/media-libs/opencv/files/opencv-4.10.0-cudnn-9.patch b/media-libs/opencv/files/opencv-4.10.0-cudnn-9.patch new file mode 100644 index 000000000000..78ac162bef2d --- /dev/null +++ b/media-libs/opencv/files/opencv-4.10.0-cudnn-9.patch @@ -0,0 +1,32 @@ +https://github.com/opencv/opencv/issues/25711 +https://github.com/opencv/opencv/pull/25841 + +From 3d74d646d8c4c48e400e650fef9463f174414b96 Mon Sep 17 00:00:00 2001 +From: Alexander Smorkalov <alexander.smorkalov@xperience.ai> +Date: Mon, 1 Jul 2024 17:33:24 +0300 +Subject: [PATCH] Fixed CuDNN runtime version check for CuDNN 9+. + +--- a/modules/dnn/src/cuda4dnn/init.hpp ++++ b/modules/dnn/src/cuda4dnn/init.hpp +@@ -23,8 +23,19 @@ namespace cv { namespace dnn { namespace cuda4dnn { + // Any patch release x.y.z is forward or backward-compatible with applications built against another cuDNN patch release x.y.w (meaning, of the same major and minor version number, but having w!=z). + // cuDNN minor releases beginning with cuDNN 7 are binary backward-compatible with applications built against the same or earlier patch release (meaning, an application built against cuDNN 7.x is binary compatible with cuDNN library 7.y, where y>=x). + // Applications compiled with a cuDNN version 7.y are not guaranteed to work with 7.x release when y > x. +- auto cudnn_bversion = cudnnGetVersion(); +- auto cudnn_major_bversion = cudnn_bversion / 1000, cudnn_minor_bversion = cudnn_bversion % 1000 / 100; ++ int cudnn_bversion = cudnnGetVersion(); ++ int cudnn_major_bversion = 0, cudnn_minor_bversion = 0; ++ // CuDNN changed major version multiplier in 9.0 ++ if (cudnn_bversion >= 9*10000) ++ { ++ cudnn_major_bversion = cudnn_bversion / 10000; ++ cudnn_minor_bversion = cudnn_bversion % 10000 / 100; ++ } ++ else ++ { ++ cudnn_major_bversion = cudnn_bversion / 1000; ++ cudnn_minor_bversion = cudnn_bversion % 1000 / 100; ++ } + if (cudnn_major_bversion != CUDNN_MAJOR || cudnn_minor_bversion < CUDNN_MINOR) + { + std::ostringstream oss; diff --git a/media-libs/opencv/files/opencv-4.10.0-dnn-explicitly-include-abseil-cpp.patch b/media-libs/opencv/files/opencv-4.10.0-dnn-explicitly-include-abseil-cpp.patch new file mode 100644 index 000000000000..ca63bea5e46b --- /dev/null +++ b/media-libs/opencv/files/opencv-4.10.0-dnn-explicitly-include-abseil-cpp.patch @@ -0,0 +1,39 @@ +From 980dd32e52da10901094a7f8a5dbe5287a62a602 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Thu, 5 Sep 2024 15:53:36 +0200 +Subject: [PATCH] dnn: explicitly include abseil-cpp + +Linking against abseil-cpp depended on protobuf exporting all abseil-cpp +libraries via protobuf::libprotobuf public libraries. + +Explcitly finding abseil ourselves removes the need for that. + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake +index 9228b04..7d9f315 100644 +--- a/cmake/OpenCVFindProtobuf.cmake ++++ b/cmake/OpenCVFindProtobuf.cmake +@@ -32,6 +32,7 @@ else() + # we still need this for command PROTOBUF_GENERATE_CPP. + set(protobuf_MODULE_COMPATIBLE ON) + ++ find_package(absl CONFIG REQUIRED) + unset(Protobuf_VERSION CACHE) + find_package(Protobuf QUIET CONFIG) + if(NOT Protobuf_FOUND) +diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt +index 562b144..052c4f8 100644 +--- a/modules/dnn/CMakeLists.txt ++++ b/modules/dnn/CMakeLists.txt +@@ -144,6 +144,7 @@ list(APPEND libs ${Protobuf_LIBRARIES}) + if(NOT BUILD_PROTOBUF) + list(APPEND include_dirs ${Protobuf_INCLUDE_DIRS}) + endif() ++list(APPEND libs absl::check) + + set(sources_options "") + +-- +2.46.0 + diff --git a/media-libs/opencv/files/opencv-4.10.0-tbb-detection.patch b/media-libs/opencv/files/opencv-4.10.0-tbb-detection.patch new file mode 100644 index 000000000000..e808aec04547 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.10.0-tbb-detection.patch @@ -0,0 +1,28 @@ +From 460bf0927fcc09e8c7a21d5bb48044fc923a8ee7 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Tue, 8 Oct 2024 00:31:52 +0200 +Subject: [PATCH] Fix tbb detection + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/cmake/OpenCVDetectTBB.cmake b/cmake/OpenCVDetectTBB.cmake +index c9ecc02..3db3ae0 100644 +--- a/cmake/OpenCVDetectTBB.cmake ++++ b/cmake/OpenCVDetectTBB.cmake +@@ -25,7 +25,12 @@ function(ocv_tbb_cmake_guess _found) + message(WARNING "No TBB::tbb target found!") + return() + endif() +- get_target_property(_lib TBB::tbb IMPORTED_LOCATION_RELEASE) ++ ++ # Get installed configuration of tbb ++ get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS) ++ list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF) ++ ++ get_target_property(_lib TBB::tbb IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF}) + message(STATUS "Found TBB (cmake): ${_lib}") + get_target_property(_inc TBB::tbb INTERFACE_INCLUDE_DIRECTORIES) + add_library(tbb INTERFACE IMPORTED) +-- +2.46.2 + diff --git a/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch b/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch deleted file mode 100644 index 6bf04daf58ae..000000000000 --- a/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch +++ /dev/null @@ -1,272 +0,0 @@ -https://github.com/opencv/opencv/pull/24203 - -From 689fa6f372975d58e9f50fd17a0abd105b1815f1 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Mon, 28 Aug 2023 04:20:58 +0100 -Subject: [PATCH] Fix compilation on arm64 with FP16 when disabled - -If building with -mcpu=native or any other setting which implies the current -CPU has FP16 but with intrinsics disabled, we mistakenly try to use it even -though convolution.hpp conditionally defines it correctly based on whether -we should *use it*. convolution.cpp on the other hand was mismatched and -trying to use it if the CPU supported it, even if not enabled in the build -system. - -Make the guards match. - -Bug: https://bugs.gentoo.org/913031 -Signed-off-by: Sam James <sam@gentoo.org> ---- a/modules/dnn/src/layers/cpu_kernels/convolution.cpp -+++ b/modules/dnn/src/layers/cpu_kernels/convolution.cpp -@@ -118,7 +118,7 @@ Ptr<FastConv> initFastConv( - const size_t wstep = weightsMat.step1(); - - conv->useFP16 = false; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - // TODO: add FP16 support for Winograd. - if (_useFP16 && (conv->conv_type == CONV_TYPE_GENERIC || conv->conv_type == CONV_TYPE_DEPTHWISE_REMAIN)) - conv->useFP16 = true; -@@ -137,7 +137,7 @@ Ptr<FastConv> initFastConv( - int padded_ksize = ((ksize + VEC_ALIGN-1) / VEC_ALIGN) * VEC_ALIGN; - int nweights = C * padded_ksize; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (conv->useFP16) - { - conv->weightsBuf_FP16.resize(nweights + VEC_ALIGN); -@@ -190,7 +190,7 @@ Ptr<FastConv> initFastConv( - #endif - const int CONV_WINO_NATOMS_F32 = CONV_WINO_AREA / CONV_WINO_ATOM_F32; // for AVX2, it is 8, otherwise, it's 16. - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - // FP 16 - const int CONV_WINO_ATOM_F16 = CONV_WINO_ATOM_F32 * 2; - const int CONV_WINO_NATOMS_F16 = CONV_WINO_AREA / CONV_WINO_ATOM_F16; -@@ -208,7 +208,7 @@ Ptr<FastConv> initFastConv( - size_t nweights = ngroups*Kg_nblocks*Cg*CONV_WINO_KBLOCK*CONV_WINO_AREA; - - float* wptrWino = nullptr; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - float16_t* wptrWino_FP16 = nullptr; - if (conv->useFP16) - { -@@ -264,7 +264,7 @@ Ptr<FastConv> initFastConv( - } - - // repack the data. --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (conv->useFP16) - { - float16_t* wptr = wptrWino_FP16 + (g*Kg_nblocks + ki) * Cg *CONV_WINO_KBLOCK*CONV_WINO_AREA + -@@ -308,7 +308,7 @@ Ptr<FastConv> initFastConv( - - float* weightsBufPtr = nullptr; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - int numStripsMR_FP16 = (Kg + CONV_MR_FP16 - 1) / CONV_MR_FP16; - int Kg_aligned_FP16 = numStripsMR_FP16 * CONV_MR_FP16; - size_t nweights_FP16 = ngroups * Kg_aligned_FP16 * DkHkWkCg; -@@ -331,7 +331,7 @@ Ptr<FastConv> initFastConv( - } - - // Pack the weight. --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (conv->useFP16) - { - parallel_for_(Range(0, ngroups * numStripsMR_FP16), [&](const Range& r0){ -@@ -415,7 +415,7 @@ static inline void packData8(char*& inpbuf, float*& inptrIn, int& in_w, int& x0, - char * inpbufC = inpbuf + s0 * esz; - float* inptrInC = (float* )inptrIn; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - float16_t* inpbufC_FP16 = (float16_t *)inpbufC; - if (esz == sizeof(float16_t)) - { -@@ -521,7 +521,7 @@ static inline void packData2(char *& inpbuf, float*& inptrIn, int& in_w, int& x0 - char* inpbufC = inpbuf + s0 * esz; - float* inptrInC = inptrIn; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - float16_t* inpbufC_FP16 = (float16_t *)inpbufC; - if (esz == sizeof(float16_t)) - { -@@ -553,7 +553,7 @@ static inline void packData2(char *& inpbuf, float*& inptrIn, int& in_w, int& x0 - in_w += stride_w; - } - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - // Fast convert float 32 to float16 - static inline void _cvt32f16f( const float* src, float16_t* dst, int len) - { -@@ -623,7 +623,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - { - // Make special branch where memcpy() is called with a constant buffer size. - // Compilers will likely unroll this loop properly. --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inptr += inp_planesize, inpbuf += CONV_NR_esz) -@@ -636,7 +636,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inptr += inp_planesize, inpbuf += CONV_NR_esz) -@@ -700,7 +700,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - int w0 = std::max(0, (-in_w + dilation_w-1)/dilation_w); - int w1 = std::min(Wk, (Wi - in_w + dilation_w-1)/dilation_w); - const float* inptrInC = inptrIn; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - float16_t* inpbufC = (float16_t *)inpbuf + s0; -@@ -761,7 +761,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - int w1 = std::min(Wk, (Wi - in_w + dilation_w-1)/dilation_w); - - const float* inptrInC = inptrIn; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - float16_t* inpbufC = (float16_t *)inpbuf + s0; -@@ -834,7 +834,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - int w0 = std::max(0, (-in_w + dilation_w-1)/dilation_w); - int w1 = std::min(Wk, (Wi - in_w + dilation_w-1)/dilation_w); - const float* inptrInC = inptrIn; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - float16_t* inpbufC = (float16_t* )inpbuf + s0; -@@ -887,7 +887,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - for (; i < CONV_NR;) - { - float* inpbuf_ki = (float* )inpbuf + k * CONV_NR * Cg + i; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - float16_t * inpbuf_ki_FP16 = (float16_t *)inpbuf + k * CONV_NR * Cg + i; - #endif - -@@ -903,7 +903,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - { - if (stride_w == 1) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -934,7 +934,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else if (stride_w == 2) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -967,7 +967,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -1006,7 +1006,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - { - if (stride_w == 1) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -1029,7 +1029,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -1057,7 +1057,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -1073,7 +1073,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR) -@@ -1260,7 +1260,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr<FastConv>& co - int CONV_MR = CONV_MR_FP32; - int esz = sizeof(float ); - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - // works at FP 16. -@@ -1433,7 +1433,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr<FastConv>& co - } - - char *weights = nullptr; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - CV_Assert(!conv->weightsBuf_FP16.empty()); -@@ -1474,7 +1474,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr<FastConv>& co - #if CV_NEON && CV_NEON_AARCH64 - if (conv->useNEON) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - opt_NEON::convBlockMR1_FP16(DkHkWkCg, weights, inptr, cptr, biasVal, fusedAdd, minval, maxval, ifMinMaxAct, outLen, CONV_NR); -@@ -1537,7 +1537,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr<FastConv>& co - #if CV_NEON - if (conv->useNEON) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - opt_NEON::convBlock_FP16(c1 - c0, wptr, inptr, (char *)cptr_f16, ldc, c0 == 0, outLen, CONV_MR, CONV_NR); -@@ -1567,7 +1567,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr<FastConv>& co - float biasval = biasptr[k]; - int j = 0; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - float32x4_t vbias = vdupq_n_f32(biasval); diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch b/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch deleted file mode 100644 index fd7d12af2644..000000000000 --- a/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/opencv/opencv/pull/24104 -https://github.com/opencv/opencv/commit/5466fd2606ca6df57bbe43f064d2ae73fe4329eb -https://bugs.gentoo.org/915775 - -From ab8cb6f8a9034da2a289b84685c6d959266029be Mon Sep 17 00:00:00 2001 -From: cudawarped <12133430+cudawarped@users.noreply.github.com> -Date: Tue, 1 Aug 2023 13:02:42 +0300 -Subject: [PATCH] cuda: fix for compatibility with CUDA Toolkit >= 12.2.0 - ---- - modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp | 2 +- - modules/dnn/src/cuda4dnn/primitives/region.hpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp -index f067dddaa701..91ff33f81718 100644 ---- a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp -+++ b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp -@@ -111,7 +111,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { - * or there might be several weights - * or we don't have to scale - */ -- if (weight != 1.0) -+ if (weight != static_cast<T>(1.0f)) - { - kernels::scale1_with_bias1<T>(stream, output, input, weight, 1.0); - } -diff --git a/modules/dnn/src/cuda4dnn/primitives/region.hpp b/modules/dnn/src/cuda4dnn/primitives/region.hpp -index d22d44214e7b..3af05155feea 100644 ---- a/modules/dnn/src/cuda4dnn/primitives/region.hpp -+++ b/modules/dnn/src/cuda4dnn/primitives/region.hpp -@@ -121,7 +121,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { - new_coords - ); - -- if (nms_iou_threshold > 0) { -+ if (nms_iou_threshold > static_cast<T>(0.0f)) { - auto output_mat = output_wrapper->getMutableHostMat(); - CV_Assert(output_mat.type() == CV_32F); - for (int i = 0; i < input.get_axis_size(0); i++) { diff --git a/media-libs/opencv/files/opencv-4.8.1-ade-0.1.2a.tar.gz.patch b/media-libs/opencv/files/opencv-4.8.1-ade-0.1.2a.tar.gz.patch deleted file mode 100644 index 056553695ee2..000000000000 --- a/media-libs/opencv/files/opencv-4.8.1-ade-0.1.2a.tar.gz.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> - -Use tar.gz instead of zip to make CI happy. - -diff --git a/modules/gapi/cmake/DownloadADE.cmake b/modules/gapi/cmake/DownloadADE.cmake -index e22c4f1..fb0c10a 100644 ---- a/modules/gapi/cmake/DownloadADE.cmake -+++ b/modules/gapi/cmake/DownloadADE.cmake -@@ -1,7 +1,7 @@ - set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade") --set(ade_filename "v0.1.2a.zip") -+set(ade_filename "v0.1.2a.tar.gz") - set(ade_subdir "ade-0.1.2a") --set(ade_md5 "fa4b3e25167319cb0fa9432ef8281945") -+set(ade_md5 "89fd5f32c2796d3fecf62273c4aa7c4d") - ocv_download(FILENAME ${ade_filename} - HASH ${ade_md5} - URL diff --git a/media-libs/opencv/files/opencv-4.8.1-drop-python2-detection.patch b/media-libs/opencv/files/opencv-4.8.1-drop-python2-detection.patch deleted file mode 100644 index 5a3a89f665b4..000000000000 --- a/media-libs/opencv/files/opencv-4.8.1-drop-python2-detection.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> - -Python2 is long gone. So don't try finding it. - -diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake -index 599b2eb..345e3ef 100644 ---- a/cmake/OpenCVDetectPython.cmake -+++ b/cmake/OpenCVDetectPython.cmake -@@ -268,14 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION) - return() - endif() - --find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR -- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING -- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND -- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY -- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH -- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH -- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION) -- - option(OPENCV_PYTHON3_VERSION "Python3 version" "") - find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR - PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING diff --git a/media-libs/opencv/files/opencv-4.8.1-eliminate-lto-compiler-warnings.patch b/media-libs/opencv/files/opencv-4.8.1-eliminate-lto-compiler-warnings.patch deleted file mode 100644 index 7d6a5456a63f..000000000000 --- a/media-libs/opencv/files/opencv-4.8.1-eliminate-lto-compiler-warnings.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/opencv/opencv/pull/23991 - -From 4ee0f212cc19f7e77483d34d4cf8378945e3da31 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E4=B8=8D=E9=B1=BC=E5=84=BF?= - <36976072+buyuer@users.noreply.github.com> -Date: Fri, 14 Jul 2023 08:45:14 +0000 -Subject: [PATCH] Eliminating compilation warnings when using lto in gcc12 and - later versions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -use -flto=auto when use gcc12 or later - -Signed-off-by: 不鱼儿 <36976072+buyuer@users.noreply.github.com> ---- - cmake/OpenCVCompilerOptions.cmake | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index d4600943fb0d..8bd86681303e 100644 ---- a/cmake/OpenCVCompilerOptions.cmake -+++ b/cmake/OpenCVCompilerOptions.cmake -@@ -261,7 +261,11 @@ if(CV_GCC OR CV_CLANG) - endif() - - if(ENABLE_LTO) -- add_extra_compiler_option(-flto) -+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12) -+ add_extra_compiler_option(-flto=auto) -+ else() -+ add_extra_compiler_option(-flto) -+ endif() - endif() - if(ENABLE_THIN_LTO) - add_extra_compiler_option(-flto=thin) diff --git a/media-libs/opencv/files/opencv-4.8.1-libpng16.patch b/media-libs/opencv/files/opencv-4.8.1-libpng16.patch deleted file mode 100644 index a5b2aedb063a..000000000000 --- a/media-libs/opencv/files/opencv-4.8.1-libpng16.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> - -Gentoo installs libpng as libpng16, so adjust the detection. - -diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 46b5108..0ff88ea 100644 ---- a/cmake/OpenCVFindLibsGrfmt.cmake -+++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -245,9 +245,9 @@ if(NOT HAVE_SPNG AND WITH_PNG) - include(FindPNG) - if(PNG_FOUND) - include(CheckIncludeFile) -- check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -- if(HAVE_LIBPNG_PNG_H) -- ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE) -+ check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" HAVE_LIBPNG16_PNG_H) -+ if(HAVE_LIBPNG16_PNG_H) -+ ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE) - else() - ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE) - endif() -@@ -255,7 +255,7 @@ if(NOT HAVE_SPNG AND WITH_PNG) - endif() - - if(NOT PNG_FOUND) -- ocv_clear_vars(PNG_LIBRARY PNG_LIBRARIES PNG_INCLUDE_DIR PNG_PNG_INCLUDE_DIR HAVE_LIBPNG_PNG_H PNG_DEFINITIONS) -+ ocv_clear_vars(PNG_LIBRARY PNG_LIBRARIES PNG_INCLUDE_DIR PNG_PNG_INCLUDE_DIR HAVE_LIBPNG16_PNG_H PNG_DEFINITIONS) - - set(PNG_LIBRARY libpng CACHE INTERNAL "") - set(PNG_LIBRARIES ${PNG_LIBRARY}) -diff --git a/cmake/templates/cvconfig.h.in b/cmake/templates/cvconfig.h.in -index d6c7875..005e9b3 100644 ---- a/cmake/templates/cvconfig.h.in -+++ b/cmake/templates/cvconfig.h.in -@@ -79,7 +79,7 @@ - #cmakedefine HAVE_JPEG - - /* libpng/png.h needs to be included */ --#cmakedefine HAVE_LIBPNG_PNG_H -+#cmakedefine HAVE_LIBPNG16_PNG_H - - /* GDCM DICOM codec */ - #cmakedefine HAVE_GDCM -diff --git a/modules/imgcodecs/src/grfmt_png.cpp b/modules/imgcodecs/src/grfmt_png.cpp -index 388a3fc..4dde181 100644 ---- a/modules/imgcodecs/src/grfmt_png.cpp -+++ b/modules/imgcodecs/src/grfmt_png.cpp -@@ -58,8 +58,8 @@ - # define _FILE_OFFSET_BITS 0 - #endif - --#ifdef HAVE_LIBPNG_PNG_H --#include <libpng/png.h> -+#ifdef HAVE_LIBPNG16_PNG_H -+#include <libpng16/png.h> - #else - #include <png.h> - #endif diff --git a/media-libs/opencv/files/opencv-4.8.1-opencv_test.patch b/media-libs/opencv/files/opencv-4.8.1-opencv_test.patch deleted file mode 100644 index 2bdc2d830570..000000000000 --- a/media-libs/opencv/files/opencv-4.8.1-opencv_test.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> - -We don't package quirc, so the misplaced #ifdef breaks compilation. - -diff --git a/modules/objdetect/test/test_qrcode.cpp b/modules/objdetect/test/test_qrcode.cpp -index 5e6ec6f..6dc14cc 100644 ---- a/modules/objdetect/test/test_qrcode.cpp -+++ b/modules/objdetect/test/test_qrcode.cpp -@@ -374,8 +374,8 @@ TEST_P(Objdetect_QRCode_Multi, regression) - qrcode = QRCodeDetectorAruco(); - } - std::vector<Point> corners; --#ifdef HAVE_QUIRC - std::vector<cv::String> decoded_info; -+#ifdef HAVE_QUIRC - std::vector<Mat> straight_barcode; - EXPECT_TRUE(qrcode.detectAndDecodeMulti(src, decoded_info, corners, straight_barcode)); - ASSERT_FALSE(corners.empty()); diff --git a/media-libs/opencv/files/opencv-4.8.1-protobuf-22.patch b/media-libs/opencv/files/opencv-4.8.1-protobuf-22.patch deleted file mode 100644 index 1e8a369777a5..000000000000 --- a/media-libs/opencv/files/opencv-4.8.1-protobuf-22.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 6f3dde396f6eed53afcd5cc882402e18ff7c1ca8 Mon Sep 17 00:00:00 2001 -From: Kumataro <Kumataro@users.noreply.github.com> -Date: Sat, 7 Oct 2023 10:11:25 +0900 -Subject: [PATCH] 3rdparty: supporting protobuf v22 and later - -subsumes: - -- dnn: disable some tests for external protobuf -- use GREATER instead of GREATER_EQUAL and remove new blank line at EOF -- fix for BUILD_TESTS=OFF -- Use Config mode in CMake. - -(cleaning up review noise) - ---- - cmake/OpenCVFindProtobuf.cmake | 35 +++++++++++++++++++++++++++----- - modules/dnn/CMakeLists.txt | 6 ++++++ - modules/dnn/test/test_layers.cpp | 24 ++++++++++++++++++---- - 3 files changed, 56 insertions(+), 9 deletions(-) - -diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index 8835347..5b1e175 100644 ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -30,8 +30,14 @@ if(BUILD_PROTOBUF) - set(Protobuf_LIBRARIES "libprotobuf") - set(HAVE_PROTOBUF TRUE) - else() -+ # we still need this for command PROTOBUF_GENERATE_CPP. -+ set(protobuf_MODULE_COMPATIBLE ON) -+ - unset(Protobuf_VERSION CACHE) -- find_package(Protobuf QUIET) -+ find_package(Protobuf QUIET CONFIG) -+ if(NOT Protobuf_FOUND) -+ find_package(Protobuf QUIET) -+ endif() - - # Backwards compatibility - # Define camel case versions of input variables -@@ -67,6 +73,20 @@ else() - endif() - endif() - -+# See https://github.com/opencv/opencv/issues/24369 -+# In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp. -+# Details: https://protobuf.dev/news/2022-08-03/ -+# And if std::text_view is in abseil-cpp requests C++17 and later. -+ -+if(HAVE_PROTOBUF) -+ if(NOT (Protobuf_VERSION VERSION_LESS 22)) -+ if((CMAKE_CXX_STANDARD EQUAL 98) OR (CMAKE_CXX_STANDARD LESS 17)) -+ message(STATUS "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is too old to support protobuf(${Protobuf_VERSION}) and/or abseil-cpp. Use C++17 or later. Turning HAVE_PROTOBUF off") -+ set(HAVE_PROTOBUF FALSE) -+ endif() -+ endif() -+endif() -+ - if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP) - message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})") - endif() -@@ -74,15 +94,20 @@ endif() - if(HAVE_PROTOBUF) - list(APPEND CUSTOM_STATUS protobuf) - if(NOT BUILD_PROTOBUF) -+ unset( __location) - if(TARGET "${Protobuf_LIBRARIES}") - get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE) - if(NOT __location) - get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION) - endif() -- elseif(Protobuf_LIBRARY) -- set(__location "${Protobuf_LIBRARY}") -- else() -- set(__location "${Protobuf_LIBRARIES}") -+ endif() -+ -+ if(NOT __location) -+ if(Protobuf_LIBRARY) -+ set(__location "${Protobuf_LIBRARY}") -+ else() -+ set(__location "${Protobuf_LIBRARIES}") -+ endif() - endif() - endif() - list(APPEND CUSTOM_STATUS_protobuf " Protobuf:" -diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt -index 804b78e..9fcc460 100644 ---- a/modules/dnn/CMakeLists.txt -+++ b/modules/dnn/CMakeLists.txt -@@ -245,6 +245,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs}) - ocv_add_samples() - ocv_add_accuracy_tests(${dnn_runtime_libs}) - -+if(NOT BUILD_PROTOBUF) -+ if(TARGET opencv_test_dnn) -+ ocv_target_compile_definitions(opencv_test_dnn PRIVATE "OPENCV_DNN_EXTERNAL_PROTOBUF=1") -+ endif() -+endif() -+ - set(perf_path "${CMAKE_CURRENT_LIST_DIR}/perf") - file(GLOB_RECURSE perf_srcs "${perf_path}/*.cpp") - file(GLOB_RECURSE perf_hdrs "${perf_path}/*.hpp" "${perf_path}/*.h") -diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp -index 763d94b..6cb6d54 100644 ---- a/modules/dnn/test/test_layers.cpp -+++ b/modules/dnn/test/test_layers.cpp -@@ -756,11 +756,15 @@ TEST_F(Layer_RNN_Test, get_set_test) - - TEST_P(Test_Caffe_layers, Accum) - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - if (backend == DNN_BACKEND_OPENCV && target != DNN_TARGET_CPU) - applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); - - testLayerUsingCaffeModels("accum", false, false, 0.0, 0.0, 2); - testLayerUsingCaffeModels("accum_ref", false, false, 0.0, 0.0, 2); -+#endif - } - - TEST_P(Test_Caffe_layers, FlowWarp) -@@ -780,27 +784,39 @@ TEST_P(Test_Caffe_layers, ChannelNorm) - - TEST_P(Test_Caffe_layers, DataAugmentation) - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) - applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); - testLayerUsingCaffeModels("data_augmentation", true, false); - testLayerUsingCaffeModels("data_augmentation_2x1", true, false); - testLayerUsingCaffeModels("data_augmentation_8x6", true, false); -+#endif - } - - TEST_P(Test_Caffe_layers, Resample) - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - if (backend != DNN_BACKEND_OPENCV) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); - testLayerUsingCaffeModels("nearest_2inps", false, false, 0.0, 0.0, 2); - testLayerUsingCaffeModels("nearest", false, false); -+#endif - } - - TEST_P(Test_Caffe_layers, Correlation) - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, - CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); - testLayerUsingCaffeModels("correlation", false, false, 0.0, 0.0, 2); -+#endif - } - - TEST_P(Test_Caffe_layers, Convolution2Inputs) -@@ -1641,12 +1657,11 @@ private: - int outWidth, outHeight, zoomFactor; - }; - --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Interp) --#else --TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (available in OpenCV source tree only) --#endif - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000) - if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_MYRIAD) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); // exception -@@ -1670,6 +1685,7 @@ TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (availa - - // Test an implemented layer. - testLayerUsingCaffeModels("layer_interp", false, false); -+#endif - } - - INSTANTIATE_TEST_CASE_P(/*nothing*/, Test_Caffe_layers, dnnBackendsAndTargets()); --- -2.43.0 - diff --git a/media-libs/opencv/files/opencv-4.8.1-python3_12-support.patch b/media-libs/opencv/files/opencv-4.8.1-python3_12-support.patch deleted file mode 100644 index 7eae8a180ce6..000000000000 --- a/media-libs/opencv/files/opencv-4.8.1-python3_12-support.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/opencv/opencv/pull/23991 - -From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com> -Date: Sun, 1 Oct 2023 16:12:25 +0100 -Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12. - -so we don't use numpy.distutils to get includes dirs of python-numpy ---- - cmake/OpenCVDetectPython.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake -index 88a434185622..d4098ce8e60d 100644 ---- a/cmake/OpenCVDetectPython.cmake -+++ b/cmake/OpenCVDetectPython.cmake -@@ -216,7 +216,7 @@ if(NOT ${found}) - message(STATUS " PYTHON3_NUMPY_INCLUDE_DIRS") - else() - # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy -- execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))" -+ execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())" - RESULT_VARIABLE _numpy_process - OUTPUT_VARIABLE _numpy_include_dirs - OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/media-libs/opencv/files/opencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch b/media-libs/opencv/files/opencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch new file mode 100644 index 000000000000..252ecdee6cb6 --- /dev/null +++ b/media-libs/opencv/files/opencv_contrib-4.10.0-CUDA-12.6-tuple_size.patch @@ -0,0 +1,53 @@ +https://github.com/opencv/opencv_contrib/pull/3785 +From 09eb618804588f77026924096d848800630c8d6f Mon Sep 17 00:00:00 2001 +From: Alexander Smorkalov <alexander.smorkalov@xperience.ai> +Date: Tue, 3 Sep 2024 13:47:48 +0300 +Subject: [PATCH] Workaround for CUDA 12.6 tuple_size issue #3773. + +--- + modules/cudaarithm/src/cuda/polar_cart.cu | 20 +++++--------------- + 1 file changed, 5 insertions(+), 15 deletions(-) + +diff --git a/modules/cudaarithm/src/cuda/polar_cart.cu b/modules/cudaarithm/src/cuda/polar_cart.cu +index 725f5741d8..c65b894bf6 100644 +--- a/modules/cudaarithm/src/cuda/polar_cart.cu ++++ b/modules/cudaarithm/src/cuda/polar_cart.cu +@@ -159,25 +159,15 @@ void cv::cuda::cartToPolar(InputArray _xy, OutputArray _mag, OutputArray _angle, + GpuMat_<float> magc(mag); + GpuMat_<float> anglec(angle); + ++ gridTransformUnary(globPtr<float2>(xy), globPtr<float>(magc), magnitude_interleaved_func<float2>(), stream); ++ + if (angleInDegrees) + { +- auto f1 = magnitude_interleaved_func<float2>(); +- auto f2 = direction_interleaved_func<float2, true>(); +- cv::cudev::tuple<decltype(f1), decltype(f2)> f12 = cv::cudev::make_tuple(f1, f2); +- gridTransformTuple(globPtr<float2>(xy), +- tie(magc, anglec), +- f12, +- stream); ++ gridTransformUnary(globPtr<float2>(xy), globPtr<float>(anglec), direction_interleaved_func<float2, true>(), stream); + } + else + { +- auto f1 = magnitude_interleaved_func<float2>(); +- auto f2 = direction_interleaved_func<float2, false>(); +- cv::cudev::tuple<decltype(f1), decltype(f2)> f12 = cv::cudev::make_tuple(f1, f2); +- gridTransformTuple(globPtr<float2>(xy), +- tie(magc, anglec), +- f12, +- stream); ++ gridTransformUnary(globPtr<float2>(xy), globPtr<float>(anglec), direction_interleaved_func<float2, false>(), stream); + } + + syncOutput(mag, _mag, stream); +@@ -191,7 +181,7 @@ void cv::cuda::cartToPolar(InputArray _xy, OutputArray _magAngle, bool angleInDe + CV_Assert( xy.type() == CV_32FC2 ); + + GpuMat magAngle = getOutputMat(_magAngle, xy.size(), CV_32FC2, stream); +- ++ + if (angleInDegrees) + { + gridTransformUnary(globPtr<float2>(xy), diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index 5979caa25015..b23fac5f689f 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/metadata.xml @@ -42,10 +42,13 @@ <flag name="tbb">Enable multithreading with the Intel Threads Building Block (<pkg>dev-cpp/tbb</pkg>)</flag> <flag name="tesseract">Use Google's OCR Engine</flag> <flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag> + <flag name="truetype">Enable <pkg>media-libs/freetype</pkg> support for gapi module</flag> <flag name="video_cards_intel">Enable Video Acceleration API for hardware decoding for Intel cards</flag> <flag name="vtk">Build new 3D visualization module viz based on <pkg>sci-libs/vtk</pkg></flag> </use> <upstream> + <changelog>https://github.com/opencv/opencv/wiki/ChangeLog</changelog> + <doc>https://docs.opencv.org</doc> <remote-id type="cpe">cpe:/a:opencv:opencv</remote-id> <remote-id type="github">opencv/opencv</remote-id> <remote-id type="github">opencv/opencv_contrib</remote-id> diff --git a/media-libs/opencv/opencv-4.9.0-r1.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild index 227ff691acb6..34bfb33194a0 100644 --- a/media-libs/opencv/opencv-4.9.0-r1.ebuild +++ b/media-libs/opencv/opencv-4.10.0.ebuild @@ -3,12 +3,16 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit cuda java-pkg-opt-2 java-ant-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs virtualx +PYTHON_COMPAT=( python3_{10..13} ) +inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic multilib multiprocessing python-r1 toolchain-funcs virtualx DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" HOMEPAGE="https://opencv.org" +# TODO +# - dnn: move module from opencv_contrib +# https://github.com/opencv/opencv/commit/93729784bb1c4e544e07ec27a43ef57c4f456cec + if [[ ${PV} = *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" @@ -28,7 +32,8 @@ else # branch nvof_2_0_bsd NVIDIA_OPTICAL_FLOW_COMMIT="edb50da3cf849840d680249aa6dbef248ebce2ca" - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + SRC_URI=" + https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz https://github.com/opencv/ade/archive/v${ADE_PV}.tar.gz -> ade-${ADE_PV}.tar.gz contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${PN}_contrib-${PV}.tar.gz @@ -51,43 +56,59 @@ else https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz -> NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz ) + https://github.com/${PN}/${PN}_contrib/commit/667a66ee0e99f3f3263c1ef2de1b90d9244b7bd4.patch + -> ${PN}_contrib-4.10.0-3607.patch ) test? ( https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz ) " - KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="Apache-2.0" SLOT="0/${PV}" # subslot = libopencv* soname version # general options -IUSE="debug doc +eigen gflags glog java non-free opencvapps +python test testprograms" +IUSE="debug doc +eigen gflags glog java non-free opencvapps python test testprograms" # modules IUSE+=" contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d dnnsamples examples +features2d" # hardware -IUSE+=" opencl cuda cudnn video_cards_intel" +IUSE+=" cuda cudnn opencl video_cards_intel" # video IUSE+=" +ffmpeg gstreamer xine vaapi v4l gphoto2 ieee1394" # image -IUSE+=" gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp" +IUSE+=" avif gdal jasper jpeg jpeg2k openexr png quirc tesseract tiff webp" # gui -IUSE+=" gtk3 qt5 qt6 opengl vtk" +IUSE+=" gtk3 qt6 opengl truetype vtk" # parallel IUSE+=" openmp tbb" # lapack options IUSE+=" atlas lapack mkl" +# from cmake/OpenCVCompilerOptimizations.cmake # TODO make this only relevant for binhost CPU_FEATURES_MAP=( cpu_flags_arm_neon:NEON cpu_flags_arm_vfpv3:VFPV3 + # cpu_flags_arm_fp:FP16 + + cpu_flags_arm_asimddp:NEON_DOTPROD + # cpu_flags_arm_neon_fp16:NEON_FP16 + # cpu_flags_arm_neon_bf16:NEON_BF16 + + # cpu_flags_loong_lsx:LSX + # cpu_flags_loong_lasx:LASX + + # cpu_flags_mips_msa:MSA + cpu_flags_ppc_vsx:VSX # (always available on Power8) cpu_flags_ppc_vsx3:VSX3 # (always available on Power9) + # cpu_flags_riscv_rvv:RVV + cpu_flags_x86_sse:SSE # (always available on 64-bit CPUs) cpu_flags_x86_sse2:SSE2 # (always available on 64-bit CPUs) @@ -102,24 +123,47 @@ CPU_FEATURES_MAP=( cpu_flags_x86_fma3:FMA3 cpu_flags_x86_avx:AVX cpu_flags_x86_avx2:AVX2 + cpu_flags_x86_avx512_bitalg:AVX_512BITALG + cpu_flags_x86_avx512_vbmi2:AVX_512VBMI2 + cpu_flags_x86_avx512_vnni:AVX_512VNNI + cpu_flags_x86_avx512_vpopcntdq:AVX_512VPOPCNTDQ + cpu_flags_x86_avx512bw:AVX_512BW + cpu_flags_x86_avx512cd:AVX_512CD + cpu_flags_x86_avx512dq:AVX_512DQ cpu_flags_x86_avx512f:AVX_512F + cpu_flags_x86_avx512ifma:AVX_512IFMA + cpu_flags_x86_avx512vbmi:AVX_512VBMI + cpu_flags_x86_avx512vl:AVX_512VL + + # AVX512_KNL_EXTRA + cpu_flags_x86_avx512er:AVX_512ER + cpu_flags_x86_avx512pf:AVX_512PF + # AVX512_KNM_EXTRA + cpu_flags_x86_avx512_4fmaps:AVX_5124FMAPS + cpu_flags_x86_avx512_4vnniw:AVX_5124VNNIW + ) IUSE+=" ${CPU_FEATURES_MAP[*]%:*}" -unset ARM_CPU_FEATURES PPC_CPU_FEATURES X86_CPU_FEATURES_RAW X86_CPU_FEATURES REQUIRED_USE=" - amd64? ( cpu_flags_x86_sse cpu_flags_x86_sse2 ) - cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) - cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) + amd64? ( + cpu_flags_x86_sse + cpu_flags_x86_sse2 + cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) + cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx512er? ( cpu_flags_x86_avx512pf ) + cpu_flags_x86_avx512pf? ( cpu_flags_x86_avx512er ) + cpu_flags_x86_avx512_4fmaps? ( cpu_flags_x86_avx512_4fmaps ) + cpu_flags_x86_avx512_4vnniw? ( cpu_flags_x86_avx512_4vnniw ) + ) cuda? ( contrib - tesseract? ( opencl ) ) cudnn? ( cuda ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) - contribcvv? ( contrib || ( qt5 qt6 ) ) + contribcvv? ( contrib qt6 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) @@ -127,26 +171,27 @@ REQUIRED_USE=" contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib ) java? ( python ) - opengl? ( ?? ( gtk3 || ( qt5 qt6 ) ) ) + opengl? ( qt6 ) + jasper? ( !abi_x86_32 ) python? ( ${PYTHON_REQUIRED_USE} ) tesseract? ( contrib ) - ?? ( gtk3 || ( qt5 qt6 ) ) - test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d ) -" - -# TODO find a way to compile these with the cuda compiler -REQUIRED_USE+=" - cuda? ( !gdal !openexr !tbb ) + ?? ( gtk3 qt6 ) + testprograms? ( test ) + test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d ) " RESTRICT="!test? ( test )" -RDEPEND=" +COMMON_DEPEND=" app-arch/bzip2[${MULTILIB_USEDEP}] dev-libs/protobuf:=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] - cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= ) - cudnn? ( dev-libs/cudnn:= ) + avif? ( media-libs/libavif:=[${MULTILIB_USEDEP}] ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + cudnn? ( + dev-cpp/abseil-cpp:= + dev-libs/cudnn:= + ) contribdnn? ( dev-libs/flatbuffers:= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( @@ -155,6 +200,7 @@ RDEPEND=" ) contribovis? ( >=dev-games/ogre-1.12:= ) ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) + truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] ) glog? ( dev-cpp/glog:=[${MULTILIB_USEDEP}] ) @@ -171,7 +217,6 @@ RDEPEND=" media-libs/libdc1394:=[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8:* ) jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) jpeg2k? ( jasper? ( media-libs/jasper:= ) @@ -205,55 +250,74 @@ RDEPEND=" ${PYTHON_DEPS} dev-python/numpy:=[${PYTHON_USEDEP}] ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qttest:5 - dev-qt/qtconcurrent:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - !qt5? ( - qt6? ( - dev-qt/qtbase:6[gui,widgets,concurrent,opengl?] - ) + qt6? ( + dev-qt/qtbase:6[gui,widgets,concurrent,opengl?] ) quirc? ( media-libs/quirc ) - tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] ) + tesseract? ( app-text/tesseract[${MULTILIB_USEDEP}] ) tbb? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] ) tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] ) - vtk? ( sci-libs/vtk:=[rendering,cuda=] ) + vtk? ( + sci-libs/vtk:=[rendering,cuda=] + || ( + ( + sci-libs/vtk[opencascade(+)] + sci-libs/opencascade[-ffmpeg] + ) + sci-libs/vtk[-opencascade(-)] + ) + ) webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) xine? ( media-libs/xine-lib ) " +GST_TEST_DEPEND=" + media-plugins/gst-plugins-aom[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-mpeg2enc[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-openh264[${MULTILIB_USEDEP}] +" DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 ) java? ( >=virtual/jdk-1.8:* ) -" -# TODO gstreamer dependencies -DEPEND+=" test? ( gstreamer? ( + amd64? ( ${GST_TEST_DEPEND} ) + arm64? ( ${GST_TEST_DEPEND} ) + x86? ( ${GST_TEST_DEPEND} ) + arm? ( media-plugins/gst-plugins-openh264[${MULTILIB_USEDEP}] ) media-plugins/gst-plugins-jpeg[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-libav[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-mpeg2dec[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-mpg123[${MULTILIB_USEDEP}] media-plugins/gst-plugins-x264[${MULTILIB_USEDEP}] + !ppc? ( !ppc64? ( + media-plugins/gst-plugins-vpx[${MULTILIB_USEDEP}] + ) ) ) ) " +RDEPEND=" + ${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* ) +" +unset COMMON_DEPEND + BDEPEND=" + dev-util/patchelf virtual/pkgconfig - cuda? ( dev-util/nvidia-cuda-toolkit:0= ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) doc? ( app-text/doxygen[dot] python? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] ) ) + java? ( >=dev-java/ant-1.10.14-r3 ) " PATCHES=( - "${FILESDIR}/${PN}-3.4.0-disable-download.patch" "${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch" "${FILESDIR}/${PN}-4.1.2-opencl-license.patch" "${FILESDIR}/${PN}-4.4.0-disable-native-cpuflag-detect.patch" @@ -261,52 +325,92 @@ PATCHES=( "${FILESDIR}/${PN}-4.8.1-use-system-flatbuffers.patch" "${FILESDIR}/${PN}-4.8.1-use-system-opencl.patch" + "${FILESDIR}/${PN}-4.9.0-drop-python2-detection.patch" "${FILESDIR}/${PN}-4.9.0-ade-0.1.2d.tar.gz.patch" "${FILESDIR}/${PN}-4.9.0-cmake-cleanup.patch" + "${FILESDIR}/${PN}-4.10.0-dnn-explicitly-include-abseil-cpp.patch" + "${FILESDIR}/${PN}-4.10.0-cudnn-9.patch" # 25841 + "${FILESDIR}/${PN}-4.10.0-cuda-fp16.patch" # 25880 + "${FILESDIR}/${PN}-4.10.0-26234.patch" # 26234 + "${FILESDIR}/${PN}-4.10.0-tbb-detection.patch" + # TODO applied in src_prepare - # "${FILESDIR}/${PN}_contrib-${PV}-rgbd.patch" + # "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch" + # "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch" + + # "${FILESDIR}/${PN}_contrib-4.10.0-CUDA-12.6-tuple_size.patch" # 3785 ) -cuda_get_cuda_compiler() { - local compiler - tc-is-gcc && compiler="gcc" - tc-is-clang && compiler="clang" - [[ -z "$compiler" ]] && die "no compiler specified" - - local package="sys-devel/${compiler}" - local version="${package}" - local CUDAHOSTCXX_test - while - local CUDAHOSTCXX="${CUDAHOSTCXX_test}" - version=$(best_version "${version}") - if [[ -z "${version}" ]]; then - if [[ -z "${CUDAHOSTCXX}" ]]; then - die "could not find supported version of ${package}" +cuda_get_host_compiler() { + if [[ -n "${NVCC_CCBIN}" ]]; then + echo "${NVCC_CCBIN}" + return + fi + + if [[ -n "${CUDAHOSTCXX}" ]]; then + echo "${CUDAHOSTCXX}" + return + fi + + einfo "Trying to find working CUDA host compiler" + + if ! tc-is-gcc && ! tc-is-clang; then + die "$(tc-get-compiler-type) compiler is not supported" + fi + + local compiler compiler_type compiler_version + local package package_version + local -x NVCC_CCBIN + local NVCC_CCBIN_default + + compiler_type="$(tc-get-compiler-type)" + compiler_version="$("${compiler_type}-major-version")" + + # try the default compiler first + NVCC_CCBIN="$(tc-getCXX)" + NVCC_CCBIN_default="${NVCC_CCBIN}-${compiler_version}" + + compiler="${NVCC_CCBIN/%-${compiler_version}}" + + # store the package so we can re-use it later + package="sys-devel/${compiler_type}" + package_version="${package}" + + ebegin "testing ${NVCC_CCBIN_default} (default)" + + while ! nvcc - -x cu <<<"int main(){}" &>/dev/null; do + eend 1 + + while true; do + # prepare next version + if ! package_version="<$(best_version "${package_version}")"; then + die "could not find a supported version of ${compiler}" fi - break - fi - CUDAHOSTCXX_test="$( - dirname "$( - realpath "$( - which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")" - )" - )" - )" - version="<${version}" - do ! echo "int main(){}" | nvcc "-ccbin ${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done - - echo "${CUDAHOSTCXX}" + + NVCC_CCBIN="${compiler}-$(ver_cut 1 "${package_version/#<${package}-/}")" + + [[ "${NVCC_CCBIN}" != "${NVCC_CCBIN_default}" ]] && break + done + ebegin "testing ${NVCC_CCBIN}" + done + eend $? + + echo "${NVCC_CCBIN}" + export NVCC_CCBIN } cuda_get_host_native_arch() { - : "${CUDAARCHS:=$(__nvcc_device_query)}" - echo "${CUDAARCHS}" + [[ -n ${CUDAARCHS} ]] && echo "${CUDAARCHS}" + + __nvcc_device_query || die "failed to query the native device" } pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + if use cuda && [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then # TODO CUDAARCHS einfo "The target CUDA architecture can be set via one of:" einfo " - CUDA_GENERATION set to one of Maxwell, Pascal, Volta, Turing, Ampere, Lovelace, Hopper, Auto" @@ -316,17 +420,24 @@ pkg_pretend() { einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus." fi + # When building binpkgs you probably want to include all targets if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN" einfo "$info_message so all available architectures are build." fi - - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use java && java-pkg-opt-2_pkg_setup + + if use cuda && [[ ! -e /dev/nvidia-uvm ]]; then + # NOTE We try to load nvidia-uvm and nvidia-modeset here, + # so __nvcc_device_query does not fail later. + + nvidia-modprobe -m -u -c 0 || true + fi } src_prepare() { @@ -337,18 +448,26 @@ src_prepare() { sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ -i CMakeLists.txt cmake/*cmake || die + sed \ + -e 's:truetype/wqy:wqy-microhei:g' \ + -i \ + modules/gapi/test/render/gapi_render_tests_ocv.cpp \ + modules/gapi/test/render/ftp_render_test.cpp \ + || die + if use contrib; then cd "${WORKDIR}/${PN}_contrib-${PV}" || die eapply "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch" eapply "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch" - if has_version ">=dev-util/nvidia-cuda-toolkit-12.4" && use cuda; then - # TODO https://github.com/NVIDIA/cccl/pull/1522 - eapply "${FILESDIR}/${PN}_contrib-4.9.0-cuda-12.4.patch" + if type -P nvcc &> /dev/null && ver_test "$(nvcc --version | tail -n 1 | cut -d '_' -f 2- | cut -d '.' -f 1-2)" -ge 12.4; then + eapply "${DISTDIR}/${PN}_contrib-4.10.0-3607.patch" + eapply "${FILESDIR}/${PN}_contrib-4.10.0-CUDA-12.6-tuple_size.patch" # 3785 fi + cd "${S}" || die ! use contribcvv && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/cvv" || die; } - # ! use contribdnn && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/dnn" || die; } + ! use contribdnn && { rm -R "${S}/modules/dnn" || die; } ! use contribfreetype && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/freetype" || die; } ! use contribhdf && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/hdf" || die; } ! use contribovis && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/ovis" || die; } @@ -429,9 +548,16 @@ src_prepare() { if use java; then java-pkg-opt-2_src_prepare - JAVA_ANT_ENCODING="iso-8859-1" # set encoding so even this cmake build will pick it up. - export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" + ANT_OPTS+=" -Dfile.encoding=iso-8859-1" + ANT_OPTS+=" -Dant.build.javac.source=$(java-pkg_get-source)" + ANT_OPTS+=" -Dant.build.javac.target=$(java-pkg_get-target)" + fi + + if multilib_native_use testprograms; then + sed \ + -e 's:share/OpenCV/testdata:@OPENCV_TEST_DATA_INSTALL_PATH@:g' \ + -i "${S}/cmake/templates/opencv_run_all_tests_unix.sh.in" || die fi } @@ -439,6 +565,10 @@ multilib_src_configure() { # bug #919101 and https://github.com/opencv/opencv/issues/19020 filter-lto + if tc-is-gcc && [[ $(gcc-major-version) -ge 15 ]] && use contribdnn; then + append-cxxflags "-fno-tree-vectorize" + fi + # please don't sort here, order is the same as in CMakeLists.txt local mycmakeargs=( -DMIN_VER_CMAKE=3.26 @@ -450,7 +580,6 @@ multilib_src_configure() { # Optional 3rd party components # =================================================== - -DENABLE_DOWNLOAD=yes -DOPENCV_ENABLE_NONFREE="$(usex non-free)" -DWITH_QUIRC="$(usex quirc)" -DWITH_FLATBUFFERS="$(multilib_native_usex contribdnn)" @@ -464,9 +593,9 @@ multilib_src_configure() { -DWITH_GTK="$(usex gtk3)" -DWITH_GTK_2_X="no" # only want gtk3 nowadays -DWITH_IPP="no" - -DWITH_JASPER="$(multilib_native_usex jasper)" + -DWITH_JASPER="$(usex jpeg2k "$(multilib_native_usex jasper)")" -DWITH_JPEG="$(usex jpeg)" - -DWITH_OPENJPEG="$(usex jpeg2k)" + -DWITH_OPENJPEG="$(usex jpeg2k "$(multilib_native_usex !jasper)")" -DWITH_WEBP="$(usex webp)" -DWITH_OPENEXR="$(multilib_native_usex openexr)" -DWITH_OPENGL="$(usex opengl)" @@ -483,7 +612,7 @@ multilib_src_configure() { # -DWITH_QUICKTIME="no" # -DWITH_QTKIT="no" -DWITH_TBB="$(usex tbb)" - -DWITH_OPENMP="$(usex !tbb "$(usex openmp)")" + -DWITH_OPENMP="$(usex openmp)" -DWITH_PTHREADS_PF="yes" -DWITH_TIFF="$(usex tiff)" -DWITH_UNICAP="no" # Not packaged @@ -506,6 +635,9 @@ multilib_src_configure() { -DWITH_GPHOTO2="$(usex gphoto2)" -DWITH_LAPACK="$(multilib_native_usex lapack)" -DWITH_ITT="no" # 3dparty libs itt_notify + + -DWITH_AVIF="$(usex avif)" + -DWITH_FREETYPE="$(usex truetype)" # =================================================== # CUDA build components: nvidia-cuda-toolkit # =================================================== @@ -516,7 +648,7 @@ multilib_src_configure() { # NOTE set this via MYCMAKEARGS if needed -DWITH_NVCUVID="no" # TODO needs NVIDIA Video Codec SDK -DWITH_NVCUVENC="no" # TODO needs NVIDIA Video Codec SDK - -DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${EPREFIX}/opt/cuda" "")" + -DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${CUDA_PATH:=${EPREFIX}/opt/cuda}" "")" # =================================================== # OpenCV build components # =================================================== @@ -526,7 +658,7 @@ multilib_src_configure() { -DBUILD_opencv_apps="$(usex opencvapps)" -DBUILD_DOCS="$(usex doc)" # Doesn't install anyways. -DBUILD_EXAMPLES="$(multilib_native_usex examples)" - -DBUILD_TESTS="$(multilib_native_usex test)" + -DBUILD_TESTS="$(multilib_native_usex test "yes" "$(multilib_native_usex testprograms)")" -DBUILD_PERF_TESTS="no" # -DBUILD_WITH_STATIC_CRT="no" @@ -551,7 +683,7 @@ multilib_src_configure() { # =================================================== # OpenCV build options # =================================================== - # -DENABLE_CCACHE="no" + -DENABLE_CCACHE="no" # bug 733796, but PCH is a risky game in CMake anyway -DBUILD_USE_SYMLINKS="yes" -DENABLE_PRECOMPILED_HEADERS="no" @@ -584,10 +716,7 @@ multilib_src_configure() { # =================================================== # things we want to be hard enabled not worth useflag # =================================================== - -DOPENCV_DOC_INSTALL_PATH="share/doc/${P}" - # NOTE do this so testprograms do not fail TODO adjust path in code - -DOPENCV_TEST_DATA_INSTALL_PATH="share/${PN}$(ver_cut 1)/testdata" - -DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test" + -DOPENCV_DOC_INSTALL_PATH="share/doc/${PF}" -DOPENCV_SAMPLES_BIN_INSTALL_PATH="libexec/${PN}/bin/samples" -DBUILD_IPP_IW="no" @@ -611,18 +740,26 @@ multilib_src_configure() { # -DBUILD_opencv_world="yes" + -DOPENCV_PLUGIN_VERSION=".$(ver_rs 1-2 '' "$(ver_cut 1-2)")" + -DOPENCV_PLUGIN_ARCH=".${ARCH}" + -DDNN_PLUGIN_LIST="all" - -DHIGHGUI_PLUGIN_LIST="all" - -DVIDEOIO_PLUGIN_LIST="all" + -DHIGHGUI_ENABLE_PLUGINS="no" + ) + local VIDEOIO_PLUGIN_LIST=() + if use ffmpeg; then + VIDEOIO_PLUGIN_LIST+=("ffmpeg") + fi + if use gstreamer; then + VIDEOIO_PLUGIN_LIST+=("gstreamer") + fi + + mycmakeargs+=( + -DVIDEOIO_PLUGIN_LIST="$(IFS=';'; echo "${VIDEOIO_PLUGIN_LIST[*]}")" ) - if use qt5; then - mycmakeargs+=( - -DWITH_QT="$(multilib_native_usex qt5)" - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" - ) - elif use qt6; then + if use qt6; then mycmakeargs+=( -DWITH_QT="$(multilib_native_usex qt6)" -DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes" @@ -643,7 +780,25 @@ multilib_src_configure() { local CPU_BASELINE="" for i in "${CPU_FEATURES_MAP[@]}" ; do if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163 - use "${i%:*}" && CPU_BASELINE="${CPU_BASELINE}${i#*:};" + local value + # These are merged into one flag internally + if [[ ${ABI} == amd64 ]]; then + case "${i%:*}" in + cpu_flags_x86_avx512er|cpu_flags_x86_avx512pf) + value="AVX512_KNL_EXTRA" + ;; + cpu_flags_x86_avx512_4fmaps|cpu_flags_x86_avx512_4vnniw) + value="AVX512_KNM_EXTRA" + ;; + *) + value="${i#*:}" + ;; + esac + else + value=${i#*:} + fi + + use "${i%:*}" && CPU_BASELINE="${CPU_BASELINE}${value};" fi done unset CPU_FEATURES_MAP @@ -661,10 +816,16 @@ multilib_src_configure() { # =================================================== # OpenCV Contrib Modules # =================================================== + # NOTE + # we remove unused modules, + # so we shouldn't need to disable options for unused modules if use contrib; then mycmakeargs+=( -DBUILD_opencv_cvv="$(usex contribcvv)" -DBUILD_opencv_dnn="$(usex contribdnn)" + -DOPENCV_DNN_OPENCL="$(usex opencl)" + -DOPENCV_DNN_CUDA="$(multilib_native_usex cudnn)" + -DBUILD_opencv_freetype="$(usex contribfreetype)" -DBUILD_opencv_hdf="$(multilib_native_usex contribhdf)" -DBUILD_opencv_ovis="$(usex contribovis)" @@ -672,7 +833,7 @@ multilib_src_configure() { -DBUILD_opencv_xfeatures2d="$(usex contribxfeatures2d)" ) - if multilib_is_native_abi && use !tesseract; then + if ! multilib_native_use tesseract; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract="yes" ) @@ -682,13 +843,37 @@ multilib_src_configure() { # workaround for bug 413429 tc-export CC CXX - if multilib_is_native_abi && use cuda; then + if multilib_native_use cuda; then cuda_add_sandbox -w - sandbox_write "/proc/self/task" - CUDAHOSTCXX="$(cuda_get_cuda_compiler)" - CUDAARCHS="$(cuda_get_host_native_arch)" - export CUDAHOSTCXX - export CUDAARCHS + addwrite "/proc/self/task" + + if ! test -w /dev/nvidiactl; then + # eqawarn "Can't access the GPU at /dev/nvidiactl." + # eqawarn "User $(id -nu) is not in the group \"video\"." + if [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then + # build all targets + mycmakeargs+=( + -DCUDA_GENERATION="" + ) + fi + else + local -x CUDAARCHS + : "${CUDAARCHS:="$(cuda_get_host_native_arch)"}" + fi + + local -x CUDAHOSTCXX CUDAHOSTLD + CUDAHOSTCXX="$(cuda_get_host_compiler)" + CUDAHOSTLD="$(tc-getCXX)" + + if tc-is-gcc; then + # Filter out IMPLICIT_LINK_DIRECTORIES picked up by CMAKE_DETERMINE_COMPILER_ABI(CUDA) + # See /usr/share/cmake/Help/variable/CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES.rst + CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES_EXCLUDE=$( + "${CUDAHOSTLD}" -E -v - <<<"int main(){}" |& \ + grep LIBRARY_PATH | cut -d '=' -f 2 | cut -d ':' -f 1 + ) + fi + mycmakeargs+=( -DENABLE_CUDA_FIRST_CLASS_LANGUAGE="yes" ) @@ -697,13 +882,22 @@ multilib_src_configure() { if use ffmpeg; then mycmakeargs+=( -DOPENCV_GAPI_GSTREAMER="no" + -DOPENCV_FFMPEG_DISABLE_MEDIASDK="yes" + ) + fi + + # according to modules/java/jar/CMakeLists.txt:23-26 + if use java; then + mycmakeargs+=( + -DOPENCV_JAVA_SOURCE_VERSION="$(java-pkg_get-source)" + -DOPENCV_JAVA_TARGET_VERSION="$(java-pkg_get-target)" ) fi if use mkl; then mycmakeargs+=( -DLAPACK_IMPL="MKL" - -DMKL_WITH_OPENMP="$(usex !tbb "$(usex openmp)")" + -DMKL_WITH_OPENMP="$(usex openmp)" -DMKL_WITH_TBB="$(usex tbb)" ) fi @@ -727,20 +921,29 @@ multilib_src_configure() { ) fi + # NOTE due to multilib we can't do + # if multilib_native_use test; then if use test; then # opencv tests assume to be build in Release mode - CMAKE_BUILD_TYPE="Release" + local -x CMAKE_BUILD_TYPE="Release" mycmakeargs+=( -DOPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata" ) if use vtk; then mycmakeargs+=( - -DVTK_MPI_NUMPROCS="$(nproc)" # TODO + -DVTK_MPI_NUMPROCS="$(makeopts_jobs)" # TODO ) fi fi - if multilib_is_native_abi && use python; then + if multilib_native_use testprograms; then + # NOTE do this so testprograms do not fail + mycmakeargs+=( + -DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test" + ) + fi + + if multilib_native_use python; then python_configure() { # Set all python variables to load the correct Gentoo paths local mycmakeargs=( @@ -767,84 +970,168 @@ multilib_src_configure() { ) cmake_src_configure fi - use java && java-ant-2_src_configure } multilib_src_compile() { - opencv_compile() { - cmake_src_compile - } - if multilib_is_native_abi && use python; then - python_foreach_impl opencv_compile + if multilib_native_use python; then + python_foreach_impl cmake_src_compile else - opencv_compile + cmake_src_compile fi } multilib_src_test() { - CMAKE_SKIP_TESTS=( - 'Test_ONNX_layers.LSTM_cell_forward/0' - 'Test_ONNX_layers.LSTM_cell_bidirectional/0' - 'Test_TensorFlow_layers.Convolution3D/1' - 'Test_TensorFlow_layers.concat_3d/1' + # no tests on ABI_X86_32 + ! multilib_is_native_abi && return + + # NOTE we don't run the tests + use testprograms && return + + declare -xA OPENCV_SKIP_TESTS + + local -x OPENCV_SKIP_TESTS_core=( + 'hal_intrin128.*32x4_CPP_EMULATOR' + 'hal_intrin128.*64x2_CPP_EMULATOR' + ) + + local -x OPENCV_SKIP_TESTS_gapi=( + 'AsyncAPICancelation/cancel/*.basic' + ) - 'AsyncAPICancelation/cancel*basic' + local -x OPENCV_SKIP_TESTS_videoio=( + '*mfx*' + 'videoio/videoio_bunny.frame_count/12' ) - if ! use gtk && ! use qt5 && ! use qt6; then - CMAKE_SKIP_TESTS+=( - # these fail with parallism - '^Highgui_*' + local -x OPENCV_SKIP_TESTS_video=( + 'GOTURN.accuracy' + 'DaSiamRPN.accuracy' + 'NanoTrack.accuracy_NanoTrack_V1' + 'NanoTrack.accuracy_NanoTrack_V2' + 'Tracking/DistanceAndOverlap.GOTURN*' + ) + + if ! use gtk3 && ! use qt6; then + local -x OPENCV_SKIP_TESTS_highgui=( + 'Highgui_GUI.*' ) + else + addpredict /dev/fuse fi - if multilib_is_native_abi && use cuda; then - CMAKE_SKIP_TESTS+=( + if multilib_native_use cuda; then + local -x OPENCV_SKIP_TESTS_cudaoptflow=( 'CUDA_OptFlow/BroxOpticalFlow.Regression/0' 'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0' 'CUDA_OptFlow/NvidiaOpticalFlow_1_0.Regression/0' 'CUDA_OptFlow/NvidiaOpticalFlow_2_0.Regression/0' ) + if use opengl; then + local -x OPENCV_SKIP_TESTS_cudaarithm=( + 'OpenGL/Buffer.MapDevice/*' + 'OpenGL/*Gpu*' + ) + fi fi - if use opengl; then - CMAKE_SKIP_TESTS+=( - 'OpenGL/Buffer.MapDevice/*' - 'OpenGL/*Gpu*' + if use contribdnn; then + local -x OPENCV_SKIP_TESTS_dnn=( + 'Test_ONNX_layers.LSTM_cell_forward/*' + 'Test_ONNX_layers.LSTM_cell_bidirectional/*' + 'Test_TensorFlow_layers.Convolution3D/*' + 'Test_TensorFlow_layers.concat_3d/*' ) - fi + local -x OPENCV_SKIP_TESTS_objdetect=( + 'Objdetect_face_detection.regression' + 'Objdetect_face_recognition.regression' 'Objdetect_QRCode_Encode_Decode_Structured_Append.regression' + ) + else + local -x OPENCV_SKIP_TESTS_objdetect=( + 'Objdetect_face_detection.regression' + 'Objdetect_face_recognition.regression' + ) - if use opencl; then - CMAKE_SKIP_TESTS+=( - 'OCL_Arithm/InRange.Mat/\(CV_32S,*' + OPENCV_SKIP_TESTS_video+=( + 'vittrack.accuracy_vittrack' + ) + fi + if use dnnsamples; then + local -x OPENCV_SKIP_TESTS_wechat_qrcode=( + 'Objdetect_QRCode_points_position.rotate45' + 'Objdetect_QRCode_Big.regression' + 'Objdetect_QRCode_Tiny.regression' + 'Objdetect_QRCode_Multi.regression/*' + 'Objdetect_QRCode_Easy_Multi.regression/1' ) fi - local myctestargs=( - --test-timeout 180 - ) - - if multilib_is_native_abi && use cuda; then - cuda_add_sandbox -w - export OPENCV_PARALLEL_BACKEND="threads" - export DNN_BACKEND_OPENCV="cuda" + if multilib_native_use cuda; then + if ! SANDBOX_WRITE=/dev/nvidiactl test -w /dev/nvidiactl ; then + eerror "Can't access the GPU at /dev/nvidiactl." + eerror "User $(id -nu) is not in the group \"video\"." + local -x TEST_CUDA="false" + # local -x OPENCV_PARALLEL_BACKEND="threads" + # local -x DNN_BACKEND_OPENCV="cuda" + + local -x OPENCV_SKIP_TESTS_photo=( "CUDA_*" ) + local -x OPENCV_SKIP_TESTS_stitching=( "CUDA_*" ) + OPENCV_SKIP_TESTS_video+=( "CUDA_*" ) + else + cuda_add_sandbox -w + addwrite "/dev/dri/" + [[ -e /dev/udmabuf ]] && addwrite /dev/udmabuf + fi fi opencv_test() { - export OPENCV_CORE_PLUGIN_PATH="${BUILD_DIR}/lib" - export OPENCV_DNN_PLUGIN_PATH="${BUILD_DIR}/lib" - export OPENCV_VIDEOIO_PLUGIN_PATH="${BUILD_DIR}/lib" + cd "${BUILD_DIR}" || die + + # directories to search for _core_ plugins + local -x OPENCV_CORE_PLUGIN_PATH="${BUILD_DIR}/lib" + # directories to search for _dnn_ plugins + local -x OPENCV_DNN_PLUGIN_PATH="${BUILD_DIR}/lib" + # directories to search for _videoio_ plugins + local -x OPENCV_VIDEOIO_PLUGIN_PATH="${BUILD_DIR}/lib" + # # path to extra OpenVINO plugins + # local -x OPENCV_DNN_IE_EXTRA_PLUGIN_PATH="${BUILD_DIR}/lib" + + local -x OPENCV_TEMP_PATH="${T}" - export OPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata" + local -x OPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata" + + local test_opts_base=( + --skip_unstable=1 + --test_threads="$(makeopts_jobs)" + ) - # Work around zink warnings - export LIBGL_ALWAYS_SOFTWARE=true - results=() - for test in "${BUILD_DIR}/bin/opencv_test_"*; do - echo "${test}" - if ! "${test}" --gtest_color=yes --gtest_filter="-$(IFS=: ; echo "${CMAKE_SKIP_TESTS[*]}")"; then + local results=() - results+=( "$(basename ${test})" ) + local tests + readarray -t tests <<< "$(find "${BUILD_DIR}/bin" -name 'opencv_test_*')" + + for test in "${tests[@]}" ; do + + if [[ ${TEST_CUDA} == "false" && ${test} = *opencv_test_cu* ]] ; then + eqawarn "Skipping test ${test}" + continue + fi + + local test_opts=( + --gtest_color=yes + --gtest_output="json:${BUILD_DIR}/test-reports/$(basename "${test}").json" + ) + + local testname + testname="OPENCV_SKIP_TESTS_$(basename "${test//opencv_test_/}")[*]" + if [[ -n "${!testname}" ]]; then + test_opts+=( + --gtest_filter="-$(IFS=':'; echo "${!testname}")" + ) + fi + + einfo "${test} ${test_opts_base[*]} ${test_opts[*]}" + if ! "${test}" "${test_opts_base[@]}" "${test_opts[@]}"; then + results+=( "$(basename "${test}")" ) if [[ -z "${OPENCV_TEST_CONTINUE_ON_FAIL}" ]]; then eerror "${results[*]} failed" @@ -853,10 +1140,13 @@ multilib_src_test() { fi done - echo -e "${results[*]}" + if [[ -n "${results[*]}" ]]; then + eerror "failed: ${results[*]}" + die "${results[*]}" + fi } - if multilib_is_native_abi && use python; then + if multilib_native_use python; then python_foreach_impl virtx opencv_test else virtx opencv_test @@ -1002,7 +1292,7 @@ multilib_src_install() { /usr/include/opencv4/opencv2/text/swt_text_detection.hpp /usr/include/opencv4/opencv2/text/textDetector.hpp - # [qt5,qt6] + # [qt6] /usr/include/opencv4/opencv2/viz.hpp /usr/include/opencv4/opencv2/viz/types.hpp /usr/include/opencv4/opencv2/viz/viz3d.hpp @@ -1013,10 +1303,15 @@ multilib_src_install() { /usr/include/opencv4/opencv2/wechat_qrcode.hpp ) # }}} fi - if multilib_is_native_abi && use python; then + + if multilib_native_use python; then python_foreach_impl cmake_src_install python_foreach_impl python_optimize else cmake_src_install fi + + for plugin in "${ED}/usr/$(get_libdir)/libopencv_"*".$(ver_rs 1-2 '' "$(ver_cut 1-2)").${ARCH}"* ; do + patchelf --set-soname "$(basename "${plugin}" ".$(get_libname)")" "${plugin}" + done } diff --git a/media-libs/opencv/opencv-4.8.1-r2.ebuild b/media-libs/opencv/opencv-4.8.1-r2.ebuild deleted file mode 100644 index bb6a1ae807ab..000000000000 --- a/media-libs/opencv/opencv-4.8.1-r2.ebuild +++ /dev/null @@ -1,794 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cuda java-pkg-opt-2 java-ant-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs - -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" -HOMEPAGE="https://opencv.org" - -ADE_PV="0.1.2a" # branch master -QRCODE_COMMIT="a8b69ccc738421293254aec5ddb38bd523503252" # branch wechat_qrcode_20210119 -DNN_SAMPLES_FACE_DETECTOR_COMMIT="b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f" # branch dnn_samples_face_detector_20170830 -XFEATURES2D_BOOSTDESC_COMMIT="34e4206aef44d50e6bbcd0ab06354b52e7466d26" # branch contrib_xfeatures2d_boostdesc_20161012 -XFEATURES2D_VGG_COMMIT="fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" # branch contrib_xfeatures2d_vgg_20160317 -FACE_ALIGNMENT_COMMIT="8afa57abc8229d611c4937165d20e2a2d9fc5a12" # branch contrib_face_alignment_20170818 -NVIDIA_OPTICAL_FLOW_COMMIT="edb50da3cf849840d680249aa6dbef248ebce2ca" # branch nvof_2_0_bsd - -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/opencv/ade/archive/v${ADE_PV}.tar.gz -> ade-${ADE_PV}.tar.gz - contrib? ( - https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz - dnnsamples? ( - https://github.com/${PN}/${PN}_3rdparty/archive/${QRCODE_COMMIT}.tar.gz -> ${PN}_3rdparty-${QRCODE_COMMIT}.tar.gz - https://github.com/${PN}/${PN}_3rdparty/archive/${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz - -> ${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz - ) - contribxfeatures2d? ( - https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz - -> ${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz - https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_VGG_COMMIT}.tar.gz - -> ${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}.tar.gz - ) - contribdnn? ( - https://github.com/${PN}/${PN}_3rdparty/archive/${FACE_ALIGNMENT_COMMIT}.tar.gz - -> ${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}.tar.gz - ) - cuda? ( - https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz - -> NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz - ) - ) -" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" # subslot = libopencv* soname version -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" -IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda cudnn debug dnnsamples +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack non-free opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms tbb tiff vaapi v4l vtk webp xine video_cards_intel" - -# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications -ARM_CPU_FEATURES=( - cpu_flags_arm_neon:NEON - cpu_flags_arm_vfpv3:VFPV3 -) -PPC_CPU_FEATURES=( - cpu_flags_ppc_vsx:VSX - cpu_flags_ppc_vsx3:VSX3 -) -X86_CPU_FEATURES_RAW=( - sse:SSE - sse2:SSE2 - sse3:SSE3 - ssse3:SSSE3 - sse4_1:SSE4_1 - popcnt:POPCNT - sse4_2:SSE4_2 - f16c:FP16 - fma3:FMA3 - avx:AVX - avx2:AVX2 - avx512f:AVX_512F -) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${PPC_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}" - -# OpenGL needs gtk or Qt installed to activate, otherwise build system -# will silently disable it without the user knowing, which defeats the -# purpose of the opengl use flag. -# cuda needs contrib, bug #701712 -REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) - cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) - cuda? ( - contrib - tesseract? ( opencl ) - ) - cudnn? ( cuda ) - dnnsamples? ( examples ) - gflags? ( contrib ) - glog? ( contrib ) - contribcvv? ( contrib || ( qt5 qt6 ) ) - contribdnn? ( contrib ) - contribfreetype? ( contrib ) - contribhdf? ( contrib ) - contribovis? ( contrib ) - contribsfm? ( contrib eigen gflags glog ) - contribxfeatures2d? ( contrib ) - java? ( python ) - opengl? ( || ( qt5 qt6 ) ) - python? ( ${PYTHON_REQUIRED_USE} ) - tesseract? ( contrib ) - ?? ( gtk3 || ( qt5 qt6 ) ) - ?? ( cuda gdal ) - ?? ( cuda openexr ) - ?? ( cuda tbb ) -" - -# The following logic is intrinsic in the build system, but we do not enforce -# it on the useflags since this just blocks emerging pointlessly: -# openmp? ( !tbb ) - -RDEPEND=" - app-arch/bzip2[${MULTILIB_USEDEP}] - dev-libs/protobuf:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= ) - cudnn? ( dev-libs/cudnn:= ) - contribdnn? ( dev-libs/flatbuffers:= ) - contribhdf? ( sci-libs/hdf5:= ) - contribfreetype? ( - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/harfbuzz:=[${MULTILIB_USEDEP}] - ) - contribovis? ( >=dev-games/ogre-1.12:= ) - ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) - gdal? ( sci-libs/gdal:= ) - gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] ) - glog? ( dev-cpp/glog:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) - gtk3? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - ) - ieee1394? ( - media-libs/libdc1394:=[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] - ) - java? ( >=virtual/jre-1.8:* ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) - lapack? ( - virtual/cblas - >=virtual/lapack-3.10 - virtual/lapacke - ) - opencl? ( - virtual/opencl[${MULTILIB_USEDEP}] - dev-util/opencl-headers - ) - openexr? ( - dev-libs/imath:= - media-libs/openexr:= - ) - opengl? ( - virtual/opengl[${MULTILIB_USEDEP}] - virtual/glu[${MULTILIB_USEDEP}] - ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy:=[${PYTHON_USEDEP}] - ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qttest:5 - dev-qt/qtconcurrent:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - !qt5? ( - qt6? ( - dev-qt/qtbase:6[gui,widgets,concurrent,opengl?] - ) - ) - tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] ) - tbb? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) - v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) - vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] ) - vtk? ( sci-libs/vtk:=[rendering,cuda=] ) - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) - xine? ( media-libs/xine-lib )" -DEPEND="${RDEPEND} - eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 ) - java? ( >=virtual/jdk-1.8:* )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-3.4.0-disable-download.patch" - "${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch" - "${FILESDIR}/${PN}-4.1.2-opencl-license.patch" - "${FILESDIR}/${PN}-4.4.0-disable-native-cpuflag-detect.patch" - "${FILESDIR}/${PN}-4.5.0-link-with-cblas-for-lapack.patch" - "${FILESDIR}/${PN}-4.8.0-arm64-fp16.patch" - "${FILESDIR}/${PN}-4.8.0-fix-cuda-12.2.0.patch" - - "${FILESDIR}/${PN}-4.8.1-use-system-flatbuffers.patch" - "${FILESDIR}/${PN}-4.8.1-eliminate-lto-compiler-warnings.patch" - "${FILESDIR}/${PN}-4.8.1-python3_12-support.patch" - - "${FILESDIR}/${PN}-4.8.1-use-system-opencl.patch" - "${FILESDIR}/${PN}-4.8.1-opencv_test.patch" - "${FILESDIR}/${PN}-4.8.1-drop-python2-detection.patch" - "${FILESDIR}/${PN}-4.8.1-libpng16.patch" - "${FILESDIR}/${PN}-4.8.1-ade-0.1.2a.tar.gz.patch" - - "${FILESDIR}/${PN}-4.8.1-protobuf-22.patch" # bug 909087, in 4.9.0 - - # TODO applied in src_prepare - # "${FILESDIR}/${PN}_contrib-${PV}-rgbd.patch" - # "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch" -) - -pkg_pretend() { - if use cuda && [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then - einfo "The target CUDA architecture can be set via one of:" - einfo " - CUDA_GENERATION set to one of Maxwell, Pascal, Volta, Turing, Ampere, Lovelace, Hopper, Auto" - einfo " - CUDA_ARCH_BIN, (and optionally CUDA_ARCH_PTX) in the form of x.y tuples." - einfo " You can specify multiple tuple separated by \";\"." - einfo "" - einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus." - fi - - if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then - local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN" - einfo "$info_message so all available architectures are build." - fi - - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - if use cuda; then - export CUDA_VERBOSE="$(usex debug "true" "false")" - cuda_src_prepare - fi - - cmake_src_prepare - - # remove bundled stuff - rm -r 3rdparty || die "Removing 3rd party components failed" - sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ - -i CMakeLists.txt cmake/*cmake || die - - if use contrib; then - cd "${WORKDIR}/${PN}_contrib-${PV}" || die - eapply "${FILESDIR}/${PN}_contrib-${PV}-rgbd.patch" - eapply "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch" - cd "${S}" || die - - ! use contribcvv && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/cvv" || die; } - # ! use contribdnn && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/dnn" || die; } - ! use contribfreetype && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/freetype" || die; } - ! use contribhdf && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/hdf" || die; } - ! use contribovis && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/ovis" || die; } - ! use contribsfm && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/sfm" || die; } - ! use contribxfeatures2d && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/xfeatures2d" || die; } - fi - - mkdir -p "${S}/.cache/ade" || die - cp \ - "${DISTDIR}/ade-${ADE_PV}.tar.gz" \ - "${S}/.cache/ade/$(md5sum "${DISTDIR}/ade-${ADE_PV}.tar.gz" | cut -f 1 -d " ")-v${ADE_PV}.tar.gz" || die - - if use dnnsamples; then - mkdir -p "${S}/.cache/wechat_qrcode" || die - for file in "detect.caffemodel" "detect.prototxt" "sr.prototxt" "sr.caffemodel"; do - mv \ - "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" \ - "${S}/.cache/wechat_qrcode/$( \ - md5sum "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" | cut -f 1 -d " " \ - )-${file}" || die - done - - mv \ - "${WORKDIR}/${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}/res10_300x300_ssd_iter_140000.caffemodel" \ - "${S}/samples/dnn/" || die - fi - - if use contribxfeatures2d; then - cp \ - "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i \ - "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die - mkdir -p "${S}/.cache/xfeatures2d/boostdesc" || die - for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i; do - mv \ - "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" \ - "${S}/.cache/xfeatures2d/boostdesc/$( \ - md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \ - )-$(basename "${file}")" || die - done - - cp \ - "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i \ - "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die - mkdir -p "${S}/.cache/xfeatures2d/vgg" || die - for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i; do - mv \ - "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" \ - "${S}/.cache/xfeatures2d/vgg/$( \ - md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \ - )-$(basename "${file}")" || die - done - fi - - if use contribdnn; then - mkdir -p "${S}/.cache/data" || die - for file in "face_landmark_model.dat"; do - mv \ - "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" \ - "${S}/.cache/data/$( \ - md5sum "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" | cut -f 1 -d " " \ - )-${file}" || die - done - fi - - if use cuda; then - mkdir -p "${S}/.cache/nvidia_optical_flow" - cp \ - "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" \ - "${S}/.cache/nvidia_optical_flow/$( \ - md5sum "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" | cut -f 1 -d " " \ - )-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" || die - fi - - if use java; then - java-pkg-opt-2_src_prepare - - # this really belongs in src_prepare() too - JAVA_ANT_ENCODING="iso-8859-1" - # set encoding so even this cmake build will pick it up. - export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" - fi -} - -multilib_src_configure() { - # bug #919101 and https://github.com/opencv/opencv/issues/19020 - filter-lto - - # please dont sort here, order is the same as in CMakeLists.txt - local mycmakeargs=( - -DMIN_VER_CMAKE=3.26 - - -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # FindCUDA - -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # FindPythonInterp - - # for protobuf - -DCMAKE_CXX_STANDARD=14 - - # Optional 3rd party components - # =================================================== - -DENABLE_DOWNLOAD=yes - -DOPENCV_ENABLE_NONFREE=$(usex non-free) - -DWITH_QUIRC=OFF # Do not have dependencies - -DWITH_FLATBUFFERS=$(multilib_native_usex contribdnn) - -DWITH_1394=$(usex ieee1394) - # -DWITH_AVFOUNDATION=OFF # IOS - -DWITH_VTK=$(multilib_native_usex vtk) - -DWITH_EIGEN=$(usex eigen) - -DWITH_VFW=OFF # Video windows support - -DWITH_FFMPEG=$(usex ffmpeg) - -DWITH_GSTREAMER=$(usex gstreamer) - -DWITH_GSTREAMER_0_10=OFF # Don't want this - -DWITH_GTK=$(usex gtk3) - -DWITH_GTK_2_X=OFF # only want gtk3 nowadays - -DWITH_IPP=OFF - # Jasper was removed from tree because of security problems. - # Upstream were/are making progress. We use openjpeg instead. - # bug 734284 - -DWITH_JASPER=OFF - -DWITH_JPEG=$(usex jpeg) - -DWITH_OPENJPEG=$(usex jpeg2k) - -DWITH_WEBP=$(usex webp) - -DWITH_OPENEXR=$(multilib_native_usex openexr) - -DWITH_OPENGL=$(usex opengl) - -DOpenGL_GL_PREFERENCE="GLVND" - -DWITH_OPENVX=OFF - -DWITH_OPENNI=OFF # Not packaged - -DWITH_OPENNI2=OFF # Not packaged - -DWITH_PNG=$(usex png) - -DWITH_GDCM=OFF - -DWITH_PVAPI=OFF - -DWITH_GIGEAPI=OFF - -DWITH_ARAVIS=OFF - -DWITH_WIN32UI=OFF # Windows only - # -DWITH_QUICKTIME=OFF - # -DWITH_QTKIT=OFF - -DWITH_TBB=$(usex tbb) - -DWITH_OPENMP=$(usex !tbb $(usex openmp)) - -DWITH_CSTRIPES=OFF - -DWITH_PTHREADS_PF=ON - -DWITH_TIFF=$(usex tiff) - -DWITH_UNICAP=OFF # Not packaged - -DWITH_V4L=$(usex v4l) - -DWITH_LIBV4L=$(usex v4l) - # -DWITH_DSHOW=ON # direct show supp - -DWITH_MSMF=OFF - -DWITH_XIMEA=OFF # Windows only - -DWITH_XINE=$(multilib_native_usex xine) - -DWITH_CLP=OFF - -DWITH_OPENCL=$(usex opencl) - -DWITH_OPENCL_SVM=OFF - -DWITH_OPENCLAMDFFT=$(usex opencl) - -DWITH_OPENCLAMDBLAS=$(usex opencl) - -DWITH_DIRECTX=OFF - -DWITH_INTELPERC=OFF - -DWITH_IPP_A=OFF - -DWITH_MATLAB=OFF - -DWITH_VA=$(usex vaapi) - -DWITH_VA_INTEL=$(usex vaapi $(usex video_cards_intel)) - -DWITH_GDAL=$(multilib_native_usex gdal) - -DWITH_GPHOTO2=$(usex gphoto2) - -DWITH_LAPACK=$(multilib_native_usex lapack) - -DWITH_ITT=OFF # 3dparty libs itt_notify - # =================================================== - # CUDA build components: nvidia-cuda-toolkit - # =================================================== - -DWITH_CUDA=$(multilib_native_usex cuda) - -DWITH_CUBLAS=$(multilib_native_usex cuda) - -DWITH_CUFFT=$(multilib_native_usex cuda) - -DWITH_CUDNN=$(multilib_native_usex cudnn) - -DWITH_NVCUVID="no" - -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "") - # =================================================== - # OpenCV build components - # =================================================== - -DBUILD_SHARED_LIBS=ON - -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag - -DBUILD_ANDROID_EXAMPLES=OFF - -DBUILD_opencv_apps=$(usex opencvapps ON OFF) - -DBUILD_DOCS=OFF # Doesn't install anyways. - -DBUILD_EXAMPLES=$(multilib_native_usex examples) - -DBUILD_PERF_TESTS=OFF - -DBUILD_TESTS=$(multilib_native_usex testprograms) - -DBUILD_WITH_DEBUG_INFO=$(usex debug) - -DOPENCV_ENABLE_MEMORY_SANITIZER=$(usex debug) - # -DBUILD_WITH_STATIC_CRT=OFF - -DBUILD_WITH_DYNAMIC_IPP=OFF - -DBUILD_FAT_JAVA_LIB=OFF - # -DBUILD_ANDROID_SERVICE=OFF - -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda) - -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/${PN}_contrib-${PV}/modules" "") - # =================================================== - # OpenCV installation options - # =================================================== - -DINSTALL_CREATE_DISTRIB=OFF - -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples) - -DINSTALL_TESTS=$(multilib_native_usex testprograms) - -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples) - # -DINSTALL_ANDROID_EXAMPLES=OFF - -DINSTALL_TO_MANGLED_PATHS=OFF - -DOPENCV_GENERATE_PKGCONFIG=ON - # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX} - # to set its destination libdir - -DLIB_SUFFIX= - # =================================================== - # OpenCV build options - # =================================================== - -DENABLE_CCACHE=OFF - # bug 733796, but PCH is a risky game in CMake anyway - -DENABLE_PRECOMPILED_HEADERS=OFF - -DENABLE_SOLUTION_FOLDERS=OFF - -DENABLE_PROFILING=OFF - -DENABLE_COVERAGE=OFF - - -DHAVE_opencv_java=$(multilib_native_usex java YES NO) - -DENABLE_NOISY_WARNINGS=OFF - -DOPENCV_WARNINGS_ARE_ERRORS=OFF - -DENABLE_IMPL_COLLECTION=OFF - -DENABLE_INSTRUMENTATION=OFF - -DGENERATE_ABI_DESCRIPTOR=OFF - -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF - # =================================================== - # things we want to be hard off or not yet figured out - # =================================================== - -DBUILD_PACKAGE=OFF - # =================================================== - # Not building protobuf but update files bug #631418 - # =================================================== - -DWITH_PROTOBUF=ON - -DBUILD_PROTOBUF=OFF - -DPROTOBUF_UPDATE_FILES=ON - -DProtobuf_MODULE_COMPATIBLE=ON - # =================================================== - # things we want to be hard enabled not worth useflag - # =================================================== - -DCMAKE_SKIP_RPATH=ON - -DOPENCV_DOC_INSTALL_PATH= - -DBUILD_opencv_features2d=$(usex features2d ON OFF) - ) - - if use qt5; then - mycmakeargs+=( - -DWITH_QT=$(multilib_native_usex qt5 ON OFF) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON - ) - elif use qt6; then - mycmakeargs+=( - -DWITH_QT=$(multilib_native_usex qt6 ON OFF) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON - ) - else - mycmakeargs+=( - -DWITH_QT=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON - ) - fi - - # ================================================== - # cpu flags, should solve 633900 - #=================================================== - local CPU_BASELINE="" - for i in "${CPU_FEATURES_MAP[@]}" ; do - if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163 - use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};" - fi - done - - mycmakeargs+=( - -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON - -DCPU_BASELINE="${CPU_BASELINE}" - -DCPU_DISPATCH= - ) - - # =================================================== - # OpenCV Contrib Modules - # =================================================== - if use contrib; then - mycmakeargs+=( - -DBUILD_opencv_dnn=$(multilib_native_usex contribdnn ON OFF) - -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF) - -DBUILD_opencv_cvv=$(usex contribcvv ON OFF) - -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF) - -DBUILD_opencv_sfm=$(usex contribsfm ON OFF) - -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF) - -DBUILD_opencv_ovis=$(usex contribovis ON OFF) - ) - - if multilib_is_native_abi; then - mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract) - ) - else - mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON - ) - fi - fi - - # workaround for bug 413429 - tc-export CC CXX - - if multilib_is_native_abi && use cuda; then - cuda_add_sandbox -w - sandbox_write "/proc/self/task" - - if [[ -n "${CUDA_GENERATION}" ]]; then - mycmakeargs+=( - -DCUDA_GENERATION="${CUDA_GENERATION}" - ) - fi - - if [[ -n "${CUDA_ARCH_BIN}" ]]; then - mycmakeargs+=( - -DCUDA_ARCH_BIN="${CUDA_ARCH_BIN}" - ) - - if [[ -n "${CUDA_ARCH_PTX}" ]]; then - mycmakeargs+=( - -DCUDA_ARCH_PTX="${CUDA_ARCH_PTX}" - ) - fi - fi - - local NVCCFLAGS_OpenCV="${NVCCFLAGS// /\;}" - mycmakeargs+=( - -DOPENCV_CUDA_DETECTION_NVCC_FLAGS="-ccbin=$(cuda_gccdir)" - -DCUDA_NVCC_FLAGS="-forward-unknown-opts;${NVCCFLAGS_OpenCV//\"/}" - ) - - use vtk && mycmakeargs+=( - -DCMAKE_CUDA_FLAGS="-forward-unknown-opts ${NVCCFLAGS//\;/ }" - ) - fi - - if multilib_is_native_abi && use python; then - python_configure() { - # Set all python variables to load the correct Gentoo paths - local mycmakeargs=( - "${mycmakeargs[@]}" - # python_setup alters PATH and sets this as wrapper - # to the correct interpreter we are building for - -DPYTHON_DEFAULT_EXECUTABLE="${EPYTHON}" - -DINSTALL_PYTHON_EXAMPLES="$(usex examples)" - ) - cmake_src_configure - use java && java-ant-2_src_configure - } - - python_foreach_impl python_configure - else - mycmakeargs+=( - -DPYTHON_EXECUTABLE=OFF - -DINSTALL_PYTHON_EXAMPLES=OFF - -DBUILD_opencv_python2=OFF - -DBUILD_opencv_python3=OFF - ) - cmake_src_configure - use java && java-ant-2_src_configure - fi - -} - -multilib_src_compile() { - if multilib_is_native_abi && use python; then - python_foreach_impl cmake_src_compile - else - cmake_src_compile - fi -} - -multilib_src_install() { - if use abi_x86_64 && use abi_x86_32; then - MULTILIB_WRAPPED_HEADERS=( - # [opencv4] - /usr/include/opencv4/opencv2/cvconfig.h - /usr/include/opencv4/opencv2/opencv_modules.hpp - - /usr/include/opencv4/opencv2/core_detect.hpp - - /usr/include/opencv4/opencv2/cudaarithm.hpp - /usr/include/opencv4/opencv2/cudabgsegm.hpp - /usr/include/opencv4/opencv2/cudacodec.hpp - /usr/include/opencv4/opencv2/cudafeatures2d.hpp - /usr/include/opencv4/opencv2/cudafilters.hpp - /usr/include/opencv4/opencv2/cudaimgproc.hpp - /usr/include/opencv4/opencv2/cudalegacy.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp - /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp - /usr/include/opencv4/opencv2/cudaobjdetect.hpp - /usr/include/opencv4/opencv2/cudaoptflow.hpp - /usr/include/opencv4/opencv2/cudastereo.hpp - /usr/include/opencv4/opencv2/cudawarping.hpp - # [cudev] - /usr/include/opencv4/opencv2/cudev.hpp - /usr/include/opencv4/opencv2/cudev/block/block.hpp - /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp - /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp - /usr/include/opencv4/opencv2/cudev/block/reduce.hpp - /usr/include/opencv4/opencv2/cudev/block/scan.hpp - /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp - /usr/include/opencv4/opencv2/cudev/common.hpp - /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp - /usr/include/opencv4/opencv2/cudev/expr/color.hpp - /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp - /usr/include/opencv4/opencv2/cudev/expr/expr.hpp - /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp - /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp - /usr/include/opencv4/opencv2/cudev/expr/warping.hpp - /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp - /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp - /usr/include/opencv4/opencv2/cudev/functional/functional.hpp - /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp - /usr/include/opencv4/opencv2/cudev/grid/copy.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp - /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp - /usr/include/opencv4/opencv2/cudev/grid/integral.hpp - /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp - /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp - /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp - /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp - /usr/include/opencv4/opencv2/cudev/grid/transform.hpp - /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp - /usr/include/opencv4/opencv2/cudev/util/atomic.hpp - /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp - /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp - /usr/include/opencv4/opencv2/cudev/util/limits.hpp - /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp - /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp - /usr/include/opencv4/opencv2/cudev/util/tuple.hpp - /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp - /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp - /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp - /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp - /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp - /usr/include/opencv4/opencv2/cudev/warp/scan.hpp - /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp - /usr/include/opencv4/opencv2/cudev/warp/warp.hpp - # [contribcvv] - /usr/include/opencv4/opencv2/cvv.hpp - /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp - /usr/include/opencv4/opencv2/cvv/cvv.hpp - /usr/include/opencv4/opencv2/cvv/debug_mode.hpp - /usr/include/opencv4/opencv2/cvv/dmatch.hpp - /usr/include/opencv4/opencv2/cvv/filter.hpp - /usr/include/opencv4/opencv2/cvv/final_show.hpp - /usr/include/opencv4/opencv2/cvv/show_image.hpp - # [contribdnn] - /usr/include/opencv4/opencv2/dnn.hpp - /usr/include/opencv4/opencv2/dnn/all_layers.hpp - /usr/include/opencv4/opencv2/dnn/dict.hpp - /usr/include/opencv4/opencv2/dnn/dnn.hpp - /usr/include/opencv4/opencv2/dnn/dnn.inl.hpp - /usr/include/opencv4/opencv2/dnn/layer.details.hpp - /usr/include/opencv4/opencv2/dnn/layer.hpp - /usr/include/opencv4/opencv2/dnn/shape_utils.hpp - /usr/include/opencv4/opencv2/dnn/utils/debug_utils.hpp - /usr/include/opencv4/opencv2/dnn/utils/inference_engine.hpp - /usr/include/opencv4/opencv2/dnn/version.hpp - /usr/include/opencv4/opencv2/dnn_superres.hpp - # [contribhdf] - /usr/include/opencv4/opencv2/hdf.hpp - /usr/include/opencv4/opencv2/hdf/hdf5.hpp - - /usr/include/opencv4/opencv2/mcc.hpp - /usr/include/opencv4/opencv2/mcc/ccm.hpp - /usr/include/opencv4/opencv2/mcc/checker_detector.hpp - /usr/include/opencv4/opencv2/mcc/checker_model.hpp - - /usr/include/opencv4/opencv2/text.hpp - /usr/include/opencv4/opencv2/text/erfilter.hpp - /usr/include/opencv4/opencv2/text/ocr.hpp - /usr/include/opencv4/opencv2/text/swt_text_detection.hpp - /usr/include/opencv4/opencv2/text/textDetector.hpp - - # [qt5,qt6] - /usr/include/opencv4/opencv2/viz.hpp - /usr/include/opencv4/opencv2/viz/types.hpp - /usr/include/opencv4/opencv2/viz/viz3d.hpp - /usr/include/opencv4/opencv2/viz/vizcore.hpp - /usr/include/opencv4/opencv2/viz/widget_accessor.hpp - /usr/include/opencv4/opencv2/viz/widgets.hpp - - /usr/include/opencv4/opencv2/wechat_qrcode.hpp - ) - fi - if multilib_is_native_abi && use python; then - python_foreach_impl cmake_src_install - python_foreach_impl python_optimize - else - cmake_src_install - fi -} diff --git a/media-libs/opencv/opencv-4.9.0-r2.ebuild b/media-libs/opencv/opencv-4.9.0-r2.ebuild index 3ddfccd217f2..971d60f16ecb 100644 --- a/media-libs/opencv/opencv-4.9.0-r2.ebuild +++ b/media-libs/opencv/opencv-4.9.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cuda java-pkg-opt-2 cmake-multilib flag-o-matic python-r1 toolchain-funcs virtualx DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" @@ -56,7 +56,7 @@ else https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz ) " - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" fi LICENSE="Apache-2.0" @@ -218,7 +218,7 @@ COMMON_DEPEND=" ) ) quirc? ( media-libs/quirc ) - tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] ) + tesseract? ( app-text/tesseract[opencl(+),${MULTILIB_USEDEP}] ) tbb? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] ) tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) @@ -804,7 +804,7 @@ multilib_src_test() { 'AsyncAPICancelation/cancel*basic' ) - if ! use gtk && ! use qt5 && ! use qt6; then + if ! use gtk3 && ! use qt5 && ! use qt6; then CMAKE_SKIP_TESTS+=( # these fail with parallism '^Highgui_*' diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index 16a72dd8f4be..bed46283f0c0 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,21 +1,5 @@ -AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167 -AUX openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch 1187 BLAKE2B 2e415fce94cf501b3780f6aff6bdc076db6395b53334d98484a8ac2d7b1e9ec0a5b85bc2199e7861cfb6870f81b843621ffb9a90c493cfb544b219f353362d87 SHA512 19431be0f2d8733265840ae9d428a9ddae823e37017e23d798a12a3390c879b1d8bcffd4b7d12bca8f7f929fe307fd4bff9f421830ca7b5607a188364f02bb8f -AUX openexr-3.1.5-add-missed-include-cstdint-statement.patch 546 BLAKE2B 43a64e815ef6fb9ef6d0022560553f1f025dd0cea0b309a7126602b30440125d8aaca8b550c7f07778db4888499662fd3afdb6557c9ac67b98bb3238a7f4df0a SHA512 04d538237c9945eb33546098be4b34a3c82d93fa3f14655528bf8da49bc1e34402f74385d6d6f93fa2a724d7a495082c35bd0abbc5965119c52d5efa49229bce -AUX openexr-3.1.5-drop-failing-testDwaLookups.patch 868 BLAKE2B 6ae9b57b222e038a57499e3b466f018840b0e358048283acea7519eca5f2a4140b9d553ad6cdca9bd449e8fc3d42fd84dae11a34f5c4264c3786b38a59ab4125 SHA512 f8cdab71c97953984ada16cf2a26fea0fce5ebfcfa465992a80080ad1882a3eecd925fc94bacdd60e1463a7c8a1678e93c89d9c7a9ec5e27726bcc98465f909f -AUX openexr-3.1.5-musl-i386.patch 755 BLAKE2B 0a32fd9f317aea7bc96608137ab8953d75bedd9813b7b8b2bde86acab9ba4624bb359efa3d9fa1c67891d91c12579a1fe36b38f64ed89c538fa38cc2b242b319 SHA512 a33110c648ec58513b420e9d40aeaf350f55bd9712b95e0fbca43c2cc11042c77a10d67714d7b403f1dd0d096e92bd1ab4548027b24682db48e5bb6ece5f88ad -AUX openexr-3.1.7-musl-i386.patch 815 BLAKE2B c969001a289711427465cdc75977d8a554409e62ddd4a958b2363c22fbaf18cb10a7d11f03b5e3caee3476b7f325581a51092432f2490696d79794b9abb339f6 SHA512 abae9dbe6858c6384ae1ed373267d4cc6eb1d6458e48d282e612ef216a2cce6805e7f7e2cd7faa9daf36a12b6d93b5c18b78d2bd5eee9cfc41bec7c3444ddcc4 AUX openexr-3.2.1-bintests-iff-utils.patch 399 BLAKE2B b2ba76b0fe8430cb6275bd7520ce307b8f44f642efaa90c36cea03c34b0b5d6e93cc4bc81cc30b662c3d58941696f87c76604dfd614742051e8a6be7af3115e7 SHA512 58deaacc1e81c46cccfa4190498cfbf964e1fcfef384d73f86b8b18e8348886579385f292317588f64f0f6fd1ef062465ed6253d7c7d672bdb49b1e43f8addc7 -DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc70929a802561c2be71b050e97e7087221f78110f2686fcc1ea960d87880ccdbcb57b474f635a3392f3fa169ef3c5 SHA512 ebbad4b22315522f43cafefca77cf92ce38cac87f024c8dc6429aed04a6dad1f0a3d717faaab39c4c3605e440442952acc4630c5393754ea138929be4ad8a0d4 -DIST openexr-3.1.12.tar.gz 20540857 BLAKE2B 94a78e4e45f892b56f9a05cabad5cea999ff1844ff8569995f1f301e8599e0be1c214477f501f351c248eea141db22508eb764c1c91508399e69932026361c04 SHA512 0fce6a1322d74354a29ece9f9afeca1c4874c4d55079ec720f3ef21ab2ab950ec333f793f1ffad6634f57b40c4276af578b31ac8bc3e11856d7b903d5475e5eb -DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c -DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5 -DIST openexr-3.2.3.tar.gz 18855303 BLAKE2B 4f5dbd9033031e988e973ef039b67632ac92e1272cc1d3e4540992f09f6b275c3ecb4c8f690cd98620519993099d132b43bb4bb40bb0d11caa06db868404015a SHA512 6e0a6fdcfae57c6e8b060d9aeed57140d96d39bffe5e40edd6ea5beb06e569323833d07906316ffca05f48e8409d0ea4174e2cd84d554404a4ee432e07d7b5e6 DIST openexr-3.2.4.tar.gz 18856440 BLAKE2B f29910b2e36808b741860bf603571f607ca929672b3c5b9de7c7c16242f2a38d02627614c10e7b01a8cfd8804923636eb0dfe2c798ec3ff63252dd20e3f8e535 SHA512 ecc3d8b206bda5e5897ac9cd797a8432b76981de10d49cbb107af2b4108c22186de0dda25a9a43b07e18d641ef71508445d95f659a4ca932e029d48ee029a492 DIST openexr-images-1.0.tar.gz 252222962 BLAKE2B d57c458dfbd1b08c964429022b6e08a3309bf11cbd43c64e271ebc620dae6dbe70636e5221f47dabd7fe2aa0806f2cf3f3c9b3f55fd7f45b0a34f3e62b6029e7 SHA512 c1c83a26cd326d0fcda824daccb0044abad46f29e1bd2ceb1c38bc62b3e71f0aeef126dddc4517eb1cb9f7c9d0fe234276a48a754bdb7c7823e9aee459d8670a -EBUILD openexr-3.1.11.ebuild 2065 BLAKE2B e0c0fdcdd04715324b708c5096fa9e5a6d71a9c72d2fe95b776981d2be9eaa2c438d26ca0ba45a436a662ddb37810f752c44560407a00effa99526462295fa3d SHA512 4b3fbdcc7fd97167f855d66def172129ccea5b73935c8f1ab378c7b05fa18fed35d0f06905e182215c9c1a9e60ee2fc6a9daf5b507c444fc6809cc34aa7a371a -EBUILD openexr-3.1.12.ebuild 2068 BLAKE2B 152d93c66f05c1ec9b83f9631e9984f0a5a4f39abcd7063b19756d4f0f8e9aef1d91301cd95018feca57c763558faedfe78ba07bec5f7517cf3c8c07925fbc19 SHA512 a24d130a7dd6207ae1da95cf2a04fbfbeb1188179a2f9e1c838d2a58ea502a4b0398bdbb2d9666f25926c424f24e6b940c7ec1daeabe2c7439398ce4571fcec2 -EBUILD openexr-3.1.5-r1.ebuild 2067 BLAKE2B 5def6ac36362ea8d8810bd2056df16ca57e658e83eb2a0ae6846cc322ae0be41f8c76dad1498947ed8b44fad9fac46a598e1cf173395c1a9946719f2359743b2 SHA512 9b7f62c74c723fe18766db36e4f75623818c8d2697d23f24c742061280a373fef973cc5478bd8a27492aa82249f189bdcc4c395854199d910e54d91033755174 -EBUILD openexr-3.1.7.ebuild 1924 BLAKE2B 1ae6aeb5a4693d21d798b6260fb2b485044dcfa33820f328f81993f7d3fa6a7ba98c12f183dda3b58fc8d99c3785c5e5d15acdab03d6fe2c9b19bbe76905e5cc SHA512 df60600d657768a811a5b62cb3f77c0fca177ea595b2895c7e62d797fc147f8ef0551512b67ef80d0b0ece156de143bf36e7dd20dbc88f276f879d95fb8e58e8 -EBUILD openexr-3.2.3-r2.ebuild 3582 BLAKE2B 9bfe1420f27548dce47a3fe3ba7b98694fcaf07b541277bc4542954ed2416550335fa9d1c6c3dc3c89ee016b6e9da9943ebe9a1b258c91bd25537bdc07a2b971 SHA512 1d76eb16ec764bc579008a3568d7292fa317f8753ed439856c126232e268f7b2b72334686f3b4e8b6298ff6e5e4fa0fa9e4873d5854b4aadd14dac9be47ffab2 -EBUILD openexr-3.2.4-r2.ebuild 3585 BLAKE2B 40207d48af048e261cffcd22b866cedbd6906daad9ca92eba0fe0b7d828737038190eab682e06a5699757fa5ee5d9adb2f41b16f80c26059fde54091fe8827da SHA512 2807147451e7c08004f94cc2b6e711f0640568c1f96e87a1e37e123ee0209aba496bfe932f014d20f2ecc243ff90cb9127c55322e12470f3d9fb6132d1afa340 +EBUILD openexr-3.2.4-r2.ebuild 3582 BLAKE2B 9bfe1420f27548dce47a3fe3ba7b98694fcaf07b541277bc4542954ed2416550335fa9d1c6c3dc3c89ee016b6e9da9943ebe9a1b258c91bd25537bdc07a2b971 SHA512 1d76eb16ec764bc579008a3568d7292fa317f8753ed439856c126232e268f7b2b72334686f3b4e8b6298ff6e5e4fa0fa9e4873d5854b4aadd14dac9be47ffab2 MISC metadata.xml 798 BLAKE2B d780a0ead28144e6031fedeed720d1cd79bfa8ab54a1f9d2a99324ac6db4948cf25ebf73abd630d7e697b8578ef5b6442679ce05d1949784fb8a17ed2a6fb9a1 SHA512 5c9d837a72b41c0d8463ffadd639fde0c9dc620abf4b51ef7718efed5d94a12a336d85f10d65e2fbffd3d4c59fe12a09e71f42f68d081917f4d7f1aba24de893 diff --git a/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch b/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch deleted file mode 100644 index e2f0d6e59621..000000000000 --- a/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Wed, 4 Aug 2021 08:33:52 +0200 -Subject: [PATCH] disable failing test - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - src/test/OpenEXRTest/CMakeLists.txt | 1 - - src/test/OpenEXRTest/main.cpp | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/src/test/OpenEXRTest/CMakeLists.txt b/src/test/OpenEXRTest/CMakeLists.txt -index 9dd74d1..2a1a2bd 100644 ---- a/src/test/OpenEXRTest/CMakeLists.txt -+++ b/src/test/OpenEXRTest/CMakeLists.txt -@@ -118,7 +118,6 @@ define_openexr_tests( - testMultiView - testNativeFormat - testOptimized -- testOptimizedInterleavePatterns - testPartHelper - testPreviewImage - testRgba -diff --git a/src/test/OpenEXRTest/main.cpp b/src/test/OpenEXRTest/main.cpp -index 4eaecc9..0c0caed 100644 ---- a/src/test/OpenEXRTest/main.cpp -+++ b/src/test/OpenEXRTest/main.cpp -@@ -202,7 +202,6 @@ main (int argc, char *argv[]) - TEST (testExistingStreams, "core"); - TEST (testStandardAttributes, "core"); - TEST (testOptimized, "basic"); -- TEST (testOptimizedInterleavePatterns, "basic"); - TEST (testYca, "basic"); - TEST (testTiledYa, "basic"); - TEST (testNativeFormat, "basic"); --- -2.32.0 - diff --git a/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch b/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch deleted file mode 100644 index 3b104089350e..000000000000 --- a/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch +++ /dev/null @@ -1,44 +0,0 @@ -From https://github.com/AcademySoftwareFoundation/openexr/commit/c5763cfdf59ef4880dacdb11664782822a0976cd -From: Cary Phillips <cary@ilm.com> -Date: Sun, 31 Jul 2022 13:36:03 -0700 -Subject: [PATCH 1/4] Add missing #include <cstdint> required by gcc-13 (#1264) - -Originally submitted as #1262, thanks. - -Signed-off-by: Cary Phillips <cary@ilm.com> - -Adapted changes in exrcheck/main.cpp for 3.1.5 code base on Gentoo (different -ordering of #included header files compared to current HEAD). ---- a/src/bin/exrcheck/main.cpp -+++ b/src/bin/exrcheck/main.cpp -@@ -4,6 +4,7 @@ - #include <ImfCheckFile.h> - #include <ImathConfig.h> - -+#include <cstdint> - #include <iostream> - #include <fstream> - #include <string.h> ---- a/src/lib/OpenEXR/ImfDeepTiledInputFile.h -+++ b/src/lib/OpenEXR/ImfDeepTiledInputFile.h -@@ -19,6 +19,7 @@ - - #include "ImfTileDescription.h" - -+#include <cstdint> - #include <ImathBox.h> - - OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER ---- a/src/lib/OpenEXR/ImfDeepTiledInputPart.h -+++ b/src/lib/OpenEXR/ImfDeepTiledInputPart.h -@@ -10,6 +10,7 @@ - - #include "ImfTileDescription.h" - -+#include <cstdint> - #include <ImathBox.h> - - OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER --- -2.37.3 - diff --git a/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch b/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch deleted file mode 100644 index 77ca274703cc..000000000000 --- a/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/AcademySoftwareFoundation/openexr/pull/1276 - -From 974b14f67e89dddb6710364034116b3f7b9e0247 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Thu, 15 Sep 2022 18:58:01 +0200 -Subject: [PATCH] add missed #include <cstdint> statement - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/src/lib/OpenEXR/ImfTiledMisc.h -+++ b/src/lib/OpenEXR/ImfTiledMisc.h -@@ -19,6 +19,7 @@ - - #include <stdio.h> - #include <vector> -+#include <cstdint> - - OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER - --- -2.37.3 - diff --git a/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch b/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch deleted file mode 100644 index 7579ddd23156..000000000000 --- a/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f3c61b994e9a503fcc9649cba439d81f40901d0 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Tue, 27 Sep 2022 07:29:11 +0200 -Subject: [PATCH] drop failing testDwaLookups - -On x86_32 testDwaLookups fails - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/src/test/OpenEXRTest/main.cpp -+++ b/src/test/OpenEXRTest/main.cpp -@@ -65,7 +65,6 @@ - #include "testDwaCompressorSimd.h" - #include "testRle.h" - #include "testB44ExpLogTable.h" --#include "testDwaLookups.h" - #include "testIDManifest.h" - - #include "tmpDir.h" -@@ -229,7 +228,6 @@ main (int argc, char *argv[]) - TEST (testDwaCompressorSimd, "basic"); - TEST (testRle, "core"); - TEST (testB44ExpLogTable, "core"); -- TEST (testDwaLookups, "core"); - TEST (testIDManifest, "core"); - - // NB: If you add a test here, make sure to enumerate it in the --- -2.37.3 - diff --git a/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch b/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch deleted file mode 100644 index 2b7a31ac694d..000000000000 --- a/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/lib/Iex/IexMathFpu.cpp -+++ b/src/lib/Iex/IexMathFpu.cpp -@@ -251,14 +251,14 @@ - inline void - restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) - { --# if defined(__GLIBC__) && defined(__i386__) -+# if defined(__linux__) && defined(__i386__) - setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal); - #else - setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal); - # endif - - _fpstate* kfp = reinterpret_cast<_fpstate*> (ucon.uc_mcontext.fpregs); --# if defined(__GLIBC__) && defined(__i386__) -+# if defined(__linux__) && defined(__i386__) - setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); - #else - setMxcsr (kfp->mxcsr, clearExceptions); diff --git a/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch b/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch deleted file mode 100644 index e2bedf6e7a12..000000000000 --- a/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/lib/Iex/IexMathFpu.cpp -+++ b/src/lib/Iex/IexMathFpu.cpp -@@ -251,14 +251,14 @@ - inline void - restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) - { --# if (defined(__GLIBC__) && defined(__i386__)) || defined(__ANDROID_API__) -+# if (defined(__linux__) && defined(__i386__)) || defined(__ANDROID_API__) - setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal); - #else - setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal); - # endif - - _fpstate* kfp = reinterpret_cast<_fpstate*> (ucon.uc_mcontext.fpregs); --# if defined(__GLIBC__) && defined(__i386__) -+# if defined(__linux__) && defined(__i386__) - setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); - #else - setMxcsr (kfp->mxcsr, clearExceptions); diff --git a/media-libs/openexr/openexr-3.1.11.ebuild b/media-libs/openexr/openexr-3.1.11.ebuild deleted file mode 100644 index 4b0af468a73a..000000000000 --- a/media-libs/openexr/openexr-3.1.11.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -MY_PN=OpenEXR - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cpu_flags_x86_avx examples large-stack utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.6:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch ) -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests" - - if use x86; then - eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch - fi - - cmake_src_prepare -} - -src_configure() { - if use x86; then - replace-cpu-flags native i686 - fi - - local mycmakeargs=( - -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo - -DBUILD_TESTING=$(usex test) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=() - - use arm64 && CMAKE_SKIP_TESTS+=( - # bug #922247 - 'OpenEXRCore.testDWAACompression' - 'OpenEXRCore.testDWABCompression' - ) - - cmake_src_test -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - - cmake_src_install -} diff --git a/media-libs/openexr/openexr-3.1.12.ebuild b/media-libs/openexr/openexr-3.1.12.ebuild deleted file mode 100644 index de6cba52a4ee..000000000000 --- a/media-libs/openexr/openexr-3.1.12.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -MY_PN=OpenEXR - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cpu_flags_x86_avx examples large-stack utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.6:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch ) -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests" - - if use x86; then - eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch - fi - - cmake_src_prepare -} - -src_configure() { - if use x86; then - replace-cpu-flags native i686 - fi - - local mycmakeargs=( - -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo - -DBUILD_TESTING=$(usex test) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=() - - use arm64 && CMAKE_SKIP_TESTS+=( - # bug #922247 - 'OpenEXRCore.testDWAACompression' - 'OpenEXRCore.testDWABCompression' - ) - - cmake_src_test -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - - cmake_src_install -} diff --git a/media-libs/openexr/openexr-3.1.5-r1.ebuild b/media-libs/openexr/openexr-3.1.5-r1.ebuild deleted file mode 100644 index 8ec80d3071e3..000000000000 --- a/media-libs/openexr/openexr-3.1.5-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -MY_PN=OpenEXR - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-${PV}:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( dev-python/breathe ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch - "${FILESDIR}"/${P}-Add-missing-include-cstdint-required-by-gcc-13-1264.patch - "${FILESDIR}"/${P}-add-missed-include-cstdint-statement.patch - "${FILESDIR}"/${P}-musl-i386.patch -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" - - if use x86; then - eapply "${FILESDIR}"/${P}-drop-failing-testDwaLookups.patch - fi - - cmake_src_prepare -} - -src_configure() { - if use x86; then - replace-cpu-flags native i686 - fi - - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DDOCS=$(usex doc) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - - cmake_src_install -} diff --git a/media-libs/openexr/openexr-3.1.7.ebuild b/media-libs/openexr/openexr-3.1.7.ebuild deleted file mode 100644 index cedfef02a75b..000000000000 --- a/media-libs/openexr/openexr-3.1.7.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -MY_PN=OpenEXR - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cpu_flags_x86_avx examples large-stack utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.6:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch - "${FILESDIR}"/${PN}-3.1.7-musl-i386.patch -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests" - - if use x86; then - eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch - fi - - cmake_src_prepare -} - -src_configure() { - if use x86; then - replace-cpu-flags native i686 - fi - - local mycmakeargs=( - -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo - -DBUILD_TESTING=$(usex test) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - - cmake_src_install -} diff --git a/media-libs/openexr/openexr-3.2.3-r2.ebuild b/media-libs/openexr/openexr-3.2.3-r2.ebuild deleted file mode 100644 index 574d441feb13..000000000000 --- a/media-libs/openexr/openexr-3.2.3-r2.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -MY_PN=OpenEXR - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - utils? ( - https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz - -> openexr-images-1.0.tar.gz - ) - ) -" - -LICENSE="BSD" -SLOT="0/31" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads" -REQUIRED_USE="doc? ( utils )" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/libdeflate:=[zlib(+)] - >=dev-libs/imath-3.1.6:= -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( sys-apps/help2man ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch" -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests" - - sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \ - -i docs/CMakeLists.txt || die - - cmake_src_prepare - - if use test && use utils; then - IMAGES=( - Beachball/multipart.0001.exr - Beachball/singlepart.0001.exr - Chromaticities/Rec709.exr - Chromaticities/Rec709_YC.exr - Chromaticities/XYZ.exr - Chromaticities/XYZ_YC.exr - LuminanceChroma/Flowers.exr - LuminanceChroma/Garden.exr - MultiResolution/ColorCodedLevels.exr - MultiResolution/WavyLinesCube.exr - MultiResolution/WavyLinesLatLong.exr - MultiView/Adjuster.exr - TestImages/GammaChart.exr - TestImages/GrayRampsHorizontal.exr - v2/LeftView/Balls.exr - v2/Stereo/Trunks.exr - ) - - mkdir -p "${BUILD_DIR}/src/test/bin" || die - - for image in "${IMAGES[@]}"; do - mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die - cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die - done - fi - -} - -src_configure() { - if use x86; then - replace-cpu-flags native i686 - fi - - local mycmakeargs=( - -DOPENEXR_CXX_STANDARD="17" - - -DBUILD_SHARED_LIBS="yes" - -DBUILD_TESTING="$(usex test)" - -DBUILD_WEBSITE="no" - - -DOPENEXR_BUILD_EXAMPLES="$(usex examples)" - -DOPENEXR_BUILD_PYTHON="no" - -DOPENEXR_BUILD_TOOLS="$(usex utils)" - -DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)" - -DOPENEXR_ENABLE_THREADING="$(usex threads)" - - -DOPENEXR_INSTALL="yes" - -DOPENEXR_INSTALL_DOCS="$(usex doc)" - -DOPENEXR_INSTALL_PKG_CONFIG="yes" - -DOPENEXR_INSTALL_TOOLS="$(usex utils)" - - -DOPENEXR_USE_CLANG_TIDY="no" # don't look for clang-tidy - - -DOPENEXR_FORCE_INTERNAL_DEFLATE="no" - -DOPENEXR_FORCE_INTERNAL_IMATH="no" - ) - if use test; then - # OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see - # - https://bugs.gentoo.org/925128 - # - https://openexr.com/en/latest/install.html#component-options - - # NOTE: the fuzz tests are very slow - mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" ) - fi - - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=() - - use arm64 && CMAKE_SKIP_TESTS+=( - # bug #922247 - 'OpenEXRCore.testDWAACompression' - 'OpenEXRCore.testDWABCompression' - ) - use x86 && CMAKE_SKIP_TESTS+=( - '^OpenEXR.testDwaLookups$' - ) - - cmake_src_test -} - -src_install() { - use examples && docompress -x "/usr/share/doc/${PF}/examples" - - cmake_src_install -} diff --git a/media-libs/openexr/openexr-3.2.4-r2.ebuild b/media-libs/openexr/openexr-3.2.4-r2.ebuild index 8c58eef5d830..574d441feb13 100644 --- a/media-libs/openexr/openexr-3.2.4-r2.ebuild +++ b/media-libs/openexr/openexr-3.2.4-r2.ebuild @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/31" # based on SONAME # -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads" REQUIRED_USE="doc? ( utils )" diff --git a/media-libs/openfec/Manifest b/media-libs/openfec/Manifest index 0a8eabd459ab..815eb212aa6e 100644 --- a/media-libs/openfec/Manifest +++ b/media-libs/openfec/Manifest @@ -1,3 +1,6 @@ +AUX openfec-1.4.2.11-opt.patch 653 BLAKE2B 81643e0a4feedccf4415e7ea0ee57bb6d52c627a33423f62cf216e9b728049093b818398e5b6a0631eb73f56e7d827aafc832565797499c57d5f45c5b9e3705c SHA512 d7321af8990bb51042d632008f2f0b532c586eb7a32765fbd18019cf7ab706696fee9415fe9b678f7c906a2fa84355d01b7ac75133f282405ca9fd9c4906b7bd +DIST openfec-1.4.2.11.tar.gz 1112095 BLAKE2B d54fcb6f3a6ea76e44519384fb288e1a896315642175694ed887ee7637c9b479d94a4e461e446b92baf669695f496eb30b5b7836b86b297c3cc95bd63edbd48d SHA512 e77da3997296e6518574102e54af2f60d27a691bb32ea9eb61a5de714974e35287d2c18e1564fa7d299fa2191af1ad718ffd8f9fd5ad7ea468aca0dd6b88e9e5 DIST openfec-1.4.2.9.tar.gz 1111548 BLAKE2B c3fd234c6f758144e514a262028024cb61a2379d065ab645067200618181a5ba4ae793fda82f60f0a870906d1978ef08ba8e73f9711bccf27b5161c5732702d1 SHA512 6c23f4d4263c514170f6abf806d7faf4c3fbf7fe34f55128383dcd84808a6966edd13587f7549ead74578ca219bdce9e42a32fc04071df0d54dae5b1336ed2b3 +EBUILD openfec-1.4.2.11-r1.ebuild 806 BLAKE2B 163d5c8ab0807885a027e1cb7f6be0fbba8c065f7c32c7a319e6cff789add38c6ad264f0c5f76cceeca78c406b25964fef034683ae12248042d698d5920d5864 SHA512 91617e527a0f0ef3da32f9134df0c16a3221280f417a17be956e5b553d6361c3569d57e011ce7f34a41cc104a5ed8acbf58c4678886ba78e11410294d9fa7609 EBUILD openfec-1.4.2.9.ebuild 541 BLAKE2B f0bad1287512b7bbfdbdbb29a31787da98c822795807f631fc0227a29cec65503f0a2ea4307c8074f50337839283dafd4fbdf7bf6b5cc4dff510081dd1f07748 SHA512 d1bc4577f8b32d330cc52e7715d9cd06d0bd5a6b14990ec0d28b44159e0e1334efec25ec7e2223274a72b33eecbacd17fd1f50baa01b71ba273122e52feb50d1 MISC metadata.xml 326 BLAKE2B d0c0beff93a23eb6f331f003f68c77402081370dbdcf2b6a8bd72ac4ee1a110e3944367d12aacedc6cbe2fbd4657f4557dde21dc06efa2147fef7b9c5b47ee59 SHA512 b790ce0573fc3bb81da40a56c77821314d5fe0ddc34923c007b0fe7cb6c49a1a756744d8c97b62648af80078eea98e5cc45061aba64179d6d8e2630f8fa07219 diff --git a/media-libs/openfec/files/openfec-1.4.2.11-opt.patch b/media-libs/openfec/files/openfec-1.4.2.11-opt.patch new file mode 100644 index 000000000000..97339443437f --- /dev/null +++ b/media-libs/openfec/files/openfec-1.4.2.11-opt.patch @@ -0,0 +1,16 @@ +This breaks with e.g. -Wa,-O2. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,12 +36,6 @@ message(STATUS "Debug mode ON" ) + else(DEBUG STREQUAL "ON") + # Release mode + set(CMAKE_BUILD_TYPE Release) +-set(OPTIMIZE "3" CACHE STRING "Set optimization level (0-3 or DEFAULT)") +-if (NOT OPTIMIZE STREQUAL "DEFAULT") +- string(REGEX REPLACE "(-O[A-Za-z0-9]+)" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") +- string(REGEX REPLACE "(-O[A-Za-z0-9]+)" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O${OPTIMIZE}") +-endif() + message(STATUS "Debug mode OFF") + message(STATUS "Optimization level ${OPTIMIZE}") + diff --git a/media-libs/openfec/openfec-1.4.2.11-r1.ebuild b/media-libs/openfec/openfec-1.4.2.11-r1.ebuild new file mode 100644 index 000000000000..316e50512f58 --- /dev/null +++ b/media-libs/openfec/openfec-1.4.2.11-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Library of various AL-FEC codecs" +HOMEPAGE="https://github.com/roc-streaming/openfec http://openfec.org/" +SRC_URI="https://github.com/roc-streaming/openfec/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +# See https://github.com/roc-streaming/openfec/blob/d87b258e3de3cdddf700b40e94c51ec9bd44a47f/CHANGELOG#L47. +LICENSE="CeCILL-2 CeCILL-C" +SLOT="0" +KEYWORDS="~amd64" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.2.11-opt.patch +) + +src_configure() { + local mycmakeargs=( + # Causes crashes in media-libs/roc-toolkit (bug #941750) + # https://github.com/roc-streaming/openfec/issues/22 + -DASSEMBLY_SSE_OPT=OFF + ) + + cmake_src_configure +} + +src_test() { + cmake_src_test tests +} diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index 11010064d389..e9af9a370622 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,7 +1,6 @@ AUX openimageio-2.5.12.0-heif-find-fix.patch 802 BLAKE2B bdf3e77c396d7e39935a3afb6fcb5140d4db83cc7bc3385d71adad7f3d27d53f300244f986be788e0ac51e26a59edc67c819ed57c5affc514f7d72088fa34e38 SHA512 c1d02001703ee17af4192d7a8ada592d9e03e2af2822393eb1d1db1de26777dd1715dfe68af36d1070dd29bf33b3f8db6b2d9d7a6dde989c90fc89b4cfff24cb AUX openimageio-2.5.12.0-tests-optional.patch 1310 BLAKE2B 563d3ede3ea10439e130d96647918387455ae8fb1fbb75220a064ce98322f8d87f113c04b6e215db6d6e95bf1e96f9c922f144a46af1674726f5b87918a4ae3a SHA512 95b6921b4dadc6535d978178141b62916121e27540f8e578d93347bfab59506f49ded7584b03b8dac04af44e14a74701437fa0f6faacca9d12657352fc0d3f06 AUX openimageio-2.5.12.0_heif_test.patch 839 BLAKE2B e7309fde786053afc3c373bfd5d6affa8d86d7524ff44b52a61b3c4cf3bb18cd2a987699e788eb7d6a910a1bd8b813deb2497475799593a6c780442d6cc31963 SHA512 f32a5b46bc4fb678322b0f9d930e1bdaae370087084ffce4dcf61de6a3d56059a384924fd718ed5cfbaff0ab76c6a1f8bdaf8c4e3961b9defaadb04e1d402b90 -AUX openimageio-2.5.8.0-fits.patch 672 BLAKE2B 3bc6252c246698ef29dd74fdf1e1dde59658c717ed078cd5b9e251dc59f57395bc761325664d07ccae90df32e3600ab9c68732d3610ba9c99fbc236eb28840d6 SHA512 bdcca17073be2d8d2fdfb770f117f429fa4c8db26e7366d1ab9e211837fe07622054cd71ff9206fa7c449974faba865c6412d7a5cbd3042ca1a0b8e8a944efc5 AUX openimageio-2.5.8.0-fix-tests.patch 10084 BLAKE2B d6cc1e35cb31df4d42a4a4b14283c81fb4b9157be480688102f912052a51ad5d56d22573a3b9c4c9fc80465c12b3c085b07cf8745ac86b1c83985af30942f4c8 SHA512 39e55ad64fc644420a2305abb616f6ca409fc345bc363557c176c2e88b32fd96d52fbacaf2c002d159341bf6401d19407c50781af2b39c638e738047d86d3903 AUX openimageio-2.5.8.0-fix-unit_simd.patch 1028 BLAKE2B 2d9c9a61f44a8e1cf11429d9f32ffd047368ee9d42c5ab25bfafc3bdd3d856afb49aef8c46c850f9739de8db634dcadccdf83cc86fc9d7c078d5b96b7f300a6b SHA512 a96074ee5db257f0317677f8e67e1b634504fa0a608dddd089f1683fe6f77ca586bd6ebf54c35017eaf51c9025fb7c48697a340c74fd4c29976287009a805729 DIST J2KP4files.zip 52204801 BLAKE2B 9e1c9afc11dc9e9be9987d458c274902f4205a5838a22bccd990699cfe1612139703d0ecc10fa77eacf5d246739025ddf57a02d91b80d3acfa1bae8377044b24 SHA512 71822f8b2518c4a7a5e195700d0e960a4b900e5b36ddfd2498e5a1e4e149ae3ea0262c51a24a7081119aa5d00772d45d1b0bab836bbca0557c2e9bb9a88b89f4 @@ -10,12 +9,9 @@ DIST file002.fits 11520 BLAKE2B e1983941ca932f9db088f2d1856ca3b1fd268cf8d30e1885 DIST file003.fits 581760 BLAKE2B 35d77c64ff9e25f34593ea41839a4f7712dc344d12ab2c041a1e1ef7ad9846a711fafb71ba71b191a7dc44cd94ae7172640210a5c48e2910d34efea4c20989e1 SHA512 dc143b27f8850e2a55ad95a9a7a76a348f0b9b0af5a223d1ae11157eb358acf74e482957faaa0cdbaf260b9cbe14b10e6b504068c7b312f059119c022279611f DIST file009.fits 25920 BLAKE2B 594061eba4d48da8cbfee58ab592a0adb5a22d681228330e84f60304e5146a8856e9c65b763d6d8e2136217ebe85d92128318cccfcf6358c7bc767232c6382c9 SHA512 57d53622854399aed96efbeff78e700990b2fc63c4dbd1bc9ac58c7670af98d528db2f1a3e9de4e74b977f8318109b465b46423bbac36bf2bf34a1e33e7dcdb8 DIST file012.fits 1019520 BLAKE2B e86d9e0004ca159d9a5ae0585776db65c7dd49162cb5dbd8b511686244950e33746d8a41f60b5ba8fcea220194fa87e16235adb7ccc0b4fb4b0a61e6c5c376a8 SHA512 45439544da478b24ccbcf14dc9a651aa8ecbce29b9992204d85c1eee42bc88b68802ec57bc148510da1e062de95ee53dd5c64c9bfa2e0b6cdfd945a78d1fc76a -DIST openimageio-2.5.12.0.tar.gz 52535046 BLAKE2B d60e823b8834c68098e771929475b7321363aad044b244a5c2a284e1c67a1a3145d22ed259eccbc4f6fbfcd6d2768414e4f22bdfa17f6516205d7749dcc6c6c8 SHA512 c6e53b5484702c66f01490d23f272e597e016b984d54f81e400605bf2a2e1dd7843ce25a7ef51ffbc7ee7089b42e8d73a91699b93cb655b5ca9ef869c9a950f4 DIST openimageio-2.5.13.1.tar.gz 52538869 BLAKE2B ceba0bde73cbf2b5b7b243fa1dc4806aece881c37775418c3305d5e5665e1c249219cad2c7b0d9d4acd5955897dc13dfb94e4627e9ae866e6400559b99e7021a SHA512 3c9eb9a361464e73fae518b704438bbf409c846031f05026d8b9ace91431819ac80674130ccd2300deb9756ae26e150bf5c0a866be3f3fb65bdfba0ba60395ab -DIST openimageio-2.5.9.0.tar.gz 52051925 BLAKE2B 7d499d80af6cdecfdea9a422030c095357b67a7d8dd281638e2e687df47b5c7b57c909c8682f1c6185251df13d6f9c7ddf1f9d5fc7fef26351fe0d4b8cc7d8c6 SHA512 554f61e19e3f81c8495f48386494a1aeee3a2a759b3022b4fb5cf1dba1dbc813cd0956b60d08a2c1feca69d97141e5836651fcbbeadab1e050eb2d103eb1c41f DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f DIST openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz 141224552 BLAKE2B e185f6b2bd345ca0740d1ac7bc48e5a283a80db0d2fa88566367e1179e96d048ac371708db29a6591d0c4eb7f9c171af22bac30fd68bc223e2c373db3b99077d SHA512 a3c9e4151c946b79e2eb37cd53fd2865d6117431ad06e4e35d42c10d9ff8415224e2f20e14af8dd869ec2a6c6faf4f9d8ef28e5b6556c88a54398de4a8843b59 -DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521 DIST tst0001.fits 43200 BLAKE2B 7d9d82fde64c3b21f8f86be6feaf9187d48c2c504c9afc0e652015512fb3d9e04c0f78596cdc9d7cc54815175549bfdf01d2d80f894cd36f4e6284aaf065dcc8 SHA512 b401accd51b56a493e2ec52fe4441e05cbefa3d03fe0e1c6834327094ab9f8e0c69a0f2cff26007ed7c7f8686a78a3a7e043d945f3a93c1b68e03668b8cbdc5c DIST tst0003.fits 152640 BLAKE2B 74c38c9f6cd65a46eff865589bd319111187d123c90bedc80f934caf6625f20120ecb30e8f5210c7d5d6609964e63fc2c2fc59f60bf609a07f2440421f44356e SHA512 4cd9c9a96fd3a5b8daae7d6b34af4c68c965abc4cc825aaaf9f3587a43328f468595ff1cd210e9fbca365bd52bf31a70abf39b2b3966d3087dd3af40ba0781a4 DIST tst0005.fits 48960 BLAKE2B ef8bb62702f579c8500721835100e150b2ca73272866a88457589d6f14b407efb41d106be2d454089dae00c04b903bb874132d5b44852245e6d4372ed20c7b6f SHA512 515a4dbca51e5b7fa0139b369066c02fcfa96eeffb471c6f5073343ab50da527ee610d9b677e6fabdaad1b7f9f9c68bd65eb71c5b944e5ffacf429d01fe14a39 @@ -23,7 +19,5 @@ DIST tst0006.fits 112320 BLAKE2B 1e3df92d994c1d0cfbf18956b124cc85510ae2dbbdbc528 DIST tst0007.fits 8640 BLAKE2B cf6eaff174e88bbd27f642964e6b3e5502cb08742d465a7cabb7aeaf284838f44660b5fa98c17df3c28f5986ecf657d8ec011579e3d9d62e63ce2171c157fd91 SHA512 ee8359132031678fa5e37f3b44642f41a7f64b251c3e788fbb756ad761327c1e1243df2b718cfe246449198d4e642b36fd43c61308ac434121ad4eadb3b2aaa3 DIST tst0008.fits 8640 BLAKE2B 7b4213cef2106cf0e298fce1ba3b28e74ba6ed26a2441650af297384b46c22910af8a36c2693c1c0e5aed6196561a8e4b4c75cde54541ea7a1a9d684a41f2f40 SHA512 c2dc77eb54cfc48bc97228a06e25cc5b4b2a8f32f417d5a34bb6794b020b277e144b1d5c71f09a44c94e05797c99f318de3f8705eabd22b44ac1b47fe601f918 DIST tst0013.fits 72000 BLAKE2B 6ca11cd033782adc8f359217e30752b47623c317aa155dc1bae43a0a019f7d5f9d4ba9c7349e99ee14f2d6498d5d166597606721b251b1b2dc039fbe400d00a3 SHA512 c816642e89e3bfdce38a4f755e84a12af35c9da48916abb66bcabf2f899201dfba3c988f929395092921a53a6d94922d84d325334e9bd8d348cdb305878ccb6a -EBUILD openimageio-2.5.12.0.ebuild 8173 BLAKE2B 9f2f0de7c572bb0faf773c7bd86e88e52e94ad174f585f688afe6bf9ee33b6808594119a8c750a751c36a87995a31b5a853ee828c01902f196b11130136eb0d8 SHA512 67de131af4ba7ee0e0db2be375dcfa5fdef0ff8d789f47e3ed535537e90404197f48bdaaf5ba23366e29de27ccfb14bd342ddfbb9159f54c7ed27086e4217ecf -EBUILD openimageio-2.5.13.1.ebuild 8173 BLAKE2B 9f2f0de7c572bb0faf773c7bd86e88e52e94ad174f585f688afe6bf9ee33b6808594119a8c750a751c36a87995a31b5a853ee828c01902f196b11130136eb0d8 SHA512 67de131af4ba7ee0e0db2be375dcfa5fdef0ff8d789f47e3ed535537e90404197f48bdaaf5ba23366e29de27ccfb14bd342ddfbb9159f54c7ed27086e4217ecf -EBUILD openimageio-2.5.9.0.ebuild 7112 BLAKE2B b7f47974a996bc81e5439f4a7ab84496c06dffe01ee96a33a85415f6b4341d2281b853123b7a4b116d83715ddf21481dd592ca4689426ae84f332e95d3ebac41 SHA512 c0119d58d7a34f0511c3fd7e4a941acd98b271719460b12c6ccbefa9f49ea10b18003f005553a6cc86e6425b57399452cd1b6e52c113c37bb0c63d22ae583885 +EBUILD openimageio-2.5.13.1.ebuild 8172 BLAKE2B 05996004cb5ce2d09ae25c0afbe6de0691b974133d7116c7648738eb1dffadc381f32bec7e8c74e6ef798390b32ef4a755a22f586fba31819687b5f0fcf2f505 SHA512 ad69a9ebdddc3e0623d8929ac233c74cf84fdea7ece4a5079835602f3fed31fd2930b9ff997bf59a1790f13660910677670ab6dd0bbc1c2146f9ea6f2b6c8f77 MISC metadata.xml 981 BLAKE2B 3497976625638ed812c74f4cceef74a752ab81f035674352d5b30f533c8b3f819a7cb44395d7e8456c78d92103ebe9c89bbf71aa292a2c72255674676e379318 SHA512 a349edcb5a9fcf5c7abe77d37260126b4866ba9bff06e7bc11279d91ac193ffe8df13dfcb373306fea417a28d0a6b8b2028c660adaf83d9a6f1a698cd48dd4e5 diff --git a/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch b/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch deleted file mode 100644 index 1ef05f817202..000000000000 --- a/media-libs/openimageio/files/openimageio-2.5.8.0-fits.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> -Make fits test images download optional -Make j2k test images download optional - -diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake -index b671def..ff84b7d 100644 ---- a/src/cmake/testing.cmake -+++ b/src/cmake/testing.cmake -@@ -410,6 +410,10 @@ function (oiio_setup_test_data) - oiio_get_test_data (openexr-images - REPO https://github.com/AcademySoftwareFoundation/openexr-images.git - BRANCH main) -+ if(ENABLE_FITS) - oiio_get_test_data (fits-images) -+ endif() -+ if(OPENJPEG_FOUND) - oiio_get_test_data (j2kp4files_v1_5) -+ endif() - endfunction () diff --git a/media-libs/openimageio/openimageio-2.5.12.0.ebuild b/media-libs/openimageio/openimageio-2.5.12.0.ebuild deleted file mode 100644 index bd837866d719..000000000000 --- a/media-libs/openimageio/openimageio-2.5.12.0.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="7d821f02c848022b2ee703d6bee48ca2acbfae70" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic python-single-r1 virtualx - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz - -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz - -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip ) - - fits? ( - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits - ) - ) -" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )" - -RESTRICT="!test? ( test )" - -BDEPEND=" - jpeg2k? ( app-arch/unzip ) - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - fits? ( sci-libs/cfitsio:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -PATCHES=( - "${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch" - "${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch" - "${FILESDIR}/${PN}-2.5.12.0-tests-optional.patch" - "${FILESDIR}/${PN}-2.5.12.0-heif-find-fix.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - if ! use dicom; then - rm "src/dicom.imageio" -r || die - fi - - if ! use gif; then - rm src/gif.imageio -r || die - fi - - if ! use jpeg2k; then - rm src/jpeg2000.imageio -r || die - fi - - if ! use raw; then - rm src/raw.imageio -r || die - fi - - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die - mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die - - if use fits; then - mkdir -p "${WORKDIR}/fits-images/"{ftt4b,pg93} || die - for a in ${A}; do - if [[ "${a}" == file*.fits ]]; then - cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/ftt4b/" || die - fi - if [[ "${a}" == tst*.fits ]]; then - cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/pg93/" || die - fi - done - fi - - if use jpeg2k; then - mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die - fi - - cp testsuite/heif/ref/out-libheif1.1{2,5}-orient.txt || die - eapply "${FILESDIR}/${PN}-2.5.12.0_heif_test.patch" - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - -DVERBOSE="yes" - -DINTERNALIZE_FMT="no" - # -DALWAYS_PREFER_CONFIG="yes" - # -DGLIBCXX_USE_CXX11_ABI="yes" - # -DTEX_BATCH_SIZE="8" # TODO AVX512 -> 16 - -DSTOP_ON_WARNING="OFF" - - -DCMAKE_CXX_STANDARD="17" - -DDOWNSTREAM_CXX_STANDARD="17" - - -DCMAKE_UNITY_BUILD_MODE="BATCH" - -DUNITY_SMALL_BATCH_SIZE="$(nproc)" - - -DBUILD_DOCS="$(usex doc)" - # -DBUILD_OIIOUTIL_ONLY="no" - -DBUILD_TESTING="$(usex test)" - - -DINSTALL_FONTS="OFF" - -DINSTALL_DOCS="$(usex doc)" - - -DENABLE_DCMTK="$(usex dicom)" - -DENABLE_FFmpeg="$(usex ffmpeg)" - -DENABLE_FITS="$(usex fits)" - -DENABLE_FREETYPE="$(usex truetype)" - -DENABLE_GIF="$(usex gif)" - -DENABLE_LibRaw="$(usex raw)" - -DENABLE_Nuke="no" # not in Gentoo - -DENABLE_OpenCV="$(usex opencv)" - -DENABLE_OpenJPEG="$(usex jpeg2k)" - -DENABLE_OpenVDB="$(usex openvdb)" - -DENABLE_TBB="$(usex openvdb)" - -DENABLE_Ptex="$(usex ptex)" - - -DENABLE_GIF="$(usex gif)" - -DENABLE_LIBRAW="$(usex raw)" - -DENABLE_PTEX="$(usex ptex)" - -DENABLE_OPENJPEG="$(usex jpeg2k)" - - -DOIIO_BUILD_TOOLS="$(usex tools)" - -DOIIO_BUILD_TESTS="$(usex test)" - -DOIIO_DOWNLOAD_MISSING_TESTDATA="no" - - -DUSE_CCACHE="no" - -DUSE_EXTERNAL_PUGIXML="yes" - # -DUSE_LIBCPLUSPLUS="yes" - -DUSE_R3DSDK="no" # not in Gentoo - -DUSE_PYTHON="$(usex python)" - -DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")" -) - - if use gui; then - mycmakeargs+=( -DUSE_IV="yes" -DUSE_OPENGL="yes" -DUSE_QT="yes" ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) - fi - else - mycmakeargs+=( - -DUSE_QT="no" - ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # A lot of tests needs to have access to the installed data files. - # So install them into the image directory now. - DESTDIR="${T}" cmake_build install - - CMAKE_SKIP_TESTS=( - "-broken$" - ) - - sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \ - -i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die - - local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH - CI=true - CMAKE_PREFIX_PATH="${T}/usr" - LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" - OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts" - - if use python; then - PYTHONPATH="${T}$(python_get_sitedir)" - fi - - virtx cmake_src_test - - # Clean up the image directory for src_install - rm -fr "${T:?}"/usr || die -} - -src_install() { - cmake_src_install - - # remove Windows loader file - if use python; then - rm "${D}$(python_get_sitedir)/__init__.py" || die - fi -} diff --git a/media-libs/openimageio/openimageio-2.5.13.1.ebuild b/media-libs/openimageio/openimageio-2.5.13.1.ebuild index bd837866d719..0e6c33de61fd 100644 --- a/media-libs/openimageio/openimageio-2.5.13.1.ebuild +++ b/media-libs/openimageio/openimageio-2.5.13.1.ebuild @@ -40,7 +40,7 @@ S="${WORKDIR}/OpenImageIO-${PV}" LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv" X86_CPU_FEATURES=( aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 diff --git a/media-libs/openimageio/openimageio-2.5.9.0.ebuild b/media-libs/openimageio/openimageio-2.5.9.0.ebuild deleted file mode 100644 index 091b7d122581..000000000000 --- a/media-libs/openimageio/openimageio-2.5.9.0.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 virtualx - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz - -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz - -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip ) - - fits? ( - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits - https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits - https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits - ) - ) -" -S="${WORKDIR}/OpenImageIO-${PV}" - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - jpeg2k? ( app-arch/unzip ) - doc? ( - app-text/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/imath-3.1.2-r4:= - >=media-libs/opencolorio-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - fits? ( sci-libs/cfitsio:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -PATCHES=( - "${FILESDIR}/${PN}-2.5.8.0-fits.patch" - "${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch" - "${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - if ! use dicom; then - rm -r "${S}/src/dicom.imageio/" || die - fi - - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die - mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die - if use jpeg2k; then - mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die - fi - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - -DCMAKE_CXX_STANDARD="17" - -DDOWNSTREAM_CXX_STANDARD="17" - - -DCMAKE_UNITY_BUILD_MODE="BATCH" - -DUNITY_SMALL_BATCH_SIZE="$(nproc)" - - -DOIIO_BUILD_TOOLS="$(usex tools)" - -DOIIO_BUILD_TESTS="$(usex test)" - -DOIIO_DOWNLOAD_MISSING_TESTDATA="OFF" - - -DBUILD_TESTING="$(usex test)" - -DBUILD_DOCS="$(usex doc)" - - -DINSTALL_FONTS="OFF" - -DINSTALL_DOCS="$(usex doc)" - -DSTOP_ON_WARNING="OFF" - -DUSE_CCACHE="OFF" - - -DUSE_EXTERNAL_PUGIXML="ON" - - -DENABLE_DCMTK="$(usex dicom)" - -DENABLE_FFMPEG="$(usex ffmpeg)" - -DENABLE_GIF="$(usex gif)" - -DENABLE_NUKE="OFF" # not in Gentoo - -DENABLE_OPENJPEG="$(usex jpeg2k)" - -DENABLE_OPENCV="$(usex opencv)" - -DENABLE_OPENVDB="$(usex openvdb)" - -DENABLE_PTEX="$(usex ptex)" - -DUSE_PYTHON="$(usex python)" - -DENABLE_LIBRAW="$(usex raw)" - -DENABLE_FREETYPE="$(usex truetype)" - - -DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")" - - -DVERBOSE="yes" - -DENABLE_FITS="$(usex fits)" - - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( - # -DENABLE_IV=OFF - -DUSE_QT=OFF - ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # A lot of tests needs to have access to the installed data files. - # So install them into the image directory now. - DESTDIR="${T}" cmake_build install - - CMAKE_SKIP_TESTS=( - "-broken$" - ) - - sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \ - -i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die - - local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH - CI=true - CMAKE_PREFIX_PATH="${T}/usr" - LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" - OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts" - - if use python; then - PYTHONPATH="${T}$(python_get_sitedir)" - fi - - virtx cmake_src_test - - # Clean up the image directory for src_install - rm -fr "${T:?}"/usr || die -} - -src_install() { - # NOTE both eclasses export src_install so we ran both by hand. - font_src_install - cmake_src_install -} diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest index 43298b8cadd0..69e2c89bf6e6 100644 --- a/media-libs/openjpeg/Manifest +++ b/media-libs/openjpeg/Manifest @@ -6,5 +6,5 @@ DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 34a1c39379d9f8f4caad6c8263a DIST openjpeg-data_20230923.tar.gz 498600318 BLAKE2B cf595b9f8690ad0b9616f080c3bfdaf553802912cd41015f86766085c0bd021cead294372bd9925c2a569fabbd9a0f1684bcf6eb1b5ecdc14d64231a76401a3b SHA512 3e1e3bb489eac6047671395fbf92bbfb2ad7c7c0206c1a233c215ba3d5b5263a6ce65d523f98fdaa4949e28eaa179716264f89eebf73b44c71373a9c86313cc1 EBUILD openjpeg-2.5.0-r5.ebuild 3016 BLAKE2B 58ccde41f1a927a062a7cc9600ff8e7a1224dc1fa2af44d4ed76e88bf03d85429dd2e2f3a56fc45377b779e0aa5fb246be88f645485d17b5c6bd6f27bb6c59ed SHA512 6cf06915de4bb0ca9b96ded1560322673ca98a82c5ad67e8f2b437f83d8b7819efa5a5cee6b9cd41e00e0bb0cbfa17b10d0cd707fb564c2d9d7e6f950c4aafcc EBUILD openjpeg-2.5.0-r6.ebuild 3019 BLAKE2B 390894e12a72f321302e6cffa4c77bd9ea6d2305968af8b5298d3066b7f4d97fa16da127afc5a0ed1637ed9bb834696d1da6023adaeab4ba395661d3672e8880 SHA512 7e21b4d51c87892ca5e1aff7da50db28285c5d298b324fe250c9cc162e0c7d21922668b4397d509dc0954654614fefe7834e888e6ebd109057f61ab2e29161b5 -EBUILD openjpeg-2.5.2.ebuild 2876 BLAKE2B c225c7a18c91fe6330d9643e280236ab933625aac9594032926930805d5813a84070c86755ae520d12e226d3c77f213b795942627a6bf509a7c955d3fbf19ab5 SHA512 001248732949c590d79f61714367b4f8080d6863ff7b819ff164c62075f3bac12bd5d703cc1ff8f57265e1115b8a1efb55b9e903d61e21edcf1a8b86588766f7 +EBUILD openjpeg-2.5.2.ebuild 2868 BLAKE2B f96d6dd0cf58d628a97695109d75c181ca257628913553f0f628316d6694280aaf05d693cd494bd351431c1a591583f3a440a44ba49d0e42642f0912e1b8acaa SHA512 31b7f72d4d277c8e9ca1d705e7a5884f321dba42a164ca19f6186457753893234ed81a8997808e45c7ac273852f90e64bb56830c16a201f1dbedd11af2e8731e MISC metadata.xml 612 BLAKE2B ecbdd9706b1975ad5a9f5ba9957ee7e1cc7cf42e7dfcb3e8b8f9e1f9851b035ac3d997ec9515a181b52be5112dfa44e9d2f98eeb532b21bf353afedcee035181 SHA512 243f4e9e4bc1d851c97167ab8f19ac240ea12d1e53ea59e6709b6da7a810edeb8aa287d92e0334b6b09d2df7660cc64de2dd9af739b2f3daa6ff19dcc304fa8d diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild b/media-libs/openjpeg/openjpeg-2.5.2.ebuild index 65e0b670b719..cdd476b7fcc7 100644 --- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild +++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2" SLOT="2/7" # based on SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index b928aa45d7d3..a355edc91538 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,9 +1,7 @@ DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5 DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d -DIST osl-1.13.7.0.tar.gz 21774349 BLAKE2B 1fd731f14b8dce948d7995efadb63eec8ce028ed6b095db391d2dfedcbbd62ca3aad9cd5d7d40f94c9e358f952d841899103467a2f81b12a605ae8c8436a16ff SHA512 15ffc6a5eed44141672af3d7ddab5d97abacad2062cddb35ef2a8484538a9a9a86cbd7e7170deafcefd3b69df764bfd207685603ca17a2fbff4299ccd1afe569 EBUILD osl-1.12.14.0-r1.ebuild 9915 BLAKE2B 1066b5f8de5e64142f545025ee50eb7cfbc9bcb97ba3148363cf17c7962c997205df7341fb250b8b3acfcb10c19fe3259404aaa049e638fe8a12cd243b5a6049 SHA512 f56d81c78fb40713cbf5e1635275975d5801b6abbb876a2c67709a3c22ed5cbe521c153e8aa3865fc943675f5d15935244b18f99fed14d552db878877c620bde EBUILD osl-1.12.14.0.ebuild 3906 BLAKE2B 99da9664c5a9ea78af28d4ce67cc44ba9b446bcf46efc7ce2f5f57fafe6e3a51ed89f16681b8cd2be5afaf3d1b0cee9e5f2a8156547fca4945d0d2432ecb9b92 SHA512 db06490cc6dea73fa9e4c0dec4a4f0c605689ad8ec10710a44a0da718b9aada9524ba40cad6d6df75049ac50abbae0ad0fca595b7dd69429a45f49943d0f9cb5 EBUILD osl-1.13.10.0.ebuild 7681 BLAKE2B af39ddf672f0121c07efb623cca9260ecd0423bd885397ce7ca787b86c4f8fefabe5433259e69fa87b58f85d5905519e6835766b8e8e2fa813721a971a375aef SHA512 0073d65ff2063947aab3d8e1d05d4d043626392fb79d90ffb5b1f304695561494d4de9a460031f58bad9179e61191a08e67de7f5de284eabab8f8f86c3ea3efa -EBUILD osl-1.13.7.0.ebuild 11741 BLAKE2B 98ae068b097406fcbfeed428c051e3049a2a7b0feda20f4744664072d5be18ac2d6b5eeaf6e96d8573997ff0ba6da3240afb307f6a84f178d4915daa4ff6617a SHA512 74254e8793acc25a7429fb4915912f7f2f14cf810e83b0ad922be4ec6853f5cd8e12992bb7532d891b66bbf2078f89c46bd416b61e21c88487d4008ed48590ce EBUILD osl-9999.ebuild 7682 BLAKE2B 2088ec50cc26da7374f29f5da59f302f04c626010f687d9365dac517894ef101d7e15730d96efe109deb5adf0a44e34f3d32748258f5525589c19ca71c9f9e39 SHA512 5f1a8c990888f4af09b2676fe131dacaf13855a0ac49fc1c614b1e849c1b1afbbc4029b6c7258e1530190edf4db02374fff1b2db74a61434dc2658e0b0ef229c MISC metadata.xml 1162 BLAKE2B 56fc654915ef7d354844d8b9d99cbe1e2fa8ece1bf3ee2028847d8add16c663cab3110598ae78b7da05c6f3b06bc0926ff1797827c5b2750c03ec02d4c5effe2 SHA512 6e391782385aca530fb9526dd4675845aefd42d760555a7633b0daec2d2890e5d2ce93f39b4c297c1f1056e2c4607c228baba4a1875f05c47362abeb50455dba diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild deleted file mode 100644 index a8e64ed97c5f..000000000000 --- a/media-libs/osl/osl-1.13.7.0.ebuild +++ /dev/null @@ -1,462 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -# Check this on updates -LLVM_COMPAT=( {15..17} ) - -inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 - -DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage" - -if [[ ${PV} = *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git" -else - # If a development release, please don't keyword! - SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64" - S="${WORKDIR}/OpenShadingLanguage-${PV}" -fi - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-3)" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# TODO optix -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - >=media-libs/openexr-3:0= - >=media-libs/openimageio-2.4:= - $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT} - sys-devel/llvm:${LLVM_SLOT} - ') - sys-libs/zlib:= - optix? ( dev-libs/optix[-headers-only] ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}] - ') - ) - partio? ( media-libs/partio ) - gui? ( - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtopengl:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -pkg_setup() { - llvm-r1_pkg_setup - - use python && python-single-r1_pkg_setup -} - -src_prepare() { - if use optix; then - cuda_src_prepare - cuda_add_sandbox -w - fi - - sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/875836 - # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810 - filter-lto - - # pick the highest we support - local mysimd=() - if use cpu_flags_x86_avx512f; then - mysimd+=( avx512f ) - elif use cpu_flags_x86_avx2 ; then - mysimd+=( avx2 ) - if use cpu_flags_x86_f16c ; then - mysimd+=( f16c ) - fi - elif use cpu_flags_x86_avx ; then - mysimd+=( avx ) - elif use cpu_flags_x86_sse4_2 ; then - mysimd+=( sse4.2 ) - elif use cpu_flags_x86_sse4_1 ; then - mysimd+=( sse4.1 ) - elif use cpu_flags_x86_ssse3 ; then - mysimd+=( ssse3 ) - elif use cpu_flags_x86_sse3 ; then - mysimd+=( sse3 ) - elif use cpu_flags_x86_sse2 ; then - mysimd+=( sse2 ) - fi - - local mybatched=() - if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then - if use cpu_flags_x86_avx512f ; then - if use nofma; then - mybatched+=( - "b8_AVX512_noFMA" - "b16_AVX512_noFMA" - ) - else - mybatched+=( - "b8_AVX512" - "b16_AVX512" - ) - fi - fi - if use cpu_flags_x86_avx2 ; then - if use nofma; then - mybatched+=( - "b8_AVX2_noFMA" - ) - else - mybatched+=( - "b8_AVX2" - ) - fi - fi - elif use cpu_flags_x86_avx ; then - mybatched+=( - "b8_AVX" - ) - fi - - # If no CPU SIMDs were used, completely disable them - [[ -z "${mysimd[*]}" ]] && mysimd=("0") - [[ -z "${mybatched[*]}" ]] && mybatched=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local gcc - gcc="$(tc-getCC)" - - local mycmakeargs=( - -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA - -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp - - # std::tuple_size_v is c++17 - -DCMAKE_CXX_STANDARD="17" - - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DINSTALL_DOCS="$(usex doc)" - -DUSE_CCACHE="no" - -DLLVM_STATIC="no" - -DOSL_BUILD_TESTS="$(usex test)" - -DSTOP_ON_WARNING="no" - -DUSE_PARTIO="$(usex partio)" - -DUSE_PYTHON="$(usex python)" - -DPYTHON_VERSION="${EPYTHON/python}" - -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" - -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" - -DUSE_LIBCPLUSPLUS="$(usex libcxx)" - -DOSL_USE_OPTIX="$(usex optix)" - - -DOpenImageIO_ROOT="${EPREFIX}/usr" - ) - - if use debug; then - mycmakeargs+=( - -DVEC_REPORT="yes" - ) - fi - - if use gui; then - mycmakeargs+=( -DUSE_QT="yes" ) - if ! use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) - fi - else - mycmakeargs+=( -DUSE_QT="no" ) - fi - - if use optix; then - mycmakeargs+=( - -DOptiX_FIND_QUIETLY="no" - -DCUDA_FIND_QUIETLY="no" - - -DOPTIXHOME="${EPREFIX}/opt/optix" - -DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda" - - -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)" - -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)" - -DCUDA_VERBOSE_BUILD="yes" - ) - fi - - if use partio; then - mycmakeargs+=( - -Dpartio_DIR="${EPREFIX}/usr" - ) - fi - - cmake_src_configure -} - -src_test() { - # A bunch of tests only work when installed. - # So install them into the temp directory now. - DESTDIR="${T}" cmake_build install - - ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die - - if use optix; then - cp \ - "${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \ - "${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \ - "${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \ - "${BUILD_DIR}/bin/" || die - - # NOTE this should go to cuda eclass - addwrite /dev/nvidiactl - addwrite /dev/nvidia0 - addwrite /dev/nvidia-uvm - addwrite /dev/nvidia-caps - addwrite "/dev/char/" - fi - - CMAKE_SKIP_TESTS=( - "broken" - "^render" - - # broken with in-tree <=dev-libs/optix-7.5.0 and out of date - "^example-cuda$" - - # outright fail - "^transform-reg.regress.batched.opt$" - - # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 - "^derivs.opt.rs_bitcode$" - "^geomath.batched$" - "^matrix.batched$" - "^matrix.batched.opt$" - "^spline-reg.regress.batched.opt$" - "^transformc.batched$" - ) - - # These only fail inside sandbox - if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then - CMAKE_SKIP_TESTS+=( - # TODO: investigate failures - # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 - "^andor-reg.regress.batched.opt$" - "^arithmetic-reg.regress.batched.opt$" - "^array-assign-reg.regress.batched.opt$" - "^array-copy-reg.regress.batched.opt$" - "^array-length-reg.regress.batched$" - "^bug-outputinit.optix$" - "^bug-outputinit.optix.fused$" - "^bug-outputinit.optix.opt$" - "^bug-return.optix$" - "^bug-return.optix.fused$" - "^bug-return.optix.opt$" - "^closure-parameters.batched$" - "^closure-parameters.batched.opt$" - "^closure.batched$" - "^closure.batched.opt$" - "^debug-uninit$" - "^debug-uninit.batched$" - "^debug-uninit.batched.opt$" - "^debug-uninit.opt$" - "^debug-uninit.opt.rs_bitcode$" - "^derivs$" - "^derivs.batched$" - "^derivs.batched.opt$" - "^derivs.opt$" - "^exponential$" - "^exponential.opt$" - "^exponential.opt.rs_bitcode$" - "^filterwidth-reg.regress.batched.opt$" - "^geomath$" - "^geomath.batched.opt$" - "^geomath.opt$" - "^geomath.opt.rs_bitcode$" - "^getattribute-camera.batched$" - "^getattribute-camera.batched.opt$" - "^getattribute-shader.batched.opt$" - "^gettextureinfo-reg.regress.batched.opt$" - "^gettextureinfo-udim-reg.regress.batched.opt$" - "^gettextureinfo.batched$" - "^hyperb.batched.opt$" - "^hyperb.opt$" - "^hyperb.opt.rs_bitcode$" - "^initlist.batched$" - "^initlist.batched.opt$" - "^linearstep.batched$" - "^linearstep.batched.opt$" - "^loop.batched$" - "^loop.batched.opt$" - "^matrix$" - "^matrix-compref-reg.regress.batched.opt$" - "^matrix-reg.regress.rsbitcode.opt$" - "^matrix.opt$" - "^matrix.opt.rs_bitcode$" - "^matrix.rsbitcode.opt$" - "^message-no-closure.batched$" - "^message-no-closure.batched.opt$" - "^message-reg.regress.batched.opt$" - "^miscmath$" - "^miscmath.batched$" - "^miscmath.batched.opt$" - "^miscmath.opt$" - "^miscmath.opt.rs_bitcode$" - "^noise-cell.batched$" - "^noise-gabor-reg.regress.batched.opt$" - "^noise-gabor.batched$" - "^noise-gabor.batched.opt$" - "^noise-generic.batched$" - "^noise-generic.batched.opt$" - "^noise-perlin.batched$" - "^noise-perlin.batched.opt$" - "^noise-reg.regress.batched.opt$" - "^noise-simplex.batched$" - "^noise-simplex.batched.opt$" - "^noise.batched$" - "^opt-warnings.batched$" - "^opt-warnings.batched.opt$" - "^pnoise-cell.batched$" - "^pnoise-gabor.batched$" - "^pnoise-gabor.batched.opt$" - "^pnoise-generic.batched$" - "^pnoise-generic.batched.opt$" - "^pnoise-perlin.batched$" - "^pnoise-perlin.batched.opt$" - "^pnoise-reg.regress.batched.opt$" - "^pnoise.batched$" - "^pointcloud.batched$" - "^pointcloud.batched.opt$" - "^regex-reg.regress.batched.opt$" - "^select.batched$" - "^select.batched.opt$" - "^shaderglobals.batched$" - "^shaderglobals.batched.opt$" - "^smoothstep-reg.regress.batched.opt$" - "^spline-derivbug.batched$" - "^spline-derivbug.batched.opt$" - "^spline.batched$" - "^spline.batched.opt$" - "^splineinverse-ident.batched$" - "^splineinverse-ident.batched.opt$" - "^split-reg.regress.batched.opt$" - "^string$" - "^string-reg.regress.batched.opt$" - "^string.batched$" - "^string.batched.opt$" - "^string.opt$" - "^string.opt.rs_bitcode$" - "^struct-array-mixture.batched$" - "^struct-array-mixture.batched.opt$" - "^struct.batched$" - "^test-fmt-matrixcolor.opt.rs_bitcode$" - "^testoptix-noise.optix.opt$" - "^testoptix-reparam.optix.opt$" - "^texture-environment-opts-reg.regress.batched.opt$" - "^texture-opts-reg.regress.batched.opt$" - "^texture-wrap.batched$" - "^texture-wrap.batched.opt$" - "^transcendental-reg.regress.batched.opt$" - "^transform$" - "^transform.batched$" - "^transform.batched.opt$" - "^transform.opt$" - "^transform.opt.rs_bitcode$" - "^transformc$" - "^transformc.batched.opt$" - "^transformc.opt$" - "^transformc.opt.rs_bitcode$" - "^transformc.rsbitcode.opt$" - "^trig$" - "^trig-reg.regress.batched.opt$" - "^trig.batched$" - "^trig.batched.opt$" - "^trig.opt$" - "^trig.opt.rs_bitcode$" - "^vecctr.batched$" - "^vecctr.batched.opt$" - "^vector$" - "^vector-reg.regress.batched.opt$" - "^vector.opt$" - "^vector.opt.rs_bitcode$" - "^wavelength_color.optix$" - "^wavelength_color.optix.fused$" - "^wavelength_color.optix.opt$" - "^xml-reg.regress.batched.opt$" - - # diff - "^testoptix.optix.opt$" - ) - fi - - myctestargs=( - # src/build-scripts/ci-test.bash - '--force-new-ctest-process' - ) - - local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH - DEBUG=1 # doubles the floating point tolerance - CXXFLAGS="-I${T}/usr/include" - LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" - OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" - OSL_SOURCE_DIR="${S}" - - if use python; then - PYTHONPATH="${BUILD_DIR}/lib/python/site-packages" - fi - - cmake_src_test - - CMAKE_SKIP_TESTS=( - "^render-background$" - "^render-mx-furnace-sheen$" - "^render-mx-burley-diffuse$" - "^render-mx-conductor$" - "^render-microfacet$" - "^render-veachmis$" - "^render-ward$" - "^render-raytypes.opt$" - "^render-raytypes.opt.rs_bitcode$" - ) - - myctestargs=( - # src/build-scripts/ci-test.bash - '--force-new-ctest-process' - --repeat until-pass:10 - -R "^render" - ) - - cmake_src_test -} diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest deleted file mode 100644 index 598e85a2648a..000000000000 --- a/media-libs/phonon-gstreamer/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX phonon-gstreamer-4.10.0-wayland.patch 2179 BLAKE2B e596a9c542f24eb5cb0e5f724627f7950aff5946eb502cc61e9e674f0e5adaa6cf15747c815e0bc6e86125ecbcbdc39743fc810d365b7007ea939b53a3771639 SHA512 4c5817d048ea3b07d12ef64330e8329390e9a6683f9804072183487d13d860eafab8c21646784dce8b36a021b592a41c64b5ae61d6da2fcaf58a29da16f123ab -DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4 -EBUILD phonon-gstreamer-4.10.0-r1.ebuild 1041 BLAKE2B f8e34a6076a41a5a61001a90842440726e6b9f42e2467f84fd794589ff502aad22611c80d5e45abe46a74d415a305185fe7ebb084a8617db58d4a20eba49560b SHA512 a567e06ec74117e97c6b20a4b43e0638dcb9207d8e6e7c7a696707c5b2651b6a189af2977491d6c132cc2bf9b64f8dc02862bb557c89923368624c5057ac03c3 -MISC metadata.xml 408 BLAKE2B 07776659b5c1bb14bd28befa8caf94e3b2d46da3f71576aac663b01aa0a49ab3344245784e0091bb2ddc651011831e3a607e0bd75c295e9ccd9bea41f00ada24 SHA512 dc126debed190c51ffd8448d379dfa4a3268a800f70bb2356c0139b50de40dde6392db66d17d00a7cef91622ec0dfb99bf4bf54565bcaf62e76ea57edb7db1f7 diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch deleted file mode 100644 index ef1697a8395a..000000000000 --- a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bbbb160f30a394655cff9398d17961142388b0f2 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Wed, 17 Nov 2021 15:20:08 +0000 -Subject: [PATCH] Only create window handles for actual windows - -winId() creates a platform window for the given widget. This makes sense -for the topmost widget in a tree, we can't assume the parent widget is -the topmost widget. - -Doing this on XCB is confusing and wrong, but apparently harmless. Doing -this on wayland causes issues as we promote the parent window to a -subsurface but never show that window leaving things in a bizarre -corrupt state that leads to content not updating. - -BUG: 445196 ---- - gstreamer/videowidget.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gstreamer/videowidget.cpp b/gstreamer/videowidget.cpp -index bd27b21f..83fa9b9e 100644 ---- a/gstreamer/videowidget.cpp -+++ b/gstreamer/videowidget.cpp -@@ -158,7 +158,7 @@ void VideoWidget::setupVideoBin() - gst_object_unref(videopad); - QWidget *parentWidget = qobject_cast<QWidget*>(parent()); - if (parentWidget) { -- parentWidget->winId(); // Due to some existing issues with alien in 4.4, -+ parentWidget->window()->winId(); // Due to some existing issues with alien in 4.4, - // we must currently force the creation of a parent widget. - } - m_isValid = true; //initialization ok, accept input -@@ -171,8 +171,8 @@ void VideoWidget::setupVideoBin() - gst_object_unref(videopad); - QWidget *parentWidget = qobject_cast<QWidget*>(parent()); - if (parentWidget) { -- parentWidget->winId(); // Due to some existing issues with alien in 4.4, -- // we must currently force the creation of a parent widget. -+ parentWidget->window()->winId(); // Due to some existing issues with alien in 4.4, -+ // we must currently force the creation of a parent widget's window - } - m_isValid = true; //initialization ok, accept input - } --- -GitLab - diff --git a/media-libs/phonon-gstreamer/metadata.xml b/media-libs/phonon-gstreamer/metadata.xml deleted file mode 100644 index 52ea6e1ffca9..000000000000 --- a/media-libs/phonon-gstreamer/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> - </upstream> - <use> - <flag name="network">Enable network streaming support via libsoup</flag> - </use> -</pkgmetadata> diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild deleted file mode 100644 index e3281141130b..000000000000 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="phonon-backend-gstreamer" -inherit ecm kde.org - -DESCRIPTION="GStreamer backend for the Phonon multimedia library" -HOMEPAGE="https://community.kde.org/Phonon" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz" - S="${WORKDIR}/${MY_PN}-${PV}" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" -fi - -LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" -SLOT="0" -IUSE="alsa debug +network" - -DEPEND=" - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - media-libs/gst-plugins-base:1.0 - media-libs/gstreamer:1.0 - >=media-libs/phonon-4.10.60 - media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] - virtual/opengl -" -RDEPEND="${DEPEND} - network? ( media-plugins/gst-plugins-soup:1.0 ) -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}/${P}-wayland.patch" ) # KDE-bug 445196 diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest index a8e71b92f73f..a92ef0e7ea2f 100644 --- a/media-libs/plotutils/Manifest +++ b/media-libs/plotutils/Manifest @@ -7,5 +7,5 @@ AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7 EBUILD plotutils-2.6-r2.ebuild 1951 BLAKE2B 61b359ceee3fd071ce8697dda0d1adf5a49557c5a44c233bc5b624d8d2a9c8534c408956484b18447aaa5018d2305c7b9b0f67eb3ae69b59697e30e8f1d59be6 SHA512 e7ba267bfd35da25de1cdee136b866d241214ed8ec6c4b7630cd4750ebb6146fddacc02c5a7bdaa7f4e61ae0f5b680493408d2b7f9e89c42e193c84f8c1b1d00 -EBUILD plotutils-2.6-r3.ebuild 2052 BLAKE2B aaf0d565df1b63cef0744ec07dc7d7c536f1161d66ac2eab5ff34a2968a844306168d7ffd851e732ec1867640798bc594deb14e7963ef7702355ae202cc0a217 SHA512 fe699af4ab08e992df5fea9cb2612a3a222da835e92ca80e1e7bad0a5383aed2fa9cb7421590303adac97faf73bc0ce4ac2daa31b49cb275cab24d4d5d4b7d49 +EBUILD plotutils-2.6-r3.ebuild 2046 BLAKE2B 6df62493a2cf7466bff10bb601d0dcc337d1d32c6d95c4cf521fe5f11fc1c8d535cdc2c2fb41699866328201bec01142e37513d3af065cf14be54611557f42b0 SHA512 9c141df892f4f3490e5764a5f68b2563c464eb16973c80e043e37fdf779ba75370594866c8a422c529b7e86697efd4711b5904fcb70f8100f9d61dd647918556 MISC metadata.xml 266 BLAKE2B 8dc7c8e41cf8c2190d095f43854e0572b406aafcddb65f5edd577a97f2d1c83174e6eb3552785d95a4a2d064f22794427cbbec5809e25409aa3ada141284ba7c SHA512 6cc6a0d81ad8a450f5fea7ed8977424c16376dd2026223c98c77847785418a7401a4c755ee16fb1a8629fd985957afd57194e8e6a99a8dbe46d50ca16806e5db diff --git a/media-libs/plotutils/plotutils-2.6-r3.ebuild b/media-libs/plotutils/plotutils-2.6-r3.ebuild index b672831c46b9..9e99519f5a2f 100644 --- a/media-libs/plotutils/plotutils-2.6-r3.ebuild +++ b/media-libs/plotutils/plotutils-2.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+png X" DEPEND=" diff --git a/media-libs/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest index 00a7b8ac6ebf..406b44f025cf 100644 --- a/media-libs/pulseaudio-qt/Manifest +++ b/media-libs/pulseaudio-qt/Manifest @@ -1,5 +1,5 @@ -DIST pulseaudio-qt-1.5.0.tar.xz 36004 BLAKE2B ef61c70b1fdfc850c2cd0bde7621da9ff088347f1134b970eb2c5383b3f1dc2aa0d07a37d27b617c5647def3cda92fc745a847e9234826acc825d64d7e542426 SHA512 c0ce24c10b607b2866eb08bae14bac340de028bbf6ebfdd57ae8f9bd3bbb182cc681a124f20a4f309fd56c97598a33db07c6289d2c9801cc8f395cd424e588b8 DIST pulseaudio-qt-1.6.0.tar.xz 37232 BLAKE2B 6302ea3a2cedae8abe8b936b16766753c8995d3bc39c4217d1aeff3682d756191c2a82d3f04b4b40602de22e6cf8cecca2e28e4a9a528c1ccc472a6f5a9834b1 SHA512 4bf612efc5caf51cd177d26ebaba0bd11f9513ac65d0bece86c8171745ec824dc924cbb067d440b711be6eaf5ebcf84e9996286944de352df5fc7cf91142ac77 -EBUILD pulseaudio-qt-1.5.0.ebuild 660 BLAKE2B 56d8a2276ca6e3a9915a5624c2fab8c06cabe1b9b6de8d636be4252b59574a3a4f4cbd98e0161e2962d1d0b3e1b2850b261073925a4aa33d9ed8b894b695b7ed SHA512 26ba62de5490d70f5a708091a73319937680ef9b1a4d24d89b33b5df0f1ac31cd127112f01d7cd043e36bee277a6ea81c2c5e3379edbb3e3b8c39b4ba762f2cb -EBUILD pulseaudio-qt-1.6.0.ebuild 662 BLAKE2B 6c4587faa82deb3c4ba590c798447f4c4d87ec1888b98b117063670440b6dfb2cfb68a07d6540a1d05d7d9d9ecbd49e9e7be075d34ba3b5e36a835f924a63978 SHA512 07f102ea509dc292977161c910fa895506f278ace3379283ad74e7d3b5c132737545f9733b9d1b45889c2dbb69a1f0c5b740ca82639151449fdaf509592152ed +DIST pulseaudio-qt-1.6.1.tar.xz 38072 BLAKE2B 2d25c05ecc3f401ce4881ae1902f4b1798586bb61c758a7fcb150225c1223bc38c4a053db4502e7ff813d73cc4d34b4887a7f24c7d352893c0da02166768d66c SHA512 7bb79bdc77d2fd8d8be569f692fa0f63b3f000fe5db605c38220a572878120ebe505edc272c43f4a3b22c70f44ee2d8cd0a0be3015c3d7660764258eca62b459 +EBUILD pulseaudio-qt-1.6.0.ebuild 660 BLAKE2B 1b96738760d675d532cfd60f93dffb6106579bd624f6e762e28b45c98ab8e2f99d94831b3fa082e9edc455cfc4dfb6fb1c55259bbec450bff381b624a6f538a6 SHA512 b10456bd17683e4000ed718af874b3cd28bbfda2189a1e37a3111b743d3ddb4118f0efe9ff695fb449859c321cd7ceb37f03076ac7378a0b1ca1028a17bcde24 +EBUILD pulseaudio-qt-1.6.1.ebuild 662 BLAKE2B 6c4587faa82deb3c4ba590c798447f4c4d87ec1888b98b117063670440b6dfb2cfb68a07d6540a1d05d7d9d9ecbd49e9e7be075d34ba3b5e36a835f924a63978 SHA512 07f102ea509dc292977161c910fa895506f278ace3379283ad74e7d3b5c132737545f9733b9d1b45889c2dbb69a1f0c5b740ca82639151449fdaf509592152ed MISC metadata.xml 385 BLAKE2B 66910b8057aee5141d69520b1a4485d15182552cc027156ea4929987c66128fac2e06d2b5ae450692ffd8fac97fcdfdd27e30fc4ebc9915cad50e480af1425a6 SHA512 1b549f3f3e21a2a2dee45285ac8c7a61f4f06d8e6b4d7fdc42d8aa3c537a921c613faef3d57e36efa86a74117e7f71f54fcb4d7fca8c747980d63f314f4ba1db diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.0.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.0.ebuild index 50417aaad3b8..714faa3d4c02 100644 --- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.0.ebuild +++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.0.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" fi LICENSE="LGPL-2.1" diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.1.ebuild index 46af9297856c..50417aaad3b8 100644 --- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild +++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_QTHELP="true" ECM_TEST="true" -KFMIN=6.0.0 +KFMIN=6.3.0 QTMIN=6.6.2 inherit ecm kde.org @@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="LGPL-2.1" diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest index bf22d5279e96..1353800c1d4f 100644 --- a/media-libs/quarter/Manifest +++ b/media-libs/quarter/Manifest @@ -1,5 +1,8 @@ AUX quarter-1.1.0-find-qhelpgenerator-binary.patch 864 BLAKE2B dbffc6c53bb6834b8825b4c515c749a1fbaf378a7b03b9f9d2509ba72ca9ba363b800f26eed68421e4bca0a68f721e0ef360cd29ca95f465f4fca7ee3054b99d SHA512 23e9a0bb5a3cabe7f2c4e1b977d5a01973331416633fa3f44c1869d22d420a5e60c1d3d61853f422b6ce4340a8b3352031e4a6841fcb4be5c3b0cdf416087ae3 AUX quarter-1.2.1-cmake.patch 2049 BLAKE2B eec271da9ff2eab955f13f3a64abe862b316880d4f9c563a0ffdd799ea812bd61ef3f24796e9e35046e390e778234fcfe063a06441c13c2be7bc4e9e882289bc SHA512 e6542e5840cbbc7319e7844dd8303f75084af72aa8bb0530968dd1bc64abc439b5e6edf9161b8db90b2a17c626e4128befbf86434a9bf1d8949b3db08391b625 +AUX quarter-1.2.2-find-qhelpgenerator.patch 689 BLAKE2B b04f6f780dcc4f32e8f4ba5f612b2f494d7ba2f0edf854b768817a7e64c6021ada05af3861ea71c252f5614fde220bbf71637f2aaa1e6900726ca898c187d6de SHA512 05c82f3d0658f31917fbdbab6ce63ce5d82239a74502272b0cff1b81af039ff39041acc221527d3d7ae930f3617678505a2e614b038e0fca4ce82161172add63 DIST quarter-1.2.1-src.tar.gz 737236 BLAKE2B 91b332eb36ac1911449b923aabf6913a1901306c258f8e430f0c589774d1ad5991916863f14d6c3d35898a9756f7c68bd30287defe5deb04036f2dce4b8f135f SHA512 454e99ae8f65c9d8e425aaabc02f218357db4e4447a481680f75301d4102864c77da58a48144f2a9211d4de0bd9962b394ad48a832e89674291b94778e5ff96d +DIST quarter-1.2.2-src.tar.gz 6709135 BLAKE2B 7294236c446ba4389cc89987cf0c461a1414405142a7d943faf8fd215f3ad103994b2cee600b9b8fad56102a7046b3d59de5b6accb748924f8bac604d5ca180c SHA512 a8e0edf1ce6155aef52392a94dbc0f9692c98e295124ac2e7465bde5398f0716822e606b924194251091f7ae3dd39dd134d5a3fdd8a745f22a94c159553271a1 EBUILD quarter-1.2.1.ebuild 1762 BLAKE2B 3e2db6c6484b2c1eabfae4312f5294edda3d5669c716657fbe75b552f547530798267b2a9559d00d98558304e230c61043d303d31ab16344fce7405cb486b8a9 SHA512 c01632544c6e89fd1f29419976f33f75efdb47868217c599dc46f5e949af35b3b73f242752dec8be4eada69c883893951d763ac1880a1534364fa69f11a576bb -MISC metadata.xml 1095 BLAKE2B d49405831d4200b0294c6bdedee25ce91e91f8a74f69d279fa557ab85df3f4a84b4f65d8824375ef943bbdf135ec0affbbdd74459b7dc3d16c813816c6405ff0 SHA512 c6ddcec450816262a64df90e9f081c0a6eb7572d8d3d2ff0dcf5980263d84ac2425a1d49997072dd9d7baf8e27007944a46a96cfcdde12282e8fcbe84c47fd0a +EBUILD quarter-1.2.2.ebuild 1612 BLAKE2B 48e416db85a37ba7388578294cac07bd807e863406d224f79d920428ce0e3bd1cebe308644eb94ab84429caa8df300c0fdeb74d2aa9b4e23058971c926d33c66 SHA512 fcc75c898e46ddaf55732fdab59f01eae073c1df722c93bee3afc2ef9fe90ceedc84f60d6b922524a372d7b14cabd18e9065c69a15648150064255003f3309f9 +MISC metadata.xml 1161 BLAKE2B fba0231cf7c12a86d711e50a42d9ced67491624d32e9b79f0abeaa53f23116498be732efddf6b28e65dfd76ea611393e2c1bbc000177736026c38c2bb57e991f SHA512 9dcdbb125b996058b03ef3b69b3ac073298142213c65fb18ade17917252139a87635b4f157251be092c0546ce437a61daecdae12fe8d9b022fd5d2eb11ece104 diff --git a/media-libs/quarter/files/quarter-1.2.2-find-qhelpgenerator.patch b/media-libs/quarter/files/quarter-1.2.2-find-qhelpgenerator.patch new file mode 100644 index 000000000000..b031ff8c6c41 --- /dev/null +++ b/media-libs/quarter/files/quarter-1.2.2-find-qhelpgenerator.patch @@ -0,0 +1,20 @@ +--- a/CMakeLists.txt 2024-02-05 00:29:17.000000000 +0100 ++++ b/CMakeLists.txt 2024-10-13 17:20:53.412858588 +0200 +@@ -239,13 +239,10 @@ + endif() + endif() + if(QUARTER_BUILD_DOC_QTHELP) +- find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator") +- if(NOT QHG_LOCATION) +- message(FATAL_ERROR "Missing program Qt qhelpgenerator") +- else() +- set(GENERATE_QHP YES) +- mark_as_advanced(QHG_LOCATION) +- endif() ++ find_package(Qt6Tools REQUIRED Help) ++ get_target_property(QHG_LOCATION Qt6::qhelpgenerator LOCATION) ++ set(GENERATE_QHP YES) ++ mark_as_advanced(QHG_LOCATION) + endif() + + set(DOXYGEN_INTERNAL_DOCS NO) diff --git a/media-libs/quarter/metadata.xml b/media-libs/quarter/metadata.xml index 356911f89686..d0938058334e 100644 --- a/media-libs/quarter/metadata.xml +++ b/media-libs/quarter/metadata.xml @@ -21,6 +21,7 @@ </longdescription> <use> <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag> + <flag name="qch">Install API documentation in QCH format</flag> <flag name="qthelp">Build API documentation in QtHelp format</flag> </use> <upstream> diff --git a/media-libs/quarter/quarter-1.2.2.ebuild b/media-libs/quarter/quarter-1.2.2.ebuild new file mode 100644 index 000000000000..4f1146c8f8cc --- /dev/null +++ b/media-libs/quarter/quarter-1.2.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt" +HOMEPAGE="https://github.com/coin3d/coin/wiki" +SRC_URI="https://github.com/coin3d/quarter/releases/download/v${PV}/${P}-src.tar.gz" +S="${WORKDIR}/quarter" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug designer doc qch" + +REQUIRED_USE="qch? ( doc )" + +RDEPEND=" + dev-qt/qtbase:6[gui,opengl,widgets] + dev-qt/qttools:6[widgets] + media-libs/coin + virtual/opengl + designer? ( dev-qt/qttools:6[designer] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + qch? ( dev-qt/qttools:6[assistant] ) + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.1-cmake.patch + "${FILESDIR}"/${P}-find-qhelpgenerator.patch # bug 933432 +) + +DOCS=( AUTHORS NEWS README.md ) + +src_prepare() { + cmake_src_prepare + sed -e 's|/lib$|/lib@LIB_SUFFIX@|' \ + -i Quarter.pc.cmake.in || die +} + +src_configure() { + use debug && append-cppflags -DQUARTER_DEBUG=1 + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DQUARTER_BUILD_SHARED_LIBS=ON + -DQUARTER_BUILD_PLUGIN=$(usex designer) + -DQUARTER_BUILD_EXAMPLES=OFF + -DQUARTER_BUILD_DOCUMENTATION=$(usex doc) + -DQUARTER_BUILD_AWESOME_DOCUMENTATION=$(usex doc) + -DQUARTER_BUILD_DOC_MAN=$(usex doc) + -DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF + -DQUARTER_BUILD_DOC_QTHELP=$(usex qch) + -DQUARTER_BUILD_DOC_CHM=OFF + -DQUARTER_USE_QT6=ON + ) + use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON ) + cmake_src_configure +} diff --git a/media-libs/rnnoise/Manifest b/media-libs/rnnoise/Manifest index a1cbfe19cdba..85464066c316 100644 --- a/media-libs/rnnoise/Manifest +++ b/media-libs/rnnoise/Manifest @@ -1,4 +1,4 @@ AUX rnnoise-0.4.1_p20210122-configure-clang16.patch 4220 BLAKE2B b1ca6538b4210a82e5aa5193e4f91b17e3319d503fec45b7d8d1b4d2082133779ebfb1a045efc39702bfcd7d2c1f41375642cd938d8a401d757f57a2b6e87e79 SHA512 64f798f98113caf78b45d96264f3b072f8275e174c67f93a9994916c7066b6644a8f89d41a33aa679b28412cf394499963b66ea90895afc38c37487695fc5166 DIST rnnoise-1cbdbcf1283499bbb2230a6b0f126eb9b236defd.tar.bz2 137650 BLAKE2B a129c57116903770c8af2b8e34efc1e718370b9d7c2d211cdebd59b6dcc22bfe736a6a75564cab89a2bc0bb7fdf9e0b08ec02f686e5d42cbcd826b68e46686e4 SHA512 81e47dfe39502d3b5374b19374b2decd124a77dbfaa3dc7391f518a56f6a564100c8cd67d54f25aad10654f8aafab87b14d1950ba6479163af9eea08a69d9948 -EBUILD rnnoise-0.4.1_p20210122-r1.ebuild 1016 BLAKE2B b0d93c8aedd87c0e922d4c875e2fc5cc57c303b545acf5e2af9075f06ca874a7cdde856f7877e09f75672d0a07639c0ebc6228a8e256c837d41b38e8ae601856 SHA512 a27e0ec28b98652f6e346b1934a0dbddf0323c5a880cb2632c2646fa3d719e8392a5072518dd8444813195307b5344a11a2b0e586ba0c2e1b857e3c80448e481 +EBUILD rnnoise-0.4.1_p20210122-r1.ebuild 1080 BLAKE2B f935d9e617734cca095794b898aedbde19e179c7b82fa874cf8042bed8f0b682196d4c8a533684e5c6c1f2fe55ad8ac9e3f41689423f02ac7d5a15389bbc6929 SHA512 b3a68b5280621617ab0e2e4cc08f875668a4e360ac57b77f7ccfd10c6b8d8a2200699e771255235a6277e06da940cdb17a00a7b2c6f2e392d1f2069bc879ea63 MISC metadata.xml 410 BLAKE2B 4bb73f9210c791887bf87b9d6476c339ed077d8a9e2cca19a7c96fdd6634dd7217cd96e196dd52f112f79ae88b320651fa91ed7f3b13a7db1a5ae6fb4fa2f1ad SHA512 ee72d3f004691ec17c5c5b95e5c602757a4679d7eb92d31afb1394adf34b758829ea2d1fb049d25a7db24247331e58c22ccb322421fe956ec843c65f7ddc612e diff --git a/media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild b/media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild index 07d0f1cf8321..7499832df477 100644 --- a/media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild +++ b/media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="doc" +IUSE="doc examples" # NOTE: Documentation currently empty (version 0.4.1_p20210122) BDEPEND=" @@ -36,8 +36,8 @@ src_prepare() { src_configure() { local myeconfargs=( - --disable-examples $(use_enable doc) + $(use_enable examples) ) econf "${myeconfargs[@]}" } @@ -46,4 +46,5 @@ src_install() { default rm "${ED}/usr/share/doc/${PF}/COPYING" || die find "${ED}" -name '*.la' -delete || die + use examples && dobin examples/.libs/rnnoise_demo } diff --git a/media-libs/rtaudio/Manifest b/media-libs/rtaudio/Manifest index f15a20146809..4d900c7dcd4d 100644 --- a/media-libs/rtaudio/Manifest +++ b/media-libs/rtaudio/Manifest @@ -1,4 +1,6 @@ AUX rtaudio-5.1.0-cflags.patch 416 BLAKE2B 6bc60ee1056a56e84a349b9677ab20a00f50fc22e053e0a2a29167db5f631f57749e96c73bbe585adaa346b878b43c5529f10f18b7153b79c10a4ac418d3c04e SHA512 7afad0bf9b562a9ed91567509aacc94d0cb3d95d8241e2bb14b6c826a499a296b99b7ee13317b65fb3bf4bc2526f357c1a34a290290b3fbd82810a43c820fdbf DIST rtaudio-5.2.0.tar.gz 247110 BLAKE2B 1949885c3cbb2846e083fd25ec06ed5ca716563dd4c121f6985e2487488d88b9ffb62078185fe2f4261083c8c1ed4c3e8502d25614767d70d2ab316d77f51eeb SHA512 34e78522778db13d95d4465d7c6a808a63b34d4e1bd0b88113b6390f7b192017e405d0d9ac8fbb1151129627688626d17569dc47da420f7b4631892eb1adff11 +DIST rtaudio-6.0.1.tar.gz 254664 BLAKE2B 17a3893023147b2d68bdb1c827e41b721066cf1759ef1a904d3178ff28b54ba288831e96ad20e23308644800b14d81f9133727efb6012cf9cd01aa80c7ffea02 SHA512 085feb2673185460717ba45fc87254961e477823759e11281092c1ba13301303de1cd36aa9efeba0710cbf2c70f2e2f7f9e41173cf372ded528c41612b19acd5 EBUILD rtaudio-5.2.0.ebuild 1317 BLAKE2B 5e2150db24057aa3e25863d9a0640a8b947aaa79ef14fc78e247f0c0d217e6cdc63f45e2f1557c5cf8ebd3ee3bf50590c566caaec1f198ae2362c635f9da0e52 SHA512 08652c0435a672ba6bbb1674ef635b5d229f3f3b19f28d81720ae642c1ad8d39f5f07ce7538f0423389aec80e847184b7fc648a68ff54ab8934e23a5149933e9 +EBUILD rtaudio-6.0.1.ebuild 1317 BLAKE2B 0762d8b84e82f8be0010629577d9b4515fb496176567af0625864ec04076c1b52466613eb46d353a21a0a02379c51a460551edf35192c1779a4d0bbf760cacc8 SHA512 8e01743b3698fab61bdae36b298ab6ccba08f73d207095154096b137567619805dbdef300e35567b5350122f48178960431749f3922c7168585f4d69d177ec9a MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd diff --git a/media-libs/rtaudio/rtaudio-6.0.1.ebuild b/media-libs/rtaudio/rtaudio-6.0.1.ebuild new file mode 100644 index 000000000000..0cdeea0544f6 --- /dev/null +++ b/media-libs/rtaudio/rtaudio-6.0.1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A set of cross-platform C++ classes for realtime audio I/O" +HOMEPAGE="https://www.music.mcgill.ca/~gary/rtaudio/" +SRC_URI="https://github.com/thestk/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/7" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="+alsa doc jack pulseaudio static-libs" +REQUIRED_USE="|| ( alsa jack pulseaudio )" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + jack? ( + media-libs/alsa-lib + virtual/jack + ) + pulseaudio? ( media-libs/libpulse )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( app-text/doxygen ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.1.0-cflags.patch +) + +src_prepare() { + default + + # don't rebuild docs + export ac_cv_prog_DOXYGEN= + + eautoreconf +} + +src_configure() { + # OSS support requires OSSv4 + local myconf=( + $(use_enable static-libs static) + $(use_with jack) + $(use_with alsa) + $(use_with pulseaudio pulse) + --without-oss + ) + + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use doc; then + pushd doc + doxygen || die + popd + fi +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc README.md doc/release.txt + if use doc; then + dodoc -r doc/html + dodoc -r doc/images + fi + + find "${D}" -name "*.la" -delete +} diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index fed2514c571b..2e588ce30467 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,3 +1,5 @@ DIST rubberband-3.3.0.tar.bz2 223408 BLAKE2B 2dccdbadbb8a24f837e82e2399f3ca1f09e25bf332fc745252ef8d5b6c80f422a2708227690cc81d0cf10ea22c9f11b21f985c738079e3c80e9d97536758f0fd SHA512 0216c33a250d52d539ad7a0ec28ea94e6d4684a308a9cb62509221b3861f74717021bd79196a1f58a7715799757491f32e0475ad2ddb7884683bb9130c676591 +DIST rubberband-4.0.0.tar.bz2 236705 BLAKE2B 4de34fd67e1e9188177d2cf7c67ff69b9134e754b13a0a791eef788bd032ee8c306d249c08aae320bd64ad6da6cd1ff1a4cd2c0aee54be2caca5cac95b6a9a1e SHA512 975ceead691c9fb9cb8b876d00d5661986d85ba59a97bb3c17bc8a835e8aeaf0bc324dd43ffa20f2854e019572b404d37d5e4868a99076d422f279359c44a7b4 EBUILD rubberband-3.3.0-r1.ebuild 2423 BLAKE2B 783ca54ffc1478a42ec81607225b9af222d115f4bbcdcd5cac3b740ebfe7c245bb897c2c8de88663e0ee52ae89d7b24c879dfcdd2ac5df0e26a71e132fce2252 SHA512 97ec963fc6717e1b450248549ec3d8d0307b39726c0b6251dd2fb94a2f1444d533cf3333b4ded9a7705e8b4d347a5cf8040a211546af621520e04c60a6606b5d +EBUILD rubberband-4.0.0-r1.ebuild 2431 BLAKE2B ef9f100858b7270a5e4d7ea4a0c037a6400d7e833c9cd92e78d5bc28e3fed889457abcdf0badc6318b0ae64687ba3d2ef7fcdbd4cffcbc36609f4b24ab23aa4e SHA512 10d72bda01521015aa82404680a0c72c6499810753f905a74eddae286f0341307ea77da2276ddf30d938d806f2c66dd8926c9d977baed66df851360917b37e85 MISC metadata.xml 542 BLAKE2B 3a2847c1efdc85bd471215d4ab69c44a8e209e701de1d3aece7c1800dfc74107d6c93ea5736a3587a23146f2ed4a8a58f0829c305db9c32aebf92b9bfc8dff46 SHA512 852f9c71e2bce0df67a5a45bd7833472abc6e66dabe149a5a22938a0aef5c29477f2545d03fff5fe39e5eee14a21d30d0e7fcb7597f0b05c7570a0abf9265b54 diff --git a/media-libs/rubberband/rubberband-4.0.0-r1.ebuild b/media-libs/rubberband/rubberband-4.0.0-r1.ebuild new file mode 100644 index 000000000000..7238c2c72f38 --- /dev/null +++ b/media-libs/rubberband/rubberband-4.0.0-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib flag-o-matic toolchain-funcs + +DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program" +HOMEPAGE="https://www.breakfastquay.com/rubberband/" +SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="ladspa lv2 jni static-libs +programs test vamp" +RESTRICT="!test? ( test )" + +DEPEND=" + media-libs/libsamplerate[${MULTILIB_USEDEP}] + sci-libs/fftw:3.0[${MULTILIB_USEDEP}] + jni? ( >=virtual/jdk-1.8:* ) + ladspa? ( media-libs/ladspa-sdk[${MULTILIB_USEDEP}] ) + lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] ) + programs? ( media-libs/libsndfile[${MULTILIB_USEDEP}] ) + vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} + ppc? ( sys-devel/gcc:* ) +" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/boost[${MULTILIB_USEDEP}] ) +" + +EMESON_BUILDTYPE=release + +src_prepare() { + sed -i \ + -e "s/if have_jni/if get_option('jni')/g" \ + -e "s/if have_ladspa/if get_option('ladspa')/g" \ + -e "s/if have_lv2/if get_option('lv2')/g" \ + -e "s/if have_vamp/if get_option('vamp')/g" \ + -e "s/if have_sndfile/if get_option('cmdline')/g" \ + "meson.build" || die + + sed -i -e "s/type: 'feature', value: 'auto'/type: 'boolean', value: 'false'/g" "meson_options.txt" || die + + default +} + +multilib_src_configure() { + if use ppc ; then + # bug #827203 + # meson doesn't respect/use LIBS but mangles LDFLAGS with libs + # correctly. Use this until we get a Meson test for libatomic. + append-ldflags -latomic + elif tc-is-clang && [[ $(tc-get-cxx-stdlib) == libstdc++ ]] ; then + # bug #860078 + # undefined reference to `__atomic_is_lock_free' + append-ldflags -latomic + fi + + local emesonargs=( + -Dfft=fftw + -Dresampler=libsamplerate + -Ddefault_library=$(use static-libs && echo "both" || echo "shared") + $(meson_use ladspa) + $(meson_use lv2) + $(meson_use jni) + $(meson_use programs cmdline) + $(meson_use vamp) + $(meson_use test tests) + ) + use jni && emesonargs+=( + -Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux" + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test --timeout-multiplier=30 +} + +multilib_src_install_all() { + ! use jni && find "${ED}" -name "*.a" -delete +} diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest index 954d855f67f6..e6f7daa630a1 100644 --- a/media-libs/sdl-gfx/Manifest +++ b/media-libs/sdl-gfx/Manifest @@ -1,3 +1,4 @@ DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01 EBUILD sdl-gfx-2.0.26-r1.ebuild 1164 BLAKE2B 92fb8d384f19c99089d905d17af735d8a14064943f5dd6f6ca63f0a4324ca4852e7938a3a5e373fe93bb1d9cb0eb7077a161d0ca54207fc68f4378895e0923ad SHA512 102d297a2d5eed4195fa79d1f0c0999eb04f5d467f382b8d2bdf601b8764c5c95a54bbe46880272713b3e35c9963640295dd39a40ec5ba837dd485b3b8b33683 +EBUILD sdl-gfx-2.0.26-r2.ebuild 1046 BLAKE2B 4101c4fc00511a6d77138715f31137c59510bb281afde431b861a1261a4e3935e17643baf3a489a5fb1114e94637c844a87b3f37bd99f41d2a0a7c9dd6705a4a SHA512 d759c3e8d2f4dc10574c8245fcb4193763868e5f6fd9793f8798ce7f366a2d3a229e5eb60c58d8143414005179cf2de43044e2e2a535ffedcfcdb9cdbd25efd5 MISC metadata.xml 914 BLAKE2B 50c47db903b6572e0eac61ef4b47912eb69229007dcb3c0c041090c7941e7dc883c2d8d6207f025645b61204587446f0f0312360e50819ce059784b2fbf6cb3a SHA512 e1d39569f6049d4b44f358cac9e63a5b267865484327d551d5995778bb98c8f2a21c3ad4b956495d940b878cf55e7091823bcfd054b9c4306c134e328a3af763 diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r2.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r2.ebuild new file mode 100644 index 000000000000..f7192215325c --- /dev/null +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +MY_P="${P/sdl-/SDL_}" +DESCRIPTION="Graphics drawing primitives library for SDL" +HOMEPAGE="https://www.ferzkopp.net/joomla/content/view/19/14/" +SRC_URI="https://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="ZLIB" +SLOT="0/16" # libSDL_gfx.so.16 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc cpu_flags_x86_mmx" + +RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +src_prepare() { + default + sed -i -e 's/-O //' configure.in || die + mv configure.{in,ac} || die + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable cpu_flags_x86_mmx mmx) +} + +multilib_src_install_all() { + einstalldocs + + if use doc ; then + docinto html + dodoc -r Docs/* + fi + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index 0cc988029c90..8f92694daa57 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1,4 +1,6 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed DIST shaderc-2024.1.tar.gz 227211 BLAKE2B a4c9790cb117e4cf2d528ed294ef0599dc3c17ac367a4f658254ff9e161f82b3338a2d70a033fabcdb7a2925c2f4668ee89cfff0d4b88cd2b22fcfb3f2786ea9 SHA512 017d8625c66da7eb5b431f595b27a4ddf146aaa12ef56777cb8c3f7f0f15eb01c3286e5905c5268de55d07cc19d5ffae4d4c08987d105b0a6be74616a467b736 +DIST shaderc-2024.3.tar.gz 227490 BLAKE2B 0f9df6251b1a107c89a4e509c7a36f4035b5282f11e0b00cb7a1603b3212917894e805337d2404509b839dd9ac40aa19d8aa23bf6666b330dae2cfdabc18c9c6 SHA512 ba990054b3e50bd1c3e7decaca80b80dfade0f15505f6e89c455b7a114b8507931dff2c570ca81fd38882472e7d7014c417ca8f4c1117fc0e6825ea9f669222a EBUILD shaderc-2024.1-r1.ebuild 1902 BLAKE2B 1550d18346f423868f5016cade6320a0dc36021375bbe37655b548d36f577d2091479719a07aeb7a323503e7cdf6b900b99c0ff4fbc662f4c0f401c540492964 SHA512 be70ad1c285716139e7153b7c4e1a5da154334b77b3cc3557f3e93d79d06cb06ae11a96f02dc9c095dcef470410b02bc9378178316dd47b13c32afff53e57a96 -MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70 +EBUILD shaderc-2024.3.ebuild 1905 BLAKE2B 618b248e575675e4dd9b377e6440a5a25f502bd0ad3aa1ea14f44d55b46e06b5aba8f5a853c65545096251ad900951712c68edee15dcac04519165a944ec4cde SHA512 911ea3a270d2f64ace550182a0c7f8932e1e1d2dfeaa215669e9cba902c9be07d2b5aa8afdca9c3b49cd8eb2bbf76e7234e614b3535114ee4ce9ecf7a325f7e7 +MISC metadata.xml 328 BLAKE2B 90488589d89b69a7840eea25c4456ce0d1032d77c99dc6cbafa830d2d274e72b5075b3eaede07ae6b07f699fdbb8d894dd82beee25e5172fdd5171c753619b43 SHA512 ca9eaa48af61542d9110b28954241f98b19a91fe47483cd80ccf7f761302fc23f5455379958d535431292c70dbc27c6347185208245b738bd9bcdbf3ebaeba8b diff --git a/media-libs/shaderc/metadata.xml b/media-libs/shaderc/metadata.xml index eaf3f12b76b1..b3c9b55251a0 100644 --- a/media-libs/shaderc/metadata.xml +++ b/media-libs/shaderc/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>sarnex@gentoo.org</email> - <name>Nick Sarnie</name> - </maintainer> - <upstream> - <remote-id type="github">google/shaderc</remote-id> - </upstream> + <maintainer type="project"> + <email>vulkan@gentoo.org</email> + <name>Vulkan Project</name> + </maintainer> + <upstream> + <remote-id type="github">google/shaderc</remote-id> + </upstream> </pkgmetadata> diff --git a/media-libs/shaderc/shaderc-2024.3.ebuild b/media-libs/shaderc/shaderc-2024.3.ebuild new file mode 100644 index 000000000000..90e614d6c010 --- /dev/null +++ b/media-libs/shaderc/shaderc-2024.3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake-multilib python-any-r1 + +DESCRIPTION="Collection of tools, libraries and tests for shader compilation" +HOMEPAGE="https://github.com/google/shaderc" +EGIT_COMMIT="${PV}" +SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc" + +RDEPEND=" + >=dev-util/glslang-1.3.296.0:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-1.3.296.0[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-util/spirv-headers-1.3.296.0" + +BDEPEND="doc? ( dev-ruby/asciidoctor )" + +PATCHES=( + "${FILESDIR}"/${PN}-2020.4-fix-build.patch +) + +# https://github.com/google/shaderc/issues/470 +RESTRICT=test + +src_prepare() { + cmake_comment_add_subdirectory examples + + # Unbundle glslang, spirv-headers, spirv-tools + cmake_comment_add_subdirectory third_party + sed -i \ + -e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \ + glslc/test/CMakeLists.txt || die + + # Disable git versioning + sed -i -e '/build-version/d' glslc/CMakeLists.txt || die + + # Manually create build-version.inc as we disabled git versioning + cat <<- EOF > glslc/src/build-version.inc || die + "${P}\n" + "$(best_version dev-util/spirv-tools)\n" + "$(best_version dev-util/glslang)\n" + EOF + + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DSHADERC_SKIP_TESTS="true" + -DSHADERC_ENABLE_WERROR_COMPILE="false" + ) + cmake_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi && use doc; then + cmake_src_compile glslc_doc_README + fi + cmake_src_compile +} + +multilib_src_install() { + if multilib_is_native_abi; then + use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" ) + fi + cmake_src_install +} diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index 8773dff6d410..3d95108384a1 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1,5 +1,6 @@ AUX simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch 1175 BLAKE2B 6533dde5a029fef8bf3804855f11e703beb3e02c36f193343c3337590659e5562539fbe853914ad7287ca6cd840b432d0c71d2847da7c6884b714b5512af49c0 SHA512 1dc17b023ba8a9e07a9ae971d99d9200ce14374b106e648b4a6b62e06e0ebb34e01a635c9cacd6579b3606cf62448953e459c5b1ca45a21ede9e5c0c19b8812f DIST simage-1.8.3.tar.gz 829994 BLAKE2B 794ee3a1c71727af7e92839542470a4732584715b01cbfd5be7b34d8ea8295ca65f5634e10027e0e7e4eb36a024d31704ad31d9aa0a6ad6b66c08612879a1603 SHA512 193137bd00a322fe6c170d3ff318ac81e4cc685bdfa40a0415c5bb95802b6290174fea630eb79956f362b4e79fa0b60916976c63ef26d6a65a6a51d5d9f7de03 +EBUILD simage-1.8.3-r1.ebuild 2175 BLAKE2B e1ecf50ae26d882d1be0d70b2b8daa1d91d3675394a18f67ba6bf31fce759e40ba541a01bfc97114787923dcb473200d80367cfd8cfeea4723382a3fd4859503 SHA512 0ff7d96d095897f12ff23af0ac8ca356cb3554aa823528acdc28a0bdd3d2c258125535b6bfc701fcb476c90ed14acdeefd3857a8503ad9499f593bdb0a159cb8 EBUILD simage-1.8.3.ebuild 2335 BLAKE2B d7c97ee33cf75a66034abbc477bd01e87a66d163250e3178a6946f1581104e400dbad04db35056df125b947012cecfbd9cc437cf468fafe2ecb905ebac41b5ff SHA512 1bf68cc9a4e303f08a43317c5ea3d3e00e2bf960dbdb19b52865f8cebf89cbf791553cfc2a46665f14cc6e96846feb5d79c078a858d434c0469f06c25ad12877 -EBUILD simage-9999.ebuild 2195 BLAKE2B 618de67f99e1dd788a0deb7e841855bab3668e4645b82aba660400f254e1ad98a339901fd527558fdfa64cf2d0825f519d0595fea368530a8c70296f9870b46c SHA512 9ee520ed02d22469ff31ec572a3343d8499fe92f90a8b20879b97721089c155bc8a9b46ddd194772ab1ca015c8e0ad471b684408e82fa200dc33b91312f3aab5 +EBUILD simage-9999.ebuild 2175 BLAKE2B e1ecf50ae26d882d1be0d70b2b8daa1d91d3675394a18f67ba6bf31fce759e40ba541a01bfc97114787923dcb473200d80367cfd8cfeea4723382a3fd4859503 SHA512 0ff7d96d095897f12ff23af0ac8ca356cb3554aa823528acdc28a0bdd3d2c258125535b6bfc701fcb476c90ed14acdeefd3857a8503ad9499f593bdb0a159cb8 MISC metadata.xml 298 BLAKE2B bbb65357f89a126895f808f22a14211302edac1ef368ceea547a0cb8b0a4d62e50e61572a47a2d9a123d22f33f384cd7fe6b0604d78ce83701608db0725a076d SHA512 70fe0d52216ae4902962671d07b6667c1aad035e9d6a737700a44d3f0ef08670e965cf692dcb3fe106a0dd62125b9fd433bd980cc46a3be4d34cfef7d79da06e diff --git a/media-libs/simage/simage-1.8.3-r1.ebuild b/media-libs/simage/simage-1.8.3-r1.ebuild new file mode 100644 index 000000000000..73fd53ca3009 --- /dev/null +++ b/media-libs/simage/simage-1.8.3-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Image and video texturing library" +HOMEPAGE="https://github.com/coin3d/simage/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/coin3d/simage.git" +else + SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + S="${WORKDIR}/${PN}" +fi + +LICENSE="BSD-1" +SLOT="0" +IUSE="gif jpeg png qt6 sndfile test tiff vorbis zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + gif? ( media-libs/giflib:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:= ) + qt6? ( dev-qt/qtbase:6[gui] ) + sndfile? ( + media-libs/libsndfile + media-libs/flac:= + ) + tiff? ( + media-libs/tiff:=[lzma,zstd] + app-arch/xz-utils + app-arch/zstd:= + ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + media-libs/opus + ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( media-libs/libsndfile )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch +) + +DOCS=( AUTHORS ChangeLog NEWS README ) + +src_configure() { + local mycmakeargs=( + -DSIMAGE_BUILD_SHARED_LIBS=ON + -DSIMAGE_BUILD_EXAMPLES=OFF + -DSIMAGE_BUILD_TESTS=$(usex test) + -DSIMAGE_BUILD_DOCUMENTATION=OFF + -DSIMAGE_USE_AVIENC=OFF # Windows only + -DSIMAGE_USE_GDIPLUS=OFF # Windows + -DSIMAGE_USE_CGIMAGE=OFF # OS X only + -DSIMAGE_USE_QUICKTIME=OFF # OS X only + -DSIMAGE_USE_QIMAGE=$(usex qt6) + -DSIMAGE_USE_QT5=OFF + -DSIMAGE_USE_QT6=$(usex qt6) + -DSIMAGE_USE_CPACK=OFF + -DSIMAGE_USE_STATIC_LIBS=OFF + -DSIMAGE_LIBJASPER_SUPPORT=OFF + -DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile) + -DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis) + -DSIMAGE_EPS_SUPPORT=ON + -DSIMAGE_MPEG2ENC_SUPPORT=ON + -DSIMAGE_PIC_SUPPORT=ON + -DSIMAGE_RGB_SUPPORT=ON + -DSIMAGE_TGA_SUPPORT=ON + -DSIMAGE_XWD_SUPPORT=ON + -DSIMAGE_ZLIB_SUPPORT=$(usex zlib) + -DSIMAGE_GIF_SUPPORT=$(usex gif) + -DSIMAGE_JPEG_SUPPORT=$(usex jpeg) + -DSIMAGE_PNG_SUPPORT=$(usex png) + -DSIMAGE_TIFF_SUPPORT=$(usex tiff) + ) + cmake_src_configure +} diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-9999.ebuild index fce11a8bd619..73fd53ca3009 100644 --- a/media-libs/simage/simage-9999.ebuild +++ b/media-libs/simage/simage-9999.ebuild @@ -8,7 +8,7 @@ inherit cmake DESCRIPTION="Image and video texturing library" HOMEPAGE="https://github.com/coin3d/simage/" -if [[ ${PV} = *9999 ]]; then +if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/coin3d/simage.git" else @@ -50,7 +50,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch ) -DOCS=(AUTHORS ChangeLog NEWS README) +DOCS=( AUTHORS ChangeLog NEWS README ) src_configure() { local mycmakeargs=( @@ -63,7 +63,6 @@ src_configure() { -DSIMAGE_USE_CGIMAGE=OFF # OS X only -DSIMAGE_USE_QUICKTIME=OFF # OS X only -DSIMAGE_USE_QIMAGE=$(usex qt6) - -DSIMAGE_USE_QT4=OFF -DSIMAGE_USE_QT5=OFF -DSIMAGE_USE_QT6=$(usex qt6) -DSIMAGE_USE_CPACK=OFF diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest index 10979de889eb..6d89d5f9274d 100644 --- a/media-libs/spandsp/Manifest +++ b/media-libs/spandsp/Manifest @@ -1,3 +1,3 @@ DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4 -EBUILD spandsp-0.0.6-r3.ebuild 1840 BLAKE2B 297728b55535342595108961a32dd25f66668322e99299744eff22453809a708a7a54333dedf71eb5f2cd993cac266cc460762aec1cc07118c54a07834d8c84d SHA512 61c58c4ed897d22264793e33ccb1afa6e79ce12b6322c9939e242ff540e6b35b17484f76ad6ecd6e7bb12af9c7bc91ce5f117d64d5e6763836d6eb0246e6f6a6 +EBUILD spandsp-0.0.6-r3.ebuild 1847 BLAKE2B de2e5b1b948554b39feb72eb3dd331316692e549c1d0a89de69a1b94d6af77c1d95c0a42073123314400361d588698962e3839002db503782ee1d25b286612fb SHA512 d1ccf441502bb9fee811cac05715909f97c94a6263d0a6d59b8c948b55884ec89d2ad699e801a4fbf2116abc9bf2b37e824a8d76d93324211b63e583708bd059 MISC metadata.xml 244 BLAKE2B 55f7bb21fa829b545045078abd465615b8e8d3ba8ce19e1acf7466d14d45d695d771d9d78983749f8e0290166f3eab703ea332169a4fda45427ad4baa6ff8512 SHA512 2dde78e90a526f069d855081163e58cbcd9cd9e0429eb1615c9ef8bc5af93bcea4d145333feedd8adcf8421e3417c7ebf0b03b98227cad03431f20cb014f080a diff --git a/media-libs/spandsp/spandsp-0.0.6-r3.ebuild b/media-libs/spandsp/spandsp-0.0.6-r3.ebuild index 96aa162cc7ac..875041e66c6a 100644 --- a/media-libs/spandsp/spandsp-0.0.6-r3.ebuild +++ b/media-libs/spandsp/spandsp-0.0.6-r3.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3" RDEPEND="media-libs/tiff:= diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest index f81708b5d6a4..9afc101f5878 100644 --- a/media-libs/sratom/Manifest +++ b/media-libs/sratom/Manifest @@ -1,3 +1,3 @@ DIST sratom-0.6.16.tar.xz 18940 BLAKE2B e78bc572d990ce6914f3276d1b110cb3ba01213f5a084d8548009bf9226107c820f9f86f4cf22ae8076dd9d44bdb5e8b4bc623f67759150fb267b6ccf673a1f7 SHA512 8e01eec642bff63745e8d99a814780ff34e4b79cc99699a1bb7ddac60da8808231d3b4a615a1d87464cbcf4dc26b8ec39e71688a268d493df71dc75892bf6479 -EBUILD sratom-0.6.16.ebuild 1237 BLAKE2B 589c68a30bf41722c268c1086fc3156fb152b859a5769340734bd70615a0ff124ba9f6a33dae76e75e1412fe49a2a5ab9ef0d5d7163531a5e930ff13181cb6bd SHA512 05999c9216cd63206e253e01bc1dfa7d9694ecef9010683da144fe4440be85272c08b8523a7d3aaa75dbd6a5562064fdad12523e697a5d8566edaad1165225cf +EBUILD sratom-0.6.16.ebuild 1237 BLAKE2B 4c766c1700c410d1636c31831716894dea6f2124ed742bfc7c6f5e0b9b1cc916d0fd9347fe33f30c693a0a7461547812fce6f9c856f989fbd54bce261a4a8380 SHA512 aff8980507428bddc3649691d86f46b956029734754b0306b65fa8aebd2aac8724001d858e9669c80bec0ab98c7a3bff4389c6f1e3914bbbce77cb3b4f19a7d2 MISC metadata.xml 377 BLAKE2B 84eb83054cb3e46b4951e9591d49532daa6bbdeb41932dfb331c11816e713f3d72286a2560ba876c065c07bda267af764c40443b01cfbe5d7873c35c582f66ac SHA512 9c5b079dac47c97ff426e2fdfd5c03a07f548b8b7f90df01058286c83b753dbe7d33d818722adcda1fbb2864c808146052cd472e0f0d47d41c3810eabf607f2f diff --git a/media-libs/sratom/sratom-0.6.16.ebuild b/media-libs/sratom/sratom-0.6.16.ebuild index 3ff1af7a3adc..adc8ca6c7a9e 100644 --- a/media-libs/sratom/sratom-0.6.16.ebuild +++ b/media-libs/sratom/sratom-0.6.16.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..13} ) PYTHON_REQ_USE='threads(+)' inherit meson-multilib python-any-r1 diff --git a/media-libs/svt-hevc/Manifest b/media-libs/svt-hevc/Manifest index e994397770e8..03c587ba4dcb 100644 --- a/media-libs/svt-hevc/Manifest +++ b/media-libs/svt-hevc/Manifest @@ -3,4 +3,4 @@ DIST svt-hevc-1.5.1.tar.gz 1220295 BLAKE2B e70dc07f74746cb69561818b642d8ce5efd9e EBUILD svt-hevc-1.5.1-r1.ebuild 722 BLAKE2B 89543bc747dd60295e48eb3bd5d2e8831c03a53bf6cdb637b9cb9b011c0714358f9698e79d8406a4fbbe892e39894e8870c3ea18376b46f96a9b04be7cca08cc SHA512 9c0f0aebb13ae80eea0eff5c0e202ecd7c8f102400d9d59b1ad75717f5f82e2a2f964661808a11bbc0df4c2f381717b6153215e12894d0fb5ce8b742a5f9c61a EBUILD svt-hevc-1.5.1.ebuild 648 BLAKE2B 02673e1c6187f6c88dfe5469d82657c3b0fcd1c63151464ebbe9ea14a7cf3e642203faeac14f7228fe890f58fc0388d38b4243d55ca33115928d33a90988ca37 SHA512 7f38654a9e6847d819df103d93eb344528455da41258905158c78e8a5d04791ab2ec24eed523b9a294720b8a43d3e58a61b5738b4eea3d768832cf8f77056598 EBUILD svt-hevc-9999.ebuild 722 BLAKE2B 89543bc747dd60295e48eb3bd5d2e8831c03a53bf6cdb637b9cb9b011c0714358f9698e79d8406a4fbbe892e39894e8870c3ea18376b46f96a9b04be7cca08cc SHA512 9c0f0aebb13ae80eea0eff5c0e202ecd7c8f102400d9d59b1ad75717f5f82e2a2f964661808a11bbc0df4c2f381717b6153215e12894d0fb5ce8b742a5f9c61a -MISC metadata.xml 336 BLAKE2B 0215dfef922463ea85c1de3dae1edaad331222d6ca91b4d6fdfe76651787ee693c42cc8b02d7469f03c07e23676ee5366d51c5e301b3a5d152c4246b46915268 SHA512 e0063b56e6b1176640728a548ed881930560aa3702b013240b49c2f20d1e9df5fa07532d7617cfda7c799d06f388847f5f1ff352c37b4122a2c8d9212a70cdc2 +MISC metadata.xml 337 BLAKE2B 0a83eeb3586fb26b89f08c5ef59ecafdbc9bfc4573e6e82c36aaff285e78a9f93ed77e761aee2212a1d45c15fb98e639fdcf0d32265546d448bf75018f3f6da5 SHA512 c014454888b5d9e175d6581b635f03a141306305d8e56a06b94c9c1b30f91bec093d35a62806f33b08de8f2ee4aed8e2be718971414974c6ff9accdd885a9c3c diff --git a/media-libs/svt-hevc/metadata.xml b/media-libs/svt-hevc/metadata.xml index 8d78ba1412a6..4beaa38e37d8 100644 --- a/media-libs/svt-hevc/metadata.xml +++ b/media-libs/svt-hevc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>media-video@gentoo.org</email> diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest index 0253ac98eb59..cba935f2f1a9 100644 --- a/media-libs/tg_owt/Manifest +++ b/media-libs/tg_owt/Manifest @@ -3,5 +3,5 @@ DIST libyuv-04821d1e7d60845525e8db55c7bcd41ef5be9406.tar.bz2 418856 BLAKE2B a72e DIST tg_owt-0_pre20230921.tar.gz 13726037 BLAKE2B 635342dd2127330542374e2f0f9acee91844c3c825fe4610dabe2996c541d9b3dc1681999910e5b591752f7e8f65a089c16b43216dd0c0b84f1a0e913e5a0213 SHA512 538d713e9ac91e9f676cdf301d11d7b5be0d67bda6283537e03b6322f3cca5c0234ff2f2b0b23e9046709f77ed282fc4d3526d3b21ee93478c50380be410372f DIST tg_owt-0_pre20240804.tar.gz 11722734 BLAKE2B 084bedf7ae20ba173244851e82749dba31ba1320d83d021876f12350ecaa2fb03e47857fdc8013c87df6cae6e9250ec78548b498f35a92d305a28070475f36e4 SHA512 12bc17f39569f8b09c793d0e65b82926325c8d9046454e385ef7c82ab26f4e39e8f44f7491c80be71743abd78565bca50023b62365437fc8e43fc23d1b64840b EBUILD tg_owt-0_pre20230921.ebuild 3929 BLAKE2B a28ef164c41e80fdca76aec17677aec37afa28686670b6dd376094558991476b2d2d7af6223da57aea97d6bd2bcd4c3b492997e18245ba455d8c3c4df14b98fd SHA512 a2a55e8eacbef27e8405746a91871f8e64c08fbc9ece42969b1cbf27d715a9f6f41723bc7176a57fc14b4a2401ec5a6def5f1772ba587331a01a2df441df693f -EBUILD tg_owt-0_pre20240804-r1.ebuild 3574 BLAKE2B dabca80c564ae7eb0c8985091bedc4b7285df34fb126a4caf971b0f51231f01362cda3239b49e2e9324aa17a62fee106218349ae8a5d07a87b1faed8bf596707 SHA512 fb5e4b2ba6469b225498b7a5b2665ce7c95b4e15b055af3fb71333da4cff419799da7ee56e718fd1bcdac034a14a1d48569f49665d2f43afb176d755dae9205c +EBUILD tg_owt-0_pre20240804-r1.ebuild 3573 BLAKE2B 47e94d8983e8d97ea50b7567afba0f6b0335a11a9f2cd8faf3b9da1e686b64f8f6888663d1281dcefb856208c01690f184738358ccbd233eaf7cb8b8e2a19b58 SHA512 a32ca51d7496c12dc3ec5422bb7196dfefbf8b78dec4620c0ded7d11b985adb25f7e0da62f4dde0efb13b1cdc3456af19d8b18fa9cbcdd9cfacdf4687beb8f27 MISC metadata.xml 493 BLAKE2B ce75939609c6fdef8bce490ca81ba5a011c0a44746e9d813651c2dad5e29e66cc529789b90a61e484c1b13c4d51f0a6cc18988bc7992f9a68e532b6bec9906f2 SHA512 d7aa16d810350f42fb07d47a020363fa77f2a2bab07bd78b49f22afd1ddffc51bf0b55b9ac84ebd208dfc85779494144a75f33e209032c0db15567eb8ba4ebf1 diff --git a/media-libs/tg_owt/tg_owt-0_pre20240804-r1.ebuild b/media-libs/tg_owt/tg_owt-0_pre20240804-r1.ebuild index 59214057bbec..9b909cbcc72a 100644 --- a/media-libs/tg_owt/tg_owt-0_pre20240804-r1.ebuild +++ b/media-libs/tg_owt/tg_owt-0_pre20240804-r1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}" LICENSE="BSD" SLOT="0/${PV##*pre}" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv" IUSE="screencast +X" # This package's USE flags may change the ABI and require a rebuild of diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest index dcd7101b7ef7..582aad4c6805 100644 --- a/media-libs/vips/Manifest +++ b/media-libs/vips/Manifest @@ -1,3 +1,5 @@ DIST vips-8.15.2.tar.xz 18653840 BLAKE2B fa46d58d77ec835cbb7036764bcc40554a72c2d6a854adee31905d04cb189de131340f990b432293935bc8563236816d14fa45c08ba858de6b1be5ee3ea148ec SHA512 f746e4590f0105cb40dbb4ee35fe4b177acbf09d7fc4202f623812018030b9cfdfcbe585742724b35f40ef9b68717ebd015243f3db293086621d9eac3d89a5b2 +DIST vips-8.15.5.tar.xz 18652672 BLAKE2B bebd8078cb6cedffb4aee98aab17f62538439f81378b4953085ec0cd6e9ce2c6fb17831e77113980bc91c0ed4355d765c2008232b1cf64246467a9cd936e2245 SHA512 d8f87292fa395e108f36769accc64b67ea49aadbea4a6bd97fc457f340c0f78c0365a43ae4b14ac5f154e696a8b2abc100078a8c5ac58aae2dd1b04347fbf4d8 EBUILD vips-8.15.2.ebuild 4183 BLAKE2B e071640ea63ca130ef7d7c173d431d984c6f343a287ddfe4d3655a274de63bc23bf62cbab4d7d6007c86db334cbfc21abf4dcb21ddff81cf4c8d525b2373b195 SHA512 fa65617455189c2ccc9b76f423f3dea374f5237f12622fac05977818c70d027f2dfbe02ff110cfe53b621feb1e928ddf4d16b24e6d638adc2f3d0f2a7a15b728 +EBUILD vips-8.15.5.ebuild 4147 BLAKE2B fe0c41018b3c7f94b559ebe05084dc987bb4c8a88de3f56aab365e46bb91650813e8eae7a33724594878388c9160f6c7d44a9e22bedf6e9da152790ee1a1c4ab SHA512 7514160a4d6237d5d2d7edb19ab78b492947b5e6beb71e6ddf43ca1632803b5591b8ec4a4307b841ea2866814945c1c29655b328dd86b2552b65dfbbd2e459b8 MISC metadata.xml 1040 BLAKE2B c8af14c5f65716cb6dfa16319ac8411cde2151f846c9fe7ab8ac0484a032d4c9d11e03e0ab82c1817f26e70194df7b88f5fad2e7b8998c951238449ff8f1e9e2 SHA512 d00ecc6c916d40a2b3ac3fd64ce2089afa75261f8c388d65cd6c12ad72c327e8c56df26f0d46285ed39088fb457447970ca8d16141adb4febfd8057755f30f76 diff --git a/media-libs/vips/vips-8.15.5.ebuild b/media-libs/vips/vips-8.15.5.ebuild new file mode 100644 index 000000000000..d95b054a4b0f --- /dev/null +++ b/media-libs/vips/vips-8.15.5.ebuild @@ -0,0 +1,167 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit flag-o-matic meson python-single-r1 toolchain-funcs vala + +DESCRIPTION="VIPS Image Processing Library" +HOMEPAGE="https://libvips.github.io/libvips/" +SRC_URI="https://github.com/libvips/libvips/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1+ MIT" +SLOT="0/42" # soname +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE=" + archive deprecated doc exif fftw fits fontconfig graphicsmagick + gtk-doc heif +highway imagemagick imagequant +introspection +jpeg + jpeg2k jpegxl lcms matio openexr orc pango pdf +png python svg + test tiff vala webp +" +REQUIRED_USE=" + fontconfig? ( pango ) + graphicsmagick? ( imagemagick ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( jpeg png webp ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/expat + virtual/libintl + archive? ( app-arch/libarchive:= ) + exif? ( media-libs/libexif ) + fftw? ( sci-libs/fftw:3.0= ) + fits? ( sci-libs/cfitsio:= ) + fontconfig? ( media-libs/fontconfig ) + heif? ( media-libs/libheif:= ) + highway? ( >=dev-cpp/highway-1.0.5 ) + !highway? ( + orc? ( dev-lang/orc ) + ) + imagemagick? ( + graphicsmagick? ( media-gfx/graphicsmagick:= ) + !graphicsmagick? ( media-gfx/imagemagick:= ) + ) + imagequant? ( media-gfx/libimagequant ) + introspection? ( dev-libs/gobject-introspection ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( media-libs/openjpeg:= ) + jpegxl? ( media-libs/libjxl:= ) + lcms? ( media-libs/lcms:2 ) + matio? ( sci-libs/matio:= ) + openexr? ( media-libs/openexr:= ) + pango? ( + x11-libs/cairo + x11-libs/pango + ) + pdf? ( + app-text/poppler[cairo] + x11-libs/cairo + ) + png? ( media-libs/libpng:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') + ) + svg? ( + gnome-base/librsvg:2 + sys-libs/zlib:= + x11-libs/cairo + ) + tiff? ( media-libs/tiff:= ) + webp? ( media-libs/libwebp:= ) +" +DEPEND=" + ${RDEPEND} + pango? ( x11-base/xorg-proto ) + pdf? ( x11-base/xorg-proto ) + svg? ( x11-base/xorg-proto ) + test? ( + tiff? ( media-libs/tiff[jpeg] ) + ) +" +BDEPEND=" + dev-util/glib-utils + sys-devel/gettext + doc? ( + app-text/doxygen + media-gfx/graphviz + ) + gtk-doc? ( dev-util/gtk-doc ) + python? ( ${PYTHON_DEPS} ) + vala? ( $(vala_depend) ) +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + use vala && vala_setup + + sed -i "s/'vips-doc'/'${PF}'/" cplusplus/meson.build || die + + sed -i "/subdir('fuzz')/d" meson.build || die +} + +src_configure() { + # workaround for bug in lld (bug #921728) + tc-ld-is-lld && filter-lto + + local emesonargs=( + $(meson_use deprecated) + $(meson_use doc doxygen) + -Dexamples=false + $(meson_use gtk-doc gtk_doc) + $(meson_use vala vapi) + -Dcgif=disabled # not packaged, and not used to view gif (only saving) + $(meson_feature archive) + $(meson_feature exif) + $(meson_feature fftw) + $(meson_feature fits cfitsio) + $(meson_feature fontconfig) + $(meson_feature heif) + $(meson_feature highway) + $(meson_feature imagemagick magick) + -Dmagick-package=$(usex graphicsmagick GraphicsMagick MagickCore) + $(meson_feature imagequant) + $(meson_feature introspection) + $(meson_feature jpeg) + $(meson_feature jpeg2k openjpeg) + $(meson_feature jpegxl jpeg-xl) + $(meson_feature lcms) + $(meson_feature matio) + -Dnifti=disabled # not packaged + $(meson_feature openexr) + -Dopenslide=disabled # not packaged + $(meson_feature orc) # no-op if USE=highway is set + $(meson_feature pango pangocairo) + -Dpdfium=disabled # not packaged, can use poppler instead + $(meson_feature png) + $(meson_feature pdf poppler) + -Dquantizr=disabled # not packaged, can use imagequant instead + -Dspng=disabled # not packaged, can use libpng instead + $(meson_feature svg rsvg) + $(meson_feature tiff) + $(meson_feature webp) + $(meson_feature svg zlib) # zlib is currently only used by svgload.c + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + if use python; then + python_fix_shebang "${ED}"/usr/bin/vipsprofile + else + rm -- "${ED}"/usr/{bin/vipsprofile,share/man/man1/vipsprofile.1} || die + fi +} diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest index dc7562e15374..0d6c18ad36ea 100644 --- a/media-libs/virglrenderer/Manifest +++ b/media-libs/virglrenderer/Manifest @@ -3,6 +3,6 @@ DIST virglrenderer-0.10.4.tar.gz 3833794 BLAKE2B 45420e5085866a5e38543129cff0361 DIST virglrenderer-1.0.1.tar.gz 980054 BLAKE2B 59295d4c6d92079fe2e2d6c8d7e170052e3a8c2d26db661575d582b847f06cd0b3b6299a07e0bec0fd85192eca19a9d48c607679c4d0f6e9fc6ece7336efceee SHA512 9f3b29f06c6359ac385c199fa186e004b2d32fbb50e9ad01ffd16aaf076ac6d6bf93cf5c938ad76505c80cda8b644342a9f6703e493860ee962d67f413966714 EBUILD virglrenderer-0.10.1.ebuild 986 BLAKE2B 4f28dc90d6d1ec4f68cf7d562985040585e2e9c95b3837c12b125178c9bac1ca05344ce56124f4c63b4fa90c7df89ef968fab1b647ff7d36b917253f68bfd9dd SHA512 2b6fba8bd48bdb86dd30c2cc0cae050038f982752b5f7e4be909e03696346bec64e1684b0d8e88d110ba338f805205430a89c8f50493430ec55eb993e05fcde5 EBUILD virglrenderer-0.10.4.ebuild 986 BLAKE2B 4402204008bb9fb32cf173cefb2556adef42967827f9cf02aced4cfb7e9eb17c2189afd4fc0eddb4f0a16eb91c8efef9952c489504d7c7285565e9827ec614ac SHA512 329a8753a27787242f959aa39aedf8c12e2a1e4658929b2ff2ad27f04a593829cf00cb2a88e26c84470ff34c58dbdc8538a01b648e6df3ec5f2b155f7843a06a -EBUILD virglrenderer-1.0.1.ebuild 995 BLAKE2B 8984bdf201a66c8e384de4a8421fa5577be83de741b6ee131f107577401a0aa61a83c976fcdd7bf3a7e4bf78e266eb86ed4a90c67c82157bf7dc09611e1b24d1 SHA512 81d7fe86eec4d630e19ccfc31c37bf58c117c6cf6126d3ec6f28f184482f7f222dfa5ce58bf1aeed793b0300b73f38a813ce8b9a70c025c3cdc17ef08c6f8cb5 +EBUILD virglrenderer-1.0.1.ebuild 993 BLAKE2B 713d9e875d103f7e8ab160814dc63f9808ffbb575dc00e2d7ec43f199006835e0927c64e1544aa2c04e62405f3664f1db9284c261a8da885ff1fa1061981000f SHA512 b243d32bc220c2f2d460ca5782e4b4bd059598087b20e6f7c7056457570f7839dbddf79b589853ee64919afc50b390d07700a504dc6e3d227f236184945c8d91 EBUILD virglrenderer-9999.ebuild 981 BLAKE2B d798abe9def761f42aa79ef96db6110741c9a5aba7befbf5bb7f3883a91e3453140ebf0091e875b7da4db503aa81bb13e91f413e53a778f167cc7aedc3f7584c SHA512 510793d1db746994b53a6b45f8c5419b7b65793e4c466237c28e718df508b07e8a6008b55b2c2a53137b1472f2500cc087688a184144347af81218fa960d6d72 MISC metadata.xml 368 BLAKE2B 125cd5ea866b530a0b15934e162ee659031bcabd5bbe5144ae89c038060c52138cde9050bb62ac7e8402f55c2563c0d76951b3907e16105b7257f23cc128b32b SHA512 f0ea53773e25fe6ceee02e7a8d0c3d3849be30d949b6ee8e913799902d6c221b27494276da0b8c7c9149d9ee521d9084c04d8507e0bed9073a14cd73e62f1507 diff --git a/media-libs/virglrenderer/virglrenderer-1.0.1.ebuild b/media-libs/virglrenderer/virglrenderer-1.0.1.ebuild index 7447e0b2e3d9..913a7d03fa8a 100644 --- a/media-libs/virglrenderer/virglrenderer-1.0.1.ebuild +++ b/media-libs/virglrenderer/virglrenderer-1.0.1.ebuild @@ -13,7 +13,7 @@ else SRC_URI="https://gitlab.freedesktop.org/virgl/${PN}/-/archive/${P}/${MY_P}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" fi DESCRIPTION="library used implement a virtual 3D GPU used by qemu" diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index f7ab1baf8a6d..5685baae9563 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,4 +1,6 @@ DIST vulkan-layers-1.3.290.0.tar.gz 5270142 BLAKE2B cdd22f6dd3b4da9433cba1c0d0ace16961bad2d61279efca3a0d7e5ad885766f25377036f3418ba3ed4e93beeff717b8b45fc772e9e2ad8750a8aac0aec731d2 SHA512 9f1d512b4bafbcef586789e933f903c383bbb9644d0a978a390da16e03ee2395c39c9c7b622e437e1c74880409df0a3cfc3a44b066cc0efeaee8d1edb9349d26 +DIST vulkan-layers-1.3.296.0.tar.gz 5529046 BLAKE2B 42d321cff2cf7f6c0377b5deff298df60811026a4121dc3315610d53059e5db435494c138dfef5844d71e51536572bd8601dc496e88362f3c68ae0562680ac4f SHA512 457edee35a347456391c9b36bdf5d457f05210b6a8889d0623498582d3385bed474fbd7dae66406d20f70d96238ca752414eaa844b86b431ec7f8cf721d46d08 EBUILD vulkan-layers-1.3.290.0.ebuild 1641 BLAKE2B 44d07da896ab26a974bf33f8a9db8d9d8663fcf1ef2719c23cb63075ebd1255f0352ecc646392d68364098f1a3167353116095c04f3cc9d0ffc3d6c526bcfd68 SHA512 00a4248d84b41a0ce1d497c4686bc98a70fb3ad884a163e5008291a1376466c088e0cd85a8ff4dce19c395e8bc68e63a734e311c1bf2a8a5ee68d0461a49b0bc +EBUILD vulkan-layers-1.3.296.0.ebuild 1647 BLAKE2B b309abf84fc8299fce6289a6d1285d6b8beb06cc77ac4b07eb48a9cb6aada2d7dd30ba9d574b1eb325d23aa23d5b255bc679745675c7af01a0075701738f8cfb SHA512 b1bca6852c02f377db0c27991c46d307c9256ee414d22f4b607e05f1bb8fdca264cbf99802b5bdd1b3468257141d215c1ec7f7f82e305baff539e76176822e09 EBUILD vulkan-layers-9999.ebuild 1647 BLAKE2B b309abf84fc8299fce6289a6d1285d6b8beb06cc77ac4b07eb48a9cb6aada2d7dd30ba9d574b1eb325d23aa23d5b255bc679745675c7af01a0075701738f8cfb SHA512 b1bca6852c02f377db0c27991c46d307c9256ee414d22f4b607e05f1bb8fdca264cbf99802b5bdd1b3468257141d215c1ec7f7f82e305baff539e76176822e09 -MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095 +MISC metadata.xml 350 BLAKE2B 41220dc2f9acacd1ca6d16d8cf6beb8d7cb73ea3ee7c57b0b809cd1ad72b6c867da471c4c3e7cb1cee80233a105c2854cf54cd118e566b3dbc1a48418177513d SHA512 c2f13683f0ffdde16da90ec4852c1404d6eaa4cd738772b5d55f375713c598661d1f7b2b210f9127af794d19920412877f584f024d247f4e15ff56c641c79469 diff --git a/media-libs/vulkan-layers/metadata.xml b/media-libs/vulkan-layers/metadata.xml index 774f66bf730e..59d360e7b41f 100644 --- a/media-libs/vulkan-layers/metadata.xml +++ b/media-libs/vulkan-layers/metadata.xml @@ -2,12 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> - </maintainer> - <maintainer type="person"> - <email>sarnex@gentoo.org</email> - <name>Nick Sarnie</name> + <email>vulkan@gentoo.org</email> + <name>Vulkan Project</name> </maintainer> <upstream> <remote-id type="github">KhronosGroup/Vulkan-ValidationLayers</remote-id> diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.296.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.296.0.ebuild new file mode 100644 index 000000000000..de009aa28375 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.296.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=Vulkan-ValidationLayers +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} +fi + +DESCRIPTION="Vulkan Validation Layers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="wayland X" + +RDEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-cpp/robin-hood-hashing-3.11.5-r2 + ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] + ~dev-util/spirv-headers-${PV} + ~dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" + +QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so" + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" + -DCMAKE_SKIP_RPATH=ON + -DBUILD_WERROR=OFF + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DBUILD_TESTS=OFF + ) + cmake_src_configure +} + +multilib_src_install_all() { + find "${ED}" -type f -name \*.a -delete || die +} diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index 4c1633842497..08aab27c730c 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,4 +1,6 @@ DIST vulkan-loader-1.3.290.0.tar.gz 1711013 BLAKE2B 72c55f07537df0e0ad0fedb4a3b913cde9b6d5038370c0e92bf15ad9ee881f5910842a1b5ee00d370b93341aefbd141414b77e7ac8823d101a861829cd9f338b SHA512 42ecf05e498f6422cea9d6ef70df5a936536524c1ff4d8cb391b5c55dd409082a6b2fc2eee5b395306c782ca32a7344faceef3e5385b382fb5a7e6564cfce4b5 +DIST vulkan-loader-1.3.296.0.tar.gz 1719284 BLAKE2B 5e31e490b8e301ba7b8f0fe589e3056434701bac2897fe9b1b72651d7ac0268b9b63b72003664a30f20646c7c54987c75c765ab4e39fa994603ff56fea8be3fc SHA512 535b7f324348e9edf44ff6a6a6e9eabe6e3a4bfad79bef789d1dc0cbbe3de36b6495a05236323d155631b081b89c18bb8668c79d1f735b59fc85ebee555aa682 EBUILD vulkan-loader-1.3.290.0.ebuild 1544 BLAKE2B 2d4ba7295fefcfdc9c32247327748029e0d00d9e5ad775e27116646bdbd6474f0451b424fd579ef8b5f9a474abb02e6d127e8582c575bf049a59074c48050702 SHA512 9a4ee1bcde22751ba25b1a3295f419671356581844cc8e70cac8b3b3c05310eb9f3fca6b5d6aa71e5f7668aa1c07e92dfcf4105d90bd28f88f5298b8d50a9113 -EBUILD vulkan-loader-9999.ebuild 1550 BLAKE2B 2dd24a1cacbc9d5a5117d272ce7f8a18c240276544008ab76cdeaa57f1af9da0506efeba0dd7a9968777571742d9a9ddaf3ee0a14df32f13b0bf4a5f15837f6c SHA512 72871ceab060f3103deb936cb5903cae120de5d9c7669c698cf645816beea6642362f927f61fa13348de6faad0fbd8b1dc067e665012739560b4fb593992548b -MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34 +EBUILD vulkan-loader-1.3.296.0.ebuild 1572 BLAKE2B 023bfa83a067e51f5bd6fcf5da76c60bd5393fa4ab48f78d796363ead0e10b8fcccebbac0ba2206484ec9983b2c0a1c5f6ed88495470fef3687fe66221e9d129 SHA512 a2a7f4b8919152671c0f8af073d0bb41633984ee9cfec23d09146bc5175dd9a131aea0069bff6382016878933a33e2211403888476fbe31e31beb726e3ce9a0a +EBUILD vulkan-loader-9999.ebuild 1572 BLAKE2B 023bfa83a067e51f5bd6fcf5da76c60bd5393fa4ab48f78d796363ead0e10b8fcccebbac0ba2206484ec9983b2c0a1c5f6ed88495470fef3687fe66221e9d129 SHA512 a2a7f4b8919152671c0f8af073d0bb41633984ee9cfec23d09146bc5175dd9a131aea0069bff6382016878933a33e2211403888476fbe31e31beb726e3ce9a0a +MISC metadata.xml 429 BLAKE2B a0971a1631dc09134ba547210d48115cc0ad850414badc232db88d74f97da5a9c8d181ec489742d6c142ebffead1f3535d195ea15e12651c840f634bccf3bb67 SHA512 0c54fbb7b8147877cdeb919784db42cb12f7fc36286e7c3d83783493ad67e08e2486cb98c77f7ba201ac12e35678fdb53797acbd0f4f6a8b6a9e63f29573eedc diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml index ff730de5d43a..6f6cda3d3e3a 100644 --- a/media-libs/vulkan-loader/metadata.xml +++ b/media-libs/vulkan-loader/metadata.xml @@ -2,12 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> - </maintainer> - <maintainer type="person"> - <email>sarnex@gentoo.org</email> - <name>Nick Sarnie</name> + <email>vulkan@gentoo.org</email> + <name>Vulkan Project</name> </maintainer> <upstream> <remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id> diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.296.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.296.0.ebuild new file mode 100644 index 000000000000..837b7b745e47 --- /dev/null +++ b/media-libs/vulkan-loader/vulkan-loader-1.3.296.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=Vulkan-Loader +inherit flag-o-matic cmake-multilib toolchain-funcs + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} +fi + +DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="layers wayland X" + +DEPEND=" + ~dev-util/vulkan-headers-${PV} + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-base/xorg-proto + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" +PDEPEND="layers? ( media-libs/vulkan-layers[${MULTILIB_USEDEP}] )" + +multilib_src_configure() { + # Integrated clang assembler doesn't work with x86 - Bug #698164 + if tc-is-clang && [[ ${ABI} == x86 ]]; then + append-cflags -fno-integrated-as + fi + + local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" + -DCMAKE_SKIP_RPATH=ON + -DBUILD_TESTS=OFF + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" + ) + cmake_src_configure +} + +multilib_src_install() { + keepdir /etc/vulkan/icd.d + + cmake_src_install +} diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index 54f748200e95..837b7b745e47 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -27,6 +27,7 @@ DEPEND=" ~dev-util/vulkan-headers-${PV} wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( + x11-base/xorg-proto x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] ) diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest index ab71bf518c23..bf417574abd2 100644 --- a/media-libs/zxing-cpp/Manifest +++ b/media-libs/zxing-cpp/Manifest @@ -1,3 +1,5 @@ +AUX zxing-cpp-2.2.1-cmake.patch 842 BLAKE2B edcda3cda092597c54cdb1873ccd5b5187817f08d58a78a18415943756e7f432b54bf012e009626ceb7873d459b51970d9bd2c75a08424ab2ca17e169aa973cd SHA512 fb37b4ee81538f4ea524bfe274440c43c06365cbe8e6db2284ef4bb1f005b6ff61cc357d19b049c7ebba6e9afd363585932ae462680648aab6c1ed96d6d0e6b7 +AUX zxing-cpp-2.2.1-cxx20.patch 1033 BLAKE2B 47866787c62a18fa7424a70775ccf184432aa3cf49f8cd3db83b6974eadd498fa6b2831c6aa4d3f12134f9e8dd84010faee45943dfdccff8e88535034b9aab6a SHA512 90d2f6e41607f016e95e7e7f66251507c909e58dc3f589115244253276d8dd7607989c60f80ea7441f0b91e47fca383ba851922d96300a322feb3163fbac2e4c DIST zxing-cpp-2.2.1.tar.gz 891055 BLAKE2B c6a3343cd0389d930e83dd9db4d6aeca6d4dda715c22c0b10dd76460e9d55bdd8e994c2ac24ba5d5a4f5e2069fcb035b2e4651a380b6b39bcce4b90d0c754df8 SHA512 f1de8df783061a152a18cd9102ac0c579c40c76ab4a5ba9f30bcb8ddb532f3fac08736840a631adbf7c30a7fa00ce8d65625c8cd695288620601708e8f256a53 -EBUILD zxing-cpp-2.2.1.ebuild 675 BLAKE2B 59963c6847396675c94deddd29e84366bca5bd44ad95d62512d7fdcbabd51c1b294ea9f1e1aae37082c864896729d74e072d564b091754bb06898dfcac63ec68 SHA512 9c7ce6820eaee9c4573449b97c37b83cb620c0965d3f8d17bce5139231c256eb9e357b53b3298ac7a354f615102591186d87bb59df22c04fcf2792b05bf4977d +EBUILD zxing-cpp-2.2.1.ebuild 765 BLAKE2B 6d4754e55c03051d507b124d36a52adfbce81d7aa0d1c477ad4a5ed0a5694d0b43a4fcc6c932bd6086a3080a4cbf1114b4743996f48925861ea688934b919fcf SHA512 31218574b93f51eb72d471b312a1b321d632a0d2de1d38094e314d1d4e65f0ce8ba92cbdd56e0a5334a209242091c3a790f29b10b233f7d296e117325f3676e2 MISC metadata.xml 334 BLAKE2B a835ff2824bdf38aa06708b2f5e61bb22998a63855b7095e95474320717ed3e8f0ec753a324fefc5df0c83564a8f52c9660ac07bd1d37e33e95572a3fb2cac66 SHA512 bf2898872ed6586bb33a62f9f76be56f58c5e71b1b1a1414d5fc4e3629f1b0428b20bd864bc8c436b95b4b9e190d8103aa6ea74bc082a2d1cb65051f69bf812d diff --git a/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cmake.patch b/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cmake.patch new file mode 100644 index 000000000000..58bffda307a6 --- /dev/null +++ b/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cmake.patch @@ -0,0 +1,27 @@ +From 77475338af4920fe2568d69b2318a0d5e9be77ce Mon Sep 17 00:00:00 2001 +From: axxel <awagger@gmail.com> +Date: Fri, 15 Mar 2024 22:23:17 +0100 +Subject: [PATCH] cmake: if (NOT CMAKE_CXX...) should have been if (NOT DEFINED + CMAKE_CXX...) + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 678fa6b62b..d7a1d81c85 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,10 +61,10 @@ if(NOT BUILD_DEPENDENCIES IN_LIST BUILD_DEPENDENCIES_LIST) + message(FATAL_ERROR "BUILD_DEPENDENCIES must be one of ${BUILD_DEPENDENCIES_LIST}") + endif() + +-if (NOT CMAKE_CXX_STANDARD) ++if (NOT DEFINED CMAKE_CXX_STANDARD) + set (CMAKE_CXX_STANDARD 17) + endif() +-if (NOT CMAKE_CXX_EXTENSIONS) ++if (NOT DEFINED CMAKE_CXX_EXTENSIONS) + set (CMAKE_CXX_EXTENSIONS OFF) + endif() + diff --git a/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cxx20.patch b/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cxx20.patch new file mode 100644 index 000000000000..9d89c9a8b38f --- /dev/null +++ b/media-libs/zxing-cpp/files/zxing-cpp-2.2.1-cxx20.patch @@ -0,0 +1,29 @@ +From d98739ceaac1c477879b9c4fba89ea76dba2d539 Mon Sep 17 00:00:00 2001 +From: axxel <awagger@gmail.com> +Date: Sun, 22 Sep 2024 22:39:11 +0200 +Subject: [PATCH] cmake: switch to c++-20 by default for the core library + +I finally accept the incurred performance penalty from the position +independent DataMatrix detection by default. + +This is finally fixing #386. It also (sufficiently) fixes #822 and thereby +supersedes #836. +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b602712d79..fee4c68cdc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,7 +71,9 @@ if(NOT ZXING_DEPENDENCIES IN_LIST ZXING_DEPENDENCIES_LIST) + endif() + + if (NOT DEFINED CMAKE_CXX_STANDARD) +- set (CMAKE_CXX_STANDARD 17) ++ set (CMAKE_CXX_STANDARD 20) ++ # Allow the fallback to earlier versions if the compiler does not support it. ++ set(CMAKE_CXX_STANDARD_REQUIRED OFF) + endif() + if (NOT DEFINED CMAKE_CXX_EXTENSIONS) + set (CMAKE_CXX_EXTENSIONS OFF) diff --git a/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild b/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild index 1fac2dd0fe8e..e1dcb9341fc3 100644 --- a/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild +++ b/media-libs/zxing-cpp/zxing-cpp-2.2.1.ebuild @@ -14,6 +14,11 @@ SLOT="0/3" KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-cxx20.patch" # bug 939897 +) + src_configure() { local mycmakeargs=( -DBUILD_EXAMPLES=OFF # nothing is installed |