diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-10-22 04:04:46 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-22 04:04:46 +0100 |
commit | a15e8dc7444560123d7d4be1bccb19afd5b611d0 (patch) | |
tree | 6e26ee0323c09494a66d0f78c4b81e305bb0d096 /media-libs | |
parent | 3dc4de6331223493015f198dc61854af604da86c (diff) |
gentoo auto-resync : 22:10:2024 - 04:04:46
Diffstat (limited to 'media-libs')
42 files changed, 566 insertions, 847 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex a2ffa16b0e0c..b9a7c789060f 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz 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/dav1d/Manifest b/media-libs/dav1d/Manifest index 415c08e4e012..8e3eca46f8ae 100644 --- a/media-libs/dav1d/Manifest +++ b/media-libs/dav1d/Manifest @@ -1,4 +1,6 @@ DIST dav1d-1.4.2.tar.xz 970104 BLAKE2B 03c8effb21df5c748f6e836413454577ac0920dce37d6e4922c2a0e493f79c9bb9fb6eabe05e2ac0f0f7089751bec1eb92717305c5faac1b71efd7b0dabe6be7 SHA512 36f8e632f64212db63e126b9ed2ca95c2db930d2388c551cde0b13b783ae872edeab1b5dd2274684bb03e98536d0334552ddcba209cff08c3568d97321034920 +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.5.0.ebuild b/media-libs/dav1d/dav1d-1.5.0.ebuild new file mode 100644 index 000000000000..93a307754a90 --- /dev/null +++ b/media-libs/dav1d/dav1d-1.5.0.ebuild @@ -0,0 +1,61 @@ +# 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/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 335d9bf0d5cd..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 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/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest index c58c792fd19a..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 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/kquickimageeditor/Manifest b/media-libs/kquickimageeditor/Manifest index b413288e819d..cf7d3788cd1e 100644 --- a/media-libs/kquickimageeditor/Manifest +++ b/media-libs/kquickimageeditor/Manifest @@ -1,5 +1,5 @@ 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 681 BLAKE2B 82fda20dc4359fc35480a44e0a8a75c5c2a7c57bbb72558e9ccbc1a2eac45dba3742cd59d706ae57920398d0f5c2758d9d3baf551e937a7d1662b359bca39b66 SHA512 8b35350a3988c2e16101943d80122b88d0440f11e22f86b6fc683ec684aef7764e0c418e1b31b751cd3142104c8175f1609ccfa47fa77ef70af74b3bc97abf0f MISC metadata.xml 389 BLAKE2B 1a40d2e6e9a20deb5aa726b6b3d355f41baae2aa9e091d0c7dc0c2cbf4cf9741d23bbc4338f49af52752da876430554cec8e7a9b0db50536a50480b3afb43aaa SHA512 6c160febb064cb5ec85fec3ca63db97d29f868da68f8d26e42ef90ef52e4e0a487f4897aaddb9db13b89b0ac0e270de1e29a853a871f03f41c0be2e3d689e680 diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.4.0.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.4.0.ebuild index a013e066c728..2301d11d2fa1 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/libva-intel-driver/Manifest b/media-libs/libva-intel-driver/Manifest index bc2093b85d7f..98cc9b9fe802 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-2.4.1-r5.ebuild 1493 BLAKE2B 80af7a717424e11416e54931ff3988bdd6e4538cadfacbdcd0ca54f47047c5168a21bd521a41558ded5f734d1a0b711dfb55cd44124193de7f0f8f3dc351ace1 SHA512 435734caf3c92bcfe93feb61654f5b088ec315a0b83739b476eb0728c96586bb63f5230353c448ad874258cbfe2dea11396e8df4b3bd832350e13c2fa01c4b80 EBUILD libva-intel-driver-9999.ebuild 1434 BLAKE2B 187b9f9c37d5e17fddf9669e112b869ce7054836e40186902f7d4740c0e6b381468f6bab4879b79a4f0d5ccd0973faaec51698c4cb8bfc4bab801feac757e6ce SHA512 3869a58a3a4a76e9c58cebf2a8ce55862eabc3da676617b3183cd59fc9d6d39a661db872b7e82cc6f9a0caa61928700a6a309da1d2ab5abc0e4d6907f073dfed 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-r5.ebuild index 4a0de8f43ac2..493e54089192 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-r5.ebuild @@ -40,6 +40,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PV}-Make-wl_drm-optional.patch +) + src_prepare() { eapply_user sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest index a032b9db7500..e56ebc01c7fe 100644 --- a/media-libs/libva-intel-media-driver/Manifest +++ b/media-libs/libva-intel-media-driver/Manifest @@ -1,18 +1,6 @@ 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 1512 BLAKE2B fbcaa3d74924d108719352a39e427cf67ac308f16c2241b72075651beebfb1a6b121c96f9c4e3866a5ebd5cbdafeee42f1cfa2cb01f76516bf86326133c99e67 SHA512 c24ac146c9bbd37b715697adfba21a486f3887197dde0d5bbd5362acdeddf88a540492b1d60720c96b3461da03b56b9b7de372f515b48898291f69b371ebbff0 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.2.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.2.ebuild deleted file mode 100644 index bc3be02793b7..000000000000 --- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.2.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/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/mlt/Manifest b/media-libs/mlt/Manifest index 07aeb7e7718f..89beda90d613 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -2,7 +2,9 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed8 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.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/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest index 3dc9d17f54c0..284bdca092f2 100644 --- a/media-libs/pulseaudio-qt/Manifest +++ b/media-libs/pulseaudio-qt/Manifest @@ -1,5 +1,3 @@ -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 660 BLAKE2B 1b96738760d675d532cfd60f93dffb6106579bd624f6e762e28b45c98ab8e2f99d94831b3fa082e9edc455cfc4dfb6fb1c55259bbec450bff381b624a6f538a6 SHA512 b10456bd17683e4000ed718af874b3cd28bbfda2189a1e37a3111b743d3ddb4118f0efe9ff695fb449859c321cd7ceb37f03076ac7378a0b1ca1028a17bcde24 MISC metadata.xml 385 BLAKE2B 66910b8057aee5141d69520b1a4485d15182552cc027156ea4929987c66128fac2e06d2b5ae450692ffd8fac97fcdfdd27e30fc4ebc9915cad50e480af1425a6 SHA512 1b549f3f3e21a2a2dee45285ac8c7a61f4f06d8e6b4d7fdc42d8aa3c537a921c613faef3d57e36efa86a74117e7f71f54fcb4d7fca8c747980d63f314f4ba1db diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild deleted file mode 100644 index 46af9297856c..000000000000 --- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_QTHELP="true" -ECM_TEST="true" -KFMIN=6.0.0 -QTMIN=6.6.2 -inherit ecm kde.org - -DESCRIPTION="Qt bindings for libpulse" -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" -fi - -LICENSE="LGPL-2.1" -SLOT="0/5" - -RDEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[gui,dbus] - media-libs/libpulse[glib] -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtdeclarative-${QTMIN}:6 ) -" -BDEPEND="virtual/pkgconfig" 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/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 |