From 8d3527b916ca7e0a2c8d9b8d064253a2eda02c1f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Jan 2024 07:56:47 +0000 Subject: gentoo auto-resync : 03:01:2024 - 07:56:47 --- media-video/ffmpeg/Manifest | 17 +++++++++-------- media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 15 +++++++++++++-- media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.0.1.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.1-r3.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-6.1.1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 4 ++-- 9 files changed, 35 insertions(+), 23 deletions(-) (limited to 'media-video/ffmpeg') diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 20f3fa90d6fe..14a27612bb34 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -21,6 +21,7 @@ AUX ffmpeg-6.1-0005-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch 1 AUX ffmpeg-6.1-0006-hwcontext_vulkan-guard-unistd.h-include.patch 953 BLAKE2B 1f2049db77ef8ded2f28101408a16c6d831eecbbbe92285614e35a4a48860f289a59b92a378c90352ae52243ae7013d7de1f9a6e6cdb7e8278bf160fb6c7410c SHA512 e4a9d7e751c6bb77f3c063cce2fd5dd820782c85cf96a3e6e8dbf67224c14c47a11f1215e64fffce26f9a72c955678918f91417e775ed2947d8b080cd593b1dd AUX ffmpeg-6.1-wint-conversion.patch 3514 BLAKE2B fcb65b882af964a8f45f71ea3f885fc016e3f89c3d6f0bd6d661d489715c0f746e763a86c6ade1515e212b01559d90ea9c2a97c965e0c0f9087b8396cdd58414 SHA512 7e09fc1a811a21aee9eef0370e57a37817652229a6b0e58cd2e8723e8336124396fe40f6a7c6c5f860046410596027d27d900371ff86609b86ef94dd0633977f AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a +DIST ffmpeg-4.4.4-texinfo.patch.xz 19136 BLAKE2B 591b46180fccdb58c5b6b102c5e12075ff4388dc6bc0ab1752531d4f9f2802c1fd09ed1353ed70a539fdc5c2298f9cfc84ec24e3a04d371ef0d9f3f30d8e8f38 SHA512 f86a324efe261801a5192d4f204f48de581466550cca49b54432fdf5430f1b3bc9a9d31b9b52e2f23481def67ad55b5ad315752c482709aa67b1f3a3e6c17a4f DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf DIST ffmpeg-4.4.4.tar.xz.asc 520 BLAKE2B c8bf944883e375555b6dd69029fe863c23f68a3584d84aa3e9c4278ae45aee0bfa3697cc1d8a768b95a1ebd7a9cb91553671072f88f46f6a9c947faa74344a44 SHA512 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea DIST ffmpeg-5.1.4.tar.xz 10009968 BLAKE2B 3e632e6de23a8dd0a75b01910e9a642840f06dc3eba4cd015b729889f785b98d1fdb4e43b8e8a2e9ea69c8fa686f6fcc9f5785837a9f32ccd8d69331d408a99a SHA512 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795 @@ -33,12 +34,12 @@ DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370f DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5 DIST ffmpeg-6.1.tar.xz 10455956 BLAKE2B 5eaee0e0f72139e3b018e6ee26a102c7d6881ec8e7a70b21c51e4a515a37396ae12f19185112bb3f8b3401b85e68c08435146a83470e07ffb571d3d9bca89289 SHA512 72f47924806b9b128672bd268aa2c8fc2c9b8491899a772b6f82421daa2b67de45a4bdd71f6071825814e599a73adb1e42682e202a12fc055e9a224c7d5baa4a DIST ffmpeg-6.1.tar.xz.asc 520 BLAKE2B 774ba20a8ad3d786368c7e6928ee0976cd943756f24e3f076dc0cc92fc0069637f0a9a92e3c5238c74148330385d040118d3c5f9af6b267d572283b8de83b286 SHA512 e4885270869cc6a1681bc3f76f344f77c4858c490a517e45a758d15214ce67c3c2113a1caa8ca65eb6447b68d822fa1dd730081345bcc0928faaf82bb76037ba -EBUILD ffmpeg-4.4.4-r8.ebuild 19889 BLAKE2B 2ac4c8bc186b3ecd84b9be3f18aac7db85271cf7f90f748f99fa11f54f6141beda69ef2361d1eac867139e303ad58423bfd8950b19189d89b1475cee3d856edd SHA512 acf92b78b1940c342691c365080b82c053c9a08eebafd0e73070db765fafecdf3abcb5f63b0da824cc27118917c760cffda8887508265250c6cc82b16c19527d -EBUILD ffmpeg-5.1.4-r1.ebuild 19986 BLAKE2B 773453e422fb06b6792f9eb71d5e62f5c81deea5d380043b4ba77fcebb0c232051970626d32cd06d7adb62c4eac79ba6aa27c1d1cbf547715d8555fbd9f4faa8 SHA512 c5ce23d5b3d85a2c730bcdffb70a8affdd1135f571f13edc319a1485f5912deabee561881cc959ab431462dae57d9f0f0a3519165d8b20bd1af80d31c78b9217 -EBUILD ffmpeg-6.0-r10.ebuild 19917 BLAKE2B 5304c69a76766b26e8a6c33b7645ab99dd69c4231821ac11a463a309480a1c31dd0993eb1aa994608e673f7078f5b7b4a1534264ccb78a0868fa37a77304eb27 SHA512 615f08fad6be1022b224af84cbaf19bc98a9fc90d41fd2a011b3844022e8cd8daa9c2e4a3e38d6f8c07cc780318c09060118d284b04f6ba8662bd988b5155139 -EBUILD ffmpeg-6.0-r9.ebuild 19906 BLAKE2B 227dd2dcdd13be6ee0f31e4052b8d108baae2fbfdac7561d2023114dc470068def5cfadad549c885960f83fb7f46b43c33bd8860047efdcd53096ee25dacdfbc SHA512 05f17c841d79fae5d5a81c915e1202b57b726e3c189546e326ffcd21968d080b23a64a3c14eda1607e18877b4b14b138922005d06973cdd58ff4a304014b48ca -EBUILD ffmpeg-6.0.1.ebuild 19778 BLAKE2B 7c7e7fc36f4744bafb8d410d737c121faed2d88a0e5c2a6fddc9aa92a683c1e68bf1aa30a4c3af2b730f112d5513aa9b768945035a519fcc9221de2fc5cb5cdc SHA512 fabb81140ee8941edde63ceb3c3601877ab48910c0d837113ed4900e3b840bf6611fc26b2473569353f125fec1edf6919f89e9efc61b877104ff6fbe5fff4de7 -EBUILD ffmpeg-6.1-r3.ebuild 19923 BLAKE2B ba11c69f6a0ad141b28bf5375c03a52e524de53e0ebac2dfb33f3fb5148b1ff5c48e36ba3d1c1dd3ec80574c34a8b8895f568d98823ad82f893b9ab5a79e5e61 SHA512 0ca23d9ef6e7b6600e411bccf06ecf3b04b063993a8355f50b2fa5dda7fe5eceabef79bafffdbdb2f2fe17ebbc1b4da35315358d0b709065085005821d58b508 -EBUILD ffmpeg-6.1.1.ebuild 19411 BLAKE2B 9873e3f73a0acdeb8a87568a6c22036c333b53c70d18b7883707d13c9b4f7a6663bf600ec96ca55ca60d79d1188dcbf10d314c10a96c7b74f245ee7e53490d5d SHA512 fc840e80e5050229241d11a219d9f77047dbb58333e749e421c97707d04d5745a53f7b10f07fb5a3c9a3074e13d1ba8f32b3474a86023b01d1f68bbf22eb3323 -EBUILD ffmpeg-9999.ebuild 19364 BLAKE2B a5844745f821742ef4d3db2b7a5e8018f43086b211189686e92607a17a06e0b125c5e605e2582826b1f37b44da98adca1352c96c67217f9217dc5558845e396e SHA512 ab4cd55bdea1f65489f973e619e4463bb4aa0c4e5fa572ba01c11a0fa06cb5efbb0ea449e444a162117ceed5e0cf8c9e91468b7a2f9405ba8cb2df02fa87beac +EBUILD ffmpeg-4.4.4-r8.ebuild 20211 BLAKE2B f5f498de85894ab7a696beaa14d0a617bd7a0c4e5fd7cb815f185c8d1d32a72b4d400abe2ef9962956e12b1f6f8913b4588d75f760ed219fbeb2da358cfd2563 SHA512 3c92511bccb5b06956da98161662586ff60753243c280d764ec5d70c63b1e0cd586d0e15e960fed827f5a90614239fff5ceaa6b01f5cb842475225b6fbd99ffa +EBUILD ffmpeg-5.1.4-r1.ebuild 19987 BLAKE2B 7c6b084cd9f93645fff46ee4eadd02b8b712eeb1b2d977fdc3f9325613f7a9fcba6da8617272d476269d7f66837eb23f0e4342a7cb4f150994cb8d09ef6cd1f6 SHA512 ffd1b853abc72d77c5074d822231f58f08429a8be932635ba97269d504aad3ebad8a2fdd6c1962ff31e8f93cf138f3d13ccef4ff3e012f708e4e09d645839cf3 +EBUILD ffmpeg-6.0-r10.ebuild 19918 BLAKE2B 8f986116e7801d4fc897259a2b6da3a1e70f8bbde1057331ac23a1cbb7878ca363a913a287cae9df9524764731e7876428f895845fe65c3db04f234dc529361f SHA512 69c9ab5314a2ca5116ae25b75319c071edcc72b0a0a69fb3de2f7150c8d9222bc62066385498ddbaba959030bc9be1de6948c142825439197dd8353091618a11 +EBUILD ffmpeg-6.0-r9.ebuild 19907 BLAKE2B a9a631f2a1f802dcecadc62904884c7e438dcd36ed55d8ff269df432461256dca7c17a8972beb751929848b9f07e5be130bdad25262a86fbab316e0ae3904295 SHA512 58f4ca0e31b7db599acfa82a5fe58ae57904af407a525bacbe853f4f848e8443779a0782745e50439001afaa77c09aee823b759833a33537d9ad3983c313a880 +EBUILD ffmpeg-6.0.1.ebuild 19779 BLAKE2B fd7c9abe1e5ae1024531df7c508f1b23f5d6838a4f079f06d126f5b8928f48285d043228df4b96c70d0d6d903cc7f006d6f613ff49bb8b90fc6bc059f00ec064 SHA512 a0c748860ffe6e03933d33c73ea2a477d1f7cca70be26c7948f1f285371fdffcad1f09b6aa887bb30e0534c8556f3f1f3c33a9eb074abebd525e5633343771bc +EBUILD ffmpeg-6.1-r3.ebuild 19924 BLAKE2B cdeb914296e2fd552832a175d87a25337f9b5026b5e8ca261b05ef776ade92b5012c7ecb7d047e1725a387f2bf755646dc4930b079d803537c4ec449804c984b SHA512 39bb234d648e3e1c85bc4d75b163056464a75466fd6e0fadb89b6af19aa9412910c229af1e8bb20af624ab29c7d10421adeeb5eaca3eccf8f55d64d0ff3e43ea +EBUILD ffmpeg-6.1.1.ebuild 19412 BLAKE2B 0858e957820c85303fcd804b769a71d460cce0182464dbf331866386712694a2f88b3ed9be58c1926fca470a8877f147f54ba20726964510cff6411813b44602 SHA512 c741b9d91ae1c40fdf73f92c4ebbe4781bbfd498b9deaad80e00d67e5101eedebfd64f806d4025d30143bc502ba2e5ce7763ab77b85ca9814f0d253773b9e39f +EBUILD ffmpeg-9999.ebuild 19365 BLAKE2B 5d670d7cd84e091ec864c2bff470735ffdd7493238daaf5cd0331c7689759b9267545fd93137c4f9ea09c09217f2d78ec7b6751d5f1ded3edea9a790e0654456 SHA512 cd6adf293dfba5e95a475d8060ac2ceaab8e59c5bf2cf05b7970573d2067a763d84c9b718135aaeabb382f6e5c72776a499cf1499ba6b766948ffc09cdca0ce1 MISC metadata.xml 7626 BLAKE2B aac77cb3d4cb65c30e9654f59d6d10c59a4df70f096024ce5395c0572d1cf0289178320153d819853cfb6499cdff73ac6a2887cc2325be1e594019261f90d85e SHA512 0b59f1cbaa1800cd3896bd50046510f62933670fc3f1e7524d263f9fb1ddc722f2817b45776a0613a361d57f94aebc3b96228ae95f7e94abe1a009efbb5725b4 diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 6b2411dd0079..dd95ea498d94 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,6 +33,7 @@ else # Release VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc inherit verify-sig SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-texinfo.patch.xz" SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" @@ -107,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " @@ -347,6 +348,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch "${FILESDIR}"/${P}-fix-build-svt-av1-1.5.0.patch "${FILESDIR}"/${PN}-5.1.3-binutils-2.41.patch + "${WORKDIR}"/${PN}-4.4.4-texinfo.patch ) MULTILIB_WRAPPED_HEADERS=( @@ -371,6 +373,15 @@ pkg_setup() { fi } +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} + fi + + default +} + src_prepare() { if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION} diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild index 39d9265358be..e10f598a6997 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index 635fcf2e4f7d..74a648a4cc18 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index a494461a30e2..2454bd54cad6 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild index 7a382e4aeebd..6b9dc10b5bf6 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild index b79bccb0a98f..482524b3d718 100644 --- a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-6.1.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1.ebuild index 36572f204937..aa526685a188 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1.ebuild @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 188eb6e7b762..8f10926eaca6 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,7 +108,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " -- cgit v1.2.3