From 7f62b7906818d8ac1396f22ba4b30b2f038690db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 4 Nov 2014 22:50:21 +0100 Subject: [PATCH] - rel 3; build with new openjpeg2 --- mupdf-openjpeg.patch | 11 +++++++++++ mupdf.spec | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mupdf-openjpeg.patch b/mupdf-openjpeg.patch index cda5935..7f83cba 100644 --- a/mupdf-openjpeg.patch +++ b/mupdf-openjpeg.patch @@ -11,3 +11,14 @@ 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); + diff --git a/mupdf.spec b/mupdf.spec index b7cfcad..1c28426 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -2,7 +2,7 @@ Summary: MuPDF - lightweight PDF, XPS and CBZ viewer and parser/rendering librar Summary(pl.UTF-8): MuPDF - lekka przeglądarka oraz biblioteka renderująca PDF, XPS, CBZ Name: mupdf Version: 1.3 -Release: 2 +Release: 3 License: AGPL v3+ Group: Applications/Text #Source0Download: http://code.google.com/p/mupdf/downloads/list?q=source @@ -18,7 +18,7 @@ BuildRequires: freetype-devel >= 2 BuildRequires: jbig2dec-devel BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel -BuildRequires: openjpeg2-devel >= 2 +BuildRequires: openjpeg2-devel >= 2.1.0 BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: v8-devel @@ -59,7 +59,7 @@ Requires: freetype-devel >= 2 Requires: jbig2dec-devel Requires: libjpeg-devel Requires: libstdc++-devel -Requires: openjpeg2-devel >= 2 +Requires: openjpeg2-devel >= 2.1.0 Requires: openssl-devel Requires: v8-devel Requires: zlib-devel @@ -99,6 +99,7 @@ LDFLAGS="%{rpmldflags}" \ CC="%{__cc}" \ CXX="%{__cxx}" \ V8_PRESENT=yes \ + SYS_OPENJPEG_CFLAGS="$(pkg-config --cflags libopenjp2)" \ build=release \ libdir=%{_libdir} \ verbose=1 -- 2.43.0