diff options
| author | Alexandre Demers | 2016-10-23 17:25:11 -0400 |
|---|---|---|
| committer | Alexandre Demers | 2016-10-23 17:25:11 -0400 |
| commit | 9b92bfc11aa2d05e6f9f208214c252184c13858d (patch) | |
| tree | 7ab13739f6274487d96adb44f81e3929e015e35d | |
| parent | da80b913c69091e472cc81d530714934a3da0fd8 (diff) | |
| download | aur-9b92bfc11aa2d05e6f9f208214c252184c13858d.tar.gz | |
Port patch to fix build against openjpeg2
Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | ffmpeg_opj2.patch | 36 |
2 files changed, 48 insertions, 3 deletions
@@ -35,14 +35,23 @@ provides=( 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so' ) -source=(http://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.bz2{,.asc}) +source=( + "http://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.bz2"{,.asc} + "https://trac.ffmpeg.org/raw-attachment/ticket/5694/ffmpeg_opj2.patch" +) validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') -sha256sums=('58bc89c65dd114d874efbf76f76368d03b5e407f0a3f42d5b40801c280968a38' - 'SKIP') +sha256sums=( + '58bc89c65dd114d874efbf76f76368d03b5e407f0a3f42d5b40801c280968a38' + 'SKIP' + 'SKIP' +) build() { cd ${_pkgbasename}-${pkgver} + #Patching FFMPEG to compile againt a change in OpenJPEG2 static library until this patch is integrated in next release + patch -p1 < ../ffmpeg_opj2.patch + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" ./configure \ diff --git a/ffmpeg_opj2.patch b/ffmpeg_opj2.patch new file mode 100644 index 000000000000..11e66b4047df --- /dev/null +++ b/ffmpeg_opj2.patch @@ -0,0 +1,36 @@ +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" |