diff options
| author |   Sam James <sam@gentoo.org> | 2024-01-03 06:35:21 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-01-03 06:35:32 +0000 |
| commit | fb2656e79a37fe7b11b2f8888bccd78930e05a7b (patch) | |
| tree | c12daeed06c364f29d633859e45796ff39b07a1c /media-video | |
| parent | games-simulation/openrct2: Stabilize 0.4.7 ppc64, #921237 (diff) | |
| download | gentoo-fb2656e79a37fe7b11b2f8888bccd78930e05a7b.tar.gz gentoo-fb2656e79a37fe7b11b2f8888bccd78930e05a7b.tar.bz2 gentoo-fb2656e79a37fe7b11b2f8888bccd78930e05a7b.zip | |
media-video/ffmpeg: backport texinfo fixes to 4.4
Closes: https://bugs.gentoo.org/920570
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/Manifest | 1 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 5385f03466c4..c2054eb5009c 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,3 +1,4 @@ +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 diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 6b2411dd0079..b688a1857b4e 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 )" @@ -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} |