From 5d93bae2c1576ab817f482024a6d47592829407b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Sep 2024 12:28:41 +0100 Subject: gentoo auto-resync : 05:09:2024 - 12:28:40 --- media-libs/Manifest.gz | Bin 69625 -> 69625 bytes media-libs/gmmlib/Manifest | 2 + media-libs/gmmlib/gmmlib-22.5.1.ebuild | 41 ++++ media-libs/libva-intel-media-driver/Manifest | 2 + .../libva-intel-media-driver-24.3.3.ebuild | 57 +++++ media-libs/mesa/Manifest | 2 +- media-libs/mesa/mesa-9999.ebuild | 11 +- media-libs/netpbm/Manifest | 6 +- media-libs/netpbm/netpbm-11.2.10.ebuild | 265 +++++++++++++++++++++ media-libs/netpbm/netpbm-11.7.0.ebuild | 257 -------------------- media-libs/netpbm/netpbm-11.7.1.ebuild | 257 ++++++++++++++++++++ media-libs/oidn/Manifest | 4 +- media-libs/oidn/oidn-2.2.2.ebuild | 9 +- media-libs/oidn/oidn-2.3.0.ebuild | 9 +- media-libs/openpgl/Manifest | 6 +- media-libs/openpgl/metadata.xml | 2 +- media-libs/openpgl/openpgl-0.5.0-r1.ebuild | 14 +- media-libs/openpgl/openpgl-0.6.0.ebuild | 7 +- media-libs/phonon-vlc/Manifest | 2 - media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild | 32 --- media-libs/phonon/Manifest | 5 +- .../phonon/files/phonon-4.11.1-clang-16.patch | 38 --- media-libs/phonon/metadata.xml | 1 - media-libs/phonon/phonon-4.11.1-r2.ebuild | 55 ----- media-libs/vulkan-layers/Manifest | 2 +- .../vulkan-layers/vulkan-layers-1.3.290.0.ebuild | 2 +- media-libs/vulkan-loader/Manifest | 2 +- .../vulkan-loader/vulkan-loader-1.3.290.0.ebuild | 2 +- 28 files changed, 668 insertions(+), 424 deletions(-) create mode 100644 media-libs/gmmlib/gmmlib-22.5.1.ebuild create mode 100644 media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.3.ebuild create mode 100644 media-libs/netpbm/netpbm-11.2.10.ebuild delete mode 100644 media-libs/netpbm/netpbm-11.7.0.ebuild create mode 100644 media-libs/netpbm/netpbm-11.7.1.ebuild delete mode 100644 media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild delete mode 100644 media-libs/phonon/files/phonon-4.11.1-clang-16.patch delete mode 100644 media-libs/phonon/phonon-4.11.1-r2.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 2291ff4e90a2..1a99309ad1ba 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 0139acb46ec1..ae51bf9bc83b 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -4,8 +4,10 @@ AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a 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 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-9999.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9 diff --git a/media-libs/gmmlib/gmmlib-22.5.1.ebuild b/media-libs/gmmlib/gmmlib-22.5.1.ebuild new file mode 100644 index 000000000000..2a09f24b8f3d --- /dev/null +++ b/media-libs/gmmlib/gmmlib-22.5.1.ebuild @@ -0,0 +1,41 @@ +# 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/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest index 8bc66c038916..3d4e23ed551d 100644 --- a/media-libs/libva-intel-media-driver/Manifest +++ b/media-libs/libva-intel-media-driver/Manifest @@ -5,10 +5,12 @@ DIST intel-media-24.2.5.tar.gz 25860224 BLAKE2B 2d2cfe9b72a1271e98deae9b80321c49 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 EBUILD libva-intel-media-driver-24.1.5.ebuild 1512 BLAKE2B cf3863f914dca4ca54c2d52455cd2e278e4fa9570743fae517bef623d94d6202a10ef583c724193d0a3fcb169064f2efc4e09c0d0581dd24428fa6ac27f305ee SHA512 ed937550ae0e8944c8e0dc3f76177150bf0fb45e06a193cd410b4d9d6643446f298c1ebcf6b315c7192f6fc342465abce823d01dc0a7667b7336dc012d1925c3 EBUILD libva-intel-media-driver-24.2.5.ebuild 1513 BLAKE2B 12f5e2300d3fc0560a6bdbf73d15c3fe54eb71973912c93b089ad6700741f5dd2e180751d75c9f487462d3dd8ded18565c9268f1ed01118d0a8ddae2d2d345db SHA512 51fe6b32460a5d35466aceea3cdee22438bb0d4d2ecb1ea292158c4bf03db0c0e65d5333b1b228a0a92c8660b4e948559c761d240bcd00f5cd8636413d969c1a 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-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.3.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.3.ebuild new file mode 100644 index 000000000000..bc3be02793b7 --- /dev/null +++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.3.ebuild @@ -0,0 +1,57 @@ +# 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/mesa/Manifest b/media-libs/mesa/Manifest index fa3facc6e3ae..ba5e37ae6d43 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -24,5 +24,5 @@ EBUILD mesa-24.1.7.ebuild 13739 BLAKE2B 23b5b302962a028676b753f1bf71b85986445e64 EBUILD mesa-24.2.0.ebuild 13665 BLAKE2B 77bb4aebb4bc005d1a03fa4f34dc47380302b4b7f6614bc3cd6413fbc08b29d49677255e728d76168bed215a3048f2a11c27460c334d7933e3e106bc0b898d30 SHA512 ae6303ce7eb79a2ca55c82de2f95d6cde71350f6fd72f11ab043ff06215d860e13016e7af825b98b4aa082fed306091114c9d52734560da6c2fc1e329b0619af EBUILD mesa-24.2.0_rc4.ebuild 13665 BLAKE2B f2191d5fac54380bacaf3e4f71ed7fa854e95c6e23f779800d046cfbd758bca20908af8a4d0023bbf2a3078b9c6aa602eed6ba158b18c3cd516ec3085de683e8 SHA512 5a956ca54b19d4d755e23baccaaea48144c9bd894e65c05f6ca79dd6d3ebe5967fbb55186fe25774b3c6adcd56bde70fb15bbf998f7441c2042e6af003125b07 EBUILD mesa-24.2.1.ebuild 13665 BLAKE2B 77bb4aebb4bc005d1a03fa4f34dc47380302b4b7f6614bc3cd6413fbc08b29d49677255e728d76168bed215a3048f2a11c27460c334d7933e3e106bc0b898d30 SHA512 ae6303ce7eb79a2ca55c82de2f95d6cde71350f6fd72f11ab043ff06215d860e13016e7af825b98b4aa082fed306091114c9d52734560da6c2fc1e329b0619af -EBUILD mesa-9999.ebuild 13665 BLAKE2B 77bb4aebb4bc005d1a03fa4f34dc47380302b4b7f6614bc3cd6413fbc08b29d49677255e728d76168bed215a3048f2a11c27460c334d7933e3e106bc0b898d30 SHA512 ae6303ce7eb79a2ca55c82de2f95d6cde71350f6fd72f11ab043ff06215d860e13016e7af825b98b4aa082fed306091114c9d52734560da6c2fc1e329b0619af +EBUILD mesa-9999.ebuild 13493 BLAKE2B 57454a8ab031ba3a0aa41db56efa9a8c2fa47f7afda0af8b817316e43776f6babe3e24a9c239431a9b9646630ca98dca889fb13666a167c26818872f1a079962 SHA512 90d86f138a4f437c09514a1f6f4bf4504bf0dfc6ff18ce20206998ec02b2e1c0177e7aa2a750fbd4ce25c9017bae611b77a7d90225da22e61208c87fcc307042 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index a64eb1901f88..172d1f066e10 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -60,7 +60,7 @@ 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" + wayland +X xa +zstd" RESTRICT="!test? ( test )" REQUIRED_USE=" d3d9? ( @@ -77,7 +77,6 @@ REQUIRED_USE=" ) ) 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 ) ) @@ -413,6 +412,8 @@ multilib_src_configure() { ) fi fi + + emesonargs+=(-Dvulkan-layers=device-select,overlay) fi driver_list() { @@ -420,11 +421,6 @@ multilib_src_configure() { 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 @@ -440,7 +436,6 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dshared-glapi=enabled - -Ddri3=enabled -Dexpat=enabled $(meson_use opengl) $(meson_feature opengl gbm) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index a76134ebeeca..bad86f150423 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -4,8 +4,10 @@ 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 +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.0.tar.xz 3805348 BLAKE2B fa42e4806e9573a6dc6d2df3bde6e8318269a88669e6417022e7c5c6c995a46b7762acca47cb5eea301824d8ec78c57a29df34ec68fd3146d9e785271524e205 SHA512 b9cd20c568056a32314addce7d9d059e4c4475a36aabbaebf3f8e74ae4b127a62e8280a32dafd17a2cf1e06fa3f509818ddb5d11700132810b93ee65c933f099 +DIST netpbm-11.7.1.tar.xz 3805692 BLAKE2B af7d9374c0dbea1b77a02bb9ea371dd46faac4225cef179d5076ae3f41115b681728267a9cc84c8544f0217647206648242499043b15cf9e076f1c5e41c134ec SHA512 7a07a0d959944a95c51853d9a5392302de00ebd0c18a9039ceeaf4b398bf796c9079aa8c0c46865f4b19628c1bda29b60c9efec4ee7b7968db82ba3e83f5c079 +EBUILD netpbm-11.2.10.ebuild 7118 BLAKE2B 691585120dadc860069f371d13941daba39c2d6a93cec6d5d716a7587d67893e001ea93e591abcb9f7efa6663b6d77eb7d1b1eb5d73a6adc3a1983be2b4b3a88 SHA512 425210a4e383faf5e0d2a21288677e7d805803972a73b95c83f0097c88ba186f8c410dc62a1a12b6395a17cd820c82569e8be8d619cc12a6d5f3297bfba5ae92 EBUILD netpbm-11.2.9-r1.ebuild 7110 BLAKE2B f1286bc6c56a4665bb6eee95c22eb4280a502b6cde45d3eae15a3c61782fd8d8edc09e232e8dc112347bdf107bb1db0ad2c8812a68e0661a98566c9a454569e2 SHA512 b676b61d9b8b8a28a5e3fcf8be1dcb3d115fe31de714fbeba6c2187929e974ddeb789ef401abef83c28a58209020a333d903ed39807e0ce7639f367ddb308e7f -EBUILD netpbm-11.7.0.ebuild 6906 BLAKE2B ebe384a5f39da3e5a6976ed15cdbef152c9664701a8cecc33db5fd16cde9195a15b1e4513aae21567e81b116966d79d5af536252ff2405d92d05984d277ea4b7 SHA512 486d33ab4c49231325deda664bb321a4a65de18b33d1aebfeaea14753cfcbfc99e85c12d41dc713bcbdffb0273aa72d59b50f5d0f1a9df173f52792c04060901 +EBUILD netpbm-11.7.1.ebuild 6906 BLAKE2B ebe384a5f39da3e5a6976ed15cdbef152c9664701a8cecc33db5fd16cde9195a15b1e4513aae21567e81b116966d79d5af536252ff2405d92d05984d277ea4b7 SHA512 486d33ab4c49231325deda664bb321a4a65de18b33d1aebfeaea14753cfcbfc99e85c12d41dc713bcbdffb0273aa72d59b50f5d0f1a9df173f52792c04060901 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80 diff --git a/media-libs/netpbm/netpbm-11.2.10.ebuild b/media-libs/netpbm/netpbm-11.2.10.ebuild new file mode 100644 index 000000000000..1fefcc467f12 --- /dev/null +++ b/media-libs/netpbm/netpbm-11.2.10.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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". +# 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 + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="https://netpbm.sourceforge.net/" +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 ~ia64 ~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 +# some utilities execute /usr/bin/gs +# some installed programs are perl scripts +RDEPEND=" + dev-lang/perl + jbig? ( media-libs/jbigkit:= ) + jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) + png? ( + >=media-libs/libpng-1.4:0= + sys-libs/zlib + ) + postscript? ( + app-text/ghostscript-gpl + sys-libs/zlib + ) + rle? ( media-libs/urt:= ) + svga? ( media-libs/svgalib ) + tiff? ( >=media-libs/tiff-3.5.5:= ) + xml? ( dev-libs/libxml2 ) + X? ( x11-libs/libX11 ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-arch/xz-utils + app-alternatives/lex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/netpbm-10.86.21-build.patch + "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch + "${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 +) + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} + +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} + +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} + +netpbm_config_lib() { + usex ${1} -l${2:-$1} NONE +} + +# for bug #828127 +netpbm_cflags_for_build() { + if is-flagq -fPIC; then + echo -fPIC + fi +} + +src_prepare() { + default + + # make sure we use system libs + sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die + + # fix typo in a test + sed -i \ + -e 's:^o#! /bin/sh:#! /bin/sh:' \ + test/stdin-ppm3.test || die + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed -i \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + common.mk || die + sed -i \ + -e '/%.c/s: importinc$::' \ + common.mk lib/Makefile lib/util/Makefile || die + sed -i \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + GNUmakefile converter/other/Makefile other/pamx/Makefile || die + + # The postscript knob is currently bound up with a fork test. + if ! use postscript ; then + sed -i \ + -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ + converter/other/Makefile generator/Makefile || die + sed -i -r \ + -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e 's:lps-roundtrip.*::' \ + -e 's:pbmtextps-dump.*::' \ + -e 's:pbmtextps.*::' \ + test/Test-Order || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + sed -i \ + '2iexit 80' \ + test/ps-{alt-,flate-,}roundtrip.test || die + fi + + # the new postscript test needs +x + chmod +x test/lps-roundtrip.test || die + + # Do not test png if not built + if ! use png ; then + sed -i -E \ + -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + + sed -i -E \ + -e 's:(pamrgbatopng|pngtopnm).*::' \ + test/legacy-names.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/legacy-names.ok || die + sed -i \ + -e 's:png-roundtrip.*::' \ + -e 's:winicon-roundtrip.*::' \ + test/Test-Order || die + fi + + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl + # ppmpat-random is broken on musl + # bug #907295 + if use elibc_musl; then + sed \ + -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ + -e 's:ppmpat-random.*::' \ + -i test/Test-Order || die + fi +} + +src_configure() { + cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" + # Misc stuff + BUILD_FIASCO = N + SYMLINK = ln -sf + + # These vars let src_test work by default + PKGDIR_DEFAULT = ${T}/netpbm + RESULTDIR_DEFAULT = ${T}/netpbm-test + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + PKG_CONFIG = $(tc-getPKG_CONFIG) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + STATICLIB_TOO = $(usex static-libs Y N) + + # The var is called SSE, but the code is actually SSE2. + WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) + + # Gentoo build options + TIFFLIB = $(netpbm_config_lib tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N + JPEGLIB = $(netpbm_config_lib jpeg) + PNGLIB = $(netpbm_config_lib png) + ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) + LINUXSVGALIB = $(netpbm_config_lib svga vga) + XML2_LIBS = $(netpbm_config_lib xml xml2) + JBIGLIB = $(netpbm_config_lib jbig) + JBIGHDR_DIR = + JASPERLIB = NONE + JASPERHDR_DIR = + URTLIB = $(netpbm_config_lib rle) + URTHDR_DIR = + X11LIB = $(netpbm_config_lib X X11) + X11HDR_DIR = + EOF +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc #149843 + emake +} + +src_test() { + # The code wants to install everything first and then test the result. + emake install.{bin,lib,data} + emake check +} + +src_install() { + # Subdir make targets like to use `mkdir` all over the place + # without any actual dependencies, thus the -j1. + emake -j1 package pkgdir="${ED}"/usr + + if [[ $(get_libdir) != "lib" ]] ; then + mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die + fi + + # Remove cruft that we don't need, and move around stuff we want + rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die + + dodir /usr/share + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die + + doman userguide/*.[0-9] + dodoc README + + cd doc || die + dodoc HISTORY Netpbm.programming USERDOC + docinto html + dodoc -r ../userguide/*.html +} diff --git a/media-libs/netpbm/netpbm-11.7.0.ebuild b/media-libs/netpbm/netpbm-11.7.0.ebuild deleted file mode 100644 index a0a3d3f56e04..000000000000 --- a/media-libs/netpbm/netpbm-11.7.0.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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". -# 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 - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="https://netpbm.sourceforge.net/" -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/advanced" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 -# some utilities execute /usr/bin/gs -# some installed programs are perl scripts -RDEPEND=" - dev-lang/perl - jbig? ( media-libs/jbigkit:= ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) - png? ( - >=media-libs/libpng-1.4:0= - sys-libs/zlib - ) - postscript? ( - app-text/ghostscript-gpl - sys-libs/zlib - ) - rle? ( media-libs/urt:= ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:= ) - xml? ( dev-libs/libxml2 ) - X? ( x11-libs/libX11 ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-arch/xz-utils - app-alternatives/lex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/netpbm-10.86.21-build.patch - "${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 -) - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} - -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} - -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} - -netpbm_config_lib() { - usex ${1} -l${2:-$1} NONE -} - -# for bug #828127 -netpbm_cflags_for_build() { - if is-flagq -fPIC; then - echo -fPIC - fi -} - -src_prepare() { - default - - # make sure we use system libs - sed '/SUPPORT_SUBDIRS/s:urt::' -i GNUmakefile || die - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - -i common.mk || die - sed \ - -e '/%.c/s: importinc$::' \ - -i common.mk lib/Makefile lib/util/Makefile || die - sed \ - -e 's:pkg-config:$(PKG_CONFIG):' \ - -i GNUmakefile converter/other/Makefile other/pamx/Makefile || die - - # The postscript knob is currently bound up with a fork test. - if ! use postscript ; then - sed \ - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ - -i converter/other/Makefile generator/Makefile || die - sed -r \ - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ - -i test/all-in-place.{ok,test} || die - sed \ - -e 's:lps-roundtrip.*::' \ - -e 's:pbmtextps-dump.*::' \ - -e 's:pbmtextps.*::' \ - -i test/Test-Order || die - sed \ - -e '/^$/d' \ - -i test/all-in-place.ok || die - sed \ - '2iexit 80' \ - -i test/ps-{alt-,flate-,}roundtrip.test || die - fi - - # Do not test png if not built - if ! use png ; then - sed -E \ - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - -i test/all-in-place.{ok,test} || die - sed \ - -e '/^$/d' \ - -i test/all-in-place.ok || die - - sed -E \ - -e 's:(pamrgbatopng|pngtopnm).*::' \ - -i test/legacy-names.{ok,test} || die - sed \ - -e '/^$/d' \ - -i test/legacy-names.ok || die - sed \ - -e 's:png-roundtrip.*::' \ - -e 's:winicon-roundtrip.*::' \ - -i test/Test-Order || die - fi - - # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl - # pbmtext-utf8 requires locale, not available on musl - # ppmpat-random and pnmindex are broken on musl - # bug #907295 - if use elibc_musl; then - sed \ - -e 's:pbmtext-iso88591.*::' \ - -e 's:pbmtext-utf8.*::' \ - -e 's:ppmpat-random.*::' \ - -e 's:pnmindex.*::' \ - -i test/Test-Order || die - fi -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" - # Misc stuff - BUILD_FIASCO = N - SYMLINK = ln -sf - - # These vars let src_test work by default - PKGDIR_DEFAULT = ${T}/netpbm - RESULTDIR_DEFAULT = ${T}/netpbm-test - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - PKG_CONFIG = $(tc-getPKG_CONFIG) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - STATICLIB_TOO = $(usex static-libs Y N) - - # The var is called SSE, but the code is actually SSE2. - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) - - # Gentoo build options - TIFFLIB = $(netpbm_config_lib tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config_lib jpeg) - PNGLIB = $(netpbm_config_lib png) - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) - LINUXSVGALIB = $(netpbm_config_lib svga vga) - XML2_LIBS = $(netpbm_config_lib xml xml2) - JBIGLIB = $(netpbm_config_lib jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config_lib rle) - URTHDR_DIR = - X11LIB = $(netpbm_config_lib X X11) - X11HDR_DIR = - EOF -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc #149843 - emake -} - -src_test() { - # The code wants to install everything first and then test the result. - emake install.{bin,lib,data} - emake check -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${ED}"/usr - - if [[ $(get_libdir) != "lib" ]] ; then - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die - fi - - # Remove cruft that we don't need, and move around stuff we want - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - - dodir /usr/share - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die - - doman userguide/*.[0-9] - dodoc README - - cd doc || die - dodoc HISTORY USERDOC - docinto html - dodoc -r ../userguide/*.html -} diff --git a/media-libs/netpbm/netpbm-11.7.1.ebuild b/media-libs/netpbm/netpbm-11.7.1.ebuild new file mode 100644 index 000000000000..a0a3d3f56e04 --- /dev/null +++ b/media-libs/netpbm/netpbm-11.7.1.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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". +# 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 + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="https://netpbm.sourceforge.net/" +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/advanced" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 +# some utilities execute /usr/bin/gs +# some installed programs are perl scripts +RDEPEND=" + dev-lang/perl + jbig? ( media-libs/jbigkit:= ) + jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) + png? ( + >=media-libs/libpng-1.4:0= + sys-libs/zlib + ) + postscript? ( + app-text/ghostscript-gpl + sys-libs/zlib + ) + rle? ( media-libs/urt:= ) + svga? ( media-libs/svgalib ) + tiff? ( >=media-libs/tiff-3.5.5:= ) + xml? ( dev-libs/libxml2 ) + X? ( x11-libs/libX11 ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-arch/xz-utils + app-alternatives/lex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/netpbm-10.86.21-build.patch + "${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 +) + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} + +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} + +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} + +netpbm_config_lib() { + usex ${1} -l${2:-$1} NONE +} + +# for bug #828127 +netpbm_cflags_for_build() { + if is-flagq -fPIC; then + echo -fPIC + fi +} + +src_prepare() { + default + + # make sure we use system libs + sed '/SUPPORT_SUBDIRS/s:urt::' -i GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + -i common.mk || die + sed \ + -e '/%.c/s: importinc$::' \ + -i common.mk lib/Makefile lib/util/Makefile || die + sed \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + -i GNUmakefile converter/other/Makefile other/pamx/Makefile || die + + # The postscript knob is currently bound up with a fork test. + if ! use postscript ; then + sed \ + -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ + -i converter/other/Makefile generator/Makefile || die + sed -r \ + -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ + -i test/all-in-place.{ok,test} || die + sed \ + -e 's:lps-roundtrip.*::' \ + -e 's:pbmtextps-dump.*::' \ + -e 's:pbmtextps.*::' \ + -i test/Test-Order || die + sed \ + -e '/^$/d' \ + -i test/all-in-place.ok || die + sed \ + '2iexit 80' \ + -i test/ps-{alt-,flate-,}roundtrip.test || die + fi + + # Do not test png if not built + if ! use png ; then + sed -E \ + -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ + -i test/all-in-place.{ok,test} || die + sed \ + -e '/^$/d' \ + -i test/all-in-place.ok || die + + sed -E \ + -e 's:(pamrgbatopng|pngtopnm).*::' \ + -i test/legacy-names.{ok,test} || die + sed \ + -e '/^$/d' \ + -i test/legacy-names.ok || die + sed \ + -e 's:png-roundtrip.*::' \ + -e 's:winicon-roundtrip.*::' \ + -i test/Test-Order || die + fi + + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl + # ppmpat-random and pnmindex are broken on musl + # bug #907295 + if use elibc_musl; then + sed \ + -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ + -e 's:ppmpat-random.*::' \ + -e 's:pnmindex.*::' \ + -i test/Test-Order || die + fi +} + +src_configure() { + cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" + # Misc stuff + BUILD_FIASCO = N + SYMLINK = ln -sf + + # These vars let src_test work by default + PKGDIR_DEFAULT = ${T}/netpbm + RESULTDIR_DEFAULT = ${T}/netpbm-test + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + PKG_CONFIG = $(tc-getPKG_CONFIG) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + STATICLIB_TOO = $(usex static-libs Y N) + + # The var is called SSE, but the code is actually SSE2. + WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) + + # Gentoo build options + TIFFLIB = $(netpbm_config_lib tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N + JPEGLIB = $(netpbm_config_lib jpeg) + PNGLIB = $(netpbm_config_lib png) + ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) + LINUXSVGALIB = $(netpbm_config_lib svga vga) + XML2_LIBS = $(netpbm_config_lib xml xml2) + JBIGLIB = $(netpbm_config_lib jbig) + JBIGHDR_DIR = + JASPERLIB = NONE + JASPERHDR_DIR = + URTLIB = $(netpbm_config_lib rle) + URTHDR_DIR = + X11LIB = $(netpbm_config_lib X X11) + X11HDR_DIR = + EOF +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc #149843 + emake +} + +src_test() { + # The code wants to install everything first and then test the result. + emake install.{bin,lib,data} + emake check +} + +src_install() { + # Subdir make targets like to use `mkdir` all over the place + # without any actual dependencies, thus the -j1. + emake -j1 package pkgdir="${ED}"/usr + + if [[ $(get_libdir) != "lib" ]] ; then + mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die + fi + + # Remove cruft that we don't need, and move around stuff we want + rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die + + dodir /usr/share + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die + + doman userguide/*.[0-9] + dodoc README + + cd doc || die + dodoc HISTORY USERDOC + docinto html + dodoc -r ../userguide/*.html +} diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest index a44a14da182e..55b4ba6c22db 100644 --- a/media-libs/oidn/Manifest +++ b/media-libs/oidn/Manifest @@ -8,6 +8,6 @@ DIST oidn-2.3.0.tar.gz 75300547 BLAKE2B 88a5922b4db63c48ab69047dca8d1077205a6d7a EBUILD oidn-1.4.2.ebuild 707 BLAKE2B c8c98d1a61c78ae0524100200c9eb02c5d700e6afe043084d30910f822b1e5fb06c41d915ad4c85d213807484199d1d89ae72e86bc723a807015f9a76268f5b7 SHA512 06b247c86ffab4c4bb7ca0e9c9ebb6a20057a3eff294995eb9062c086b7d7e41f3d9e39e1e89c69924a76d5aaea41c5a8e1319a18f77e1a53b6d9bd9e58ea874 EBUILD oidn-1.4.3.ebuild 709 BLAKE2B 83d6551d7c82d920a8339ff43a7ec966e4cd0179b5c0077624b889b600e9123de4cbb690003fffceed311928c333059c22e8f5e397c20763bdfeac47a2f32843 SHA512 90bcc6567182303fc1d15aee57784538e784c5eaae4c80abbc6d0d195162ffb9dd0b0dcfdd05bacea5895df060cd3946d34de2d01ae3f76dfdcc6cc80476d5f3 EBUILD oidn-2.1.0.ebuild 1745 BLAKE2B 623facc91063e88b56fdc80546e9b1b233a9b245f2441ba20277d11a11959d27a2d5277848530231b26b5b91cd583a43ac3c3a26bc9434678192510ece924ba5 SHA512 42ce153e58919b7addc88adacc11c30c8b7de2813b9f5d6a15dbdfa9b31b2ac39b097077a598bd2f7b2bc693892d64e8111e93e5de30cea39a712fdea1c87a17 -EBUILD oidn-2.2.2.ebuild 2191 BLAKE2B eb83d6bd78509557526685805f24fb64b3e422cd4b3e3fbc3011196a16a6a9386587f056bda509779a01d55e41b4bf5a497fb96cbdc078f98bd1b518aa3dbffe SHA512 3c81dab899bd07b05e2bd97764217e24eeb8e6644f47c9bc75f663c4d8b31f657af72b811bbec39b3024db49ea5ebc1108446b60431edcc9878ef736b8c6139a -EBUILD oidn-2.3.0.ebuild 2192 BLAKE2B 43a1e3fa26d2245721072dfc2471e2b5a767314d56a5806b1233f22d75434dadf7bb160f4faf2f46ed71eb844bbe569012c0cb072ac8d789ad1007a150bc7570 SHA512 b774dafdca5a616fd04127442d2e40cb7c0486fbe0aa6269ab13cfec1eb7ccd20536d806d115bbd20962b650ad7596c0a3122edff1bfccd070cfea701bef4fc1 +EBUILD oidn-2.2.2.ebuild 2277 BLAKE2B 65c09afb70aea9e6fbf01c57926c52f494570a776539a817c605fb7ce12482d577001e3e2359986c46b2eefe9e84dfc5b00ae9f4109737eced0d44473892840d SHA512 db75325d2f90943b91090e51bfbfa6e9e9441c8a805628a6054b077adc4038e4ca4964a92a17333f7b5d2e4f28e90d74f77e94d8898405db1a60916eef76754b +EBUILD oidn-2.3.0.ebuild 2278 BLAKE2B eda8c4f7280e2abdff673620a0a6603a45f42f0f680ab6138dffe8a33d8eff12ca6e8a311ff5c58bb096dbdd584b5cf00c2d06d5c69db4b9d72e5701fa678f4c SHA512 0bfe7ab156981f2d33f61774c8349dd77c40ae8040b3098963ee44ac518b41c156fbd57bd3d8d81c61077d899da8f47ca7c98c241d10ea21dffe53bf080b6805 MISC metadata.xml 995 BLAKE2B e4acf06e236b5d7497d7e19f20ccc961ea25da8dc3180d51ff76decd6f92cf4c927d6dbf96876ed47cb02e2ad7a42aa2571aa98d65e6b90afbe8a8142a3f090b SHA512 7f3b6cce23de7b0aade535b1fe1cb5af8bf622347731837e87cebcf28471a782825a599be79bf96bb69cd1ce5d36c9a9531d51cde1267cfc86453f94beb70d34 diff --git a/media-libs/oidn/oidn-2.2.2.ebuild b/media-libs/oidn/oidn-2.2.2.ebuild index 1d059c48a8b6..193b91c619d1 100644 --- a/media-libs/oidn/oidn-2.2.2.ebuild +++ b/media-libs/oidn/oidn-2.2.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -LLVM_COMPAT=( {15..17} ) +LLVM_COMPAT=( {15..18} ) ROCM_VERSION=5.7 inherit cuda cmake python-single-r1 llvm-r1 rocm @@ -38,7 +38,12 @@ RDEPEND=" hip? ( dev-util/hip ) openimageio? ( media-libs/openimageio:= ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') +" PATCHES=( "${FILESDIR}/${PN}-2.2.2-amdgpu-targets.patch" diff --git a/media-libs/oidn/oidn-2.3.0.ebuild b/media-libs/oidn/oidn-2.3.0.ebuild index 0dd6f000d711..3ff4eb5cf3fc 100644 --- a/media-libs/oidn/oidn-2.3.0.ebuild +++ b/media-libs/oidn/oidn-2.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -LLVM_COMPAT=( {15..17} ) +LLVM_COMPAT=( {15..18} ) ROCM_VERSION=5.7 inherit cmake cuda llvm-r1 python-any-r1 rocm @@ -36,7 +36,12 @@ RDEPEND=" hip? ( dev-util/hip ) openimageio? ( media-libs/openimageio:= ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT}= + sys-devel/llvm:${LLVM_SLOT}= + ') +" BDEPEND="${PYTHON_DEPS}" PATCHES=( diff --git a/media-libs/openpgl/Manifest b/media-libs/openpgl/Manifest index 067c6ff04a13..afe103ba0690 100644 --- a/media-libs/openpgl/Manifest +++ b/media-libs/openpgl/Manifest @@ -1,5 +1,5 @@ DIST openpgl-0.5.0.tar.gz 10767365 BLAKE2B 051b26c17300506dd20989ba9dc1aa83b0baf77c5f24650c74518ae56081b5a0ecca88c13d5d79a71cb0b6fa4a5b4841ee03e5223ec91ab16bb5655f2e52a9d7 SHA512 9b992ffa17ad6f9fcde48add5d9cc1e58be2daacd40478fb1babe0741a6c7a64f12f36c9c1f7d5ec6f79cdd847c082d39e03e58cfd9af1a903adca56f1ac19e1 DIST openpgl-0.6.0.tar.gz 10824550 BLAKE2B a08f5469cce808c51eb64a619621de31923318a230e49ababad2140d00b53d3ad688e095c4f7aba1ac6ebfd874ed1357e4a501bee5f45a826c39cddbab4fa3cd SHA512 a40161d79e9f340e631eda9dedbabd9c71fb0184c65f45e0abcb64ce53289a65b7434c11678f845f76006a0ce579c4458a39200dc8caca1c455f18739488e173 -EBUILD openpgl-0.5.0-r1.ebuild 1476 BLAKE2B 2bc6137616682adec5db0dd562ef1bc9cae4aef516a81d17502e33fec4c94fb66eeeea538bc95fe9a702a2313b80d12bb31ae41868ffff065108bb22929ccde9 SHA512 8e5a0101c489f7df3769d6f4af78038b2b922fa2dbe5399943286301a6c512e27118444a07da560ea262e998b6045ebecdc108071a1e73aa1b22b311d4417bc7 -EBUILD openpgl-0.6.0.ebuild 1414 BLAKE2B ebf50c63e94faffd57c05d8819d34317bccf7fd188e6f488dc71ab39a6cb6bdc71366494e079bfb9d08b9e4a8b8abd5c1bc73ca7302949f6507364258b3fba2a SHA512 f7e1d5169aaa2b83d749e91c0d4d38af0503d8f653d98d89e28abc7a9b931d03c398caadb3f58932f89a6e75b5b3b812b7e78865fcf13337802c298ab690f4c1 -MISC metadata.xml 1011 BLAKE2B c88245ac6d49bf09e2a96754713dcf088ec1ba4700713d2551a8af4f9c509553edbde8e9775fb1bc410b2eec742df26527b07d5cd36194ae5a2b4c5c018b51b1 SHA512 ff6c48d3db9dfd2737410f5d689d08fcb49a062bc291eb0e5442851037723a701629c13d44929b6812df5098adda7695b1edbd1bae9ed3cca63cf04b710cfdf2 +EBUILD openpgl-0.5.0-r1.ebuild 1428 BLAKE2B 35bc4d1216efd67f1d0fcbfb65f099542baae2aebc3b68615cb1c25ced4bcf2831444d20dc6df940e4202fa7291342012a19f7000335414e9ed44e2b4518bc19 SHA512 876dffd656fcf4e2b4686bcaab1e2d48b8338b8ef75c6a685ad09791d78dcac1af8718bd7a3e84fe0a2da0d4cb14c54954c3c53e28bbf624b2d336905e6ec2b3 +EBUILD openpgl-0.6.0.ebuild 1457 BLAKE2B d6cfc0f3b5a876d5323255b03e2d71cbd6dfc09b3a8fbd1adf49798e7ee6f543bfc915d85a6aa5db5a0c15aa78e6c68a0986ac3635e962705634b068c0c16932 SHA512 adeeb797e070270ceac7e0a701d6716d4b2c979377dbb5622c9fae70ea70ba7ce035b013ec89af145577dfec03bd86006160dd5a644f94c3e9e48fbe5a3d6823 +MISC metadata.xml 998 BLAKE2B 3798ad132e1b33a5414b125e0087c14acc1809c53542b4d07a5a0c070293c2768198ed5e9859e3141dbd022e96657faf42582d96dfc56f416671d590547458b5 SHA512 17d24bf0a2221f8f0b6b35cb9d29ae9ba1ce915e3ed3f9508b62f7b806aceaec7e1919fbbc5c4db0a8e95a71d4d117b7b2d36366c02bc5c86701a35076184ef6 diff --git a/media-libs/openpgl/metadata.xml b/media-libs/openpgl/metadata.xml index 362878695f7a..3fa42bd60c93 100644 --- a/media-libs/openpgl/metadata.xml +++ b/media-libs/openpgl/metadata.xml @@ -19,6 +19,6 @@ production environment. - OpenPathGuidingLibrary/openpgl + RenderKit/openpgl diff --git a/media-libs/openpgl/openpgl-0.5.0-r1.ebuild b/media-libs/openpgl/openpgl-0.5.0-r1.ebuild index ceba00c1713e..9984537e2a11 100644 --- a/media-libs/openpgl/openpgl-0.5.0-r1.ebuild +++ b/media-libs/openpgl/openpgl-0.5.0-r1.ebuild @@ -6,20 +6,19 @@ EAPI=8 inherit cmake flag-o-matic DESCRIPTION="Intel Open Path Guiding Library" -HOMEPAGE="https://github.com/OpenPathGuidingLibrary/openpgl" -SRC_URI="https://github.com/OpenPathGuidingLibrary/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/RenderKit/openpgl" +SRC_URI="https://github.com/RenderKit/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1-2)" KEYWORDS="-* amd64 ~arm64" X86_CPU_FLAGS=( sse4_2 avx2 avx512dq ) -CPU_FLAGS=( cpu_flags_arm_neon "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" ) +CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" ) IUSE="${CPU_FLAGS[*]} debug" REQUIRED_USE=" amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) ) - arm64? ( cpu_flags_arm_neon ) " RDEPEND=" @@ -40,13 +39,14 @@ src_configure() { -DOPENPGL_ISA_SSE4="$(usex cpu_flags_x86_sse4_2)" -DOPENPGL_ISA_AVX2="$(usex cpu_flags_x86_avx2)" -DOPENPGL_ISA_AVX512="$(usex cpu_flags_x86_avx512dq)" - -DOPENPGL_ISA_NEON="$(usex cpu_flags_arm_neon)" + -DOPENPGL_ISA_NEON="$(usex arm64)" # TODO look into neon 2x support - # -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm_neon2x)" + # neon2x is "double pumped" neon on apple silicon + # -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm64_neon2x)" ) # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - use cpu_flags_arm_neon && append-flags -flax-vector-conversions + use arm64 && append-flags -flax-vector-conversions # Disable asserts append-cppflags "$(usex debug '' '-DNDEBUG')" diff --git a/media-libs/openpgl/openpgl-0.6.0.ebuild b/media-libs/openpgl/openpgl-0.6.0.ebuild index 9cc85402cb51..a3ebfbe61803 100644 --- a/media-libs/openpgl/openpgl-0.6.0.ebuild +++ b/media-libs/openpgl/openpgl-0.6.0.ebuild @@ -6,8 +6,8 @@ EAPI=8 inherit cmake flag-o-matic DESCRIPTION="Intel Open Path Guiding Library" -HOMEPAGE="https://github.com/OpenPathGuidingLibrary/openpgl" -SRC_URI="https://github.com/OpenPathGuidingLibrary/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/RenderKit/openpgl" +SRC_URI="https://github.com/RenderKit/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1-2)" @@ -41,7 +41,8 @@ src_configure() { -DOPENPGL_ISA_AVX512="$(usex cpu_flags_x86_avx512dq)" -DOPENPGL_ISA_NEON="$(usex arm64)" # TODO look into neon 2x support - # -DOPENPGL_ISA_NEON2X="$(usex arm64)" + # neon2x is "double pumped" neon on apple silicon + # -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm64_neon2x)" ) # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest index 045f376ec978..7af7d50d282a 100644 --- a/media-libs/phonon-vlc/Manifest +++ b/media-libs/phonon-vlc/Manifest @@ -1,5 +1,3 @@ -DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033 DIST phonon-backend-vlc-0.12.0.tar.xz 71664 BLAKE2B 9ace1020d8e9a9e97243706ff81703d3f22bf892f402e44451147a24547d09bcf12f5745377c01d65b4d1fb03cd975b323b2cab62f8136880d1d9c004cca7d7b SHA512 78f5ead829d5025c7cb9e01b33819514d795651d1d932c03bd8cc2ad5d427e5aaaeeb6016820d5a7bb9907f6df1142a0fbc097830d7c63b01f77d2167a0c9264 -EBUILD phonon-vlc-0.11.3-r1.ebuild 736 BLAKE2B 68e053bf42c51ecbbad2f94e76cb8b1d982d706320cd4913aa9954cff08b7f4f6332d1f8739bf664c6dda930dbec3ec88177dd6a530c95a36caf6ec59467fa6a SHA512 f5c1296f63b6d71265c4d77b224b38bbc2ccc3b70349bd07db9432643796407f4661d3da97b8a75a556bc50e560a3290c47e4a264a3303c92d060e6fc1b4039e EBUILD phonon-vlc-0.12.0-r1.ebuild 1723 BLAKE2B 6a2370411298eb0092498638be2d10ce767e9338cd07edb63880639ec5c667f4ca68dbfb8eb58922038683f3e474b2eb03221a0ffbb39c9da33a1a90ac19c6fc SHA512 f528e55796dfd65c5e0c689285ee9d4c8857208ea5a2f6bd3c853355f9e135a313e176d39b7c40c89f682d697d4bf2ce6b2e8527b7ea7bc6e0f4f9bced3833a9 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild deleted file mode 100644 index 7c4561516741..000000000000 --- a/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="phonon-backend-vlc" -inherit ecm kde.org - -DESCRIPTION="VLC 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="" - -DEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - >=media-libs/phonon-4.11.0[qt5(+)] - media-video/vlc:=[dbus,ogg,vorbis(+)] -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index d40aa689a532..3ffcdd01cb61 100644 --- a/media-libs/phonon/Manifest +++ b/media-libs/phonon/Manifest @@ -1,7 +1,4 @@ -AUX phonon-4.11.1-clang-16.patch 1356 BLAKE2B 2adbe00797db0efab8a065c455b8122bea99ffdca9317939c85e54c65cf9292f1de7531bff89fbed227cdab035547680291c6d20d02a374bfe7e28ef9ec9706d SHA512 5ef9e3bcefd607036e47cd6578be5bb98a384bb4cd4820aab90cd7adf1eb0ae54ad001550909a93513e1d622ef4101f95fce733e3fa7a95d5df8454290ef92aa AUX phonon-4.12.0-cmake.patch 2642 BLAKE2B 0e1b71a2c8916ebd230ad38822eb1cb62b4ac4fc4239459e822c9b91d69e20ec5ebb96ebbbd1cc3a9af5eb71577797d1f12dc9121843f1b44ff9667a66198467 SHA512 8fb555e3f0da0a33a922dd82792ee59f7da842e2369112aa155d4f68bf20b34ed84cb3210100552458f0dd76c61c08e479b3af42b5b4900ffde7d8fdcd1b6c69 -DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74 DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a -EBUILD phonon-4.11.1-r2.ebuild 1307 BLAKE2B 69c75e346c77710c52591a8debe93bb09c34217584a520622dbfcfb2b4442b3039f1705ee5550f4b35edef1fc65a33286517deb24373264adceef2d365679ebd SHA512 daae7f938573ea831c299c0ef584ae4526570e64e3cb0790cfc7dae34b364fb4bb72ac0f312d0733fb17de6bcc3f74e3dbd9a08247c5d43e2776bae5deb8ec3b EBUILD phonon-4.12.0-r4.ebuild 2357 BLAKE2B 89276f8d310c9b482f9f94a26508718efa0799a9fb74b0f727cf945aedca3454077b9d022ef31bc89c497704fb465608cb70e2c6c5dd0841857f0119b261cd6d SHA512 62a1ded9aca0d08eedb9a33f9b6b7ea958eba310abab2f732af262e81f27c80cc37770ff32b20dce03f7823bb3a10bc211cb6623f52229a8dccc165b2185b024 -MISC metadata.xml 463 BLAKE2B 856a539bfa489dac4d6550f9fb4104b419dc6dd12a5d6ec67ac7d9f743fa31d96c3323937558704b7941a914c1ca342b5a6030e9f16b7d84f2339f93d2a1fb9f SHA512 c6aa1e0f8f11e813c228619f9c857bfa3e15d3278a1b5af3910f8f789a7d93f889a9adb9121f19b4b52abbfa0b4a67d89a037679ae0eab00b0db04ed5e16526e +MISC metadata.xml 410 BLAKE2B 020afc6014d4aedfde1a848e60d18650cb574a5d039275652f00ac0ad00dfc4dee4e67080375f43d5c404c4e6c203e7064fe2014a96156293eecd919b0a21999 SHA512 a5c3d2c3c4ce95b38893ae67a8f974c646064e33d97c56c65d65dec857067479af58e6aef87d9a06ddc50bd150e687dba46eb1eb65f0c6423f700f85204df098 diff --git a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch b/media-libs/phonon/files/phonon-4.11.1-clang-16.patch deleted file mode 100644 index a3fe704bba0d..000000000000 --- a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 069d5a3eb81bcbc730e44c27a0d060a85cf9213d Mon Sep 17 00:00:00 2001 -From: Dimitry Andric -Date: Sun, 16 Jul 2023 15:17:39 +0200 -Subject: [PATCH] Future-proof build fix for clang > 16 - -Clang is intending to remove the `-Wno-enum-constexpr-conversion` flag -in the future, because it can invoke undefined behavior. - -To avoid the "integer value NNNN is outside the valid range of values -[0, 7] for the enumeration type 'ObjectDescriptionType'" warnings, -explicitly specify that the `ObjectDescriptionType` enum uses `unsigned` -as the underlying type. - -This also allows to remove the CMake patch that added the -`-Wno-enum-constexpr-conversion` flag. - -* asturm 2023-08-20: Drop adding of -Wno-enum-constexpr-conversion in - commit f685bdfdf30deeea2d1db01c1edf0c60cbda652e in the first place. - ---- - phonon/objectdescription.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h -index 97fec2e79..6ce92de54 100644 ---- a/phonon/objectdescription.h -+++ b/phonon/objectdescription.h -@@ -43,7 +43,7 @@ namespace Phonon - * - * \ingroup Backend - */ -- enum ObjectDescriptionType -+ enum ObjectDescriptionType : unsigned - { - /** - * Audio output devices. This can be soundcards (with different drivers), soundservers or --- -GitLab diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml index e90f046a5550..7cf9bf61194f 100644 --- a/media-libs/phonon/metadata.xml +++ b/media-libs/phonon/metadata.xml @@ -10,6 +10,5 @@ Install plugin for dev-qt/designer - Install VLC Phonon backend diff --git a/media-libs/phonon/phonon-4.11.1-r2.ebuild b/media-libs/phonon/phonon-4.11.1-r2.ebuild deleted file mode 100644 index cfad75fb1aed..000000000000 --- a/media-libs/phonon/phonon-4.11.1-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop ecm kde.org - -DESCRIPTION="KDE multimedia abstraction library" -HOMEPAGE="https://community.kde.org/Phonon" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" -fi - -LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )" -SLOT="0" -IUSE="debug designer gstreamer pulseaudio +vlc" - -DEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - designer? ( dev-qt/designer:5 ) - pulseaudio? ( - dev-libs/glib:2 - media-libs/libpulse[glib] - ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -PDEPEND=" - gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 ) - vlc? ( >=media-libs/phonon-vlc-0.9.60[qt5(+)] ) -" - -PATCHES=( "${FILESDIR}/${P}-clang-16.patch" ) # bug 894346 - -src_configure() { - local mycmakeargs=( - -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer) - -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio) - -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio) - -DPHONON_BUILD_SETTINGS=ON - ) - ecm_src_configure -} - -src_install() { - ecm_src_install - make_desktop_entry "${PN}settings" \ - "Phonon Audio and Video" preferences-desktop-sound -} diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 4255f694c8c5..7140b20c7599 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,6 +1,6 @@ DIST vulkan-layers-1.3.283.0.tar.gz 5230566 BLAKE2B c16a4af62900a4b053f7dd60da5279bc088cd297f22bc247be2718cc3187136b60e90530298c068fdd384c9135e83f91f3ffd7b3db9f12555d6dd88b6e9b66ef SHA512 fc2ca2c79be8e01fc39a7802644d5e10b5196317eaac246a17b73093409739e771ac267c1ed8aad08ba68afdebc583702980f195a5f93421a0c041da3f4b6e49 DIST vulkan-layers-1.3.290.0.tar.gz 5270142 BLAKE2B cdd22f6dd3b4da9433cba1c0d0ace16961bad2d61279efca3a0d7e5ad885766f25377036f3418ba3ed4e93beeff717b8b45fc772e9e2ad8750a8aac0aec731d2 SHA512 9f1d512b4bafbcef586789e933f903c383bbb9644d0a978a390da16e03ee2395c39c9c7b622e437e1c74880409df0a3cfc3a44b066cc0efeaee8d1edb9349d26 EBUILD vulkan-layers-1.3.283.0.ebuild 1638 BLAKE2B db7c8e50e9c433eb82d35b68cc0babdf1bed7ed2da5afa825e1fb4c893bd5b2d5056b3102fd600a07f5bf88fba108ec4ff0aa337439d0317adfa5b20ba1c05e5 SHA512 3267e6d4723ef07403e9013ebeb23ee449959f3be0e6654fa8444d58e75b945f4bec29165fa936537b97154140fab8f5cd8e9d91b61a566f9efb7e9ae1c4b4b7 -EBUILD vulkan-layers-1.3.290.0.ebuild 1644 BLAKE2B 0c252b3ef0a045f7fe32111be58c5dd6a3a2c6813a5411649b63f6572234b148e5fef95836c39d66736d1b8918575471968ad7a44cc204ecdc07933fcd973ded SHA512 5adf8d5df14b224abf37530eae4f3eb103f3b418247dbc62f43133e5d517809fa2af17aa612c9166ea7c1ddb2edb8b1d4e19a907c8b6c40929a21e32f2d78bd5 +EBUILD vulkan-layers-1.3.290.0.ebuild 1643 BLAKE2B 139a034be5704f34f29e5afa7e9506e0633a7628f8f6727d4bc42d11dfc434773daf112b5847f9eee80c7d1caa6de8372bd311ae78d02a3d4e175d1e1e2b8a39 SHA512 cb9b64c23bde89aa2aa488aefb7d7cdcd7a71347e46dcc673bdee5617d9aee210e2fb80c4a1ae133093979697ed8a28f0fc88b0ae0d33722c81ccd359ddc9f98 EBUILD vulkan-layers-9999.ebuild 1647 BLAKE2B b309abf84fc8299fce6289a6d1285d6b8beb06cc77ac4b07eb48a9cb6aada2d7dd30ba9d574b1eb325d23aa23d5b255bc679745675c7af01a0075701738f8cfb SHA512 b1bca6852c02f377db0c27991c46d307c9256ee414d22f4b607e05f1bb8fdca264cbf99802b5bdd1b3468257141d215c1ec7f7f82e305baff539e76176822e09 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095 diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.290.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.290.0.ebuild index 69c550b2f40a..b9e5f80b13f3 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.290.0.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.290.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index 5a2a0a054732..94e578253240 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,6 +1,6 @@ DIST vulkan-loader-1.3.283.0.tar.gz 1713233 BLAKE2B 13b01518f08a206ad9a66ba74bbfa5d5199deb556e1beb2d5bcd63780f399d526d9f5ff83d0bc809e47702fd1413e799e34a3e81f00b1f27f93a08aff16aab3e SHA512 0e62cc29a28e9d0898aa0a29b05158f75116f5a86468e879499503a20e95e49791150a0a458317223a04c65dfbc1fdcd22e71596a8cf939a5d38f9bf186851d6 DIST vulkan-loader-1.3.290.0.tar.gz 1711013 BLAKE2B 72c55f07537df0e0ad0fedb4a3b913cde9b6d5038370c0e92bf15ad9ee881f5910842a1b5ee00d370b93341aefbd141414b77e7ac8823d101a861829cd9f338b SHA512 42ecf05e498f6422cea9d6ef70df5a936536524c1ff4d8cb391b5c55dd409082a6b2fc2eee5b395306c782ca32a7344faceef3e5385b382fb5a7e6564cfce4b5 EBUILD vulkan-loader-1.3.283.0.ebuild 1546 BLAKE2B 7d3b40829acc8939a7d592fe6db0d9cda8419aa342879c4ee99de6c8c65518e1b95bc58776f259dec45403c418c7d2662b58865832a9b683bfe686d8b427f911 SHA512 5a49910f2e06cc373dc101fbfbff0415a8c65d20ec46f21e4fdd19735b08138cedc7aba7594e88cca591b512d1ecab23a64acea2b4e37c6efc94da98944bbc69 -EBUILD vulkan-loader-1.3.290.0.ebuild 1549 BLAKE2B 811c9885d96c816ab46458be2bc067c8d16e8e949ff7a00e43b40fc6da64aa52fa0c43e774e00124135dd1409556582d59a111c820a91eb27589d2042742d8e0 SHA512 cc7140fbd4715d2bdee1e3242f7f451de03649f6c2e588543512befa722160ae185322bf8913d486a86446ef0189d80d8dbdf03863c28d9c17d3b3bc60b8a87a +EBUILD vulkan-loader-1.3.290.0.ebuild 1548 BLAKE2B 14e44d7ac8a89b000fab9aaba52743d8e1d9f42e9d4b89eb57d55cd1f1e643cb44ecd6647fdfd518e96a4aade0ac7b47fb95bc5d6e970f9e7ada9264ecc13341 SHA512 d31645d3ff7af615c9c9c5b9f999dcb632211f90d62a72aa091e9fbb40be299e192b949f806837b0dde64e709fc65970f9a9bd8f06068d9fa6c491b60455b8b4 EBUILD vulkan-loader-9999.ebuild 1552 BLAKE2B 2f42ef99792fb97542b7695ae89d396c5c2f0e2a16bd05e29ed019fce1795953b5795b54e7f42a4caf3e60bffa74a2cdf4a2df11fddfeb49a81cfd9f1aab0300 SHA512 a6fe7d5f1697dd1abfef7ffe42d53f208f9d4a956942fb3f96ce4ad54ca6ed9c950fdfdd205a16043bff91d77c29e2926cd70e61865d54baa8e150c98712fb7f MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34 diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.290.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.290.0.ebuild index 078514fdd5dc..7dbff34236a8 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.3.290.0.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.3.290.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi -- cgit v1.2.3