diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-03-22 00:31:30 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-03-22 00:31:30 +0000 |
commit | 6fe1dafaa446d9bc41dea28a43551fffa73f6b87 (patch) | |
tree | c6ef70a96add765cc1bfc88ac4d1ece5595cc9bf /media-video | |
parent | ae832415103492f73a8351ed7a91cb596392d779 (diff) |
gentoo auto-resync : 22:03:2025 - 00:31:29
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/Manifest.gz | bin | 23205 -> 23204 bytes | |||
-rw-r--r-- | media-video/ffmpeg-chromium/Manifest | 14 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild | 239 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild | 239 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild | 239 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild | 239 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-130.ebuild | 239 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-131.ebuild | 239 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild | 2 | ||||
-rw-r--r-- | media-video/vlc/Manifest | 5 | ||||
-rw-r--r-- | media-video/vlc/files/vlc-3.0.2.1-vdpau.patch | 174 | ||||
-rw-r--r-- | media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch | 149 | ||||
-rw-r--r-- | media-video/vlc/vlc-3.0.21-r3.ebuild | 500 |
13 files changed, 2 insertions, 2276 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex d0cc58fceac9..170b827b2da4 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index e491be3ed6af..ec9bc56aa410 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1,27 +1,15 @@ AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a AUX ffmpeg-chromium-120.patch 1485 BLAKE2B 49ece028bf7da100adc7af93e82b6235fb39f12199ce037b730b97012ca787047b45be821cec609cdfa7e00bb1f8c88a9ecae0b7b88fd8db6f53476b94833f9f SHA512 0f3276f75132bd8adbde4305ffa604cfa3d504ed66f883af109c75711d0f9af6dee2d55d7298ec36864a421250a0c4998d3306f0e47750c016c4274545195b49 DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140 SHA512 c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d -DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd SHA512 8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c -DIST ffmpeg-chromium-127.tar.xz 10418192 BLAKE2B 2a623ee8e2c0940e4067e6ebecaecdc64c45b16022327a84d77323348c210b091c58eb52b4afea1f2918cd29a27c3457a3294f561a5e6ee2db28c63f432b23bd SHA512 0cddb21761ad3b54f5393d3963ca94518cb4ab8183f2bbe975f8419bd94d8b20131750a22d75fd56b304a2b83be364993a839f727342b7eed6a2d1868f79af4c -DIST ffmpeg-chromium-128.tar.xz 10420280 BLAKE2B 0b5b3ca891445042c9c1a27713b57a0d99f75fd2d57116b89afa1020dde61a1b2d3d14e0c6d639a17fd0b45359e803580100c600e6ac99eb383630512ab8402b SHA512 a420da69c49c11bf49229066f7f08d837d8bfacfa47c659b8c3e5bb28426b65749a16ce221bf2996541902f2d55750c43e75596102a6449cdf4a845cbad777dc -DIST ffmpeg-chromium-129.tar.xz 10424032 BLAKE2B dbe0b8c2d799958660b6a3ca0f1a8e68a8f5b81ef813f2837b1c66bc03a9200cc8273b6c077fec5402157701cd341ce75055d39aac7b78e5af39537285a0bb8a SHA512 c6ac36f41cc7eed353b92809a481dd783ca52eabc15a10d6a41cb241e2ad8a25cb2467b62c671f303f90b6b3bb1497a196b4488457832fb5b51a796de20ca49c -DIST ffmpeg-chromium-130.tar.xz 10420352 BLAKE2B 1b7711a3ee349d1e0d8ad8f761c8a38f78a5088dcf985d5da6423938fd93512b177d749949d4a6a3894f6b1faa4e4a0a0584067448d2ac5c886c00bbc25db89c SHA512 ee1a13634695ef5fb3e1a812420662e17449cab5e3c4e29611f9503b771ccb60c4821136160c51faeb4e18919efc3138ca8e034a27f44739a60cc3452d31572a -DIST ffmpeg-chromium-131.tar.xz 10550352 BLAKE2B 985a4d0caede506050d2277af956723ae74236e2373d766862cef669031e91e44bcb51de219a76a1663f5cac5d85c74bd85215e96dffb14e6090d05ba6031f6c SHA512 1ccba5547ead2a64bcf72b6cdc9b6f9f8a6f817840125248b4d41efdf8376f8a69e8f7d3e4527cf155bb0a058ea6fc9f4cdb12d40a4b74189682e0db7b501ba3 DIST ffmpeg-chromium-132.tar.xz 10588420 BLAKE2B 988fa447019d4fc3a26685bffd9345b4cf31ace3d39c31a070551f4d4f664cf2982b47c4b6265c2f3e2e7b0eca65effb68a9e25840b6a5ca61600a33d5901b8b SHA512 51856a226e29345c708356e1c6ae478239f1f634937e0ad4caa73e33c7bef1dbaeae97d8670ccd8f15e628fc3d399fdb3a4be1769c57d1283704743b6ce23b72 DIST ffmpeg-chromium-133.tar.xz 10592716 BLAKE2B 81aac47dfb694c605242e762e6ced29714bc9780907afda6f61f55afef5416d1d998dda6785e8e64b7968f8b9cfc03bdcc4711535ccad65e6a9c55c626d30226 SHA512 798704455973439d3a1990e6344fe7bf1ebef370e7316cb813e898b84b4a39809e5681d54554a765a8f474731fcdf69897fb00f0b5e7ecc6b2e1bd6eef46a77a DIST ffmpeg-chromium-134.tar.xz 10687424 BLAKE2B c33487885bb6c75f9bc93abf7b11b52266930dde95411d7e702a2039d94de79d0fa9a4d5f82af12fb7db9e3b3e2be24147a446c6498c60c17841aa5738ec403e SHA512 369aae6bd3b065db3e3b9cac004209e596e9bbeada1a03bb8e20df4b026810fc12489ce52fb95a4320eeec31c09460d18e5c598f36fab1205024f0540be1c639 DIST ffmpeg-chromium-135.tar.xz 10688848 BLAKE2B 6421b2d7ef39bc30941e99bcf94bb53e8f4dc896c15aebb6863050b9da31215fb2fa77e710eabe79fe342d5cd1836e353272bf75193b82ddae282f21c92b9ef2 SHA512 9597736a6707c4b5fdcdf185962a3de8a8155855593813d85adfbe64b492d44e0ce66621e94f2c8de00a3ec2aca7c9f1c6850cbe3fb7de35ed6b9bddf3076288 DIST ffmpeg-chromium-136.tar.xz 10727884 BLAKE2B 4c3fc2bfc961c6a7c6c93268b55c2af45028d416316f7703db6b9c94a920a326a9d20b48f79743051087782b1e542f516536d796d436154d5c28dc14b6d32671 SHA512 7a88958b49b6c7fea525ec69faf7049336f80b037576dd08345c0feac901a8d21a7272db7300aed858508331cb837cbc0e07e14a4bead79f112d93caa2b26dfc EBUILD ffmpeg-chromium-125.ebuild 6479 BLAKE2B f71dbdd8922f14df1bca7a085645fdf48b843efe57c022bb31e2728e886c57f80b7993c675a71fd25641b995332d6a8b8015ff6eef988d2b005fb8a1ae980878 SHA512 21c167a3ba28277ac66a400fce531848a5a04a4be344ac94a7de421b8e8814f3c7f3b5612ba91c5ef1607bba371211655f7dfc87a44b8c239b473c8a7f7062a1 -EBUILD ffmpeg-chromium-126.ebuild 6479 BLAKE2B 31d1f47cf086e7617bcabc9b342c0155a0bc2782c569e65c391a4d15161165ec6869027b7498d5a20cad433f00d5bc4d64944498170b8b408be4147390ea3910 SHA512 8e7fe997f6ab7ebe4a3e24ab695b8d978296cb368ba2aeda0e5acd4e0dba5ed32bb95b4ae4210ebeef6b178004da153d4fd530ed509c050e777924f786752c37 -EBUILD ffmpeg-chromium-127.ebuild 6479 BLAKE2B 7357fe026fd686a96c6098e5259cbbd745b9b3e16afe088f3f0001a40994599439b2638d387b3dbc2aa66eba28a366ec3d032a4ed5d18948d501f8ab8cad086b SHA512 59380fcf97cc23930f8c3ff4023a8351881e8cf11dcfdad16d8c40ebb9891074ae6661455cd3395f0ca55552e8c0782458a9409bb175401d0af2e8a4222b82f4 -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 6479 BLAKE2B 1f58dc1d9b2dcafc3376f6d5048257e35d6bd8b0a0e1eb282de9ea0f710a4500cef8f17653dd41b2e099d02ec5674e01b08bb06ab96e7ef941dcb1254880d80f SHA512 5a7388287e60aed2a0542343805ca1a49a887d97bb9d6e4b2a4d1730a1898c4b953106479a12444ac856099ac7376e22df5484366a0246e86910284c6d3b55a6 -EBUILD ffmpeg-chromium-131.ebuild 6479 BLAKE2B 7eb290e9d70180370f3cf2cd0ed93ecdfea60e08df4586730533709650dccd461b43f5f1f2fdc69aa751894d3aefd550ea47fb0aa03adf3c123c1896f167eff6 SHA512 d978f8a08f1f67db72cf6b9af488b71fa57752ef94b40adc42dbddf8cfbb57b2c7654cb09fcc524cf8b533dc6f8580eccdc75cbb236a46e1f1d2737e4d75f92c EBUILD ffmpeg-chromium-132.ebuild 6452 BLAKE2B a743e4c5d771088ee19cc996ebf5743bc7e828bfca4cbff9928840a57b3658ce3bfd9fca5352c391843989b649c4d5961f1eb64c394ca543ef8e72eef3455c97 SHA512 fdd9cff14fb47a28cf5391508da080298447f049b1282651357c9faa4e3b7824c101df0af48c4221b6219e5c5e567db18992448c9e9c3a19c5c23ad2c6304357 EBUILD ffmpeg-chromium-133.ebuild 6452 BLAKE2B a743e4c5d771088ee19cc996ebf5743bc7e828bfca4cbff9928840a57b3658ce3bfd9fca5352c391843989b649c4d5961f1eb64c394ca543ef8e72eef3455c97 SHA512 fdd9cff14fb47a28cf5391508da080298447f049b1282651357c9faa4e3b7824c101df0af48c4221b6219e5c5e567db18992448c9e9c3a19c5c23ad2c6304357 -EBUILD ffmpeg-chromium-134.ebuild 6454 BLAKE2B 8210e941f03241209e30f0b70f6e9f116ea25674d4585e30ab5bf71b8a39bb330b0711ef654686bcd5e3249a340bc7b33e18dbf487912600f96c7a39fbf2c41d SHA512 da629eb6853842da6ed0ef261f96617bb9bc9cf06b0b946a263afa1c35b20b4900968165cd0ac37523905619bf7e3602530a5e4021a8419d0e79f1ad801418ba +EBUILD ffmpeg-chromium-134.ebuild 6452 BLAKE2B 9c53c1e9900dc0d600eb20bb0877b41ab724d8287435aebd1c09c9b4785cd5656c290436221e84240d8718b63afd8a9d8e75b83627f7af8b4f833ffc0d4ac859 SHA512 6a4ed7a5d557c4d6ec61bbf9e47c14c4a1d398c3db01cfe33a0582777f587b35c14eab5c91d853c8e649f7c610d8ca6122371b946f13d379d948b464a26cc25a EBUILD ffmpeg-chromium-135.ebuild 6454 BLAKE2B 8210e941f03241209e30f0b70f6e9f116ea25674d4585e30ab5bf71b8a39bb330b0711ef654686bcd5e3249a340bc7b33e18dbf487912600f96c7a39fbf2c41d SHA512 da629eb6853842da6ed0ef261f96617bb9bc9cf06b0b946a263afa1c35b20b4900968165cd0ac37523905619bf7e3602530a5e4021a8419d0e79f1ad801418ba EBUILD ffmpeg-chromium-136.ebuild 6454 BLAKE2B 6a4097b4765f8a0689db815182015b33af542670694ef67cbf9eddc178e06a0521fdebf517b96a34801dc2bdcd558c625f33d534acc45abd5d4efbf8b03fa13d SHA512 5d5f8c0b6e7832f48a3c5d7deed6cd59628075a26b6bf73ce5373cc35a6a8ec40ee04cc3b0c9788b87fe59a1f353d47fd32d08d9d6ab87eaf517786ce6bd05de MISC metadata.xml 695 BLAKE2B 84fa4967572665812d4da8bb1a86a8b28a749892570cb1fca5c0515f860fbe8c472a91240f1d3b7b3109ccdbd32cf8da941c438cd9f332b763f2824e0e193ac8 SHA512 0069bcf32d2aa083c66e13579295e8ef96b9ac72b02f1436620000c71c4d1e335391838f9a9e56f7768bd13dbe13ce6f3f3674a303cf90cc658360825867c3f9 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild deleted file mode 100644 index 30123f9c2d1f..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT=092f84b6141055bfab609b6b2666b724eee2e130 -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz" - -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" -SLOT="${PV}" - -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) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - nvenc:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 - cpu_flags_arm_asimddp:dotprod - cpu_flags_arm_i8mm:i8mm -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( - cpu_flags_arm_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( cpu_flags_arm_thumb ) - ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx - mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - >=media-libs/opus-1.0.2-r2 - vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) - nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.277:= ) -" - -DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) -" -BDEPEND=" - >=dev-build/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - vulkan? ( threads ) - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -PATCHES=( - "${FILESDIR}"/${PN}-120.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - - # -fdiagnostics-color=auto gets appended after user flags which - # will ignore user's preference. - sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die - - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - # Bug #918997. Will probably be fixed upstream in the next release. - use vulkan && append-ldflags -Wl,-z,muldefs - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) - fi - filter-lto - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Use --extra-libs if needed for LIBS - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-libopus \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild deleted file mode 100644 index f67cb20d79f3..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT=bc1ee906cede137c061bea5a5e8d0743374392a5 -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz" - -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" -SLOT="${PV}" - -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) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - nvenc:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 - cpu_flags_arm_asimddp:dotprod - cpu_flags_arm_i8mm:i8mm -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( - cpu_flags_arm_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( cpu_flags_arm_thumb ) - ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx - mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - >=media-libs/opus-1.0.2-r2 - vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) - nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.277:= ) -" - -DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) -" -BDEPEND=" - >=dev-build/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - vulkan? ( threads ) - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -PATCHES=( - "${FILESDIR}"/${PN}-120.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - - # -fdiagnostics-color=auto gets appended after user flags which - # will ignore user's preference. - sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die - - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - # Bug #918997. Will probably be fixed upstream in the next release. - use vulkan && append-ldflags -Wl,-z,muldefs - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) - fi - filter-lto - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Use --extra-libs if needed for LIBS - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-libopus \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild deleted file mode 100644 index 0669dac8dc36..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT=d941d9677bb4802f01750fd908ec284fb72c84df -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz" - -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" -SLOT="${PV}" - -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) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - nvenc:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 - cpu_flags_arm_asimddp:dotprod - cpu_flags_arm_i8mm:i8mm -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( - cpu_flags_arm_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( cpu_flags_arm_thumb ) - ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx - mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - >=media-libs/opus-1.0.2-r2 - vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) - nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.277:= ) -" - -DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) -" -BDEPEND=" - >=dev-build/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - vulkan? ( threads ) - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -PATCHES=( - "${FILESDIR}"/${PN}-120.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - - # -fdiagnostics-color=auto gets appended after user flags which - # will ignore user's preference. - sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die - - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - # Bug #918997. Will probably be fixed upstream in the next release. - use vulkan && append-ldflags -Wl,-z,muldefs - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) - fi - filter-lto - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Use --extra-libs if needed for LIBS - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-libopus \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild deleted file mode 100644 index 5c3db3e86611..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT=14d16cd143ad1993900c276e37592956702443a9 -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz" - -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" -SLOT="${PV}" - -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) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - nvenc:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 - cpu_flags_arm_asimddp:dotprod - cpu_flags_arm_i8mm:i8mm -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( - cpu_flags_arm_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( cpu_flags_arm_thumb ) - ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx - mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - >=media-libs/opus-1.0.2-r2 - vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) - nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.277:= ) -" - -DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) -" -BDEPEND=" - >=dev-build/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - vulkan? ( threads ) - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -PATCHES=( - "${FILESDIR}"/${PN}-120.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - - # -fdiagnostics-color=auto gets appended after user flags which - # will ignore user's preference. - sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die - - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - # Bug #918997. Will probably be fixed upstream in the next release. - use vulkan && append-ldflags -Wl,-z,muldefs - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) - fi - filter-lto - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Use --extra-libs if needed for LIBS - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-libopus \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-130.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-130.ebuild deleted file mode 100644 index 3c89e9f50671..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-130.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT=91903c28af60a732a051c343b496e1188eec9b05 -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz" - -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" -SLOT="${PV}" - -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) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - nvenc:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 - cpu_flags_arm_asimddp:dotprod - cpu_flags_arm_i8mm:i8mm -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( - cpu_flags_arm_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( cpu_flags_arm_thumb ) - ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx - mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - >=media-libs/opus-1.0.2-r2 - vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) - nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.277:= ) -" - -DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) -" -BDEPEND=" - >=dev-build/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - vulkan? ( threads ) - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -PATCHES=( - "${FILESDIR}"/${PN}-120.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - - # -fdiagnostics-color=auto gets appended after user flags which - # will ignore user's preference. - sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die - - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - # Bug #918997. Will probably be fixed upstream in the next release. - use vulkan && append-ldflags -Wl,-z,muldefs - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) - fi - filter-lto - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Use --extra-libs if needed for LIBS - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-libopus \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-131.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-131.ebuild deleted file mode 100644 index 81b121a64852..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-131.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT=686d6944501a6ee9c849581e3fe343273d4af3f6 -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz" - -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" -SLOT="${PV}" - -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) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - nvenc:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 - cpu_flags_arm_asimddp:dotprod - cpu_flags_arm_i8mm:i8mm -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( - cpu_flags_arm_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( cpu_flags_arm_thumb ) - ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx - mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - >=media-libs/opus-1.0.2-r2 - vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) - nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.277:= ) -" - -DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) -" -BDEPEND=" - >=dev-build/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - vulkan? ( threads ) - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -PATCHES=( - "${FILESDIR}"/${PN}-120.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - - # -fdiagnostics-color=auto gets appended after user flags which - # will ignore user's preference. - sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die - - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - # Bug #918997. Will probably be fixed upstream in the next release. - use vulkan && append-ldflags -Wl,-z,muldefs - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) - fi - filter-lto - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Use --extra-libs if needed for LIBS - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-libopus \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild index 043dc19c028a..6de9a028b6b5 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-134.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/vlc/Manifest b/media-video/vlc/Manifest index 860a629cd213..7f870a9dab9e 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -2,17 +2,12 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a 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.2.1-vdpau.patch 9068 BLAKE2B 072ab73cde74dc6b6a592218914f5b08f59fff94bebcc9c9ec8e4fcdd6288611e544b8c6ddab65bfa9d01e50800f0fcc814bf598733a29e4c3d94f899d3ae5b2 SHA512 28e10fd80a9888f85cf7b75e3df40c9b9f44d6a1d6bf3ab14a37b79767142fb2d81f40f3f806d86fbc0db1f0a995352ef47b20448dbbcaecc03f764135dba21e AUX vlc-3.0.21-freerdp-2.patch 8386 BLAKE2B ad8abf54cbf62cac4e67a000c40595a2f1ed13d57c8039aa7a9309dbe3d213e3d6838d31faf2f36d031aa25fd1a5f97fc26435b1dc4e7e082a2e517ed629b285 SHA512 7a43186c6f37aa4d4b2b971f91789c4a9c8d5d192cd9c1ed3fa9609b2d713f47420b983865d0906ca0dd6d15bc1ae6b22e84b03909c0c8e0024b779362d26c92 -AUX vlc-3.0.21-vaapi-w-ffmpeg5.patch 5223 BLAKE2B 762df3b6e2857ab985b044fc69b9c328c488faff4ae8d70c43996d01171faaa3fc1dd157a2240f35b8ac0e2ac0205b1236759f8d5b58ba8bca9d07bacc29149f SHA512 3dc0253d5e1c6fa60c6e32f4f8e024f2c953b2ea87fb324550fa12a1f5420a679274927d5922d78097135d422fc7370ff85b28bafddd7cf60070bd8fa3f62bba 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-taglib2.tar.xz 12620 BLAKE2B e0211789acc6c0381307bd154775ab32c0c403c9e245a965774667f9a83e801436b8609574f3152cde714e416d1826eb2b197349a54dfdf8eb86fc6ee3dd6f4e SHA512 f5b6691c36993b7f8002ff5c244f8e73b8fa8aeb09ef83f38f51ff9fda67c8204551cb2d762e16364229fdca6d7284a47c4d44d0a98b1d3c7759923500d04ffa -DIST vlc-3.0.21.tar.xz 25649288 BLAKE2B 0ad05282d624611ba8a2b6ca062c68aabeac8f37410dd427cc9b8c0d107af48ed203b73978e2fe83e8171ea6b78caa51394f3497061b561447dbb41058e1af9f SHA512 cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee DIST vlc-3.0.21_p20250217.tar.bz2 24645521 BLAKE2B 473cc2bc5f385635ba7c36bca2ddb0ca6cb479491e7a5baa51583edce3fa1e4b0a7afd883d595332cafe8d1b22e743e0f306aebfe2c7c13d3317d0ea5502bb38 SHA512 95d23c8ecf013d072530fe7cd6e78b5efc0a7132407e8d09d02014b4a7cf9f508cea4c18c0f39edced634338fce06613a207b5f0b556344c7481a1ed5af2dc5f -EBUILD vlc-3.0.21-r3.ebuild 13503 BLAKE2B d7ca885a762b265728b2b7a306230ab70c8d3fb54da56f8a2a9449c379726b721145ee9a6d46a320b6916c987a205b8ead5d58a3d7b1c1d935e5441b90c0bcdd SHA512 5e608871e2e9e34134c532aa2ea41d930b6a269b52087ca4ca43cc8abd25d92176077d2b02c93b13879904bf076f3ee062e7d2152c52803ed3140b9cb7af8bd6 EBUILD vlc-3.0.21_p20250217.ebuild 13541 BLAKE2B ee2719bb7fd4bd6b96b02d91352f48cee9cf6be121f3d616153cad0f1b6df125572c7c4c4da844ceddad47ea7441e7c71f30f12755de0ca539ebaafc16bd7c55 SHA512 8928c0ed30d18378d276a655df6acc015224a9a6f62116f798bb4aab42e75a982ab4695e4e59b6c3532e358df16b672ee55dd444d7bcf51fe392b8e0ad133a0e EBUILD vlc-3.0.9999.ebuild 13705 BLAKE2B d9e1065dc5667c2575712e754809f1210704c586ab3b55788f39818a3d241ca36085ed62819b16f6a30732d2634abb0a4e3a59f477fa186c9173ada961c46844 SHA512 a59625f4abad39d76f03aef0e2eff88761a5bdcc673e5c854bbb541509d6c133377b8a98e733030d8db1df35f7a4e46cec10402e76d1f947714e1ed70870ec48 EBUILD vlc-9999.ebuild 13681 BLAKE2B 7c298c160787b1fe299193101e8521f6f8191391ba36c9f9dbcadea4554139f3bba8ddfac3c6771c8b2c1cbcdb0ae71f86766b5e204ba8de1e46c9f3e756f589 SHA512 1814f64437bfe3d4f7f51d4176d2ceb6e9853714e3861178b1a71fd9135e5b5f1c112b6efe279af8a9225f6fecc4d5ca5cf2977433137de0ff58c3a19a7cb155 diff --git a/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch b/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch deleted file mode 100644 index 884c1fcd1eb2..000000000000 --- a/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch +++ /dev/null @@ -1,174 +0,0 @@ -https://bugs.gentoo.org/946178 -https://code.videolan.org/videolan/vlc/-/issues/28374 -https://code.videolan.org/videolan/vlc/-/merge_requests/6454 -https://code.videolan.org/videolan/vlc/-/merge_requests/6496 - -From 056d7349a559cb63b456505bb11c08a4910452aa Mon Sep 17 00:00:00 2001 -From: Alexandre Janniaux <ajanni@videolabs.io> -Date: Sun, 1 Dec 2024 06:25:29 +0100 -Subject: [PATCH] Makefile.am: enforce pkglib dependency order for install - -During installation, no dependencies existed between the targets being -installed and the targets being relinked against the installed version, -which made the following race condition: - - ../doltlibtool --mode=install /usr/bin/install -c libvlc_pipewire.la libvlc_pulse.la libvlc_vdpau.la libvlc_xcb_events.la '/builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc' - libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_build/sub/modules; /bin/bash "/builds/videolan/vlc/vlc-4.0.0-dev/_build/sub/modules/../libtool" --silent --tag CC --mode=relink gcc -g -O2 -pthread -Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security -Wduplicated-branches -Wduplicated-cond -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Werror-implicit-function-declaration -Winit-self -Wlogical-op -Wshadow=local -Wmultistatement-macros -pipe -Werror=missing-field-initializers -Werror=format -Werror=incompatible-pointer-types -Werror=restrict -Werror=int-conversion -Werror=implicit-int -Werror=return-mismatch -Werror=declaration-missing-parameter-type -fvisibility=hidden -fno-math-errno -funsafe-math-optimizations -fno-rounding-math -fno-signaling-nans -fcx-limited-range -funroll-loops -fstack-protector-strong -avoid-version -module -export-symbols-regex "^vlc_entry" -shrext .so -no-undefined ../compat/libcompat.la ../src/libvlccore.la -Wl,-z,defs -o libvdpau_instance_plugin.la -rpath /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/plugins/vdpau hw/vdpau/libvdpau_instance_plugin_la-device.lo libvlc_vdpau.la -lSM -lICE -lX11 -lanl ) - libtool: install: /usr/bin/install -c .libs/libvlc_vdpau.so.0.0.0 /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/libvlc_vdpau.so.0.0.0 - /usr/bin/ld: cannot find -lvlc_vdpau: No such file or directory - libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc && { ln -s -f libvlc_vdpau.so.0.0.0 libvlc_vdpau.so.0 || { rm -f libvlc_vdpau.so.0 && ln -s libvlc_vdpau.so.0.0.0 libvlc_vdpau.so.0; }; }) - collect2: error: ld returned 1 exit status - libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc && { ln -s -f libvlc_vdpau.so.0.0.0 libvlc_vdpau.so || { rm -f libvlc_vdpau.so && ln -s libvlc_vdpau.so.0.0.0 libvlc_vdpau.so; }; }) - ---------------------------------------------------------------------- - libtool: error: error: relink 'libvdpau_instance_plugin.la' with the above command before installing it - libtool: install: /usr/bin/install -c .libs/libvlc_vdpau.lai /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/libvlc_vdpau.la - make[6]: *** [Makefile:15527: install-vdpauLTLIBRARIES] Error 1 - -Here, with the thread number, we have: - - (1) doltlibtool installing the pkglibs (install-exec-am). - - (2) in parallel, libtool relinking the vdpau instance plugin. - - (1) libtool starts to be called for "relinking" (which is only - installing there) with version 0.0.0. - - (2) libtool tried to run the linker but it failed because - libvlc_vdpau.so doesn't exist yet on the target prefix. - - (1) libtool .0.0.0 links to the major version shortcut .0 for - libvlc_vdpau. - - (1) libtool .0.0.0 links to the unversioned shortcut for - libvlc_vdpau. - -So the pkglibs were not installed before installing the plugins linking -them and it was racy whether automake succeeded in installing vlc_vdpau -before or not. This could apply to any pkglib being used from plugins. - -This patch ensure the pkglibs are installed before relinking the plugins -for vpdau, same must be done for each other pkglib usage location. - -Note that install-vdpauLTLIBRARIES itself will install each target from -vdpau_LTLIBRARIES serially in the order they are defined, so there would -be no race inside the same LTLIBRARIES variables, but the different -LTLIBRARIES variables are processed in parallel themselves. - -Fixes #28374 ---- - modules/Makefile.am | 1 + - modules/audio_output/Makefile.am | 3 +++ - modules/hw/vdpau/Makefile.am | 4 ++++ - modules/video_output/Makefile.am | 3 +++ - 4 files changed, 11 insertions(+) - -diff --git a/modules/Makefile.am b/modules/Makefile.am -index d9940f95cbc8..3a41a6bbe456 100644 ---- a/modules/Makefile.am -+++ b/modules/Makefile.am -@@ -1,3 +1,4 @@ -+ - noinst_LTLIBRARIES = - check_LTLIBRARIES = - pkglib_LTLIBRARIES = -diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am -index 4c7957cdd153..8d48003e20b5 100644 ---- a/modules/audio_output/Makefile.am -+++ b/modules/audio_output/Makefile.am -@@ -1,5 +1,8 @@ - aoutdir = $(pluginsdir)/audio_output - aout_LTLIBRARIES = -+# Install the pkglib/pkglibexec first before relinking the modules. -+# This ensures libtool re-linking is not racy. -+install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES - - libvlc_android_audioformat_jni_la_SOURCES = \ - audio_output/android/audioformat_jni.c \ -diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am -index ef3601209314..f195f712310b 100644 ---- a/modules/hw/vdpau/Makefile.am -+++ b/modules/hw/vdpau/Makefile.am -@@ -1,4 +1,8 @@ - vdpaudir = $(pluginsdir)/vdpau -+# Install the pkglib/pkglibexec first before relinking the modules. -+# This ensures libtool re-linking is not racy. -+install-vpdauLTLIBRARIES: install-pkglibLTLIBRARIES -+ - - libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h - libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS) -diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am -index ad959bc45ed5..bcbb892c4c93 100644 ---- a/modules/video_output/Makefile.am -+++ b/modules/video_output/Makefile.am -@@ -1,5 +1,8 @@ - voutdir = $(pluginsdir)/video_output - vout_LTLIBRARIES = -+# Install the pkglib/pkglibexec first before relinking the modules. -+# This ensures libtool re-linking is not racy. -+install-voutLTLIBRARIES: install-pkglibLTLIBRARIES - - EXTRA_DIST += video_output/README - --- -GitLab - -From 0b9f3f836f1c678e6d101f62545a8edaba16dcd0 Mon Sep 17 00:00:00 2001 -From: Alexandre Janniaux <ajanni@videolabs.io> -Date: Sun, 8 Dec 2024 22:43:37 +0100 -Subject: [PATCH] Makefile.am: fix installation regression - -Automake doesn't generate automatic rules when a rule already exist in -the file, except if it cannot detect it. Adding the -`install-fooLTLIBRARIES: install-pkglibLTLIBRARIES` rule for audio -outputs, video outputs and vdpau broke the installation. - -Adding `$(install-fooLTLIBRARIES): install-pkglibLTLIBRARIES` also makes -automake unhappy because of the variable name looking suspiciously close -to the target it generates, so a version without the dash is used for -the variable name in the rule. With this, the install target is -preserved but the dependency also exists in the output. ---- - modules/audio_output/Makefile.am | 3 ++- - modules/hw/vdpau/Makefile.am | 3 ++- - modules/video_output/Makefile.am | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am -index 8d48003e20b..c045a892c10 100644 ---- a/modules/audio_output/Makefile.am -+++ b/modules/audio_output/Makefile.am -@@ -2,7 +2,8 @@ aoutdir = $(pluginsdir)/audio_output - aout_LTLIBRARIES = - # Install the pkglib/pkglibexec first before relinking the modules. - # This ensures libtool re-linking is not racy. --install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES -+installaoutLTLIBRARIES = install-aoutLTLIBRARIES -+$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES - - libvlc_android_audioformat_jni_la_SOURCES = \ - audio_output/android/audioformat_jni.c \ -diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am -index f195f712310..1abdfa21a9b 100644 ---- a/modules/hw/vdpau/Makefile.am -+++ b/modules/hw/vdpau/Makefile.am -@@ -1,7 +1,8 @@ - vdpaudir = $(pluginsdir)/vdpau - # Install the pkglib/pkglibexec first before relinking the modules. - # This ensures libtool re-linking is not racy. --install-vpdauLTLIBRARIES: install-pkglibLTLIBRARIES -+installvpdauLTLIBRARIES = install-vdpauLTLIBRARIES -+$(installvpdauLTLIBRARIES): install-pkglibLTLIBRARIES - - - libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h -diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am -index bcbb892c4c9..844b0dd01c8 100644 ---- a/modules/video_output/Makefile.am -+++ b/modules/video_output/Makefile.am -@@ -2,7 +2,8 @@ voutdir = $(pluginsdir)/video_output - vout_LTLIBRARIES = - # Install the pkglib/pkglibexec first before relinking the modules. - # This ensures libtool re-linking is not racy. --install-voutLTLIBRARIES: install-pkglibLTLIBRARIES -+installvoutLTLIBRARIES = install-voutLTLIBRARIES -+$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES - - EXTRA_DIST += video_output/README - --- -GitLab diff --git a/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch b/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch deleted file mode 100644 index 322818b348b7..000000000000 --- a/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch +++ /dev/null @@ -1,149 +0,0 @@ -From ba5dc03aecc1d96f81b76838f845ebde7348cf62 Mon Sep 17 00:00:00 2001 -From: David Rosca <nowrep@gmail.com> -Date: Fri, 20 Dec 2024 20:24:36 +0100 -Subject: [PATCH] avcodec: vaapi: Support VAAPI with latest FFmpeg - ---- - configure.ac | 20 +------------ - modules/codec/Makefile.am | 2 +- - modules/codec/avcodec/avcommon_compat.h | 3 ++ - modules/codec/avcodec/vaapi.c | 38 +++++++++++++++++++++++-- - 4 files changed, 41 insertions(+), 22 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 00afb063c455..089339e10e0b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2550,25 +2550,7 @@ AM_CONDITIONAL([HAVE_VAAPI], [test "${have_vaapi}" = "yes"]) - AM_CONDITIONAL([HAVE_VAAPI_DRM], [test "${have_vaapi_drm}" = "yes"]) - AM_CONDITIONAL([HAVE_VAAPI_X11], [test "${have_vaapi_x11}" = "yes"]) - AM_CONDITIONAL([HAVE_VAAPI_WL], [test "${have_vaapi_wl}" = "yes"]) -- --have_avcodec_vaapi="no" --AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [ -- VLC_SAVE_FLAGS -- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" -- CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" -- AC_CHECK_HEADERS([libavcodec/vaapi.h], [ -- AC_MSG_NOTICE([VA API acceleration activated]) -- 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 ]) -- ]) -- ]) -- VLC_RESTORE_FLAGS --]) --AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_avcodec_vaapi}" = "yes"]) -+AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"]) - - dnl - dnl dxva2 needs avcodec -diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am -index 6d9465fdaef9..dd04391c1bf7 100644 ---- a/modules/codec/Makefile.am -+++ b/modules/codec/Makefile.am -@@ -416,7 +416,7 @@ libvaapi_plugin_la_SOURCES = \ - codec/avcodec/vaapi.c hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h - libvaapi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) - libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS) --libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) -+libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(AVCODEC_LIBS) - if HAVE_AVCODEC_VAAPI - if HAVE_VAAPI_DRM - codec_LTLIBRARIES += libvaapi_drm_plugin.la -diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h -index ac02c06d2339..8ab6910f3250 100644 ---- a/modules/codec/avcodec/avcommon_compat.h -+++ b/modules/codec/avcodec/avcommon_compat.h -@@ -84,6 +84,9 @@ - #ifndef FF_API_AVIO_WRITE_NONCONST // removed in ffmpeg 7 - # define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61) - #endif -+#ifndef FF_API_STRUCT_VAAPI_CONTEXT -+# define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) -+#endif - - #endif /* HAVE_LIBAVCODEC_AVCODEC_H */ - -diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c -index c83269e43f30..e203baaf9ee2 100644 ---- a/modules/codec/avcodec/vaapi.c -+++ b/modules/codec/avcodec/vaapi.c -@@ -42,12 +42,25 @@ - # include <va/va_drm.h> - #endif - #include <libavcodec/avcodec.h> -+#if FF_API_STRUCT_VAAPI_CONTEXT - #include <libavcodec/vaapi.h> -+#else -+#include <libavutil/hwcontext_vaapi.h> -+#endif - - #include "avcodec.h" - #include "va.h" - #include "../../hw/vaapi/vlc_vaapi.h" - -+#if !FF_API_STRUCT_VAAPI_CONTEXT -+struct vaapi_context -+{ -+ VADisplay display; -+ VAConfigID config_id; -+ VAContextID context_id; -+}; -+#endif -+ - struct vlc_va_sys_t - { - struct vlc_vaapi_instance *va_inst; -@@ -145,8 +158,10 @@ static void Delete(vlc_va_t *va, void **hwctx) - - (void) hwctx; - -- vlc_vaapi_DestroyContext(o, sys->hw_ctx.display, sys->hw_ctx.context_id); -- vlc_vaapi_DestroyConfig(o, sys->hw_ctx.display, sys->hw_ctx.config_id); -+ if (sys->hw_ctx.context_id != VA_INVALID_ID) -+ vlc_vaapi_DestroyContext(o, sys->hw_ctx.display, sys->hw_ctx.context_id); -+ if (sys->hw_ctx.config_id != VA_INVALID_ID) -+ vlc_vaapi_DestroyConfig(o, sys->hw_ctx.display, sys->hw_ctx.config_id); - vlc_vaapi_ReleaseInstance(sys->va_inst); - free(sys); - } -@@ -196,6 +211,7 @@ static int Create(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *d - sys->hw_ctx.config_id = VA_INVALID_ID; - sys->hw_ctx.context_id = VA_INVALID_ID; - -+#if FF_API_STRUCT_VAAPI_CONTEXT - sys->hw_ctx.config_id = - vlc_vaapi_CreateConfigChecked(o, sys->hw_ctx.display, i_profile, - VAEntrypointVLD, i_vlc_chroma); -@@ -211,6 +227,24 @@ static int Create(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *d - goto error; - - ctx->hwaccel_context = &sys->hw_ctx; -+#else -+ AVBufferRef *hwdev_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI); -+ if (hwdev_ref == NULL) -+ goto error; -+ -+ AVHWDeviceContext *hwdev_ctx = (void *) hwdev_ref->data; -+ AVVAAPIDeviceContext *vadev_ctx = hwdev_ctx->hwctx; -+ vadev_ctx->display = va_dpy; -+ -+ if (av_hwdevice_ctx_init(hwdev_ref) < 0) -+ { -+ av_buffer_unref(&hwdev_ref); -+ goto error; -+ } -+ -+ ctx->hw_device_ctx = hwdev_ref; -+#endif -+ - va->sys = sys; - va->description = vaQueryVendorString(sys->hw_ctx.display); - va->get = Get; --- -GitLab - diff --git a/media-video/vlc/vlc-3.0.21-r3.ebuild b/media-video/vlc/vlc-3.0.21-r3.ebuild deleted file mode 100644 index ec6e25339207..000000000000 --- a/media-video/vlc/vlc-3.0.21-r3.ebuild +++ /dev/null @@ -1,500 +0,0 @@ -# Copyright 2000-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..2} ) -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/" -SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${P}-taglib2.tar.xz" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-9" # vlc - vlccore -KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86" - -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 ) -" -# <media-plugins/live-2024.11.28: https://github.com/gentoo/gentoo/pull/40610#issuecomment-2664870395 -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-2024.11.28:= ) - 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? ( media-libs/taglib:= ) - theora? ( media-libs/libtheora ) - tremor? ( media-libs/tremor ) - truetype? ( - media-libs/freetype:2 - virtual/ttf-fonts - !fontconfig? ( media-fonts/dejavu ) - ) - twolame? ( media-sound/twolame ) - udev? ( virtual/udev ) - upnp? ( net-libs/libupnp:=[ipv6(+)] ) - v4l? ( media-libs/libv4l:= ) - vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] ) - vdpau? ( x11-libs/libvdpau ) - vnc? ( net-libs/libvncserver ) - vpx? ( media-libs/libvpx:= ) - wayland? ( - >=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 - "${WORKDIR}"/${P}-taglib2 # bug 938946, in 3.0.x branch - "${FILESDIR}"/${PN}-3.0.2.1-vdpau.patch # bug 946178 - "${FILESDIR}"/${P}-vaapi-w-ffmpeg5.patch # bug 864721, in 3.0.x branch -) - -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 -} |