- updated to 1.6

- updated openjpeg,shared patches
- removed obsolete curl,v8 patches
- now it uses mujs by default, v8 by bcond

diff --git a/mupdf-curl.patch b/mupdf-curl.patch
deleted file mode 100644 (file)
index 61645bb..0000000
--- a/mupdf-curl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mupdf-1.3-source/Makerules.orig    2013-11-01 20:37:30.098722412 +0100
-+++ mupdf-1.3-source/Makerules 2013-11-01 20:53:10.238682958 +0100
-@@ -56,6 +56,8 @@
- endif
- 
- SYS_CURL_DEPS = -lpthread -lrt
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
- 
- SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
- SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
---- mupdf-1.3-source/Makethird.orig    2013-11-01 20:54:35.492012714 +0100
-+++ mupdf-1.3-source/Makethird 2013-11-01 20:54:07.405347226 +0100
-@@ -444,5 +444,6 @@
- CURL_CFLAGS := -I$(CURL_DIR)/include
- CURL_LIBS := $(SYS_CURL_DEPS)
- else
--NOCURL := yes
-+CURL_CFLAGS := $(SYS_CURL_CFLAGS)
-+CURL_LIBS := $(SYS_CURL_LIBS)
- endif

diff --git a/mupdf-openjpeg.patch b/mupdf-openjpeg.patch
index 7f83cba303f6c601a9b26f3ebdc00c03a3cb78af..877e4775d857756e1564c02de35a9a6511d06692 100644 (file)
--- 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 */

diff --git a/mupdf-shared.patch b/mupdf-shared.patch
index e860ab0204fe6f5ae578fac2af3998a87865673e..2990cfa7867ca97328d9dea8970b0fb2e4ce3a6c 100644 (file)
--- a/mupdf-shared.patch
+++ b/mupdf-shared.patch
@@ -1,7 +1,7 @@
---- mupdf-1.3-source/Makefile.orig     2013-08-14 14:41:20.000000000 +0200
-+++ mupdf-1.3-source/Makefile  2013-11-02 09:52:33.336720500 +0100
+--- mupdf-1.6-source/Makefile.orig     2014-09-30 13:25:12.000000000 +0200
++++ mupdf-1.6-source/Makefile  2014-11-28 23:35:04.957817554 +0100
 @@ -44,17 +44,24 @@
- ifeq "$(verbose)" ""
+ ifneq "$(verbose)" "yes"
  QUIET_AR = @ echo ' ' ' ' AR $@ ;
  QUIET_CC = @ echo ' ' ' ' CC $@ ;
 +QUIET_LTCC = @ echo ' ' ' ' LTCC $@ ;
@@ -25,67 +25,76 @@
  MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
  RM_CMD = $(QUIET_RM) rm -f $@
  
-@@ -86,35 +93,37 @@
- CBZ_SRC_HDR := $(wildcard source/cbz/*.h)
+@@ -90,47 +97,47 @@
  IMG_SRC_HDR := $(wildcard source/img/*.h)
+ TIFF_SRC_HDR := $(wildcard source/tiff/*.h)
  
 -FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC))))
 -PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC))))
 -XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC))))
 -CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC))))
 -IMG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(IMG_SRC))))
--
--PDF_JS_V8_OBJ := $(OUT)/pdf/js/pdf-js.o $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o
--PDF_JS_NONE_OBJ := $(OUT)/pdf/js/pdf-js-none.o
--
--$(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
--$(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
--$(XPS_OBJ) : $(FITZ_HDR) $(XPS_HDR) $(XPS_SRC_HDR)
--$(CBZ_OBJ) : $(FITZ_HDR) $(CBZ_HDR) $(CBZ_SRC_HDR)
--$(IMG_OBJ) : $(FITZ_HDR) $(IMG_HDR) $(IMG_SRC_HDR)
+-TIFF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(TIFF_SRC))))
 +FITZ_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC))))
 +PDF_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC))))
 +XPS_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC))))
 +CBZ_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC))))
 +IMG_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(IMG_SRC))))
-+
-+PDF_JS_V8_LOBJ := $(OUT)/pdf/js/pdf-js.lo $(OUT)/pdf/js/pdf-jsimp-cpp.lo $(OUT)/pdf/js/pdf-jsimp-v8.lo
-+PDF_JS_NONE_LOBJ := $(OUT)/pdf/js/pdf-js-none.lo
-+
++TIFF_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(TIFF_SRC))))
+ 
+ # --- Choice of Javascript library ---
+ 
+ ifeq "$(HAVE_MUJS)" "yes"
+-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
+-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o
++PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo
++PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-mu.lo
+ THIRD_LIBS += $(MUJS_LIB)
+ LIBS += $(MUJS_LIBS)
+ CFLAGS += $(MUJS_CFLAGS)
+ else ifeq "$(HAVE_JSCORE)" "yes"
+-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
+-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-jscore.o
++PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo
++PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-jscore.lo
+ LIBS += $(JSCORE_LIBS)
+ CFLAGS += $(JSCORE_CFLAGS)
+ else ifeq "$(HAVE_V8)" "yes"
+-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
+-PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o
++PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo
++PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.lo $(OUT)/pdf/js/pdf-jsimp-v8.lo
+ LIBS += $(V8_LIBS)
+ CFLAGS += $(V8_CFLAGS)
+ else
+-PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o
++PDF_LOBJ += $(OUT)/pdf/js/pdf-js-none.lo
+ endif
+ 
+-$(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
+-$(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
+-$(XPS_OBJ) : $(FITZ_HDR) $(XPS_HDR) $(XPS_SRC_HDR)
+-$(CBZ_OBJ) : $(FITZ_HDR) $(CBZ_HDR) $(CBZ_SRC_HDR)
+-$(IMG_OBJ) : $(FITZ_HDR) $(IMG_HDR) $(IMG_SRC_HDR)
+-$(TIFF_OBJ) : $(FITZ_HDR) $(IMG_HDR) $(TIFF_SRC_HDR)
 +$(FITZ_LOBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
 +$(PDF_LOBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
 +$(XPS_LOBJ) : $(FITZ_HDR) $(XPS_HDR) $(XPS_SRC_HDR)
 +$(CBZ_LOBJ) : $(FITZ_HDR) $(CBZ_HDR) $(CBZ_SRC_HDR)
 +$(IMG_LOBJ) : $(FITZ_HDR) $(IMG_HDR) $(IMG_SRC_HDR)
- 
--$(PDF_JS_V8_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
--$(PDF_JS_NONE_OBJ) :=  $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
-+$(PDF_JS_V8_LOBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
-+$(PDF_JS_NONE_LOBJ) :=  $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
++$(TIFF_LOBJ) : $(FITZ_HDR) $(IMG_HDR) $(TIFF_SRC_HDR)
  
  # --- Library ---
  
 -MUPDF_LIB := $(OUT)/libmupdf.a
--MUPDF_JS_NONE_LIB := $(OUT)/libmupdf-js-none.a
 +MUPDF_LIB := $(OUT)/libmupdf.la
-+MUPDF_JS_NONE_LIB := $(OUT)/libmupdf-js-none.la
- 
--$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(IMG_OBJ)
--$(MUPDF_JS_NONE_LIB) : $(PDF_JS_NONE_OBJ)
-+$(MUPDF_LIB) : $(FITZ_LOBJ) $(PDF_LOBJ) $(XPS_LOBJ) $(CBZ_LOBJ) $(IMG_LOBJ)
-+$(MUPDF_JS_NONE_LIB) : $(PDF_JS_NONE_LOBJ) $(MUPDF_LIB)
- 
- ifeq "$(V8_PRESENT)" "yes"
--MUPDF_JS_V8_LIB := $(OUT)/libmupdf-js-v8.a
--$(MUPDF_JS_V8_LIB) : $(PDF_JS_V8_OBJ)
-+MUPDF_JS_V8_LIB := $(OUT)/libmupdf-js-v8.la
-+$(MUPDF_JS_V8_LIB) : $(PDF_JS_V8_LOBJ) $(MUPDF_LIB)
-+$(MUPDF_JS_V8_LIB) :: LDLIBS += -lv8
-+$(MUPDF_JS_V8_LIB) :: LTLINK_CMD = $(LTLINKCXX_CMD)
- endif
  
- INSTALL_LIBS := $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(MUPDF_JS_V8_LIB)
-@@ -124,10 +131,8 @@
+-$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(IMG_OBJ) $(TIFF_OBJ)
++$(MUPDF_LIB) : $(FITZ_LOBJ) $(PDF_LOBJ) $(XPS_LOBJ) $(CBZ_LOBJ) $(IMG_LOBJ) $(TIFF_LOBJ)
+ 
+ INSTALL_LIBS := $(MUPDF_LIB)
+ 
+@@ -139,10 +146,8 @@
  $(ALL_DIR) $(OUT) $(GEN) :
        $(MKDIR_CMD)
  
@@ -98,7 +107,7 @@
  
  $(OUT)/%: $(OUT)/%.o
        $(LINK_CMD)
-@@ -138,6 +142,12 @@
+@@ -153,6 +158,12 @@
  $(OUT)/%.o : source/%.cpp | $(ALL_DIR)
        $(CXX_CMD)
  
@@ -111,7 +120,7 @@
  $(OUT)/%.o : scripts/%.c | $(OUT)
        $(CC_CMD)
  
-@@ -208,10 +219,10 @@
+@@ -222,10 +233,10 @@
  
  generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN)
  
@@ -123,56 +132,57 @@
 +$(OUT)/pdf/pdf-fontfile.lo : $(FONT_GEN)
 +$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN)
 +$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN)
- $(OUT)/cmapdump.o : source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c
+ $(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c
  
  # --- Tools and Apps ---
-@@ -219,31 +230,31 @@
- MUDRAW := $(addprefix $(OUT)/, mudraw)
- $(MUDRAW) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS)
- $(MUDRAW) : $(addprefix $(OUT)/tools/, mudraw.o)
+@@ -235,24 +246,24 @@
+ $(MUDRAW_OBJ) : $(FITZ_HDR)
+ $(MUDRAW) : $(MUPDF_LIB) $(THIRD_LIBS)
+ $(MUDRAW) : $(MUDRAW_OBJ)
 -      $(LINK_CMD)
 +      $(LTLINK_CMD)
  
  MUTOOL := $(addprefix $(OUT)/, mutool)
- $(MUTOOL) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS)
- $(MUTOOL) : $(addprefix $(OUT)/tools/, mutool.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o)
+ MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o)
+ $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
+ $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS)
+ $(MUTOOL) : $(MUTOOL_OBJ)
 -      $(LINK_CMD)
 +      $(LTLINK_CMD)
  
- ifeq "$(V8_PRESENT)" "yes"
- MUJSTEST_V8 := $(OUT)/mujstest-v8
- $(MUJSTEST_V8) : $(MUPDF_LIB) $(MUPDF_JS_V8_LIB) $(THIRD_LIBS)
- $(MUJSTEST_V8) : $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
--      $(LINK_CMD) $(V8_LIBS)
-+      $(LTLINK_CMD) $(V8_LIBS)
- endif
+ MJSGEN := $(OUT)/mjsgen
+ $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS)
+ $(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o)
+-      $(LINK_CMD)
++      $(LTLINK_CMD)
  
- ifeq "$(NOX11)" ""
+ MUJSTEST := $(OUT)/mujstest
+ $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS)
+ $(MUJSTEST) : $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
+-      $(LINK_CMD)
++      $(LTLINK_CMD)
+ 
+ ifeq "$(HAVE_X11)" "yes"
  MUVIEW_X11 := $(OUT)/mupdf-x11
- $(MUVIEW_X11) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS)
- $(MUVIEW_X11) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
+@@ -260,7 +271,7 @@
+ $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
+ $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS)
+ $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
 -      $(LINK_CMD) $(X11_LIBS)
 +      $(LTLINK_CMD) $(X11_LIBS)
  
- ifeq "$(NOCURL)" ""
+ ifeq "$(HAVE_CURL)" "yes"
  MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
- $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) $(CURL_LIB)
- $(MUVIEW_X11_CURL) : $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
--      $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS)
-+      $(LTLINK_CMD) $(X11_LIBS) $(CURL_LIBS)
- endif
- endif
- 
-@@ -252,7 +263,7 @@
- MUVIEW_X11_V8 := $(OUT)/mupdf-x11-v8
- $(MUVIEW_X11_V8) : $(MUPDF_LIB) $(MUPDF_JS_V8_LIB) $(THIRD_LIBS)
- $(MUVIEW_X11_V8) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
--      $(LINK_CMD) $(X11_LIBS) $(V8_LIBS)
-+      $(LTLINK_CMD) $(X11_LIBS) $(V8_LIBS)
+@@ -268,7 +279,7 @@
+ $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
+ $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB)
+ $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
+-      $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
++      $(LTLINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
  endif
  endif
  
-@@ -294,10 +305,10 @@
+@@ -316,10 +327,10 @@
        install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
  
        install -d $(DESTDIR)$(libdir)

diff --git a/mupdf-v8.patch b/mupdf-v8.patch
deleted file mode 100644 (file)
index 0a9cf20..0000000
--- a/mupdf-v8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mupdf-1.3-source/Makethird.orig    2013-11-01 20:54:07.405347226 +0100
-+++ mupdf-1.3-source/Makethird 2013-11-01 20:56:12.078675327 +0100
-@@ -43,7 +43,9 @@
- 
- V8_PRESENT := yes
- else
--V8_PRESENT := no
-+ifneq "$(V8_PRESENT)" "no"
-+V8_LIBS = -lv8 -lstdc++
-+endif
- endif
- 
- # --- FreeType 2 ---

diff --git a/mupdf.spec b/mupdf.spec
index 1c2842647686f239d0c7245026a8bd099feda627..4525b12fbadb1477ca504f416bdf46bfc6fe17e5 100644 (file)
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -1,27 +1,29 @@
+#
+# Conditional build:
+%bcond_with    v8      # use V8 JS engine instead of MuJS
+#
 Summary:       MuPDF - lightweight PDF, XPS and CBZ viewer and parser/rendering library
 Summary(pl.UTF-8):     MuPDF - lekka przeglądarka oraz biblioteka renderująca PDF, XPS, CBZ
 Name:          mupdf
-Version:       1.3
-Release:       3
+Version:       1.6
+Release:       1
 License:       AGPL v3+
 Group:         Applications/Text
-#Source0Download: http://code.google.com/p/mupdf/downloads/list?q=source
-Source0:       http://mupdf.googlecode.com/files/%{name}-%{version}-source.tar.gz
-# Source0-md5: fe53c2a56ebd7759f5f965bc4ff66359
+Source0:       http://www.mupdf.com/downloads/%{name}-%{version}-source.tar.gz
+# Source0-md5: 8d69db41ae9e0b6807b76bb6ed70dc2f
 Patch0:                %{name}-openjpeg.patch
-Patch1:                %{name}-curl.patch
-Patch2:                %{name}-v8.patch
-Patch3:                %{name}-shared.patch
+Patch1:                %{name}-shared.patch
 URL:           http://www.mupdf.com/
 BuildRequires: curl-devel
 BuildRequires: freetype-devel >= 2
 BuildRequires: jbig2dec-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libstdc++-devel
+%{!?with_v8:BuildRequires:     mujs-devel}
 BuildRequires: openjpeg2-devel >= 2.1.0
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
-BuildRequires: v8-devel
+%{?with_v8:BuildRequires:      v8-devel}
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: zlib-devel
@@ -29,7 +31,7 @@ Requires:     %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # needs symbols from one of libmupdf-js-*
-%define                skip_post_check_so      libmupdf.so.*
+#define                skip_post_check_so      libmupdf.so.*
 
 %description
 MuPDF is a lightweight PDF, XPS and CBZ viewer and parser/rendering
@@ -59,9 +61,10 @@ Requires:    freetype-devel >= 2
 Requires:      jbig2dec-devel
 Requires:      libjpeg-devel
 Requires:      libstdc++-devel
+%{!?with_v8:Requires:  mujs-devel}
 Requires:      openjpeg2-devel >= 2.1.0
 Requires:      openssl-devel
-Requires:      v8-devel
+%{?with_v8:Requires:   v8-devel}
 Requires:      zlib-devel
 
 %description devel
@@ -86,11 +89,9 @@ Statyczne biblioteki MuPDF.
 %setup -q -n %{name}-%{version}-source
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # use system libs instead
-%{__rm} -r thirdparty/{curl,freetype,jbig2dec,jpeg,openjpeg,zlib}
+%{__rm} -r thirdparty/{curl,freetype,jbig2dec,jpeg,mujs,openjpeg,zlib}
 
 %build
 CFLAGS="%{rpmcflags} %{rpmcppflags}" \
@@ -98,7 +99,15 @@ LDFLAGS="%{rpmldflags}" \
 %{__make} \
        CC="%{__cc}" \
        CXX="%{__cxx}" \
-       V8_PRESENT=yes \
+%if %{with v8}
+       HAVE_V8=yes \
+       V8_CFLAGS= \
+       V8_LIBS="-lv8 -lstdc++" \
+%else
+       HAVE_MUJS=yes \
+       MUJS_CFLAGS= \
+       MUJS_LIBS="-lmujs" \
+%endif
        SYS_OPENJPEG_CFLAGS="$(pkg-config --cflags libopenjp2)" \
        build=release \
        libdir=%{_libdir} \
@@ -127,10 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGES CONTRIBUTORS README
 %attr(755,root,root) %{_bindir}/mudraw
-%attr(755,root,root) %{_bindir}/mujstest-v8
+%attr(755,root,root) %{_bindir}/mujstest
 %attr(755,root,root) %{_bindir}/mupdf-x11
 %attr(755,root,root) %{_bindir}/mupdf-x11-curl
-%attr(755,root,root) %{_bindir}/mupdf-x11-v8
 %attr(755,root,root) %{_bindir}/mutool
 %{_mandir}/man1/mudraw.1*
 %{_mandir}/man1/mupdf.1*
@@ -140,24 +148,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmupdf.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmupdf.so.0
-%attr(755,root,root) %{_libdir}/libmupdf-js-none.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmupdf-js-none.so.0
-%attr(755,root,root) %{_libdir}/libmupdf-js-v8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmupdf-js-v8.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %doc docs/{naming,overview,progressive,refcount,thirdparty}.txt
 %attr(755,root,root) %{_libdir}/libmupdf.so
-%attr(755,root,root) %{_libdir}/libmupdf-js-none.so
-%attr(755,root,root) %{_libdir}/libmupdf-js-v8.so
 %{_libdir}/libmupdf.la
-%{_libdir}/libmupdf-js-none.la
-%{_libdir}/libmupdf-js-v8.la
 %{_includedir}/mupdf
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libmupdf.a
-%{_libdir}/libmupdf-js-none.a
-%{_libdir}/libmupdf-js-v8.a