From 1f048d9b860b8c7b69ac8dd085edc9ee3191b2d5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Mar 2023 00:19:47 +0000 Subject: gentoo auto-resync : 15:03:2023 - 00:19:47 --- media-video/ffmpeg/Manifest | 3 ++- media-video/ffmpeg/ffmpeg-6.0.ebuild | 1 + .../ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch | 29 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch (limited to 'media-video/ffmpeg') diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 27c6ae4e04d4..867eeca67f3c 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -4,6 +4,7 @@ AUX ffmpeg-4.2.7-libsdl2-new-version-scheme.patch 1132 BLAKE2B 59d40a3edcb19909a AUX ffmpeg-4.4.3-clang-14-ff_seek_frame_binary-crash.patch 1813 BLAKE2B 3fdb56fade5c723fcf387dfe5e31aefbd88e8256fb2ae24a3a90b91902ff18f9ffa9b1e464c0b0b40fad04c7230be7bec78f043b7ce52d70ee94f2a2313dc2b2 SHA512 fb11cb1047d8f44ab9f9f66e52af136b7fea27589929e45afb770e53837954fb03854ea9d839ecee80d3c3d5a493f32bbdbc74e8efc9600d5b53a7d91136abca AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb AUX ffmpeg-5.1.2-vulkan.patch 1725 BLAKE2B e8be249e7aa6f87eb1653dc6aec19e32e98efde6903cff6d1a32736dc343d7c12da249490853214c87cb95019d677e214dd0a065cf0dc9bbd44f2754c8d9cded SHA512 9fec574848c9ac90f51f6bca18120f40a22f6f737677a57d21bd07867f9e6619c146d8aa1cdac8d11ec53de87e7119316369874d3492b256f295b98b1b5df762 +AUX ffmpeg-6.0-DECLARE_ALIGNED.patch 1006 BLAKE2B 10bf1b3f618e0fad2dfb33b42fcec611329181d5481f79c42cbfda7054e2ce5f53e5b2ce439965a1beadc346492ac06c6a91a56d979a73bd72ce8952a15b2dd8 SHA512 e2d3e915a6d9ebae11e000b908bd5346de0d7731407dc783088a6d10a8e36de045a90225d16a01366ed1ad3af16fdb3b87803c03833883e7f31b93e7cdea44f7 AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275 @@ -19,6 +20,6 @@ EBUILD ffmpeg-4.2.7.ebuild 17929 BLAKE2B 94d2d6a0c1bcda9ac5831893b5844eb62ac1fa7 EBUILD ffmpeg-4.2.8.ebuild 17868 BLAKE2B 418696fff928b6be97556cd837a6673dc784cfe6834589b1ce1723dc5b229d580c05d7beca8541c43a226edd3b789f2db29e4fbc6237b2e11a7418c090d067e2 SHA512 d74c657af270235ce4024a7acd26a0aa168cf2752f9ffcbeca4aa34267111dfa06be277a0c8950ca32afdcebf50a195f9b572eb59fa9aa2b8cf30c0e6af06e1e EBUILD ffmpeg-4.4.3.ebuild 19515 BLAKE2B 2567cccbd3ac9fdaedcc119eee1d57bb9562d7c495aaf2bab3cd812bd7c6347d66e429d4de4a36cb6acea7c4e51d5f553e1a73a930da93ca72a2e3173cf90158 SHA512 3b878304d9e3e0dea02c21dd36701a8816289aa11918fcb5fc1d6ee2ab45d81fa941b2f31cc007d5341a0ee95be5d1bf8c536bfa9f72d9989ccbb96330589c99 EBUILD ffmpeg-5.1.2-r1.ebuild 19680 BLAKE2B 6400f3855f85cf4c65fbeac597e5d4da0054ea73d340809f254bb975f594216d21a40e517cb5d72a58c9d6fa6b81ae7f86b70f28ade439fc517c993c80055cb9 SHA512 c9de2ea5d25b66e9a0d196c1700119b07b9f47ab788c346e514c9f3562fe696b993a13fbfe9e81280f83c57fe4691513c5ac56bd2d4f733dc32a5ad8c7608efe -EBUILD ffmpeg-6.0.ebuild 19646 BLAKE2B 71c6dccd80cb0c0035558806c74b551b308a2904f1eabc378394ae2862af615c7394243c66aae3d81fd428370ad033d83d2647ecc491d9d22e94a36ba79c4d82 SHA512 6bc8d2f2afa185ee0a5528812f4a2e1b3b049f15740e23eb8725f98f44d32b7827a23d958dbc895cf882d09377e6940e6220487d9d650911deb2a451cc580499 +EBUILD ffmpeg-6.0.ebuild 19688 BLAKE2B b859796ac6c6a867a13c21b4d3cd417315ee48d284b796cf3e62c3a55a8ac5c8f27c064be6856018dfe24cdaed9fd645bc35081901e2ec59f707d93fa541221d SHA512 0d5cbaf99ec0880078f15f0bb76ba79704c6df25ed99a910bc44eca0fb2f15a0a44fa09090bd506244ef083a98ef6e7b3be2db600218a89eecdc40d1960b3564 EBUILD ffmpeg-9999.ebuild 19646 BLAKE2B 71c6dccd80cb0c0035558806c74b551b308a2904f1eabc378394ae2862af615c7394243c66aae3d81fd428370ad033d83d2647ecc491d9d22e94a36ba79c4d82 SHA512 6bc8d2f2afa185ee0a5528812f4a2e1b3b049f15740e23eb8725f98f44d32b7827a23d958dbc895cf882d09377e6940e6220487d9d650911deb2a451cc580499 MISC metadata.xml 7507 BLAKE2B fa8502460736edd98bbbb51648a7771e10669795b7db5f388da6fc97ac035932844178822765071b5e67a5502a9ccd287c45e407af150a00af7cd5a4b1247a71 SHA512 e3b4764379b9da922dc98c5adcb2905fb997fa3f618c659d7de6d113921e29968257a7f281e9ba2e1c5c683ef5b43dd6d867a3de1c6d6f54c1c354b858ac8289 diff --git a/media-video/ffmpeg/ffmpeg-6.0.ebuild b/media-video/ffmpeg/ffmpeg-6.0.ebuild index 31684f96890d..5cc3230259b2 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.ebuild @@ -336,6 +336,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}/${P}-DECLARE_ALIGNED.patch" ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch b/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch new file mode 100644 index 000000000000..88af1e58458c --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch @@ -0,0 +1,29 @@ +From: Zhao Zhili +Date: Tue, 28 Feb 2023 18:23:00 +0000 (+0800) +Subject: avcodec/aacps_tablegen: fix build error after avutil bump +X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=46970dd1555b3e50eee48ec95c893ee9a52f7fab + +avcodec/aacps_tablegen: fix build error after avutil bump + +Fix tickets #10225 + +DECLARE_ALIGNED has been moved to mem_internal.h. + +Signed-off-by: Zhao Zhili +Reviewed-by: Anton Khirnov +(cherry picked from commit 814178f92647be2411516bbb82f48532373d2554) +--- + +diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h +index 0ac4f68d68..5fdd7f0a9d 100644 +--- a/libavcodec/aacps_tablegen.h ++++ b/libavcodec/aacps_tablegen.h +@@ -34,7 +34,7 @@ + #include "libavutil/common.h" + #include "libavutil/libm.h" + #include "libavutil/mathematics.h" +-#include "libavutil/mem.h" ++#include "libavutil/mem_internal.h" + #define NR_ALLPASS_BANDS20 30 + #define NR_ALLPASS_BANDS34 50 + #define PS_AP_LINKS 3 -- cgit v1.2.3