diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/Manifest.gz | bin | 23212 -> 23203 bytes | |||
| -rw-r--r-- | media-video/ffmpeg-chromium/Manifest | 2 | ||||
| -rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-133.ebuild | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 9 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild | 3 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 3 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-6.1.2.ebuild | 3 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild | 3 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-4.4.5-binutils-2.43-arm.patch | 60 |
9 files changed, 76 insertions, 11 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 4f72ca53f34f..281ddaef9edf 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 963fc98f29a4..81e0e3238baf 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -18,6 +18,6 @@ EBUILD ffmpeg-chromium-129.ebuild 6479 BLAKE2B 291953066345a7e3018ba56e1cd7ebb12 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 6454 BLAKE2B c5593622c2c275f72d7bea6cf1636fb284e6993f93f178ce662a40db66f9a8b11f4bfee2a5b65ff8265e84614f263177027db45c8bce30c31a6b5a9fc5bdf863 SHA512 082e172e83a2b30cbdfbd27d95abc79879b7143128b84b59c9a4ffe16cff343a164049bbd8568651658f48c9d9d189e5c4495edc17be69ea79b87f305c7dd21a +EBUILD ffmpeg-chromium-133.ebuild 6452 BLAKE2B a743e4c5d771088ee19cc996ebf5743bc7e828bfca4cbff9928840a57b3658ce3bfd9fca5352c391843989b649c4d5961f1eb64c394ca543ef8e72eef3455c97 SHA512 fdd9cff14fb47a28cf5391508da080298447f049b1282651357c9faa4e3b7824c101df0af48c4221b6219e5c5e567db18992448c9e9c3a19c5c23ad2c6304357 EBUILD ffmpeg-chromium-134.ebuild 6454 BLAKE2B 8210e941f03241209e30f0b70f6e9f116ea25674d4585e30ab5bf71b8a39bb330b0711ef654686bcd5e3249a340bc7b33e18dbf487912600f96c7a39fbf2c41d SHA512 da629eb6853842da6ed0ef261f96617bb9bc9cf06b0b946a263afa1c35b20b4900968165cd0ac37523905619bf7e3602530a5e4021a8419d0e79f1ad801418ba MISC metadata.xml 695 BLAKE2B 84fa4967572665812d4da8bb1a86a8b28a749892570cb1fca5c0515f860fbe8c472a91240f1d3b7b3109ccdbd32cf8da941c438cd9f332b763f2824e0e193ac8 SHA512 0069bcf32d2aa083c66e13579295e8ef96b9ac72b02f1436620000c71c4d1e335391838f9a9e56f7768bd13dbe13ce6f3f3674a303cf90cc658360825867c3f9 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-133.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-133.ebuild index 649b2d94ea08..cfbddc764afd 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-133.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-133.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 c9d6fba07304..955140a4aa28 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -6,6 +6,7 @@ AUX ffmpeg-4.4.4-amd-av1-vaapi.patch 11092 BLAKE2B d3561619dd226102116c729475691 AUX ffmpeg-4.4.4-glslang.patch 1526 BLAKE2B d64d95f089c3d3aeafb7cc3fb08700641b6252c3cdbfac2e9b16431819007a8fa7b52ae156a1c9727671f00c9281024596183b85f7f74864ef997f660aa47296 SHA512 2bca3ca62bece6696dd6bd30c8cf57e31b9da551ee1f698a09d0a00ecdc96da51b519a8a42c85d1f572d26db92bec72a717d75c1a6e3c8f59a4a0066e6a332b8 AUX ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch 362 BLAKE2B 709a5a79aea781258998f295e539620651dce08820db345ab3d1d8996b076907db5157bfc7cd1fe15b8ce86bd1f6d073f79a2343f74a2548e9a699b92b4efe6f SHA512 0a5ecb29c19505564b4d3d6f362b8885d055c5a93688f3671509764194fb851aaf51483a956b8a150ec6ea17cc7ca2e5e0cca25d5f476f26c3bbdcb3ebd8ce05 AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df944ced7efc064486e325e1658ac8f30d74ac926c63de51b610eebb5be9951adcd8ad02c8c143429c6eff57ce789a1c187e0b24221aa6d SHA512 58e33b2f0e94e75ef7acebb221332dc4d618846f8a968011da370743ce80a4ab688112411d3f2a5320d144c25db567780c870a0eb4045152b73957e2d7fe747e +AUX ffmpeg-4.4.5-binutils-2.43-arm.patch 1999 BLAKE2B 89d9ed274ea6e637424b4e83e5029b6a90140bcebf577e2b9eab5e2a7c803f5a78a06f0d794ef797733c0bc3c50c9446a38f783b6a7ca84b23e117c71b792e4e SHA512 33eff894a68fe46d2440f3ada9f1d016949119028d3e9b2f8b2ec428fa255a31d4f2b72a5fc9dd91abe06d20728d58221bd9b9e3f921f5b5b43d286ebe4c0f65 AUX ffmpeg-4.4.5-incmptbl-pntr-types.patch 502 BLAKE2B 2c4d4416b112d1b4b0c985be7765e18e5d52586252834dd47052e13caa8554fd28dcbc88b37013f36134d5dba06b0c917f485f42a8e12d5cda37a6b13dd48827 SHA512 d3e9730467d52cb75999fa2494996e2b1515cdfb22d134be50240308f2c1167569033c7aaa821efe10dc0ee252863ff3c8826b58fbf2a727639c1bee652edc14 AUX ffmpeg-4.4.5-wint-inconversion-libgcrypt.patch 3472 BLAKE2B 7ba84ccd12c4c661a09ad0843ad53d863d3fe60cdba32c9ac2c05c4f2b5167a2315f24ac387d5ec612cf7d05fe6abd4cf00c7facc1c30bcf4f247ed316f716b7 SHA512 8951addd67a6720a45411f28fb3bccfd0707f35c1861969ea5e19c4e71c553116704f18c403c9032ae2443f065fae81c08d029d3a1d44de7c22a959b5e9835a1 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb @@ -33,9 +34,9 @@ DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b68 DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f DIST ffmpeg-rpi-7.0.patch 807653 BLAKE2B 2d7d4fb55313c0ea227bf714af08fe17c118969aef972cf85bd8bf33643da08b2a224b2ea7c369a58e62fb758c0e8747c6cc6694672b889016fdb16b3d33f530 SHA512 cf65f68f6b0fa351d273c1b4fd74fca63a40cbd802bcd14124018784164fd1c6a09de3d9b0e0631eaf4c8b4fbcb846cc47a7831ad70eb0cfac6d21a51bd09941 DIST ffmpeg-rpi-7.0.patch.asc 833 BLAKE2B 3086d77e2cc05b7c295fcaef26a9a0d32775999d1bab9075eeeb0a80804b35928698efe870a432558ece55d7873e016422a00013e7d0cca160b71172c31ab449 SHA512 cc885f01b9547f17c6ef1d26d7d1d053186fdf57aa31c0a411a2ab1c0246cec9c2aeef8687e7f8eb0c998d3379712541c60432bc2521a3db1b45d72d316c2d2b -EBUILD ffmpeg-4.4.5-r1.ebuild 19907 BLAKE2B 86ef88edda60622dfc4ec3c1179855200063458718a4b32475e25c0d433452ffd66811bd8ffec1a96d9a9ccc0b555386aedabb426786412129db922a21c5b6db SHA512 44d2d81cc7bc15d334bc574c4ba77a88dff209e7f16d445c76d62e15e8940b713a2385af922720f52180eacdefb69fd3c7a0e136657791800a01f545bc658d69 -EBUILD ffmpeg-6.1.1-r8.ebuild 20405 BLAKE2B 03cd08cbc65fb67c85a9c5db284269b1f20397314096e1943c5f1ee233fd242f1cef2cb44b3caa241e5705d4dd78b963bf229cc01a50e737f5d6c0967ad95354 SHA512 0bb43aa266d2cd5994dcbaa3547154e9e8a2cc096799f34e4472eea92b0a7135bb12de7a12a0eb825549b94f3b842de26fb46df2b97251343092169b9d395143 -EBUILD ffmpeg-6.1.2.ebuild 20372 BLAKE2B 9f15152bbcb4c3b535fcbc16352ee7c1cf8c66f5f74968147bbfa04b53be02a0aa3dda39a3442caecbc2299c52dfe394802fbedfdf47ab8463be3bd6d90992c6 SHA512 3a4f8b302257912b2cff7d238fb32f632f50ea452509f382e4f759add50c2b66df3fa325438df1e513d1c0d8a1b1f224e83669b0d161cbc46d68042402b53a0c -EBUILD ffmpeg-7.0.2-r1.ebuild 20346 BLAKE2B 6f6aab9925cf2b5f2337d27d9d3798a635111d7fc734562d1554b1a54867245b5f4da92e386e771cfcd06d7e78d122dda8cfa1c2ac08395e92211ffaf84be32b SHA512 350bff3c8b953d794cfdc3df585d8851d50d21e0f84aa95da5aca5c97983edbb9ff8c65f87ac67046ab75b25b73a83b7954b67c8cde7bd0ee6e0b0179ba7d7cc +EBUILD ffmpeg-4.4.5-r1.ebuild 19958 BLAKE2B a9600504e8ef0182fe7e7ff283899259347f898384f8dc7e424378d7a9b410166b45174e34c60eaac28ffa90bb40af253002c57aa939768dbb3294bd8adc9bd5 SHA512 601a6bb70db33f7dcaed498db7e87d1480c8f61aff21dd44dc0e11483c5e4e22cbeabeef66d48da7d4a20df226504349097515e3fc7d6209579a8bc3fa43a27e +EBUILD ffmpeg-6.1.1-r8.ebuild 20456 BLAKE2B 629969f63995246d9309f230447b554d55847361da6a28787b2b442402a9de8699dab6759c9775d1b27c06be67536d4ca1e61949b06c9bc4f36bc7e61f5aada4 SHA512 7c78b6ccfa8e95bff43dc344a08411305a76614c365b95315c26cc3adb8443a76514688c27dabf7403eb2ae63a94377a3743de9b6d8c5c75ed1a13683c15fc4f +EBUILD ffmpeg-6.1.2.ebuild 20423 BLAKE2B aa5b84f26eda9fde74040fd3aefa432d934525348e04afbd9e685df1222738584cd9e043cb571866cc1252962a5bcf113a8ed5d4a1c18435c124d483a9da2d4e SHA512 1d9313997ecd52c6e0935659be6abff7dec8b08e6e42825d81d7811997621939aa5dfe8923618f1b5bd7a275336f5bb6aa0cd6f427cc92c1ae2f097c8d3b8251 +EBUILD ffmpeg-7.0.2-r1.ebuild 20397 BLAKE2B a97acf1dc1ad501cd5a80dd23844c75ba473826d358387ff931cf0a29107525349b374087837e71a8a7cce4f91ffe5197191f301715fd19df573d0f550bb03e8 SHA512 34b49696021a942eb52a3a7e6085315b86d9632b016f4e2df6981a9a4c59e85171d8d3f8106efae6c74916f74f8ffec7fd0131952bc9b0b3718cdd4c65a019e1 EBUILD ffmpeg-9999.ebuild 20389 BLAKE2B 4ea633514d6eb64f502fa6919291a20558b342034a8cc06b263baea32a0906b0e0553f5d2321dbf74e81e4c5104e443f379788e97fb1f1efbd32314dee62e3ed SHA512 f6a8002cdc02ac24476baf362272ef4a152ae43cd665732c595e95a97b1741ecedb3a520787a89a2b7efc7bc8f07f74991b0cfc69f21f0b7c0d45352d80f24ce MISC metadata.xml 8343 BLAKE2B 4fa89eaccf10b2b691d66fc20df7cc09b31b848d0c054040664f6d9b132ba422c3a9cae2b239a95f307b4f15d1a5432e751a72fe1e4239376252bee9b814c59a SHA512 9b085513512c323c524d88837a517ebeb6a9db7212e4353ae1330c1db763761aa8114a47337a2f85a18ad2adae210cb56fb0472b09dfd78fdcac0fecf08ea7b3 diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild index b3e8636dea1f..64172ff012fe 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -349,6 +349,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.4.4-amd-av1-vaapi.patch "${FILESDIR}"/${PN}-4.4.5-incmptbl-pntr-types.patch "${FILESDIR}"/${PN}-4.4.5-wint-inconversion-libgcrypt.patch + "${FILESDIR}"/${PN}-4.4.5-binutils-2.43-arm.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild index a2ffb7f3e263..5cfea3a43329 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -387,6 +387,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch "${FILESDIR}"/${PN}-6.1.1-wint-inconversion-vulkan.patch "${FILESDIR}"/${PN}-6.1.1-incmptbl-pntr-types.patch + "${FILESDIR}"/${PN}-4.4.5-binutils-2.43-arm.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild index cc483e695fca..d5343a312a24 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -385,6 +385,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch "${FILESDIR}"/${PN}-6.1.1-wint-inconversion-vulkan.patch "${FILESDIR}"/${PN}-6.1.1-incmptbl-pntr-types.patch + "${FILESDIR}"/${PN}-4.4.5-binutils-2.43-arm.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild index aa31d2b98eb0..c00ae501a01e 100644 --- a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -382,6 +382,7 @@ RESTRICT=" PATCHES=( "${FILESDIR}"/chromium-r2.patch "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch + "${FILESDIR}"/${PN}-4.4.5-binutils-2.43-arm.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.5-binutils-2.43-arm.patch b/media-video/ffmpeg/files/ffmpeg-4.4.5-binutils-2.43-arm.patch new file mode 100644 index 000000000000..7ce8e0a038be --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.4.5-binutils-2.43-arm.patch @@ -0,0 +1,60 @@ +https://bugs.gentoo.org/942790 +https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/654bd47716c4f36719fb0f3f7fd8386d5ed0b916 + +From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Fri, 9 Aug 2024 11:32:00 +0100 +Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with + binutils 2.43 +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +binutils 2.43 has stricter validation for labels[1] and results in errors +when building ffmpeg for armv5: + +src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0' + +Remove the leading zero in the "01" label to resolve this error. + +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b + +Signed-off-by: Ross Burton <ross.burton@arm.com> +Signed-off-by: Martin Storsjö <martin@martin.st> +--- + libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S +index 4f9aa485fd..d31568611c 100644 +--- a/libavcodec/arm/mlpdsp_armv5te.S ++++ b/libavcodec/arm/mlpdsp_armv5te.S +@@ -229,7 +229,7 @@ A .endif + .endif + + // Begin loop +-01: ++1: + .if TOTAL_TAPS == 0 + // Things simplify a lot in this case + // In fact this could be pipelined further if it's worth it... +@@ -241,7 +241,7 @@ A .endif + str ST0, [PST, #-4]! + str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] + str ST0, [PSAMP], #4 * MAX_CHANNELS +- bne 01b ++ bne 1b + .else + .if \fir_taps & 1 + .set LOAD_REG, 1 +@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1 + str ST3, [PST, #-4]! + str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] + str ST3, [PSAMP], #4 * MAX_CHANNELS +- bne 01b ++ bne 1b + .endif + b 99f + +-- +2.25.1 |