| 1 |
commit: 6f1595fb23b828b52ad4e8dbe60efb3f9decbfec |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 29 16:32:51 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 29 16:33:02 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1595fb |
| 7 |
|
| 8 |
media-video/ffmpeg: add patch to build with latest openjpeg, bug #595318 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.1 |
| 11 |
|
| 12 |
media-video/ffmpeg/ffmpeg-3.1.3.ebuild | 1 + |
| 13 |
media-video/ffmpeg/files/openjpeg2.patch | 39 ++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 40 insertions(+) |
| 15 |
|
| 16 |
diff --git a/media-video/ffmpeg/ffmpeg-3.1.3.ebuild b/media-video/ffmpeg/ffmpeg-3.1.3.ebuild |
| 17 |
index 19db1ed..03b2cf4 100644 |
| 18 |
--- a/media-video/ffmpeg/ffmpeg-3.1.3.ebuild |
| 19 |
+++ b/media-video/ffmpeg/ffmpeg-3.1.3.ebuild |
| 20 |
@@ -294,6 +294,7 @@ src_prepare() { |
| 21 |
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot |
| 22 |
export revision=git-N-${FFMPEG_REVISION} |
| 23 |
fi |
| 24 |
+ epatch "${FILESDIR}/openjpeg2.patch" #595318 |
| 25 |
default |
| 26 |
} |
| 27 |
|
| 28 |
|
| 29 |
diff --git a/media-video/ffmpeg/files/openjpeg2.patch b/media-video/ffmpeg/files/openjpeg2.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000..e203e61 |
| 32 |
--- /dev/null |
| 33 |
+++ b/media-video/ffmpeg/files/openjpeg2.patch |
| 34 |
@@ -0,0 +1,39 @@ |
| 35 |
+https://bugs.gentoo.org/show_bug.cgi?id=595318 |
| 36 |
+https://trac.ffmpeg.org/ticket/5694 |
| 37 |
+ |
| 38 |
+diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure |
| 39 |
+--- ffmpeg-3.1.1/configure 2016-06-27 01:54:28.000000000 +0200 |
| 40 |
++++ ffmpeg-3.1.1-new/configure 2016-07-27 22:25:36.585141648 +0200 |
| 41 |
+@@ -5669,7 +5669,7 @@ enabled libopencv && { check_hea |
| 42 |
+ require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || |
| 43 |
+ require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; } |
| 44 |
+ enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion |
| 45 |
+-enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || |
| 46 |
++enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || |
| 47 |
+ check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || |
| 48 |
+ check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || |
| 49 |
+ check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || |
| 50 |
+diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c |
| 51 |
+--- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c 2016-06-27 01:54:29.000000000 +0200 |
| 52 |
++++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c 2016-07-27 22:25:45.509327071 +0200 |
| 53 |
+@@ -24,8 +24,6 @@ |
| 54 |
+ * JPEG 2000 decoder using libopenjpeg |
| 55 |
+ */ |
| 56 |
+ |
| 57 |
+-#define OPJ_STATIC |
| 58 |
+- |
| 59 |
+ #include "libavutil/common.h" |
| 60 |
+ #include "libavutil/imgutils.h" |
| 61 |
+ #include "libavutil/intreadwrite.h" |
| 62 |
+diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c |
| 63 |
+--- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c 2016-06-27 01:54:29.000000000 +0200 |
| 64 |
++++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c 2016-07-27 22:25:40.298218807 +0200 |
| 65 |
+@@ -24,8 +24,6 @@ |
| 66 |
+ * JPEG 2000 encoder using libopenjpeg |
| 67 |
+ */ |
| 68 |
+ |
| 69 |
+-#define OPJ_STATIC |
| 70 |
+- |
| 71 |
+ #include "libavutil/avassert.h" |
| 72 |
+ #include "libavutil/common.h" |
| 73 |
+ #include "libavutil/imgutils.h" |
Archives