[packages/ffmpeg] - missing patch

adwol adwol at pld-linux.org
Sat Oct 8 03:08:06 CEST 2016


commit d683ec3c51b62d5b0ed888e5022ff114135d7f97
Author: Adam Osuchowski <adwol at pld-linux.org>
Date:   Sat Oct 8 03:07:52 2016 +0200

    - missing patch

 ffmpeg-openjpeg-build.patch | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
---
diff --git a/ffmpeg-openjpeg-build.patch b/ffmpeg-openjpeg-build.patch
new file mode 100644
index 0000000..34fec82
--- /dev/null
+++ b/ffmpeg-openjpeg-build.patch
@@ -0,0 +1,36 @@
+diff -ruN ffmpeg-3.1.orig/configure ffmpeg-3.1/configure
+--- ffmpeg-3.1.orig/configure	2016-06-27 01:54:28.000000000 +0200
++++ ffmpeg-3.1/configure	2016-10-08 02:45:26.023232577 +0200
+@@ -5669,7 +5669,7 @@
+                                  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 -ruN ffmpeg-3.1.orig/libavcodec/libopenjpegdec.c ffmpeg-3.1/libavcodec/libopenjpegdec.c
+--- ffmpeg-3.1.orig/libavcodec/libopenjpegdec.c	2016-06-27 01:54:29.000000000 +0200
++++ ffmpeg-3.1/libavcodec/libopenjpegdec.c	2016-10-08 02:45:39.532177348 +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 -ruN ffmpeg-3.1.orig/libavcodec/libopenjpegenc.c ffmpeg-3.1/libavcodec/libopenjpegenc.c
+--- ffmpeg-3.1.orig/libavcodec/libopenjpegenc.c	2016-06-27 01:54:29.000000000 +0200
++++ ffmpeg-3.1/libavcodec/libopenjpegenc.c	2016-10-08 02:45:52.390124879 +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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/d683ec3c51b62d5b0ed888e5022ff114135d7f97



More information about the pld-cvs-commit mailing list