Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 doc/mupdf/DETAILS                         |    4 ++--
 doc/mupdf/HISTORY                         |    5 +++++
 doc/mupdf/PRE_BUILD                       |    2 +-
 doc/mupdf/mupdf-1.10a-shared_libs-1.patch |   20 ++++++++++++++------
 4 files changed, 22 insertions(+), 9 deletions(-)

New commits:
commit ea18c128bacb465ba9a125a2f11975ca261430e8
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    doc/mupdf: version 1.11-rc1

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 6ace5ec..46a79bb 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,10 +1,10 @@
            SPELL=mupdf
-         VERSION=1.10a
+         VERSION=1.11-rc1
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION-source.tar.gz
    SOURCE_URL[0]=http://mupdf.com/downloads/$SOURCE
    SOURCE_URL[1]=http://mupdf.com/downloads/archive/$SOURCE
-     
SOURCE_HASH=sha512:8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec
+     
SOURCE_HASH=sha512:0f006bac2c892dcc0349900060b25ee794b17866e08df63f7a08adcfbaec59a61a77fdcc5f77a8fa8bd61f58ff62e63843cf28dca9b45a42e7676f7b433b28ab
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-source"
         WEB_SITE=http://www.mupdf.com/
          ENTERED=20120426
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 8a66379..23aee94 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,8 @@
+2017-03-30 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 1.11-rc1
+       * PRE_BUILD: jpeg -> libjpeg
+       * mupdf-10a-shared_libs-1.patch: updated
+
 2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.10a
        * PRE_BUILD: use shipped openjpeg library if we have old system one
diff --git a/doc/mupdf/PRE_BUILD b/doc/mupdf/PRE_BUILD
index 513af7c..859fe3f 100755
--- a/doc/mupdf/PRE_BUILD
+++ b/doc/mupdf/PRE_BUILD
@@ -5,7 +5,7 @@ sedit "/OPJ_STATIC$/d" source/fitz/load-jpx.c &&
 sedit "s:-DOPJ_STATIC::" Makethird &&
 patch -p1 < "${SPELL_DIRECTORY}/mupdf-1.10a-shared_libs-1.patch" &&
 
-rm -rf thirdparty/{curl,freetype,harfbuzz,glfw,jbig2dec,jpeg,zlib} &&
+rm -rf thirdparty/{curl,freetype,harfbuzz,glfw,jbig2dec,libjpeg,zlib} &&
 
 # building against older system OpenJPEG library is unsupported
 if spell_ok openjpeg && ! is_version_less $(installed_version openjpeg) 2.0; 
then
diff --git a/doc/mupdf/mupdf-1.10a-shared_libs-1.patch 
b/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
index 14b7d3d..f31121a 100644
--- a/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
+++ b/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
@@ -9,32 +9,40 @@ Description: Generate shared libraries for mupdf, instead 
of static ones. This
 diff -Naur a/Makefile b/Makefile
 --- a/Makefile 2016-11-21 11:21:11.000000000 +0100
 +++ b/Makefile 2016-11-27 10:26:11.411353082 +0100
-@@ -15,7 +15,7 @@
+@@ -14,7 +14,7 @@
  # Do not specify CFLAGS or LIBS on the make invocation line - specify
  # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
  # set a variable that was set on the command line.
--CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN)
-+CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN) -fPIC
+-CFLAGS += $(XCFLAGS) -Iinclude -Igenerated
++CFLAGS += $(XCFLAGS) -Iinclude -Igenerated -fPIC
  LIBS += $(XLIBS) -lm
  
  LIBS += $(FREETYPE_LIBS)
-@@ -152,14 +152,16 @@
+@@ -300,19 +300,22 @@
  
  # --- Library ---
  
 -MUPDF_LIB = $(OUT)/libmupdf.a
 -THIRD_LIB = $(OUT)/libmupdfthird.a
+-THREAD_LIB = $(OUT)/libmuthreads.a
 +MUPDF_LIB = $(OUT)/libmupdf.so
 +THIRD_LIB = $(OUT)/libmupdfthird.so
++THREAD_LIB = $(OUT)/libmuthreads.so
  
  MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) 
$(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
- THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) 
$(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
+ THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(LIBJPEG_OBJ) 
$(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
+ THREAD_OBJ := $(THREAD_OBJ)
  
 -$(MUPDF_LIB) : $(MUPDF_OBJ)
 +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)
 +      $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
  $(THIRD_LIB) : $(THIRD_OBJ)
 +      $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so 
-Wl,--no-undefined
+ $(THREAD_LIB) : $(THREAD_OBJ)
++      $(LINK_CMD) -pthread -shared -Wl,-soname -Wl,libmuthreads.so 
-Wl,--no-undefined
  
- INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
+ 
+ # --- Tools and Apps ---