diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2022-02-19 11:26:39 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2022-02-19 11:26:51 +0100 |
| commit | 96c387e9f4dda0f3a8689ccf823dda4fa8bc0a87 (patch) | |
| tree | f1e053bc56096b1727bcda318f9f61be08b0a67e | |
| parent | dev-perl/libwww-perl: Stabilize 6.600.0-r1 ppc64, #833685 (diff) | |
| download | gentoo-96c387e9f4dda0f3a8689ccf823dda4fa8bc0a87.tar.gz gentoo-96c387e9f4dda0f3a8689ccf823dda4fa8bc0a87.tar.bz2 gentoo-96c387e9f4dda0f3a8689ccf823dda4fa8bc0a87.zip | |
media-video/mplayer: backport upstream fixes for ffmpeg5
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
| -rw-r--r-- | media-video/mplayer/Manifest | 1 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.4-r1.ebuild | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 4fd4e60d3630..bd9910e5e79e 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -2,3 +2,4 @@ DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d +DIST mplayer-1.4-ffmpeg5.patch.bz2 11428 BLAKE2B 2cc9839333161fd00db87b7dd103e10414c910eb5b21b39454daed36440d54f5947216b80ac91947932c760c21c275328b3a642d0a2c8cd6963fe4b7671c9f90 SHA512 61038ad8ef8a55a99dd7e7a20ff38805c86f6a6ecb876261d0e3f4db7f30f36a9dfedbd6c895fd8168fef8833b856b3d3501a89fd041365ba07c81c3ebd36a69 diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild index daf58bcdb444..e9da1de4a0b1 100644 --- a/media-video/mplayer/mplayer-1.4-r1.ebuild +++ b/media-video/mplayer/mplayer-1.4-r1.ebuild @@ -39,6 +39,7 @@ else RELEASE_URI="mirror://gentoo/${P}.tar.xz" fi SRC_URI="${RELEASE_URI} + https://dev.gentoo.org/~aballier/distfiles/${P}-ffmpeg5.patch.bz2 !truetype? ( ${FONT_URI} )" DESCRIPTION="Media Player for Linux" @@ -229,9 +230,11 @@ src_prepare() { subversion_wc_info printf "${ESVN_WC_REVISION}" > $svf else - eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch + eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch \ + "${FILESDIR}"/ffmpeg44.patch + has_version '>=media-video/ffmpeg-5' && eapply \ + "${WORKDIR}"/${P}-ffmpeg5.patch fi - eapply "${FILESDIR}"/ffmpeg44.patch if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" local sv=$(<$svf) |