- added mupdf patch and bcond

diff --git a/ImageMagick-mupdf.patch b/ImageMagick-mupdf.patch
new file mode 100644 (file)
index 0000000..fd4838d
--- /dev/null
+++ b/ImageMagick-mupdf.patch
@@ -0,0 +1,19 @@
+--- ImageMagick-6.8.7-3/configure.ac.orig      2013-11-01 09:48:55.513688836 +0100
++++ ImageMagick-6.8.7-3/configure.ac   2013-11-02 15:48:26.215824407 +0100
+@@ -2515,14 +2515,14 @@
+     failed=0
+     passed=0
+     AC_CHECK_HEADER(mupdf/fitz.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+-    AC_CHECK_LIB(mupdf,fz_new_context,passed=`expr $passed + 1`,failed=`expr $failed + 1`,-lmupdf $FREETYPE_LIBS)
++    AC_CHECK_LIB(mupdf,fz_new_context,passed=`expr $passed + 1`,failed=`expr $failed + 1`,-lmupdf-js-none $FREETYPE_LIBS)
+     AC_MSG_CHECKING([if MUPDF package is complete])
+     if test $passed -gt 0; then
+         if test $failed -gt 0; then
+             AC_MSG_RESULT([no -- some components failed test])
+             have_mupdf='no (failed tests)'
+         else
+-            MUPDF_LIBS='-lmupdf'
++            MUPDF_LIBS='-lmupdf -lmupdf-js-none'
+             LIBS="$MUPDF_LIBS $LIBS"
+             AC_DEFINE(MUPDF_DELEGATE,1,Define if you have MUPDF library)
+             AC_MSG_RESULT([yes])

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 82cb9b64db1ee5578c00c788d6148d36ddd4eaba..92cb9f8542007a6744b1533a3c0d16b20c2198b8 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -16,6 +16,7 @@
 %bcond_without wmf             # WMF module (which uses libwmf library)
 # - module feautres:
 %bcond_without autotrace       # Autotrace support in SVG module
+%bcond_with    mupdf           # MuPDF support in XPS module (not really used)
 
 %include       /usr/lib/rpm/macros.perl
 %define                ver     6.8.7
@@ -42,6 +43,7 @@ Patch1:               %{name}-link.patch
 Patch2:                %{name}-libpath.patch
 Patch3:                %{name}-ldflags.patch
 Patch4:                %{name}-lt.patch
+Patch5:                %{name}-mupdf.patch
 URL:           http://www.imagemagick.org/
 %{?with_opencl:BuildRequires:  OpenCL-devel}
 BuildRequires: OpenEXR-devel >= 1.0.6
@@ -73,6 +75,7 @@ BuildRequires:        libtool >= 2:2.2
 BuildRequires: libwebp-devel
 %{?with_wmf:BuildRequires:     libwmf-devel >= 2:0.2.2}
 BuildRequires: libxml2-devel >= 2.0
+%{?with_mupdf:BuildRequires:   mupdf-devel}
 BuildRequires: pango-devel >= 1:1.28.1
 BuildRequires: perl-devel >= 1:5.8.1
 BuildRequires: pkgconfig
@@ -656,6 +659,7 @@ Moduł kodera dla plików WMF.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
 
@@ -685,6 +689,7 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
        --with-gvc%{!?with_graphviz:=no} \
        --with-jp2%{!?with_jasper:=no} \
        --with-magick_plus_plus%{!?with_cxx:=no} \
+       --with-mupdf%{!?with_mupdf:=no} \
        --with-openexr%{!?with_exr:=no} \
        --with-wmf%{!?with_wmf:=no} \
        --with-gs-font-dir=%{_fontsdir}/Type1 \