Author: igor
Date: Mon Nov 17 22:27:33 2014
New Revision: 3058
Log:
fix gst-plugins-bad build with openjpeg version >= 2.1
Added:
trunk/gst-plugins-bad/
trunk/gst-plugins-bad/gst-plugins-bad-1.4.4-openjpeg21-1.patch
trunk/mupdf/mupdf-1.6-openjpeg21-1.patch
Deleted:
trunk/mupdf/mupdf-1.6-libopenjp2-1.patch
Added: trunk/gst-plugins-bad/gst-plugins-bad-1.4.4-openjpeg21-1.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/gst-plugins-bad/gst-plugins-bad-1.4.4-openjpeg21-1.patch Mon Nov
17 22:27:33 2014 (r3058)
@@ -0,0 +1,55 @@
+Submitted By: Igor Živković
+Date: 2014-11-18
+Initial Package Version: 1.4.4
+Upstream Status: Unknown
+Origin: Self
+Description: Fixes build with OpenJPEG version >= 2.1.
+
+diff -Naur gst-plugins-bad-1.4.4.orig/configure gst-plugins-bad-1.4.4/configure
+--- gst-plugins-bad-1.4.4.orig/configure 2014-11-06 11:35:45.000000000
+0100
++++ gst-plugins-bad-1.4.4/configure 2014-11-18 07:16:44.535048392 +0100
+@@ -45687,7 +45687,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+- #include <openjpeg-2.0/openjpeg.h>
++ #include <openjpeg-2.1/openjpeg.h>
+ int
+ main ()
+ {
+diff -Naur gst-plugins-bad-1.4.4.orig/ext/openjpeg/gstopenjpegdec.c
gst-plugins-bad-1.4.4/ext/openjpeg/gstopenjpegdec.c
+--- gst-plugins-bad-1.4.4.orig/ext/openjpeg/gstopenjpegdec.c 2014-10-19
13:41:13.000000000 +0200
++++ gst-plugins-bad-1.4.4/ext/openjpeg/gstopenjpegdec.c 2014-11-18
07:18:42.087868785 +0100
+@@ -1036,7 +1036,7 @@
+ opj_stream_set_write_function (stream, write_fn);
+ opj_stream_set_skip_function (stream, skip_fn);
+ opj_stream_set_seek_function (stream, seek_fn);
+- opj_stream_set_user_data (stream, &mstream);
++ opj_stream_set_user_data (stream, &mstream, NULL);
+ opj_stream_set_user_data_length (stream, mstream.size);
+
+ image = NULL;
+diff -Naur gst-plugins-bad-1.4.4.orig/ext/openjpeg/gstopenjpegenc.c
gst-plugins-bad-1.4.4/ext/openjpeg/gstopenjpegenc.c
+--- gst-plugins-bad-1.4.4.orig/ext/openjpeg/gstopenjpegenc.c 2014-10-19
13:41:13.000000000 +0200
++++ gst-plugins-bad-1.4.4/ext/openjpeg/gstopenjpegenc.c 2014-11-18
07:18:59.227104349 +0100
+@@ -899,7 +899,7 @@
+ opj_stream_set_write_function (stream, write_fn);
+ opj_stream_set_skip_function (stream, skip_fn);
+ opj_stream_set_seek_function (stream, seek_fn);
+- opj_stream_set_user_data (stream, &mstream);
++ opj_stream_set_user_data (stream, &mstream, NULL);
+ opj_stream_set_user_data_length (stream, mstream.size);
+
+ if (!opj_start_compress (enc, image, stream))
+diff -Naur gst-plugins-bad-1.4.4.orig/ext/openjpeg/gstopenjpeg.h
gst-plugins-bad-1.4.4/ext/openjpeg/gstopenjpeg.h
+--- gst-plugins-bad-1.4.4.orig/ext/openjpeg/gstopenjpeg.h 2014-10-19
13:41:13.000000000 +0200
++++ gst-plugins-bad-1.4.4/ext/openjpeg/gstopenjpeg.h 2014-11-18
07:17:36.282896003 +0100
+@@ -38,7 +38,7 @@
+ #define OPJ_CPRL CPRL
+ #else
+ #include <stdio.h>
+-#include <openjpeg-2.0/openjpeg.h>
++#include <openjpeg-2.1/openjpeg.h>
+ #endif
+
+ #endif /* __GST_OPENJPEG_H__ */
Added: trunk/mupdf/mupdf-1.6-openjpeg21-1.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mupdf/mupdf-1.6-openjpeg21-1.patch Mon Nov 17 22:27:33 2014
(r3058)
@@ -0,0 +1,47 @@
+Submitted By: Igor Živković
+Date: 2014-11-17
+Initial Package Version: 1.6
+Upstream Status: Unknown
+Origin: Debian
+Description: Fixes build with OpenJPEG version >= 2.1.
+
+diff -Naur mupdf-1.6-source.orig/Makerules mupdf-1.6-source/Makerules
+--- mupdf-1.6-source.orig/Makerules 2014-09-30 13:25:12.000000000 +0200
++++ mupdf-1.6-source/Makerules 2014-11-17 18:45:27.202705119 +0100
+@@ -75,8 +75,8 @@
+
+ SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
+ SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
+-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
+-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
++SYS_OPENJPEG_CFLAGS = -I/usr/include/openjpeg-2.1
++SYS_OPENJPEG_LIBS = -lopenjp2
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
+diff -Naur mupdf-1.6-source.orig/source/fitz/load-jpx.c
mupdf-1.6-source/source/fitz/load-jpx.c
+--- mupdf-1.6-source.orig/source/fitz/load-jpx.c 2014-09-30
13:25:12.000000000 +0200
++++ mupdf-1.6-source/source/fitz/load-jpx.c 2014-11-17 18:45:27.202705119
+0100
+@@ -1,13 +1,5 @@
+ #include "mupdf/fitz.h"
+
+-/* Without the definition of OPJ_STATIC, compilation fails on windows
+- * due to the use of __stdcall. We believe it is required on some
+- * linux toolchains too. */
+-#define OPJ_STATIC
+-#ifndef _MSC_VER
+-#define OPJ_HAVE_STDINT_H
+-#endif
+-
+ #include <openjpeg.h>
+
+ static void fz_opj_error_callback(const char *msg, void *client_data)
+@@ -117,7 +109,7 @@
+ opj_stream_set_read_function(stream, fz_opj_stream_read);
+ opj_stream_set_skip_function(stream, fz_opj_stream_skip);
+ opj_stream_set_seek_function(stream, fz_opj_stream_seek);
+- opj_stream_set_user_data(stream, &sb);
++ opj_stream_set_user_data(stream, &sb, NULL);
+ /* Set the length to avoid an assert */
+ opj_stream_set_user_data_length(stream, size);
+
--
http://lists.linuxfromscratch.org/listinfo/patches
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
