--- 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
@@ -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_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);