diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-10-24 12:24:44 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-10-24 12:35:37 +0200 |
| commit | dac021a62b73db62122c2883b09cb942e3d35bad (patch) | |
| tree | e72b1c543c25582e9d3b4c17e1f5aa5616fd5bfb | |
| parent | media-libs/imlib2: Will need to be rebuilt with giflib update (diff) | |
| download | gentoo-dac021a62b73db62122c2883b09cb942e3d35bad.tar.gz gentoo-dac021a62b73db62122c2883b09cb942e3d35bad.tar.bz2 gentoo-dac021a62b73db62122c2883b09cb942e3d35bad.zip | |
media-video/ffmpeg: bump to 3.1.5
Package-Manager: portage-2.3.2
| -rw-r--r-- | media-video/ffmpeg/Manifest | 2 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-3.1.5.ebuild (renamed from media-video/ffmpeg/ffmpeg-3.1.4.ebuild) | 1 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/openjpeg2.patch | 39 |
3 files changed, 1 insertions, 41 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 1d235268a591..db75107e8a2f 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,4 +1,4 @@ DIST ffmpeg-2.8.6.tar.bz2 8582420 SHA256 40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62 SHA512 68fb41884b95953025b9c56496b17e13062196800ff9834dac43a12e9a0048d4a763f50a2256418c91cc850b63713e1debbf9170737f29621f48946adef152dc WHIRLPOOL 20a4b12b5a03f187b753cca43c65bd75b49cc21c9ffabad31b8ac0ab47fc8e017931ad5076b701c303bb594b20acb403d3ec2dabdf647fd262c070c8dabf1eea DIST ffmpeg-2.8.7.tar.bz2 8581128 SHA256 8777ce4a335640fdd13680ba423ef6da330ff5071bfbe27cdbb452379167efe5 SHA512 26c7e50b76c89c606f4a3894c7c42bf1dc70b1778df879ba66723b0b29bfb7a206004bd3e9da29a27f57cf870ce395eb8b7ff1d53d7ba7b3c620d956b1c4cb06 WHIRLPOOL 361a3ef9c664b3b5f489b871071a1ce581cfef089a6a1014988e6c7463d45533d3a8af9b3e49ddb7e2257cef06205771d8e584a090d65e3c645421e963346a35 DIST ffmpeg-2.8.8.tar.bz2 8583641 SHA256 b70848958feadca180315d17b1131a1b519527971590e6ee8363a4c568ed06a6 SHA512 26fc2f9da8b0c62fb3147632476d328dff096f07efc83112dd3cf3a1da6b42edab053ef8f05d2035c5f824d9336020b3b4a99501243f83ec66255f082278bfb3 WHIRLPOOL 9ba67f08dcfbed0c3519767d9fea35f24a3652290ad095d01d928cf9f54e9e99afa410889c6afb84f22cd9882b5a7d44f304d602b41510973962517228f5f32f -DIST ffmpeg-3.1.4.tar.bz2 9334429 SHA256 7c99df75a4dc12d22c0f1ed11d0acf98cac1f8b5fe7a7434344b167f810bcbfa SHA512 5ec8c525dcea153316ab5fb84337d29f920d81a3c3ca0f0cd10fcb60482e7e08bc9d9e73d7ea5d5dac32838ac45fed47fb41d1e73551e654ce55cc04071ec18e WHIRLPOOL fc752ec261411c38003970199d98b0dc61eb380b83156754d3fc8246113d0431c35079e954a9b4bdf93c6bd39a97b0f20c921397ab0ff510ca9d3d0473316615 +DIST ffmpeg-3.1.5.tar.bz2 9334190 SHA256 2400882a2c7795c74f0abebc28d267f2796510fb69ba324b0e9f16cc8dbb0d2b SHA512 9d22d48318cf6d44ce3a4d2ee57fa51d04c685a1c72e9668f5ad4443d246a33108f66f1dc9106e1c4db52b6c2c267b6682b9b7c3d267e4c37e4460f4169b97d1 WHIRLPOOL fda0698359383dda01ba8b96e3004d64fb8c32534771c6eb21d1daeca32596d2a2de566eb991170a259de31b5f029fb1a6d99ab8f100bf464058a71ee6438a42 diff --git a/media-video/ffmpeg/ffmpeg-3.1.4.ebuild b/media-video/ffmpeg/ffmpeg-3.1.5.ebuild index a3950c4f6853..e15449adeb43 100644 --- a/media-video/ffmpeg/ffmpeg-3.1.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.1.5.ebuild @@ -294,7 +294,6 @@ src_prepare() { if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION} fi - epatch "${FILESDIR}/openjpeg2.patch" #595318 default } diff --git a/media-video/ffmpeg/files/openjpeg2.patch b/media-video/ffmpeg/files/openjpeg2.patch deleted file mode 100644 index e203e61147a7..000000000000 --- a/media-video/ffmpeg/files/openjpeg2.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=595318 -https://trac.ffmpeg.org/ticket/5694 - -diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure ---- ffmpeg-3.1.1/configure 2016-06-27 01:54:28.000000000 +0200 -+++ ffmpeg-3.1.1-new/configure 2016-07-27 22:25:36.585141648 +0200 -@@ -5669,7 +5669,7 @@ enabled libopencv && { check_hea - require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || - require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; } - enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion --enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || -+enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || - check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || - check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || - check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || -diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c ---- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c 2016-06-27 01:54:29.000000000 +0200 -+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c 2016-07-27 22:25:45.509327071 +0200 -@@ -24,8 +24,6 @@ - * JPEG 2000 decoder using libopenjpeg - */ - --#define OPJ_STATIC -- - #include "libavutil/common.h" - #include "libavutil/imgutils.h" - #include "libavutil/intreadwrite.h" -diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c ---- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c 2016-06-27 01:54:29.000000000 +0200 -+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c 2016-07-27 22:25:40.298218807 +0200 -@@ -24,8 +24,6 @@ - * JPEG 2000 encoder using libopenjpeg - */ - --#define OPJ_STATIC -- - #include "libavutil/avassert.h" - #include "libavutil/common.h" - #include "libavutil/imgutils.h" |