X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=mupdf-openjpeg.patch;h=877e4775d857756e1564c02de35a9a6511d06692;hb=73677cf;hp=7f83cba303f6c601a9b26f3ebdc00c03a3cb78af;hpb=7f62b7906818d8ac1396f22ba4b30b2f038690db;p=packages%2Fmupdf.git

diff --git a/mupdf-openjpeg.patch b/mupdf-openjpeg.patch
index 7f83cba..877e477 100644
--- a/mupdf-openjpeg.patch
+++ b/mupdf-openjpeg.patch
@@ -1,22 +1,9 @@
---- mupdf-1.3-source/Makerules.orig	2013-08-14 14:41:20.000000000 +0200
-+++ mupdf-1.3-source/Makerules	2013-11-01 20:36:24.832058539 +0100
-@@ -62,8 +62,8 @@
- 
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
- SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
--SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
--SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
-+SYS_OPENJPEG_CFLAGS = -I/usr/include/openjpeg-2.0
-+SYS_OPENJPEG_LIBS = -lopenjp2
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
---- mupdf-1.3-source/source/fitz/load-jpx.c~	2013-08-14 14:41:20.000000000 +0200
-+++ mupdf-1.3-source/source/fitz/load-jpx.c	2014-11-04 22:47:25.217970803 +0100
+--- mupdf-1.6-source/source/fitz/load-jpx.c~	2013-08-14 14:41:20.000000000 +0200
++++ mupdf-1.6-source/source/fitz/load-jpx.c	2014-11-04 22:47:25.217970803 +0100
 @@ -117,7 +117,7 @@
- 	opj_stream_set_read_function(stream, stream_read);
- 	opj_stream_set_skip_function(stream, stream_skip);
- 	opj_stream_set_seek_function(stream, stream_seek);
+ 	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 */