Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (af1cf8fdc776a541156b1a1d2a63dc8383d7e0f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (af1cf8fdc776a541156b1a1d2a63dc8383d7e0f0)
  • Date: Fri, 13 Apr 2018 19:18:57 +0000

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

doc/mupdf/DETAILS | 8 ++--
doc/mupdf/HISTORY | 4 ++
doc/mupdf/mupdf-1.13.0-rc1-shared_libs-1.patch | 43
+++++++++++++++++++++++++
3 files changed, 51 insertions(+), 4 deletions(-)

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

doc/mupdf: version 1.13.0-rc1 for rc branch

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 0f9caee..8b1f728 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,13 +1,13 @@
SPELL=mupdf
if [[ "${MUPDF_BRANCH}" == "rc" ]]; then
- VERSION=1.12.0
-
SOURCE_HASH=sha512:11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
+ VERSION=1.13.0-rc1
+
SOURCE_HASH=sha512:97a8c912d4b37b3188dd0eab7703a60739bd2360399baa8c8583993c0547dd43fb78317c39d92772fb932b77a3aaa4d6f86765f8eda44fa4a6d297f6f44cd5ed
else
VERSION=1.12.0
-
SOURCE_HASH=sha512:11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
+
SOURCE_HASH=sha512:4c9ce81e7b0e2d77e017776fd9f700bc2f695f34b7fd97be7ba113ec1b340e7046c9db7d396abf19a98b1d0c7d72f01ecc1b44fadd250d2d6c6ffdcd9799bc16
fi
SECURITY_PATCH=1
- SOURCE=$SPELL-$VERSION-source.tar.gz
+ SOURCE=$SPELL-$VERSION-source.tar.xz
SOURCE_URL[0]=http://mupdf.com/downloads/$SOURCE
SOURCE_URL[1]=http://mupdf.com/downloads/archive/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-source"
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 2188d65..20af6b8 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,7 @@
+2018-04-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.13.0-rc1 for rc branch, gz -> xz
+ * mupdf-1.13.0-rc1-shared_libs-1.patch: added corresponding patch
+
2017-12-14 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: needs GLUT and lcms2
* PRE_BUILD: added fixes for missing headers & z_const alias,
diff --git a/doc/mupdf/mupdf-1.13.0-rc1-shared_libs-1.patch
b/doc/mupdf/mupdf-1.13.0-rc1-shared_libs-1.patch
new file mode 100644
index 0000000..e9fd8f5
--- /dev/null
+++ b/doc/mupdf/mupdf-1.13.0-rc1-shared_libs-1.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -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
++CFLAGS += $(XCFLAGS) -Iinclude -fPIC
+ LIBS += $(XLIBS) -lm
+
+ LIBS += $(FREETYPE_LIBS)
+@@ -325,9 +325,9 @@
+
+ # --- 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
+ PKCS7_LIB = $(OUT)/libmupkcs7.a
+
+ MUPDF_OBJ := \
+@@ -355,12 +355,15 @@
+ $(ZLIB_OBJ) \
+ $(LCMS2_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
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
+
+ # --- Tools and Apps ---
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (af1cf8fdc776a541156b1a1d2a63dc8383d7e0f0), Pavel Vinogradov, 04/13/2018

Archive powered by MHonArc 2.6.24.

Top of Page