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                            |    9 ++++-
 doc/mupdf/HISTORY                            |    6 +++
 doc/mupdf/PREPARE                            |    2 +
 doc/mupdf/PRE_BUILD                          |    4 +-
 doc/mupdf/mupdf-1.10a-shared_libs-1.patch    |   20 +++---------
 doc/mupdf/mupdf-1.11-rc1-shared_libs-1.patch |   43 
+++++++++++++++++++++++++++
 6 files changed, 65 insertions(+), 19 deletions(-)

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

    doc/mupdf: added multiversioning + hash and license updates

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 46a79bb..37c0a84 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,14 +1,19 @@
            SPELL=mupdf
+if [[ "${MUPDF_BRANCH}" == "rc" ]]; then
          VERSION=1.11-rc1
+     
SOURCE_HASH=sha512:777385bbf6dffc29f1306fa193d40b495a331d785bbc79c835f286ff34dc1f8b55ec905bf064a0bc7ceef1950f763ba6a0a1c07039564209354fbeeadfd32b70
+else
+         VERSION=1.10a
+     
SOURCE_HASH=sha512:8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec
+fi
   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:0f006bac2c892dcc0349900060b25ee794b17866e08df63f7a08adcfbaec59a61a77fdcc5f77a8fa8bd61f58ff62e63843cf28dca9b45a42e7676f7b433b28ab
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-source"
         WEB_SITE=http://www.mupdf.com/
          ENTERED=20120426
-      LICENSE[0]=GPL
+      LICENSE[0]="AGPL"
         KEYWORDS="pdf"
            SHORT="lightweight PDF, XPS, EPUB and CBZ viewer and 
parser/rendering library"
 cat << EOF
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 23aee94..dfb0a68 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,7 +1,11 @@
+2017-03-31 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS, PREPARE, PRE_BUILD, mupdf-${VERSION}-shared_libs-1.patch:
+         added multiversioning, updated hash for 1.11-rc1, GPL -> AGPL
+
 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
+       * mupdf-1.10a-shared_libs-1.patch: updated
 
 2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.10a
diff --git a/doc/mupdf/PREPARE b/doc/mupdf/PREPARE
new file mode 100755
index 0000000..7efb81a
--- /dev/null
+++ b/doc/mupdf/PREPARE
@@ -0,0 +1,2 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+prepare_select_branch stable rc
diff --git a/doc/mupdf/PRE_BUILD b/doc/mupdf/PRE_BUILD
index 859fe3f..bae3caa 100755
--- a/doc/mupdf/PRE_BUILD
+++ b/doc/mupdf/PRE_BUILD
@@ -3,9 +3,9 @@ cd "${SOURCE_DIRECTORY}" &&
 
 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" &&
+patch -p1 < "${SPELL_DIRECTORY}/mupdf-${VERSION}-shared_libs-1.patch" &&
 
-rm -rf thirdparty/{curl,freetype,harfbuzz,glfw,jbig2dec,libjpeg,zlib} &&
+rm -rf thirdparty/{curl,freetype,harfbuzz,glfw,jbig2dec,jpeg,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 f31121a..14b7d3d 100644
--- a/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
+++ b/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
@@ -9,40 +9,32 @@ 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
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,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 -Igenerated
-+CFLAGS += $(XCFLAGS) -Iinclude -Igenerated -fPIC
+-CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN)
++CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN) -fPIC
  LIBS += $(XLIBS) -lm
  
  LIBS += $(FREETYPE_LIBS)
-@@ -300,19 +300,22 @@
+@@ -152,14 +152,16 @@
  
  # --- 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) $(LIBJPEG_OBJ) 
$(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
- THREAD_OBJ := $(THREAD_OBJ)
+ THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) 
$(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_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) $(THREAD_LIB)
- 
- # --- Tools and Apps ---
+ INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
  
diff --git a/doc/mupdf/mupdf-1.11-rc1-shared_libs-1.patch 
b/doc/mupdf/mupdf-1.11-rc1-shared_libs-1.patch
new file mode 100644
index 0000000..7cd07b5
--- /dev/null
+++ b/doc/mupdf/mupdf-1.11-rc1-shared_libs-1.patch
@@ -0,0 +1,43 @@
+Description: Generate shared libraries for mupdf, instead of static ones. 
This
+             allows to have the font information (around 35 MB) at one place
+             only, instead of in all the executables.
+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
+@@ -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 -Igenerated
++CFLAGS += $(XCFLAGS) -Iinclude -Igenerated -fPIC
+ LIBS += $(XLIBS) -lm
+ 
+ LIBS += $(FREETYPE_LIBS)
+@@ -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) $(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) $(THREAD_LIB)
+ 
+ # --- Tools and Apps ---
+