commit: 0416108771978522a81362196fe0317afd7f0db1
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 12:34:59 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 12:34:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04161087
media-video/ffmpeg-compat: sync with ffmpeg
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-video/ffmpeg-compat/Manifest | 1 -
media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild | 17 ++---------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/media-video/ffmpeg-compat/Manifest
b/media-video/ffmpeg-compat/Manifest
index d496ea7da759..1ddf38fe49f1 100644
--- a/media-video/ffmpeg-compat/Manifest
+++ b/media-video/ffmpeg-compat/Manifest
@@ -5,4 +5,3 @@ DIST ffmpeg-6.1-patchset-1.tar.xz 11296 BLAKE2B
5227d0c7f52a4f217d5517da11c23275
DIST ffmpeg-6.1.2.tar.xz 10466152 BLAKE2B
ff1f2b2bb60ccc4c37b6ffda2a0e6a0be80c451dc99f6d4a99bd95a1bdc44c494d62377c53383ccfb5b818573a1971948d7db34119099dbc56d7258724831d3c
SHA512
3a009184d971fc3168e1322d1d724aae787ed0e9c152d8d1813ea0b9099bda3b35c41fcabbd7b140560e7a8fa9fa1ffd7f0938432d5d498c43829fc6cc3d9e08
DIST ffmpeg-6.1.2.tar.xz.asc 520 BLAKE2B
f26a2d6f5423f93090f2a448172e49f3858aeb5a00f326207d374bbb70fa8942c7ee1a7c55338b2db664b647c983cd5ab4fd8d71efe5c37af4c90385ca17d0ab
SHA512
a26dba1f4870b964080b45f8468f5ce3591eb6aa69be426bf4afbe5a60c3cbd0fe5056dc86ca7bb817c04ae30d39160cb7773772a9a2123ae7f095b18a6d7050
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
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
index 4a3a3a7e15b3..34154406b620 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
@@ -20,10 +20,7 @@ else
https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz
verify-sig? (
https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz.asc )
${FFMPEG_SOC_PATCH:+"
- soc? (
-
https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH}
- verify-sig? (
https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH}.asc )
- )
+ soc? (
https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} )
"}
https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut
1-2)-patchset-1.tar.xz
"
@@ -320,14 +317,7 @@ BDEPEND="
"}
"
[[ ${PV} != 9999 ]] &&
- BDEPEND+="
- verify-sig? (
- sec-keys/openpgp-keys-ffmpeg
- ${FFMPEG_SOC_PATCH:+"
- soc? (
>=sec-keys/openpgp-keys-gentoo-developers-20240708 )
- "}
- )
- "
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
DOCS=( CREDITS Changelog README.md doc/APIchanges )
[[ ${PV} != 9999 ]] && DOCS+=( RELEASE_NOTES )
@@ -373,9 +363,6 @@ src_unpack() {
if use verify-sig; then
verify-sig_verify_detached
"${DISTDIR}"/ffmpeg-${PV}.tar.xz{,.asc} \
"${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc
- in_iuse soc && use soc &&
- verify-sig_verify_detached
"${DISTDIR}"/${FFMPEG_SOC_PATCH}{,.asc} \
-
"${BROOT}"/usr/share/openpgp-keys/gentoo-developers.asc
fi
default
fi
