commit: 6a8ff47fb472f00f4f7a9df77a4f531ac33e029d Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Jul 14 15:33:17 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Jul 14 15:34:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8ff47f
media-video/ffmpeg: Bump rpi patch for 7.0 Closes: https://bugs.gentoo.org/935704 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-video/ffmpeg/Manifest | 2 ++ media-video/ffmpeg/ffmpeg-7.0.1.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 1bc6100e9ac9..69b487a6d661 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -11,3 +11,5 @@ DIST ffmpeg-7.0.1.tar.xz 10793572 BLAKE2B 7468bb0768da56794c57b43db5fb8a1c5471f8 DIST ffmpeg-7.0.1.tar.xz.asc 520 BLAKE2B 3fe3bdd8da390591849ac3784bf8e68e021124715de1a8d142a42096d625df9d9a27b224258f2f0c24b20397bfea7a8035ced4202904ca12fe0eef109516dbf1 SHA512 bd787bfa6dbb147800f5f79a3fe5e4c20054d48ea9e6af4d5c84ace68c19459f4ea677f5921b084eab889ed7b9f81dc138fa2ecf9ae306ac7fb19434a68aeced DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b6845dbd18a619b844c841a97345ce24c7a5d7f4da05b08e3cb49668426b9044f3d3553d9c2ef3a50aec7199bfa3c09 SHA512 aeaf12afabf5f2192fb0b6ef47397d8477b109e49cee8c02a890d1656a27b1985c62c719ef72966d8c97b0709918233b65ea2e0ef988771507e4be137fcd9158 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 diff --git a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild index fa7e8bbf4005..797aa00fb30e 100644 --- a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild @@ -14,7 +14,7 @@ EAPI=8 # doing so since such a case is unlikely. FFMPEG_SUBSLOT=58.60.60 -SOC_PATCH="ffmpeg-rpi-6.1-r3.patch" +SOC_PATCH="ffmpeg-rpi-7.0.patch" SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -46,7 +46,7 @@ else # Release BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg - soc? ( sec-keys/openpgp-keys-gentoo-developers ) + soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 ) ) " diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index a7e9087b1df6..8294c24da0d7 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -14,7 +14,7 @@ EAPI=8 # doing so since such a case is unlikely. FFMPEG_SUBSLOT=58.60.60 -SOC_PATCH="ffmpeg-rpi-6.1-r3.patch" +SOC_PATCH="ffmpeg-rpi-7.0.patch" SCM="" if [ "${PV#9999}" != "${PV}" ] ; then @@ -46,7 +46,7 @@ else # Release BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg - soc? ( sec-keys/openpgp-keys-gentoo-developers ) + soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 ) ) "
