From 530a5a826feeb71085fb8a01927f4d775a0b131b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Nov 2024 03:02:55 +0000 Subject: gentoo auto-resync : 24:11:2024 - 03:02:54 --- media-video/Manifest.gz | Bin 23225 -> 23238 bytes media-video/alevt/Manifest | 2 +- media-video/alevt/alevt-1.8.2.ebuild | 2 +- media-video/bino/Manifest | 2 +- media-video/bino/bino-2.2.ebuild | 2 +- media-video/ffmpeg-chromium/Manifest | 2 +- .../ffmpeg-chromium/ffmpeg-chromium-131.ebuild | 2 +- media-video/ffmpeg/Manifest | 3 - .../ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch | 25 - ...eg-6.0-libplacebo-remove-deprecated-field.patch | 103 ----- .../ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch | 112 ----- media-video/handbrake/Manifest | 1 - .../handbrake-9999-remove-faac-dependency.patch | 84 ---- media-video/hevc-hm/Manifest | 2 +- media-video/hevc-hm/hevc-hm-17.0.ebuild | 2 +- media-video/motion/Manifest | 2 +- media-video/motion/motion-4.5.1-r4.ebuild | 4 +- media-video/mplayer/Manifest | 2 +- media-video/mplayer/mplayer-1.5_p20231206.ebuild | 2 +- media-video/pipewire/Manifest | 2 +- media-video/pipewire/pipewire-1.2.6.ebuild | 2 +- media-video/smplayer/Manifest | 2 +- media-video/smplayer/smplayer-24.5.0.ebuild | 2 +- media-video/vidcutter/Manifest | 4 +- .../vidcutter/vidcutter-6.0.5.1_p20230201.ebuild | 6 +- media-video/vidcutter/vidcutter-9999.ebuild | 6 +- media-video/vidify/Manifest | 2 +- media-video/vidify/vidify-2.2.6-r3.ebuild | 4 +- media-video/vlc/Manifest | 7 +- media-video/vlc/files/vlc-2.2.8-freerdp-2.patch | 131 ------ .../files/vlc-3.0.21-vaapi-without-ffmepg4.patch | 18 + media-video/vlc/vlc-3.0.21-r1.ebuild | 513 +++++++++++++++++++++ media-video/vlc/vlc-3.0.9999.ebuild | 14 +- media-video/vlc/vlc-9999.ebuild | 4 + media-video/x264-encoder/Manifest | 2 +- .../x264-encoder/x264-encoder-0.0.20240513.ebuild | 2 +- 36 files changed, 574 insertions(+), 501 deletions(-) delete mode 100644 media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch delete mode 100644 media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch delete mode 100644 media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch delete mode 100644 media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch delete mode 100644 media-video/vlc/files/vlc-2.2.8-freerdp-2.patch create mode 100644 media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmepg4.patch create mode 100644 media-video/vlc/vlc-3.0.21-r1.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 29f5359f3afc..2ce51440a87a 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/alevt/Manifest b/media-video/alevt/Manifest index a1f6fd21bb10..9e0244baf53d 100644 --- a/media-video/alevt/Manifest +++ b/media-video/alevt/Manifest @@ -4,5 +4,5 @@ AUX alevt-1.8.2-respectflags.patch 1347 BLAKE2B fda6bc2d918d2ae17f53523b905cb31c DIST alevt-1.6.2.tar.gz 133234 BLAKE2B f252fb2ce1fbbad6c1aeb7649fea8b83aacfb62c38b7efa205680b32ad3c5dd7e60efa8be754c42040488860a59ff8a1cee235cf5adb75a5c738a503ee369db1 SHA512 8ddc0b03065b186bff8b705ec6ee8581460c4da4e65f97d15915d3bf708c7898661f61fa5fe004c7634adc9f850747b3fa08fe9ec94a5155482fcda479a884ed DIST alevt-1.8.2.tar.bz2 137373 BLAKE2B 8d903718eda7a4008fa96c344f2c0719b4b10eb638557840a693f58273de7fbbf11892305224c1ea2aaf840cb47808eff4e9ae403caa11af8707bb4c800ee111 SHA512 ba9e8e3f0831f61f135e41cf703bc9a8f6284d685cda80ab863ca7fe0c7c8f3724e1231a88c5364ff07ab881b48980acca6e86f17ca7a2cc1f40a7abc8e6ef54 EBUILD alevt-1.6.2.ebuild 874 BLAKE2B c2dcf13faf50fed41ccdf1a773d1742a3c0683e0f598abdb5762d591988970af3ba509fc963451b85a3780aded89f053b1997768e277bdd08ed7599d61805a4f SHA512 07733c31d863510dc8c605d7f2c592195417c854907baf356b779a1eda72ab265596e886cfbf759de97cb7d6b355f05d97e8cd113659f34d3f61a9a31c5c1076 -EBUILD alevt-1.8.2.ebuild 988 BLAKE2B 70415a3b7af889729cc28c24eb04d6eb6fdb11d776f41237528e7fd2a5d678541e19f4d0d910edba00f4dbb3384ac28c95bc2a8918e0063d41e25a326b1253df SHA512 6eb2ed4f0b7dbacf37fae61bd79ac61c99fc33f93494f450cab6bb06864cad266b3f5eb6bdfa0801f464552cf520d5cc33383dc46cfce78403260346e47b00df +EBUILD alevt-1.8.2.ebuild 987 BLAKE2B ff794ab3d937cc529bf3c6141350933a2f1ad2ff093c695c73839ade2e867facd7f13b9ce597f0b2a1ca98b9724a91b10eaed68e3f21f5173264de82dca678ed SHA512 232530a1a9df97d9019b5d03847c569ee3edf68fadd4e3761d756f7f3f1a1616967fc9f6897a6f4f91a2544d71131bb789221b50cc456144dc61e88d9f1f0b16 MISC metadata.xml 247 BLAKE2B 3a71326f31709ab58aab3d8726405f0db71f1e278be78c3f4a5965711c62da67a38ee9620d2eddde399a596c1a2a316aa4472e1c1c2944d05f89a0abf667f17a SHA512 e0ee1e2820eb085c3c6a58512b890551126b31dd22b68db57af60884707e4148f6ee74d221ab4f8e4b52199da541f4ed929db0f28b93ca73fdbfb43d5a242b2d diff --git a/media-video/alevt/alevt-1.8.2.ebuild b/media-video/alevt/alevt-1.8.2.ebuild index fb928d7b545f..705c8c064321 100644 --- a/media-video/alevt/alevt-1.8.2.ebuild +++ b/media-video/alevt/alevt-1.8.2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~sparc x86" RESTRICT="strip" RDEPEND=" diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest index 1c630f04c420..b553c6936538 100644 --- a/media-video/bino/Manifest +++ b/media-video/bino/Manifest @@ -5,5 +5,5 @@ DIST bino-2.0.tar.gz 193004 BLAKE2B cb9f40e6eb3f925ecf83e766d613ce15c2fccf8b52a1 DIST bino-2.2.tar.gz 217784 BLAKE2B 84897edefd3c7ca34bea06bdafe985b2ba8936fc0f5303dfb288589361202537d68ffcfcda7e5daec3b59b72385f840dd5d57bc125fdf6383ca9ebed2194f6ec SHA512 73e6207db4a71673f88ebbd8999054acfc8f70a069fc74089976786082373d0eb7ae675786b1d3cf8907987267d9b1b50ddb05366b8b70f880c6898da765cd7b EBUILD bino-1.6.8.ebuild 1769 BLAKE2B 1c7604ce9345f541d3c04816dd4f6dff13ba8443b4ac316f19df3944bd9fada0029f73a23619eb664a5cc474d2a15b6d042013e2bc41e55b6847bf72f05673ee SHA512 b8e1699f3e34e307afe3c993c4af6fc6634d32b168f892f1a0a1b9ef3adb41ccc596368278ead3d778bb86385b7870db551a1cc87c33c461302aeb7808e3bb9a EBUILD bino-2.0.ebuild 597 BLAKE2B 5379a1965f26a5a9da21ffa991aab9ebf63608dbb42993c037a74205eb53c1fbad75f7b725794b808433a57c9d1977d4c1b9023b2baa1efd54523850aecad5c5 SHA512 563f3f1589a3cf8c20048c05ed4f3d4e52e1967ff78520d43682947931741495354381bfce1ecee931115a330e6ccf850db9a9c6f8e29d851816e46ba62a22a2 -EBUILD bino-2.2.ebuild 599 BLAKE2B 3189579bb3f8bc350686236bdfe2f76e7fbc5509d9ca1e2fdac3f774d12d1e05b9aefcb2f023bd5718176d7cc8c176f27169238e5b8a3c54785b0773667d3455 SHA512 4b86ec39d2f7eaa45b5d7e33f4ef5915122becd948a545b0339db2c26fd28991da6bff5651c670706fce7d523f3d43e44c4a0aa2ba19035e9cbc133dea443dfe +EBUILD bino-2.2.ebuild 598 BLAKE2B a150936a9cd9819f356989640277f6ccdbfee1d095db78b590d79e759d2c22970f14343baec12f0891702d558b590b3b66841e1000a32b4c658db7c12bad7aa1 SHA512 1f484bd5c8151dd0d3db544c5908074c64a785a5edd41742a428f18ee60e1c137076c4f5e1de296e0036679ce642d81cb43f81d83ca6bddc34403c551665f72a MISC metadata.xml 251 BLAKE2B d8d3e540aec003dfab0b6663c9087bee59dbf7dbff2128c27883615d7250c03073926b9e023cf27925cce18736f86ca20ac3cb2a66d5fcaa0c009471ae95f822 SHA512 de4a63914b8a58e54b0d04d2461cc66199ad857191a11668b0f5b1c0f8713a3486cf22ea3d4df58ba8087775524608fb3d399cee3393f64770fdaa872f818467 diff --git a/media-video/bino/bino-2.2.ebuild b/media-video/bino/bino-2.2.ebuild index 38365b40dc8c..9d3b91f77242 100644 --- a/media-video/bino/bino-2.2.ebuild +++ b/media-video/bino/bino-2.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://bino3d.org/releases/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=" dev-qt/qtbase:6[gui,opengl,widgets] diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index ed3995d6f94f..07ff819ef634 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -15,7 +15,7 @@ EBUILD ffmpeg-chromium-127.ebuild 6479 BLAKE2B 7357fe026fd686a96c6098e5259cbbd74 EBUILD ffmpeg-chromium-128.ebuild 6479 BLAKE2B 9b7d9a1d995d0a925979ba122a51821d98e5299329f5453bcf3f80587ebc0e760afc9d9b65a3a444bf3dc00bd3bf495cc1d0fcbd6daa25ad477e2f2ae39c6beb SHA512 8c6b99f807c0b7b6bc6fe9d5c2ff436ffaab41ac4e20c7567f17d8ac6a66ec1007353a1f383052dc707da692002a05cc3a2f447947fce6c5b224e08de3a4eef5 EBUILD ffmpeg-chromium-129.ebuild 6479 BLAKE2B 291953066345a7e3018ba56e1cd7ebb12c5f14220c19030b78197381764fb5fe5ff48fad423786ef0dbd335ba917886ab2d71765ef7cae43eed324a0cd08eb88 SHA512 e59e8ec78bcdd939b100ba681488d3c212539ee79a441be0dd6d894689b8a37b2b0e7fbf6d18a9cbf3673daec0be9055dc455c1b0d38fb5afb34594319e63206 EBUILD ffmpeg-chromium-130.ebuild 6481 BLAKE2B 195a106874439d9465ba8674a32c3192c0166ec840f179c8b15b90fc68a68440d4312c649fa4af63100bd1d4da7caf58184bbc1267327604c5027e5b56e8c05a SHA512 c3da69729075c2a4ca3ebb4f76e4d115c3b8b9f8971c89ef2b7489447184d81070a9fb954ba1d23a71b1fd896798dee63cbacdd21a996a9f94e30986b7144ac6 -EBUILD ffmpeg-chromium-131.ebuild 6481 BLAKE2B ee5b2d6aa7753dab3e8682e3c01a7a715017efc1497d669d9b1660d6637e7d77693fc1985f03cb983ce94e620a3e224b0d8721c4a810c91219e6aed31479d206 SHA512 057c3247ba3224e365e7b092a7bbd13ed03c2a69554af3ada24853df92fee6be07818d2b45e13130d09995c3364b699e0fa50483a882ed5f7ba40149a0aa7f02 +EBUILD ffmpeg-chromium-131.ebuild 6479 BLAKE2B 7eb290e9d70180370f3cf2cd0ed93ecdfea60e08df4586730533709650dccd461b43f5f1f2fdc69aa751894d3aefd550ea47fb0aa03adf3c123c1896f167eff6 SHA512 d978f8a08f1f67db72cf6b9af488b71fa57752ef94b40adc42dbddf8cfbb57b2c7654cb09fcc524cf8b533dc6f8580eccdc75cbb236a46e1f1d2737e4d75f92c EBUILD ffmpeg-chromium-132.ebuild 6481 BLAKE2B 995a021e434a6cdb09a70967e33257f6c35a53fa2358cd0a3b8dbd49db701afee04626d88b01ecafcf4274b1316b45c49370bfe28760db08b579e4f958efb7c3 SHA512 ec690c21ec3b21634ff08ccc1b9e88f7547e8d884cfbec231de54b16999e1dc1dc46ad1de30ce556440f9a3abb5db2c32dda50348dd7ddef862e71f75bb800c7 EBUILD ffmpeg-chromium-133.ebuild 6481 BLAKE2B 995a021e434a6cdb09a70967e33257f6c35a53fa2358cd0a3b8dbd49db701afee04626d88b01ecafcf4274b1316b45c49370bfe28760db08b579e4f958efb7c3 SHA512 ec690c21ec3b21634ff08ccc1b9e88f7547e8d884cfbec231de54b16999e1dc1dc46ad1de30ce556440f9a3abb5db2c32dda50348dd7ddef862e71f75bb800c7 MISC metadata.xml 695 BLAKE2B 84fa4967572665812d4da8bb1a86a8b28a749892570cb1fca5c0515f860fbe8c472a91240f1d3b7b3109ccdbd32cf8da941c438cd9f332b763f2824e0e193ac8 SHA512 0069bcf32d2aa083c66e13579295e8ef96b9ac72b02f1436620000c71c4d1e335391838f9a9e56f7768bd13dbe13ce6f3f3674a303cf90cc658360825867c3f9 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-131.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-131.ebuild index 024196225912..81b121a64852 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-131.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-131.ebuild @@ -16,7 +16,7 @@ LICENSE=" " SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64" # Options to use as use_enable in the foo[:bar] form. # This will feed configure with $(use_enable foo bar) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index a47d01f65167..988d5afdf07b 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -10,12 +10,9 @@ AUX ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch 362 BLAKE2B 709a5a79aea78125899 AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df944ced7efc064486e325e1658ac8f30d74ac926c63de51b610eebb5be9951adcd8ad02c8c143429c6eff57ce789a1c187e0b24221aa6d SHA512 58e33b2f0e94e75ef7acebb221332dc4d618846f8a968011da370743ce80a4ab688112411d3f2a5320d144c25db567780c870a0eb4045152b73957e2d7fe747e AUX ffmpeg-4.4.5-incmptbl-pntr-types.patch 502 BLAKE2B 2c4d4416b112d1b4b0c985be7765e18e5d52586252834dd47052e13caa8554fd28dcbc88b37013f36134d5dba06b0c917f485f42a8e12d5cda37a6b13dd48827 SHA512 d3e9730467d52cb75999fa2494996e2b1515cdfb22d134be50240308f2c1167569033c7aaa821efe10dc0ee252863ff3c8826b58fbf2a727639c1bee652edc14 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb -AUX ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch 999 BLAKE2B 736a85e60d3ee9b48346e1d7795bd8e075e8bcc2556695ec9db0a48a8d7356d20795ed31e1d6dcda7615e5ad3ff9faf7edf7563ba6e1f822a99d3cd442bd8a72 SHA512 f16c7185a3265710b6638e35322895590b58dffaffcb8fb436b08f945e19c44a1b66a17902b73e89fd53cf5e4cd9e7f2256bef4df4c82be16a807eb6bf663f5a AUX ffmpeg-5.1.3-binutils-2.41.patch 2217 BLAKE2B f013c5df1cc3495830d101e551e42dfd07b016913c7cfed82920e85e69d857fb8081e19503d7f0306ca2e0313683d00e3b20293fc8ddab491eb10ffdd3a92b1a SHA512 2db666d4e5f3e9e4f32b6a34e537b5af2229c744eebdbc6680e883b88e5d937ab59f8a0fd7da812a28d9d0a3955853cb594ac5352d31a9655da95b735bbc46c0 AUX ffmpeg-6.0-fix-lto-type-mismatch.patch 1782 BLAKE2B 4cafd0244136c645e8da072b21c906fba97579f667e57f678b450410759fddc834e5a2428b7d0f078130cfc7ab267cad82a46d369951efddcfc5853dd2118837 SHA512 170114d57af0a0b5fc5da71ae76f4725b8cf1a604b5eca10e60761ef22fb0cdb35a166d1dd5ebc4ef990c383e1d1331f8ef2ceccb8dc7bf4adcc7e9ebb2ba899 -AUX ffmpeg-6.0-libplacebo-remove-deprecated-field.patch 4733 BLAKE2B eba46b33bdbb387b90f89491aa638cb941e7fb72d522945394e540fdfadaf83efc6837a13eefedc285b6bce3ef4443ef32f2c04754209c4a47c4d2216574d597 SHA512 0673dab6043466eecf79048f1da8879d89a014b207910bfd6ec6ebf151fe77edf35460035583f803133969d90ab202ce31aaddf322501ac4e34e1270a66f09fe AUX ffmpeg-6.0.1-alignment.patch 5048 BLAKE2B 9a9345b84b68442c97258a71b49ed773e40d985ea8f2525a8749a7562d787634ff0b0e5e1d257e94f7cf68fab81790ca2f0b64cfcb27453e1e6912de30c560e9 SHA512 575b71b2d69b0c7b4e0498b9375dad55945adc7178c72ed5fd12addeae3ffb0081ab59d743a2a6da1a3b67d84642c7dd3d04e2fdb9ae2d992968ba52aa1aee41 -AUX ffmpeg-6.0.1-libjxl-0.9.patch 5209 BLAKE2B 52c393c8e9b15382dbaf06f0c4651927f9dd87ac5437eb333f84689fafea841aeccf6ce9a43a522e2d4a1ec7e56074b8ee394f8c4b12c521cd48f293d36530f1 SHA512 bd114c62a4692fce9d625acb519900bee48fb604b0b7d7a2dba0a8f6648511be2019612ea8bafde95fa3b115bc9b527ab3267477327ce6e41d34b816f24a2654 AUX ffmpeg-6.1-gcc-14.patch 523 BLAKE2B b82fc06a7eee0c7ab68ef78f3ac205f45a68a7799dc241f0a574afa48e4dbd477c0d67f7c5a7ff46971adc821ef1507f4957156200167a2c59f8c7f7867ac048 SHA512 092cd9bad652ab82c3b160a37c0c92b561577d56b33776e30b79b7abf487fffeb1ef1273b950c4d4eff62d3cd7fec2a6dc2c294285b0b32eda364e47834a4ff9 AUX ffmpeg-6.1-opencl-parallel-gmake-fix.patch 370 BLAKE2B 46afba747d26105e5520389016aa8cc73ebc1425095e7818e0c2e23ff66b822a5428fec8253a6b545456bd94d0e746ed24bc014a7fa25d97b6fc4acf753341d4 SHA512 82b16798e63736dc67ad03e62eb31c7d3653d2e53a775a0a4456e01985da2336ebde587d3acd2272065c5ce82be528ebc051cd6c121832829d7cd0ed2aba3fdd AUX ffmpeg-6.1-wint-conversion.patch 3514 BLAKE2B fcb65b882af964a8f45f71ea3f885fc016e3f89c3d6f0bd6d661d489715c0f746e763a86c6ade1515e212b01559d90ea9c2a97c965e0c0f9087b8396cdd58414 SHA512 7e09fc1a811a21aee9eef0370e57a37817652229a6b0e58cd2e8723e8336124396fe40f6a7c6c5f860046410596027d27d900371ff86609b86ef94dd0633977f diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch b/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch deleted file mode 100644 index 40db3304b564..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/901099 and partly https://bugs.gentoo.org/900937. - -Newer compilers may optimise such that < 7 registers are free on 32-bit x86 -and then we get an "invalid asm" error. This is https://bugs.gentoo.org/901099 -and https://trac.ffmpeg.org/ticket/8903. - -Making matters worse, GCC sometimes hangs on invalid asm, so this also -mitigates a hang with e.g. -O3 -march=znver1. See https://bugs.gentoo.org/900937 -and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109137. - -In future, we may want to adjust the definition of HAVE_7REGS to just exclude -32-bit x86, but that's a big sledgehammer, so let's avoid it for now until we have -a reply on the upstream ffmpeg bug. ---- a/libavcodec/x86/cabac.h -+++ b/libavcodec/x86/cabac.h -@@ -175,7 +175,7 @@ - - #endif /* BROKEN_RELOCATIONS */ - --#if HAVE_7REGS && !BROKEN_COMPILER -+#if HAVE_7REGS && !BROKEN_COMPILER && !ARCH_X86_32 - #define get_cabac_inline get_cabac_inline_x86 - static - #if defined(_WIN32) && !defined(_WIN64) && defined(__clang__) - diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch b/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch deleted file mode 100644 index ca05c1c56ea4..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch +++ /dev/null @@ -1,103 +0,0 @@ -Bug: https://bugs.gentoo.org/910406 - -Backports the following two commits: - https://github.com/FFmpeg/FFmpeg/commit/11eca6018c40f5ebe6af93cbc4b4dce447d8b3bc - https://github.com/FFmpeg/FFmpeg/commit/1231003c3c6d4839a9e838d06f8e16ee7690958f - ---- a/doc/filters.texi -+++ b/doc/filters.texi -@@ -16242,9 +16242,6 @@ - @item disable_builtin - Disable built-in GPU sampling (forces LUT). - --@item force_icc_lut --Force the use of a full ICC 3DLUT for gamut mapping. -- - @item disable_fbos - Forcibly disable FBOs, resulting in loss of almost all functionality, but - offering the maximum possible speed. ---- a/libavfilter/version_major.h -+++ b/libavfilter/version_major.h -@@ -35,4 +35,6 @@ - * the public API and may change, break or disappear at any time. - */ - -+#define FF_API_LIBPLACEBO_OPTS (LIBAVFILTER_VERSION_MAJOR < 10) -+ - #endif /* AVFILTER_VERSION_MAJOR_H */ ---- a/libavfilter/vf_libplacebo.c -+++ b/libavfilter/vf_libplacebo.c -@@ -97,7 +97,6 @@ - float polar_cutoff; - int disable_linear; - int disable_builtin; -- int force_icc_lut; - int force_dither; - int disable_fbos; - -@@ -132,11 +131,15 @@ - int inverse_tonemapping; - float crosstalk; - int tonemapping_lut_size; -+ -+#if FF_API_LIBPLACEBO_OPTS - /* for backwards compatibility */ - float desat_str; - float desat_exp; - int gamut_warning; - int gamut_clipping; -+ int force_icc_lut; -+#endif - - /* pl_dither_params */ - int dithering; -@@ -380,6 +383,7 @@ - pl_rect2df_aspect_set(&target.crop, aspect, s->pad_crop_ratio); - } - -+#if FF_API_LIBPLACEBO_OPTS - /* backwards compatibility with older API */ - if (!tonemapping_mode && (s->desat_str >= 0.0f || s->desat_exp >= 0.0f)) { - float str = s->desat_str < 0.0f ? 0.9f : s->desat_str; -@@ -397,6 +401,7 @@ - gamut_mode = PL_GAMUT_WARN; - if (s->gamut_clipping) - gamut_mode = PL_GAMUT_DESATURATE; -+#endif - - /* Update render params */ - params = (struct pl_render_params) { -@@ -458,7 +463,6 @@ - .polar_cutoff = s->polar_cutoff, - .disable_linear_scaling = s->disable_linear, - .disable_builtin_scalers = s->disable_builtin, -- .force_icc_lut = s->force_icc_lut, - .force_dither = s->force_dither, - .disable_fbos = s->disable_fbos, - }; -@@ -818,11 +822,14 @@ - { "inverse_tonemapping", "Inverse tone mapping (range expansion)", OFFSET(inverse_tonemapping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC }, - { "tonemapping_lut_size", "Tone-mapping LUT size", OFFSET(tonemapping_lut_size), AV_OPT_TYPE_INT, {.i64 = 256}, 2, 1024, DYNAMIC }, -+ -+#if FF_API_LIBPLACEBO_OPTS - /* deprecated options for backwards compatibility, defaulting to -1 to not override the new defaults */ - { "desaturation_strength", "Desaturation strength", OFFSET(desat_str), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "desaturation_exponent", "Desaturation exponent", OFFSET(desat_exp), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 10.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "gamut_warning", "Highlight out-of-gamut colors", OFFSET(gamut_warning), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "gamut_clipping", "Enable colorimetric gamut clipping", OFFSET(gamut_clipping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, -+#endif - - { "dithering", "Dither method to use", OFFSET(dithering), AV_OPT_TYPE_INT, {.i64 = PL_DITHER_BLUE_NOISE}, -1, PL_DITHER_METHOD_COUNT - 1, DYNAMIC, "dither" }, - { "none", "Disable dithering", 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, STATIC, "dither" }, -@@ -847,7 +854,9 @@ - { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC }, - { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, -- { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, -+#if FF_API_LIBPLACEBO_OPTS -+ { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, -+#endif - { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { NULL }, diff --git a/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch b/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch deleted file mode 100644 index 10c216ec4c88..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch +++ /dev/null @@ -1,112 +0,0 @@ -https://bugs.gentoo.org/924431 -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=75b1a555a70c178a9166629e43ec2f6250219eb2 -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=ac06190a5a11f2b170e7719d769d7c0d65bff3e0 - -From 75b1a555a70c178a9166629e43ec2f6250219eb2 Mon Sep 17 00:00:00 2001 -From: Leo Izen -Date: Sat, 8 Jul 2023 14:43:31 -0400 -Subject: [PATCH] avcodec/libjxldec: build against libjxl 0.9 - -Git master libjxl changed several function signatures, so this commit -adds some #ifdefs to handle the new signatures without breaking old -releases. Do note that old git master development versions of libjxl -will be broken, but no releases will be. - -Signed-off-by: Leo Izen ---- a/libavcodec/libjxldec.c -+++ b/libavcodec/libjxldec.c -@@ -210,14 +210,22 @@ static int libjxl_get_icc(AVCodecContext *avctx) - JxlDecoderStatus jret; - /* an ICC profile is present, and we can meaningfully get it, - * because the pixel data is not XYB-encoded */ -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) - jret = JxlDecoderGetICCProfileSize(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &icc_len); -+#else -+ jret = JxlDecoderGetICCProfileSize(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, &icc_len); -+#endif - if (jret == JXL_DEC_SUCCESS && icc_len > 0) { - av_buffer_unref(&ctx->iccp); - ctx->iccp = av_buffer_alloc(icc_len); - if (!ctx->iccp) - return AVERROR(ENOMEM); -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) - jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, -- ctx->iccp->data, icc_len); -+ ctx->iccp->data, icc_len); -+#else -+ jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, ctx->iccp->data, icc_len); -+#endif - if (jret != JXL_DEC_SUCCESS) { - av_log(avctx, AV_LOG_WARNING, "Unable to obtain ICC Profile\n"); - av_buffer_unref(&ctx->iccp); -@@ -253,12 +261,21 @@ static int libjxl_color_encoding_event(AVCodecContext *avctx, AVFrame *frame) - /* set this flag if we need to fall back on wide gamut */ - int fallback = 0; - -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) - jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color); -+#else -+ jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color); -+#endif - if (jret == JXL_DEC_SUCCESS) { - /* enum values describe the colors of this image */ - jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_color); - if (jret == JXL_DEC_SUCCESS) -- jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color); -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) -+ jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, -+ JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color); -+#else -+ jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color); -+#endif - /* if we couldn't successfully request the pixel data space, we fall back on wide gamut */ - /* this code path is very unlikely to happen in practice */ - if (jret != JXL_DEC_SUCCESS) --- -2.30.2 - -From ac06190a5a11f2b170e7719d769d7c0d65bff3e0 Mon Sep 17 00:00:00 2001 -From: Leo Izen -Date: Tue, 23 Jan 2024 17:29:14 -0500 -Subject: [PATCH] avcodec/libjxl.h: include version.h - -This file has been exported since our minimum required version (0.7.0), -but it wasn't documented. Instead it was transitively included by - (but not jxl/encode.h), which ffmpeg relied on. - -libjxl broke its API in libjxl/libjxl@66b959239355aef5255 by removing -the transitive include of version.h, and they do not plan on adding -it back. Instead they are choosing to leave the API backwards- -incompatible with downstream callers written for some fairly recent -versions of their API. - -As a result, we include to continue to build against -more recent versions of libjxl. The version macros removed are also -present in that file, so we no longer need to redefine them. - -Signed-off-by: Leo Izen ---- a/libavcodec/libjxl.h -+++ b/libavcodec/libjxl.h -@@ -27,19 +27,8 @@ - #ifndef AVCODEC_LIBJXL_H - #define AVCODEC_LIBJXL_H - --#include - #include -- --/* -- * libjxl version 0.7.0 and earlier doesn't contain these macros at all -- * so to detect version 0.7.0 versus 0.8.0 we need to define them ourselves -- */ --#ifndef JPEGXL_COMPUTE_NUMERIC_VERSION -- #define JPEGXL_COMPUTE_NUMERIC_VERSION(major,minor,patch) ((major<<24) | (minor<<16) | (patch<<8) | 0) --#endif --#ifndef JPEGXL_NUMERIC_VERSION -- #define JPEGXL_NUMERIC_VERSION JPEGXL_COMPUTE_NUMERIC_VERSION(0, 7, 0) --#endif -+#include - - /** - * Transform threadcount in ffmpeg to one used by libjxl. --- -2.30.2 diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 902c1c3ed94c..c4c68c754f11 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -2,7 +2,6 @@ AUX handbrake-1.3.3-x265-link.patch 205 BLAKE2B e65b844a3924f2a332112502b9fb627e AUX handbrake-1.6.1-missing-include.patch 550 BLAKE2B 874c646bd6ce430dd2b273fc80406bee3ab4b405be41f984a6f8600b69a9344996de31e007db3d62c4a423d4e5c75758e47d7d089a5c7b07ea7e866a7b222fd4 SHA512 7b09ad791823f34ca8d64312bbcf0583a087522502625eba043fb9c81db5a135c7585bdd8d8241ecb2a3dd045cee4192b0bab83a9457d419b82204cb1b48432d AUX handbrake-9999-dont-search-for-python.patch 626 BLAKE2B 25226e243d06fb1a4bf7d7a9a0b2d5f77b37e87fd413c17bad285f10c0cefd33bee9dc193cc3497cd0740a36d3c596579502d3c76eccb514fa09b5976a171e48 SHA512 fd7684b0e312772c4e9e206dad402f3672c600a570cc60da543dc7e984b2bb91c7a3843b1a86dfe11179b86e35396aafa1c7464d6d7d0e93472d740ab6bcc4d9 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0 -AUX handbrake-9999-remove-faac-dependency.patch 3869 BLAKE2B 41f5c9499430fbd4e38d22403d1d84dce5c1c0a0cc16c3e544028ee6612175c28913587cdca922d7438fe41761a28e4b1f80eb2073c6619bb2d954e848857451 SHA512 39ee580ff14a4286b9f74557866fb0ceef2521628eeb6f2d311dd46a8cfbc0c5933068deb2bc717cdf29d014a2eb3d54470f17f2214626ceba43a2d89f5be8b8 AUX handbrake-9999-system-tools.patch 1404 BLAKE2B b18f3149ba5012bc97084c29a1dc4409de6dd7e76a83687fed961c54534c226077e170d227d3d8e1c1d973e8c843ac9c5f796c2dadece1a14e3eb831323c4ac6 SHA512 965eb699193ab22f64621e3776e7af68f0fc13abcf16c779e7dddb3c6aa121afbe8791c63f2a6969842bc11c28c7b0f91f8eb26f1959e2fdb8fb08da4ceb182e DIST handbrake-1.6.1.tar.bz2 15934833 BLAKE2B 027457c874bd49ff8a625233a5d09d70bdf76c45e6f2664f3ca65efcd0e1705d5575a81c5ac8f2237b8add7025314f12f0a19d6cc7337e2b0edd28c30ee3334b SHA512 e5cc0fee5bf063c4cdb8f64a772dac6800a7214bfdc65042c121e0e81878599fe615b499ebf6466bb78740314374ad8b8fa364fb24ff86852183e7dbbf565617 EBUILD handbrake-1.6.1.ebuild 4197 BLAKE2B 9ea44d080f1c0808f3bced34af7dc7cb4cd7d98f25bc322fa289553df928aa20922514793d5f71dc15258209e26c932685861e007db58dc4dad53d4121d7119d SHA512 b3da04d14b2294828f24b6681a6d39ae358ac4ac0ba3744ebc1d366f23e93d81452dd750e804a568d41c2448a67a8bd2ce6e7ea95b75980b74869227b870aac1 diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch deleted file mode 100644 index 12a0814fc056..000000000000 --- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- a/libhb/common.c -+++ b/libhb/common.c -@@ -375,7 +375,6 @@ hb_encoder_internal_t hb_audio_encoders[] = - { - // legacy encoders, back to HB 0.9.4 whenever possible (disabled) - { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_DTS_PASS, }, -- { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC, }, - { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC, }, - { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AC3, }, - { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_MP3, }, ---- a/scripts/manicure.rb -+++ b/scripts/manicure.rb -@@ -349,7 +349,7 @@ class Display - audioEncoders << "copy:dtshd" - when /AAC Pass/ - audioEncoders << "copy:aac" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoders << "av_aac" - when "AAC (FDK)" - audioEncoders << "fdk_aac" -@@ -466,7 +466,7 @@ class Display - case hash["AudioEncoderFallback"] - when /AC3/ - audioEncoderFallback << "ac3" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoderFallback << "av_aac" - when "AAC (FDK)" - audioEncoderFallback << "fdk_aac" -@@ -748,7 +748,7 @@ class Display - audioEncoders << "copy:dtshd" - when /AAC Pass/ - audioEncoders << "copy:aac" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoders << "av_aac" - when "AAC (FDK)" - audioEncoders << "fdk_aac" -@@ -865,7 +865,7 @@ class Display - case hash["AudioEncoderFallback"] - when /AC3/ - audioEncoderFallback << "ac3" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoderFallback << "av_aac" - when "AAC (FDK)" - audioEncoderFallback << "fdk_aac" -@@ -1148,7 +1148,7 @@ class Display - audioEncoders << "copy:dtshd" - when /AAC Pass/ - audioEncoders << "copy:aac" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoders << "av_aac" - when "AAC (FDK)" - audioEncoders << "fdk_aac" -@@ -1283,7 +1283,7 @@ class Display - case hash["AudioEncoderFallback"] - when /AC3/ - audioEncoderFallback << "ac3" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoderFallback << "av_aac" - when "AAC (FDK)" - audioEncoderFallback << "fdk_aac" -@@ -1600,7 +1600,7 @@ class Display - audioEncoders << "copy:dtshd" - when /AAC Pass/ - audioEncoders << "copy:aac" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoders << "av_aac" - when "AAC (FDK)" - audioEncoders << "fdk_aac" -@@ -1717,7 +1717,7 @@ class Display - case hash["AudioEncoderFallback"] - when /AC3/ - audioEncoderFallback << "ac3" -- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)" -+ when "AAC (ffmpeg)", "AAC (avcodec)" - audioEncoderFallback << "av_aac" - when "AAC (FDK)" - audioEncoderFallback << "fdk_aac" diff --git a/media-video/hevc-hm/Manifest b/media-video/hevc-hm/Manifest index bf94eef0f125..633a98e67172 100644 --- a/media-video/hevc-hm/Manifest +++ b/media-video/hevc-hm/Manifest @@ -1,3 +1,3 @@ DIST HM-HM-17.0.tar.gz 1692323 BLAKE2B fa620ce66acbc634d9768303fe8d60711759a9d6d1ff91b69680993ae45e4581c9df4f0a4fe36719de9713fd29ba020278cf7ef9a51ebee6b01dc578bfbd8f2f SHA512 e8492ee63326da497d0731ef3f70e9f11043618ab5a7244aed94b248dba3f64e301f0ec2d12447a0ef22cc630cfa425341f65b4cacef184b453ba5125b7f8738 -EBUILD hevc-hm-17.0.ebuild 1171 BLAKE2B da5a0c65eb2dcc3433929fe15eaf6f1b3693ad75cfd0d01e6df5f5da167bdda6f9e7179b037f786725820d465155f350c1ff6e4b53e01c2b9b6ad91e10183c76 SHA512 7e12572e493c6151c4bea0e73d9938dcdc512badc20891a8e78beac84df8f0925109c854e828b0619fbe1e6f3988f9045276e8e001aad64147623202ec62fa18 +EBUILD hevc-hm-17.0.ebuild 1167 BLAKE2B 6ce33116d90b6b5a9ea68c86213c629963e8b233e0033fa880808ef9473e29f70217ad59c2f82a9c2901393c927ca020e4a8db82264be8d243104bb29bce3bc2 SHA512 59edfc164d1a7ea50941fbe003284f27c9751abeff98be22aa369ebab4166d0f77dce7292293e6db16732ee045642f62c7a7f66f1a4ebcec76e49052be51e9ae MISC metadata.xml 260 BLAKE2B ee10cc021112a6e67381cc76d642cabfe9876b9e2da97243070551179a9f8eb2bcb67d8bf96822d40239c350808a8a129882914f1ce9b5f924c99d16ba1300a6 SHA512 0bc4c52638ab97c96d6e1ea6b8199201567dbdac880349e8ab501de49bbfba142e4f2f60baac9c0bc48df6f5d170d81d641277cc01762d720b720764bb162c1a diff --git a/media-video/hevc-hm/hevc-hm-17.0.ebuild b/media-video/hevc-hm/hevc-hm-17.0.ebuild index 958e4a2525ca..2bc7ae9af575 100644 --- a/media-video/hevc-hm/hevc-hm-17.0.ebuild +++ b/media-video/hevc-hm/hevc-hm-17.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://vcgit.hhi.fraunhofer.de/jvet/HM/-/archive/HM-${PV}/HM-HM-${PV}. LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86" S="${WORKDIR}/HM-HM-${PV}" diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest index 3cebbbef5b2c..9e4e6899d2d2 100644 --- a/media-video/motion/Manifest +++ b/media-video/motion/Manifest @@ -5,5 +5,5 @@ AUX motion.initd-r5 1392 BLAKE2B 87ac71a1e75ace73ac28c52ff0b1d6bbce364e6d43ef860 AUX motion.service-r4 497 BLAKE2B 8941424317635d214e74d5d558a443212129c38fed9921b101bd3689d743ed6bd68e30748075ae8c5d26aa10732fc6ce1f08707c9ed559eb89a27322e57e0995 SHA512 44e0fa13e4d93af517a06bac5191d16d528648c6b3eb9d56f80e447db7ef46b311acf6fd1d2159a24fa22200be41bdc62eeef8670ddba918bdd28f6d710f90c0 DIST motion-release-4.5.1.tar.gz 856665 BLAKE2B 59ae638113c7f08ced4b18d7c4f19e3b3f1850ba0cd4c224b300be5ac65ae3b45aa391f26f506a91bb4c38a47b552c71db846d2b3217ccf0b2f5799873ab7ddb SHA512 3b8b60ad4f41c37cc215aa575b0295ee99b15f2d32cbf3393c0f7cdd8d87616cca1c00e11cb7bf74e4afa285caa094f08df3ba62ab21dcb28a48336e3ff5803e EBUILD motion-4.5.1-r3.ebuild 2342 BLAKE2B fc35de7f4f3236dc84afb32727671bbb6baa7d697b7373ce8bfcec8aa82c6adf401d75194ad3b3b931ae0c46f0e811aa56a0f12d28aeb352fe55aec773b840d7 SHA512 0669ddd7b26388f24ea120614dac71c23c3d191ef36cb08598b1418746e9e59aac69b89ac1e66dd98e14f1033a941752459678e53f5268bd23283aa51d999d47 -EBUILD motion-4.5.1-r4.ebuild 2275 BLAKE2B 94b3ff22e3f6080fcc1dca0b104fda2268d967f2b55a376b61c7cd264880910b8ce11b7c5704d7280dc93f9384295c1f51b8506ff38229b3b22ad7c672d4d8de SHA512 2e7aeaf92759636de9c1eb9dd701130a386805cf888725737fd40b23e9e6a1b2a2478fad917720f8bfb1d92c58242b09c4a1fd41044f179b290a7c55cb8c78f4 +EBUILD motion-4.5.1-r4.ebuild 2273 BLAKE2B 841a187dcb94597fbbc08939a5259729702e41892e929d19e7008e1774866b2d0856ade5892a3cae9be8843191e3c306fe3d6523cbacef58976d32d4d8234958 SHA512 072ecb46f10904a801b62c5cbf0cc13da82d9f6c423eab47e8c6aa13b9996adb132170e198bec6e94a5bf0d893f071742654f0cc53f273eb65d2669f869bfb70 MISC metadata.xml 766 BLAKE2B 1385dc89a2d67fc06b0c430b7cb6a606ce22af15c633edc78382e48bc14e423a2a4ff1553531e0e373151e48d2fed1ab78f9da67680fda3eea6b3d717b077d22 SHA512 8c944d3b1bb54b25597bae085b3fdc3da3ff3677eb97fee314558597917355a2fa4db4216720dc51aa171bb032eb426ae8b1d3c9bc5efed3662af75d8d49cc54 diff --git a/media-video/motion/motion-4.5.1-r4.ebuild b/media-video/motion/motion-4.5.1-r4.ebuild index 6c898913fac2..0ea39b3e956f 100644 --- a/media-video/motion/motion-4.5.1-r4.ebuild +++ b/media-video/motion/motion-4.5.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-release-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86" IUSE="ffmpeg mariadb mysql postgres sqlite v4l webp" RDEPEND=" diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 0a7993ab76a3..72570a21ebca 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -10,6 +10,6 @@ DIST mplayer-1.5_p20230618.tar.xz 15101476 BLAKE2B 74f1d2d579c83330d8bf1e1ce2a89 DIST mplayer-1.5_p20231206.tar.xz 15212032 BLAKE2B c4658a0070296a9e24bb8388787a2ef322fefad4f4ea095bbf3f95b20f2e32b0423814ae311e43c9a6ef20afe0970540abd5d6d0ae0ebd59df74a8beb7abe3df SHA512 480502c735fb8d24ea1761a2b3f7daf1872df268f44791c7141f5b444b583beb0e4ecebe94e04129d27aae27656baddfb2da50406a431f1df39c589baac69432 EBUILD mplayer-1.5_p20230215.ebuild 17495 BLAKE2B 00fbaddadf64602f68a02c1fadf950081697f749003454165154792c78e0da4a4132e1c766c5fefece67ea98b947324a2e0f1ebc13a733b36368b416fe68850e SHA512 ea127eb56b1a6f5df61e9ed7fabea50ea56b53f9f3c3986acd8aa9fee638fc11495d80d62e8e990489f4488f87aa72d2e1977693dd48304fec50076d506091b2 EBUILD mplayer-1.5_p20230618.ebuild 17887 BLAKE2B 09ffce401d06826d180e5694469fc2014e97abfe7417f60b00c2469e16c59c3e2d2fb506d5b5573724bd6e391497e0dfb237166e6ef6eef1333a35f341c41bc7 SHA512 7a82ebee32e708ea5133a79f7b3e1d4f1102bbad8c874d3a3bc7def70361fd8703140455f4a35af3752a143b0ec4249208aaa76ff5e655c4639b3eb2bc4aa39a -EBUILD mplayer-1.5_p20231206.ebuild 17908 BLAKE2B 15016d72084f6dfacee9bb4e21f3d62421b4f8c625b323071f1dc288231850c6c0eb7e216b6e14221edae2041abcae19d7d6a6df6a595d3e561172df561c9235 SHA512 bab83f04006922dfd467e1ecd904d8e206b1468c2d49f449e8b11fc381606f4d11ffd496c620b87b72ff0bf1dc2da9f12d84674d461460503421740a5373bee9 +EBUILD mplayer-1.5_p20231206.ebuild 17904 BLAKE2B 268e181e40706ddf34fde616b35552125c695b6a2dbabeddc9d68d02bd5e53fb2494e3102a1bb3eadd0e075b1305bebaea5e9a8aaf3a0464e154be2fc9e5f575 SHA512 bf4dbcf9ebfe5331579dcef6d0ffb783bcf57c890ca6662899ba50b210859345ec46aed6ed5d37b3a950537284f833a680b2a2abeaee32dbbf1dec718c0d15ad EBUILD mplayer-9999.ebuild 17840 BLAKE2B 2fe583c53048f2fd66bbd3b63331fdc9906df313c704907127d32c1504a702b29a7db8618429ab6f979dfabc36ef8cad21d0cec7feed9861944176bbb2a210a5 SHA512 6a4dbb74ded57d6c472f9313c569cd67474b4dfb3e4a7fe64fca297a569bd367db7a6e49d9c352bbbbb72afccb39d4bc7f98f9c7ef9f498d70b2664c63087a6f MISC metadata.xml 2475 BLAKE2B 5a083ce5b8ed729245ec9eaf544be95f6cbdb9fcb5b80d3a21195557c3aede46d09bd93a0d1acd3830fc796f90dd5f15a17a3d3c69ba2a1a54a0676264dd02de SHA512 f04082ffd63adf9102dd82eb5b4c628fbf912701c7dae69f0b00bbad4e0957355e43369912e9422acc087200de982920c212efb60ba9c26675f74fd5f37fd739 diff --git a/media-video/mplayer/mplayer-1.5_p20231206.ebuild b/media-video/mplayer/mplayer-1.5_p20231206.ebuild index 2fcc4c0f3ffe..ce8e7a78b894 100644 --- a/media-video/mplayer/mplayer-1.5_p20231206.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20231206.ebuild @@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )" LICENSE="GPL-2" SLOT="0" if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi # faac codecs are nonfree diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 31920546b449..34f4ba253782 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -22,6 +22,6 @@ EBUILD pipewire-1.0.7-r1.ebuild 19565 BLAKE2B c0250fdcf5157412d74ef4c020d64b571f EBUILD pipewire-1.2.3.ebuild 19596 BLAKE2B bada9a63a09f8ca26fbadeebdc0efba1acd88d15b50a81bbc2ba0ed25273543439c0441d1fdb6596c1a5c30f6efacbf7c14b181c09a329fff674753256e10d33 SHA512 db0183a5bffe627e947684f6414fbdb14986a4f05a9722ff3bf63988bcf95e13bd55817881d19f695737b2882f4145beb107d2c5fac37084989ef9f4c18d9219 EBUILD pipewire-1.2.4.ebuild 19602 BLAKE2B 0594a1082c02d88befd9d3cdf4eaea883bb905e3a16223e1646be00d6281c1446d4c56b07db6c5873c73a38a80f4219106ac0f5d77a3490ad8f4c88d293ace14 SHA512 f14db8d84c6081b6ea4d59d6b67a83f82cf795794d73c8b4917a67ca037b22a3c041bf2f58020f7d7b342fbbbaaa44cea1e17b9e43847ba388e27a8bcdabf9e5 EBUILD pipewire-1.2.5.ebuild 19871 BLAKE2B dfae536c24cf9a489a08b33b08298027cbb31e90b0e06d59d1045e2b2406c6a23152a36de5abc0d90f0f9bb76d5e9f2f38e05e21dea751b6c3cb925cd347b628 SHA512 696652eee3c8ab6227f44160f29e163250368c883843c9e62188f88d1843c189ffa09efe573af3f96c046a3b089077756e4b89ce08e7588d005f10e9d586a362 -EBUILD pipewire-1.2.6.ebuild 19872 BLAKE2B 1be6bf6a5fbf3521da89fd374b2a8b2a49336611463061e67f5537653ab2490088212354fed9a098a4a43d09cded2dc63e21df57be4555c758d04944f4614651 SHA512 1d714382cb3ee22f0dcdc1c623ef45024dfeb50e7d44bd75bc7d7bb5843e2512a80f3594e4c1f0a0f916ad3294023887f35124b2efa4713d25415628bb060054 +EBUILD pipewire-1.2.6.ebuild 19871 BLAKE2B dfae536c24cf9a489a08b33b08298027cbb31e90b0e06d59d1045e2b2406c6a23152a36de5abc0d90f0f9bb76d5e9f2f38e05e21dea751b6c3cb925cd347b628 SHA512 696652eee3c8ab6227f44160f29e163250368c883843c9e62188f88d1843c189ffa09efe573af3f96c046a3b089077756e4b89ce08e7588d005f10e9d586a362 EBUILD pipewire-9999.ebuild 19866 BLAKE2B e178f8dc8254d7d77191e71b7a13d2d6225586c65f25fd969dfff45a40d7ed1f2c8b0139a13b3e4691c2acaa24e07f89d152cf5061e64c4b3c8ba356ff3da36f SHA512 ccdf5dfbafedac96b7c248a186249cbd0e19dc85d16431f54d98894f890b05d9bfdc4cf5cf7dd27911898fefbe94e39e3943ac3d842689724024c7e9ec196d43 MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb diff --git a/media-video/pipewire/pipewire-1.2.6.ebuild b/media-video/pipewire/pipewire-1.2.6.ebuild index af22cd23e875..bad144148611 100644 --- a/media-video/pipewire/pipewire-1.2.6.ebuild +++ b/media-video/pipewire/pipewire-1.2.6.ebuild @@ -47,7 +47,7 @@ else PIPEWIRE_DOCS_USEFLAG="man" fi - KEYWORDS="~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi DESCRIPTION="Multimedia processing graphs" diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 71e6a3d85306..4e0d58908400 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -8,5 +8,5 @@ DIST smplayer-23.6.0.tar.bz2 5164535 BLAKE2B 27200ad658a2acfc3c93c48ed59fca2333b DIST smplayer-24.5.0.tar.bz2 5221961 BLAKE2B 6c088b87508ada09fb8712610da76403fbcc9f0d3f2ce1908d99560400aac8351b08453c77f2cf64f13625b09e4d748a7f0a64458e6429aeb29ce1ae49ebcaad SHA512 0de968babbb99a92ef2721d8b30d336433bb99745212da0d7dadec9ec389da0be6cdc5b461960662b4342f80ee6407a814bc6abc3372c07a75ee6804e705851e EBUILD smplayer-23.6.0-r1.ebuild 2991 BLAKE2B c1da6177ae5f5783890ddcef9f29f929cc7b343862aff97ba2ed331d54e3f2b3dfea435389f497593ab743a4600edb5a5d7c14d9d69a57fcba7adabff08e119d SHA512 bbfad3d0dbcbf98cc41a02229d3d7fceacbf49923cdcc3ad169a97fe7ff7ceff276d4c18f174d04ab0f55c55613bbdbcd9d5630c11622e42d516b1ebed1d3974 EBUILD smplayer-23.6.0.ebuild 2949 BLAKE2B 755329f4f39cbb197f0b649117711b993b7e47ac5f5984a15012dda4984f656b08af6c22b9a66faf606d102e1681a8073848189e89f2e13b0d6d00bcf9c33ea1 SHA512 0350083c5965481bfd220303f33ad4a3088e4ae16c510bd16ced76c046fd0d66c391325ec55481b9d9bbee4ed1cf87a5a80271135c1d7212b05a67eaa0184725 -EBUILD smplayer-24.5.0.ebuild 2933 BLAKE2B fb98aca286fc75482bd4ee8851f440047a7e9e02fdd5bd5083645df63f82329b1bdd0d5fd7e516c4079b2d9886d9bb46d9ca501a9311bb2ccb3787e56e3169bc SHA512 0688fc1f04cbc628bc86983823aa03482dd5e11d16afa28d1de06b600f9d89fe432000f1d5339c614bf0cde2540e0fd893f5da7d715ed9810cbd3b488d094254 +EBUILD smplayer-24.5.0.ebuild 2931 BLAKE2B a8e12c32c1f524d78bcefc4e30ec77c11daf593aa43865ddfad0733da9a3df09ef710108be4dcdea65ffc3f128c9680865e700bc055b784a77e187880edf64b6 SHA512 c5382c7782683482913b2ae4b4937fbd16f05cfcce65d2b5f30c322dc10da950d47f790c5b8c6621230bd93432338e27073469767e7ec5725f28ef45a17ba822 MISC metadata.xml 411 BLAKE2B 81e72a005d2f58e43de29d290792014d13c8c79ceffab567898d376cdd9fd36a14a88de9a6d9ca8fe9c323f20a3b74a655430557cb3e2ffc2c07354322dbcc36 SHA512 62f0495b08725281602dd806248170300e75c238a574006c11eaf0ac3171726b0efc88d4791510eb1db1da7d124d47e89914822534833e454f595e5298a341f3 diff --git a/media-video/smplayer/smplayer-24.5.0.ebuild b/media-video/smplayer/smplayer-24.5.0.ebuild index 6ae116a3af27..4c6686c2ede7 100644 --- a/media-video/smplayer/smplayer-24.5.0.ebuild +++ b/media-video/smplayer/smplayer-24.5.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/smplayer-dev/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-2+ BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux" IUSE="bidi debug" DEPEND=" diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest index 7e0bdc9cbb13..9026d2d39517 100644 --- a/media-video/vidcutter/Manifest +++ b/media-video/vidcutter/Manifest @@ -1,4 +1,4 @@ DIST vidcutter-6.0.5.1_p20230201.tar.gz 9858362 BLAKE2B da10506810f93f5635a364d35f293a2c587455ee5c29cf28c0636b7441e330e6ab70385c22d9da914a22c71fed9f6d13688bcac9106d4430e5820fdd2b377d28 SHA512 1b355db77f4e78ade6c0553441d9b60739209fde74db6d9f0be3613e31f99806c94f33bf40912a43106dfc77bde09a54768d5786e06116af3dae2f9851823041 -EBUILD vidcutter-6.0.5.1_p20230201.ebuild 1132 BLAKE2B 8d9287006dcbf30d04c20673ddaab5b9f5924f7e461d0a33ade6ce39b2f1f199f1404dde142c48eee7a1e5a5b13465a214b33b8e9e2b58667ead58f583f7d1de SHA512 8533576089ab79fa5bc3466f92b33164907303152a35e5c0b19b4e99aa98eb37848a0703ccc6efa7066b640423e6d7797c0b17ef6a2423ec5b203e8470d54d42 -EBUILD vidcutter-9999.ebuild 1039 BLAKE2B 23367dd798d30314be248a8fd8888614970ba2348f0b9398814d46482e4276e26f26484e6cb7ecbe7490af2548ac98a30b1b0e7a22d8ad72ce90289ca6edbdb8 SHA512 78047940d8eaca428fea020622142583e2e8c133aafce7bd69d44a154449cf077139d0a3d752d9228b35c1ee31a11b9a5cb58c6477f56b0fa894034fd2f86e9f +EBUILD vidcutter-6.0.5.1_p20230201.ebuild 1133 BLAKE2B baa00b6cc687d0bee60e333369ca6cff270d2f7bf462a0c18b633f0ae84a280ecacf20375944090f6d149e35d1ae3675104fa37e715f11e95ee08805e0cf8807 SHA512 b4b429ed1338f81cfe39644bc8788a522a7aad38ae7361d95f2456d1d7c27b8b1d8eeb1c049cdfa8a3e16db3a9f4ee68fa429b9e5c25d0654d1a1b77141636a6 +EBUILD vidcutter-9999.ebuild 1040 BLAKE2B 4c06e4feeb11af8292b69cceac1f3161d032c1ac03913d1fcb19a1a147e44ec86068017bc929b9997476f2314f2ad26c82403ca63c63dc66db788535f946053a SHA512 23ddd52d3c17ec5f8256293acfe70a749141590bd9556cc7a468174806934a7b6885f395f753b1eb4fb04c3951af2a150a65148d1ea4e022a43a5f25138f16d8 MISC metadata.xml 342 BLAKE2B f01b41aebb261bcbcdc771f4eed7db58848718b414f2b5b37392c88aa3632731bde42a41da889bf4db9010d659fcac2466dce7dea53a03bf60bb65c256285073 SHA512 c6031aa3c9eabea4c4f3aed9b3dfb1d76dd0e17f2647e842808fb8fc63f2006115cea23066ecc45e30fa7d9a582b7bcce7e89c2913ccf3f07cc15887ee8c69ae diff --git a/media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild b/media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild index e5c3b3b2b5d3..ff216aac4416 100644 --- a/media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild +++ b/media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 xdg @@ -28,7 +28,7 @@ DEPEND=" >=media-video/mpv-0.25:=[libmpv] " RDEPEND="${DEPEND} - >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] + >=dev-python/pyqt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] dev-python/pyopengl[${PYTHON_USEDEP}] media-video/ffmpeg[X,encode] media-video/mediainfo" diff --git a/media-video/vidcutter/vidcutter-9999.ebuild b/media-video/vidcutter/vidcutter-9999.ebuild index a8ca07fe5865..a0315410bdd6 100644 --- a/media-video/vidcutter/vidcutter-9999.ebuild +++ b/media-video/vidcutter/vidcutter-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 xdg @@ -27,7 +27,7 @@ DEPEND=" >=media-video/mpv-0.25:=[libmpv] " RDEPEND="${DEPEND} - >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] + >=dev-python/pyqt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] dev-python/pyopengl[${PYTHON_USEDEP}] media-video/ffmpeg[X,encode] media-video/mediainfo" diff --git a/media-video/vidify/Manifest b/media-video/vidify/Manifest index 77ae58151392..46ecce6ad018 100644 --- a/media-video/vidify/Manifest +++ b/media-video/vidify/Manifest @@ -1,5 +1,5 @@ AUX vidify-2.2.6-python310.patch 743 BLAKE2B 143ae6532398038da83cf08fc95f25338cabd35f02213336b3e7e54944c2a49b1fd831a7d8ded957305b2b2a292f5bcfc64fb290888029c4859ce8f002db9809 SHA512 63b24e30e1159455411cf1aeaa8c2d2d88db6fa7c08536fb8cf95401c2f23ad68d2d67efdc8fc92d9decb3e2541154fb083a44aba1ba15f526333ff46a3bdf8a AUX vidify-2.2.6-yt-dlp.patch 4669 BLAKE2B 04f1c80702a495f732e617c5a1ad51a70dcaed82e9650c4ab21844d2aadeb58893889c575ed141fd9e8b8e2353f24b234217b1b9fad83d1b1d2b9e5f87e90474 SHA512 4ff0ca2d2c9999dae5b90abdd9554f8808b30b263a74f099d21c1de001736d1040e53e2ab55607fe6b0807ac4fbffb81cf10935f1419055a9ac136188ef90d84 DIST vidify-2.2.6.tar.gz 2906511 BLAKE2B 3df48ca57e102f664852e2fc2abeb3d19427673e1fec5144a8c0afda112a0f3b281b18db43b4326244266d6e9dfbcb2443319ddad3f864098a61bd1e3c966307 SHA512 15487ee9dcbe647b2b287bd2eb3c09962b557320313a9a3885fb3c0d6af945909531111d5297c1a5fb5b451af5df6fd968b3953bbf79af113980ed368a5674b5 -EBUILD vidify-2.2.6-r3.ebuild 2494 BLAKE2B 82238e5e148ea4b91e0f6cf7c8a215f068f8ccdb7c3eb4e5913e2c3cc9f113b81199bcc0ff28bec90b9143829ec7d0dc6f607239528951a37f715db248604efd SHA512 21e2c00b6eb91a57b8a7bdbdd96c945baa243b7798a69a9812df0f03ba81aa319bd88d8978d5f1f4959ae119a50e0696c35e8606926ede16495a4ea20591bce1 +EBUILD vidify-2.2.6-r3.ebuild 2494 BLAKE2B 57a5c83bd4fe4de6de10e26650fcda6d9f2207809eb7fb9a0e72483b6306c35a99d0e37191d0e60de3b53bb2e64d3e796e3d98734ada19fe99116b3c78604b5e SHA512 1e116fe775063ce1eb77625a6765a5f9316de2ebcbf24e5d35a5e4374bf68e0197f791159ba8ef94ec4f51256c2ad876ccb1471aaaa306ebe0a003429e681e4b MISC metadata.xml 779 BLAKE2B 8cf9bdd31415915b97cbd3195fbf65837114c4068b03c6b9eef9aafbf6a5e41777fbe20551545b362f531f274c287bd0b925fa81cb5eacb9d878ed03a546de77 SHA512 833806490154ad58f1d173f909e1b7bd74d0532b110e8a121a18b7852d2dfb70aaae89666131f3bc24ae0e845d3623287d7f150f6b5c7dc13d960253df9e449c diff --git a/media-video/vidify/vidify-2.2.6-r3.ebuild b/media-video/vidify/vidify-2.2.6-r3.ebuild index 5ca1b5eed6bb..a1c94e41dae9 100644 --- a/media-video/vidify/vidify-2.2.6-r3.ebuild +++ b/media-video/vidify/vidify-2.2.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ REQUIRED_USE="|| ( vlc mpv zeroconf )" RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] - dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}] + dev-python/qtpy[gui,webengine,${PYTHON_USEDEP}] net-misc/lyricwikia[${PYTHON_USEDEP}] net-misc/yt-dlp[${PYTHON_USEDEP}] dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] ) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 4d30783b8d2d..fd7c7642a012 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,15 +1,16 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a7fa4dec9891f718816e44fd08970a5477cdc7ae34510b26af9971fe5d20b25c96595901117c804c7679341e1e8cd5309a14 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae -AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6 AUX vlc-3.0.18-drop-minizip-dep.patch 1024 BLAKE2B f00df51fe46743b760785151fdc4b770347331b80fcb4208860b4cf99555504e634959384c236a3539c9235547d5eb54c0a1b18e0183b0864e0c4fc070359e15 SHA512 5911e0e64d07fd23a67b142adaec684c581125f06295a64dee9aade31e780b6010538007c7477ea9ef69e4e7b4aeb1cc30891dd22bf273c18407f694111a66f8 AUX vlc-3.0.21-freerdp-2.patch 8386 BLAKE2B ad8abf54cbf62cac4e67a000c40595a2f1ed13d57c8039aa7a9309dbe3d213e3d6838d31faf2f36d031aa25fd1a5f97fc26435b1dc4e7e082a2e517ed629b285 SHA512 7a43186c6f37aa4d4b2b971f91789c4a9c8d5d192cd9c1ed3fa9609b2d713f47420b983865d0906ca0dd6d15bc1ae6b22e84b03909c0c8e0024b779362d26c92 +AUX vlc-3.0.21-vaapi-without-ffmepg4.patch 692 BLAKE2B 6e9194d387e5b4643fb90d06fed809834e3a2c8e8f7e8a43b4d0866b73d5c2bf479181b83ae6e1b0a3b7971494fb478577a4385870c559be44961bed0d5bc9df SHA512 709450c0f51000618a7341cca7e4ffe6eac42a76a4cb7092ed197fbe28a6d6502c6bb234d6b0579ca3eb69bd918d1217a691ad2aa2aa7869c383ca77939ae83f AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b AUX vlc-9999-configure-lua-version.patch 1840 BLAKE2B 1b9f11c05ed58e12616732c73a8418917870515f9612467b2839e8414f553ba3d0d9ede4c38e15957cc9b271aecae9364961103dafd72b80c6088a826f18777b SHA512 fa6350a02a92b65e5cc1c7b8e65e14045ca279d9d6f3f1ae255ab2a8ac88b3b3ff16102aa7e91e51e65e2500712bd7fccbdc987e760a5753581098afb1259eb9 AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f941520b5435f852e0b0e7cdb8763e15df645cdc794087c188fb17ee331be7ba4d953311276583886e3fe0f93d6de32e63e3207 SHA512 93893a0accecc3470f33e505ef2ce86aeb5f2a3a6524adc7de354366bb8e51def2d67957be4ea705ff20c1510e7274691e587e70740d4b3657b35f5c91de7280 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d DIST vlc-3.0.21.tar.xz 25649288 BLAKE2B 0ad05282d624611ba8a2b6ca062c68aabeac8f37410dd427cc9b8c0d107af48ed203b73978e2fe83e8171ea6b78caa51394f3497061b561447dbb41058e1af9f SHA512 cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee +EBUILD vlc-3.0.21-r1.ebuild 13634 BLAKE2B 802356e9f6fa00b27c7eb154daed99545907f8cea0eac931201380ac3f6cf36b3ad561ed6702b37193f513529f924fc396602f2cb3305bd1e7a32cc3db4c2a02 SHA512 d702509a432f46f15ebac1ad572f285a232075b7a1fa5e0e54b47a44bc8997b41e7d3b5d9f6a93312bb94f8dff99d0809d33c9ece01d72d00f67b90e65674182 EBUILD vlc-3.0.21.ebuild 13632 BLAKE2B cdf1b077440ba3400b7504018eb5d3af65f2cd18232a2c12072331dedd81ee5a0ddf245145cc55915807c297c07681485cf785361e0dc371261652a0467a3a46 SHA512 ef40a8bc248737c874527774e29107d8d89d36d5cc251ada4ea65c12b7194db850c207a06f982eca2df3982c37f7ac2dc3aca5615be335bfe0ef3a18f93de768 -EBUILD vlc-3.0.9999.ebuild 13629 BLAKE2B 8ae0d493b94834e7209a14f2d2162bdaf6e5f64b0a29ae538ae58da3c41edeaa5bd2262e353d1f021c0edc5d2bfbeaa812ab5438a5ad813501c20c205b06f97f SHA512 01432aeafddf27949afac97047d072031e9254291c7ef840451b22216aa408ecccf072c45a05158cc236ca2b817e94a06dc9254baa1a938990f94541d6b95e8a -EBUILD vlc-9999.ebuild 13489 BLAKE2B a67f57b8a9e7e41cdcd4d6dd5f6353481b94b256eeb8f4983cd4bf1f8e95de5e961abfaabb6476bd5c5193dff374bfe2559862babab9553615686b280e297ca3 SHA512 99fb7b0f37b46bb7ec657a6281fb489c58a495d30b924a2e1993b7ed4baeb92a7e1c394c4fb2701194a8153f3bc0fce0a1d0869542bd0c512e1e5452bcb041a3 +EBUILD vlc-3.0.9999.ebuild 13634 BLAKE2B 802356e9f6fa00b27c7eb154daed99545907f8cea0eac931201380ac3f6cf36b3ad561ed6702b37193f513529f924fc396602f2cb3305bd1e7a32cc3db4c2a02 SHA512 d702509a432f46f15ebac1ad572f285a232075b7a1fa5e0e54b47a44bc8997b41e7d3b5d9f6a93312bb94f8dff99d0809d33c9ece01d72d00f67b90e65674182 +EBUILD vlc-9999.ebuild 13532 BLAKE2B 111e062ea2274e308c3c78cbf41fbfc71137438523ab0eee21d8b6b7e5c42ddfd22dfa71ad91d5df822381c146f6e4028c4deab13a0c7bc81de048bb1c0b67ea SHA512 a7a7c23a4c9ca063009ba2665219dadd2eee58a037e7f56c5ba3e7aae59eb576a7fd91d92df7b6bd7e1aa32e43ce844469a3ce084ec66e7ad9f03eaa32aa40c8 MISC metadata.xml 4815 BLAKE2B 90ef1af4058b83694f6b233c0b2daf46f45f6d23517103923b324db6ca167bb0e04226cae62162fc86a39bca5666b969b13f9d53d8b967a14af2595943d8c4e6 SHA512 544df4a6e4ed05f055f0aababa8c396932440f21336705818cbbce1397d0810ea5050ec16cdf2e3ebf0d7d63b70e77cd07c35edffeecde182ae2ecc571a1dbf7 diff --git a/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch b/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch deleted file mode 100644 index 5cee1336505f..000000000000 --- a/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch +++ /dev/null @@ -1,131 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1957,7 +1957,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [li - - dnl RDP/Remote Desktop access module - dnl --PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) ) -+PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) ) - - dnl - dnl Real RTSP plugin ---- a/modules/access/rdp.c 2017-12-25 17:45:32.964429170 +0100 -+++ b/modules/access/rdp.c 2017-12-25 17:53:15.114093670 +0100 -@@ -45,18 +45,6 @@ - # include - #endif - --#if !defined(FREERDP_VERSION_MAJOR) || \ -- (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))) --# define SoftwareGdi sw_gdi --# define Fullscreen fullscreen --# define ServerHostname hostname --# define Username username --# define Password password --# define ServerPort port --# define EncryptionMethods encryption --# define ContextSize context_size --#endif -- - #include - #ifdef HAVE_POLL - # include -@@ -140,6 +128,7 @@ - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context; - demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; - rdpGdi *p_gdi = p_context->gdi; -+ unsigned bytesPerPixel; - - if ( p_sys->es ) - { -@@ -149,19 +138,23 @@ - - /* Now init and fill es format */ - vlc_fourcc_t i_chroma; -- switch( p_gdi->bytesPerPixel ) -+ switch( p_gdi->dstFormat ) - { - default: -- case 16: -+ msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat); -+ case PIXEL_FORMAT_BGR16: - i_chroma = VLC_CODEC_RGB16; -+ bytesPerPixel = 16; - break; -- case 24: -+ case PIXEL_FORMAT_BGR24: - i_chroma = VLC_CODEC_RGB24; -+ bytesPerPixel = 24; - break; -- case 32: -+ case PIXEL_FORMAT_BGRA32: - i_chroma = VLC_CODEC_RGB32; -+ bytesPerPixel = 32; - break; - } - es_format_t fmt; - es_format_Init( &fmt, VIDEO_ES, i_chroma ); - -@@ -172,7 +165,7 @@ - fmt.video.i_height = p_gdi->height; - fmt.video.i_frame_rate_base = 1000; - fmt.video.i_frame_rate = 1000 * p_sys->f_fps; -- p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel; -+ p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel; - - if ( p_sys->p_block ) - p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize ); -@@ -233,28 +226,19 @@ - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; - - msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", --#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)) - p_instance->settings->DesktopWidth, - p_instance->settings->DesktopHeight, - p_instance->settings->ColorDepth --#else -- p_instance->settings->width, -- p_instance->settings->height, -- p_instance->settings->color_depth --#endif - ); - - p_instance->update->DesktopResize = desktopResizeHandler; - p_instance->update->BeginPaint = beginPaintHandler; - p_instance->update->EndPaint = endPaintHandler; - -- gdi_init( p_instance, -- CLRBUF_16BPP | --#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ -- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2)) -- CLRBUF_24BPP | --#endif -- CLRBUF_32BPP, NULL ); -+ if ( p_instance->settings->ColorDepth > 16 ) -+ gdi_init( p_instance, PIXEL_FORMAT_XRGB32); -+ else -+ gdi_init( p_instance, PIXEL_FORMAT_RGB16); - - desktopResizeHandler( p_instance->context ); - return true; -@@ -428,10 +412,6 @@ - if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0; - p_sys->i_frame_interval = 1000000 / p_sys->f_fps; - --#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 -- freerdp_channels_global_init(); --#endif -- - p_sys->p_instance = freerdp_new(); - if ( !p_sys->p_instance ) - { -@@ -506,9 +486,6 @@ - - freerdp_disconnect( p_sys->p_instance ); - freerdp_free( p_sys->p_instance ); --#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 -- freerdp_channels_global_uninit(); --#endif - - if ( p_sys->p_block ) - block_Release( p_sys->p_block ); diff --git a/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmepg4.patch b/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmepg4.patch new file mode 100644 index 000000000000..c71a39910733 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmepg4.patch @@ -0,0 +1,18 @@ +avcodec_vaapi requires ffmpeg-4, but other vaapi modules can be built + +diff --git a/configure.ac b/configure.ac +index 69beb77..c7f7142 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2454,9 +2454,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [ + have_avcodec_vaapi="yes" + ],[ + AS_IF([test -n "${enable_libva}"], [ +- AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing]) ++ AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing]) + ], [ +- AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ]) ++ AC_MSG_NOTICE([libva is present but libavcodec/vaapi.h is missing ]) + ]) + ]) + VLC_RESTORE_FLAGS diff --git a/media-video/vlc/vlc-3.0.21-r1.ebuild b/media-video/vlc/vlc-3.0.21-r1.ebuild new file mode 100644 index 000000000000..863da84818a5 --- /dev/null +++ b/media-video/vlc/vlc-3.0.21-r1.ebuild @@ -0,0 +1,513 @@ +# Copyright 2000-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} = *9999 ]] ; then + if [[ ${PV%.9999} != ${PV} ]] ; then + EGIT_BRANCH="3.0.x" + fi + EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git" + inherit git-r3 +else + if [[ ${MY_P} = ${P} ]] ; then + SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" + else + SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" + fi + S="${WORKDIR}/${MY_P}" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86" +fi +inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg + +DESCRIPTION="Media player and framework with support for most multimedia files and streaming" +HOMEPAGE="https://www.videolan.org/vlc/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-9" # vlc - vlccore + +IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus + dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth + fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate + libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua + macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg + omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image + sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame + udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi + cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +" +REQUIRED_USE=" + chromecast? ( encode ) + directx? ( ffmpeg ) + fontconfig? ( truetype ) + libcaca? ( X ) + libtar? ( skins ) + libtiger? ( kate ) + lua? ( ${LUA_REQUIRED_USE} ) + skins? ( archive gui truetype X xml ) + ssl? ( gcrypt ) + vaapi? ( ffmpeg X ) + vdpau? ( ffmpeg X ) +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + amd64? ( dev-lang/yasm ) + wayland? ( dev-util/wayland-scanner ) + x86? ( dev-lang/yasm ) +" +RDEPEND=" + media-libs/libvorbis + net-dns/libidn:= + sys-libs/zlib + virtual/libintl + virtual/opengl + a52? ( media-libs/a52dec ) + alsa? ( media-libs/alsa-lib ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) + aribsub? ( media-libs/aribb24 ) + bidi? ( + dev-libs/fribidi + media-libs/freetype:2[harfbuzz] + media-libs/harfbuzz:= + virtual/ttf-fonts + ) + bluray? ( >=media-libs/libbluray-1.3.0:= ) + cddb? ( media-libs/libcddb ) + chromaprint? ( media-libs/chromaprint:= ) + chromecast? ( + >=dev-libs/protobuf-2.5.0:= + >=net-libs/libmicrodns-0.1.2:= + ) + dav1d? ( media-libs/dav1d:= ) + dbus? ( sys-apps/dbus ) + dc1394? ( + media-libs/libdc1394:2 + sys-libs/libraw1394 + ) + dts? ( media-libs/libdca ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) + dvd? ( + >=media-libs/libdvdnav-6.1.1:= + >=media-libs/libdvdread-6.1.2:= + ) + faad? ( media-libs/faad2 ) + fdk? ( media-libs/fdk-aac:= ) + ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] ) + flac? ( + media-libs/flac:= + media-libs/libogg + ) + fluidsynth? ( media-sound/fluidsynth:= ) + fontconfig? ( media-libs/fontconfig:1.0 ) + gcrypt? ( + dev-libs/libgcrypt:= + dev-libs/libgpg-error + ) + gme? ( media-libs/game-music-emu ) + keyring? ( app-crypt/libsecret ) + gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) + ieee1394? ( + sys-libs/libavc1394 + sys-libs/libraw1394 + ) + jack? ( virtual/jack ) + jpeg? ( media-libs/libjpeg-turbo:0 ) + kate? ( media-libs/libkate ) + libass? ( + media-libs/fontconfig:1.0 + media-libs/libass:= + ) + libcaca? ( media-libs/libcaca ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify + ) + libsamplerate? ( media-libs/libsamplerate ) + libtar? ( dev-libs/libtar ) + libtiger? ( media-libs/libtiger ) + linsys? ( media-libs/zvbi ) + lirc? ( app-misc/lirc ) + live? ( media-plugins/live:= ) + lua? ( ${LUA_DEPS} ) + mad? ( media-libs/libmad ) + matroska? ( + >=dev-libs/libebml-1.4.2:= + media-libs/libmatroska:= + ) + modplug? ( >=media-libs/libmodplug-0.8.9.0 ) + mp3? ( media-sound/mpg123-base ) + mpeg? ( media-libs/libmpeg2 ) + mtp? ( media-libs/libmtp:= ) + musepack? ( media-sound/musepack-tools ) + ncurses? ( sys-libs/ncurses:=[unicode(+)] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) + ogg? ( media-libs/libogg ) + opus? ( >=media-libs/opus-1.0.3 ) + png? ( media-libs/libpng:0= ) + projectm? ( + media-fonts/dejavu + >=media-libs/libprojectm-3.1.12:0= + ) + pulseaudio? ( media-libs/libpulse ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:2= ) + samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) + sdl-image? ( media-libs/sdl-image ) + sftp? ( net-libs/libssh2 ) + shout? ( media-libs/libshout ) + sid? ( media-libs/libsidplay:2 ) + skins? ( + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm + ) + soxr? ( >=media-libs/soxr-0.1.2 ) + speex? ( + >=media-libs/speex-1.2.0 + media-libs/speexdsp + ) + srt? ( >=net-libs/srt-1.4.2:= ) + ssl? ( net-libs/gnutls:= ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) + taglib? ( =dev-libs/wayland-1.15 + dev-libs/wayland-protocols + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) + x264? ( >=media-libs/x264-0.0.20190214:= ) + x265? ( media-libs/x265:= ) + xml? ( dev-libs/libxml2:2 ) + zeroconf? ( net-dns/avahi[dbus] ) + zvbi? ( media-libs/zvbi ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch + "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch + "${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164 + "${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmepg4.patch # bug 864721, thx Fedora +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + +pkg_setup() { + if use lua; then + lua-single_pkg_setup + fi +} + +src_prepare() { + default + + # bug 608256 + xdg_environment_reset + + has_version 'net-libs/libupnp:1.8' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + + # Bootstrap when we are on a git checkout. + if [[ ${PV} = *9999 ]] ; then + ./bootstrap + fi + + # Make it build with libtool 1.5 + rm m4/lt* m4/libtool.m4 || die + + # We are not in a real git checkout due to the absence of a .git directory. + touch src/revision.txt || die + + # Don't use --started-from-file when not using dbus. + if ! use dbus ; then + sed -i 's/ --started-from-file//' share/vlc.desktop.in || die + fi + + # Disable running of vlc-cache-gen, we do that in pkg_postinst + sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ + -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + + # Fix gettext version mismatch errors. + sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die + + eautoreconf + + # Disable automatic running of tests. + find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die +} + +src_configure() { + local -x BUILDCC="$(tc-getBUILD_CC)" + + local myeconfargs=( + --disable-aa + --disable-optimizations + --disable-rpath + --disable-update-check + --enable-fast-install + --enable-screen + --enable-vcd + --enable-vlc + --enable-vorbis + $(use_enable a52) + $(use_enable alsa) + $(use_enable aom) + $(use_enable archive) + $(use_enable aribsub) + $(use_enable bidi fribidi) + $(use_enable bidi harfbuzz) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable chromecast microdns) + $(use_enable cpu_flags_arm_neon neon) + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable dav1d) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable directx) + $(use_enable directx d3d11va) + $(use_enable directx dxva2) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable encode sout) + $(use_enable encode vlm) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable ffmpeg avcodec) + $(use_enable ffmpeg avformat) + $(use_enable ffmpeg postproc) + $(use_enable ffmpeg swscale) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable keyring secret) + $(use_enable gstreamer gst-decode) + $(use_enable gui qt) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable mad) + $(use_enable matroska) + $(use_enable modplug mod) + $(use_enable mp3 mpg123) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable nfs) + $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable optimisememory optimize-memory) + $(use_enable opus) + $(use_enable png) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable rdp freerdp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable sdl-image) + $(use_enable sftp) + $(use_enable shout) + $(use_enable sid) + $(use_enable skins skins2) + $(use_enable soxr) + $(use_enable speex) + $(use_enable srt) + $(use_enable ssl gnutls) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vdpau) + $(use_enable vnc) + $(use_enable vpx) + $(use_enable wayland) + $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) + $(use_enable x264) + $(use_enable x264 x26410b) + $(use_enable x265) + $(use_enable xml libxml2) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --with-kde-solid="${EPREFIX}"/usr/share/solid/actions + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opencv + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-schroedinger + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-vsxu + --disable-wasapi + --disable-wma-fixed + ) + # ^ We don't have these disabled libraries in the Portage tree yet. + + # https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143) + append-flags -fno-strict-aliasing + filter-lto + + # Compatibility fix for Samba 4. + use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0" + + if use x86; then + # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 + append-cflags $(test-flags-CC -fno-stack-check) + # Bug 569774 + replace-flags -Os -O2 + fi + + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/" + + if use riscv; then + # bug #803473 + append-libs -latomic + fi + + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then + local dejavu="${EPREFIX}/usr/share/fonts/dejavu/" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) + fi + + econf "${myeconfargs[@]}" + + # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die +} + +src_test() { + virtx emake check-TESTS +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then + einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/" + "${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/" + else + ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" + ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "If you do not do it, vlc will take a long time to load." + fi + + xdg_pkg_postinst +} + +pkg_postrm() { + if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then + rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + fi + + xdg_pkg_postrm +} diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index c78279fbee98..863da84818a5 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -20,6 +20,7 @@ else else SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" fi + S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86" fi inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg @@ -61,7 +62,6 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner ) x86? ( dev-lang/yasm ) " -# =media-libs/taglib-1.9 ) + taglib? (