Skip to content

GitLab

M
mupdf
Commit 45a4b83e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated mupdf to 1.16.1

parent bd31f654
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 14 deletions
Makefile
View file @ 45a4b83e
all: all:
tar xf mupdf-1.13.0-source.tar.gz tar xf mupdf-1.16.1-source.tar.gz
rm -rf mupdf-1.13.0-source/thirdparty/curl # rm -rf mupdf-1.16.1-source/thirdparty/curl
rm -rf mupdf-1.13.0-source/thirdparty/freeglut # rm -rf mupdf-1.16.1-source/thirdparty/freeglut
rm -rf mupdf-1.13.0-source/thirdparty/freetype # rm -rf mupdf-1.16.1-source/thirdparty/freetype
rm -rf mupdf-1.13.0-source/thirdparty/harfbuzz # rm -rf mupdf-1.16.1-source/thirdparty/harfbuzz
rm -rf mupdf-1.13.0-source/thirdparty/jpeg # rm -rf mupdf-1.16.1-source/thirdparty/jpeg
rm -rf mupdf-1.13.0-source/thirdparty/lcms2 # rm -rf mupdf-1.16.1-source/thirdparty/lcms2
rm -rf mupdf-1.13.0-source/thirdparty/libjpeg # rm -rf mupdf-1.16.1-source/thirdparty/libjpeg
rm -rf mupdf-1.13.0-source/thirdparty/openjpeg # rm -rf mupdf-1.16.1-source/thirdparty/openjpeg
rm -rf mupdf-1.13.0-source/thirdparty/zlib # rm -rf mupdf-1.16.1-source/thirdparty/zlib
patch -Np1 -d mupdf-1.13.0-source < mupdf-1.13.0-shared_libs-1.patch patch -Np1 -d mupdf-1.16.1-source < mupdf-1.16.1-shared_libs-1.patch
$(MAKE) -C mupdf-1.13.0-source build=release USE_SYSTEM_LIBS=yes $(MAKE) -C mupdf-1.16.1-source build=release
$(MAKE) -C mupdf-1.13.0-source prefix=/usr build=release docdir=/usr/share/doc/mupdf-1.13.0 install USE_SYSTEM_LIBS=yes $(MAKE) -C mupdf-1.16.1-source prefix=/usr build=release docdir=/usr/share/doc/mupdf-1.16.1 install
ln -sfv mupdf-x11 /usr/bin/mupdf ln -sfv mupdf-x11 /usr/bin/mupdf
rm -rf mupdf-1.13.0-source rm -rf mupdf-1.16.1-source
mupdf-1.13.0-shared_libs-1.patch → mupdf-1.16.1-shared_libs-1.patch
View file @ 45a4b83e
...@@ -5,10 +5,13 @@ Upstream Status: Not submitted ...@@ -5,10 +5,13 @@ Upstream Status: Not submitted
Origin: Self Origin: Self
Description: Change static libraries to shared libraries Description: Change static libraries to shared libraries
diff -Naur mupdf-1.13.0-source-orig/Makefile mupdf-1.13.0-source/Makefile Rediffed for Version 1.14 2018-10-07
--- mupdf-1.13.0-source-orig/Makefile 2018-04-12 08:14:06.000000000 -0500 Rediffed for Version 1.16 2018-10-07
+++ mupdf-1.13.0-source/Makefile 2018-04-21 17:15:25.797923084 -0500
@@ -14,7 +14,7 @@ diff -Naur mupdf-1.14.0-source.orig/Makefile mupdf-1.14.0-source/Makefile
--- mupdf-1.14.0-source.orig/Makefile 2018-10-04 04:19:28.000000000 -0500
+++ mupdf-1.14.0-source/Makefile 2018-10-07 15:13:52.617926593 -0500
@@ -20,7 +20,7 @@
# Do not specify CFLAGS or LIBS on the make invocation line - specify # Do not specify CFLAGS or LIBS on the make invocation line - specify
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
# set a variable that was set on the command line. # set a variable that was set on the command line.
...@@ -16,38 +19,47 @@ diff -Naur mupdf-1.13.0-source-orig/Makefile mupdf-1.13.0-source/Makefile ...@@ -16,38 +19,47 @@ diff -Naur mupdf-1.13.0-source-orig/Makefile mupdf-1.13.0-source/Makefile
+CFLAGS += $(XCFLAGS) -Iinclude -fPIC +CFLAGS += $(XCFLAGS) -Iinclude -fPIC
LIBS += $(XLIBS) -lm LIBS += $(XLIBS) -lm
LIBS += $(FREETYPE_LIBS) ifneq ($(threading),no)
@@ -325,10 +325,10 @@ @@ -190,17 +190,21 @@
# --- Library --- # --- Library ---
-MUPDF_LIB = $(OUT)/libmupdf.a -MUPDF_LIB = $(OUT)/libmupdf.a
-THIRD_LIB = $(OUT)/libmupdfthird.a -THIRD_LIB = $(OUT)/libmupdf-third.a
-THREAD_LIB = $(OUT)/libmuthreads.a -THREAD_LIB = $(OUT)/libmupdf-threads.a
-PKCS7_LIB = $(OUT)/libmupkcs7.a -PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+MUPDF_LIB = $(OUT)/libmupdf.so +MUPDF_LIB = $(OUT)/libmupdf.so
+THIRD_LIB = $(OUT)/libmupdfthird.so +THIRD_LIB = $(OUT)/libmupdf-third.so
+THREAD_LIB = $(OUT)/libmuthreads.so +THREAD_LIB = $(OUT)/libmupdf-threads.so
+PKCS7_LIB = $(OUT)/libmupkcs7.so +PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so
MUPDF_OBJ := \
$(FITZ_OBJ) \
@@ -355,12 +355,16 @@
$(ZLIB_OBJ) \
$(LCMS2_OBJ)
-$(MUPDF_LIB) : $(MUPDF_OBJ) -$(MUPDF_LIB) : $(MUPDF_OBJ)
+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined $(THIRD_LIBS)
$(THIRD_LIB) : $(THIRD_OBJ) $(THIRD_LIB) : $(THIRD_OBJ)
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined
$(THREAD_LIB) : $(THREAD_OBJ) $(THREAD_LIB) : $(THREAD_OBJ)
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread
$(PKCS7_LIB) : $(PKCS7_OBJ) $(PKCS7_LIB) : $(PKCS7_OBJ)
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupfs-pkcs7.so
-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) +INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
# --- Tools and Apps --- # --- Main tools and viewers ---
--- a/Makethird.orig 2018-10-08 00:01:36.527172802 -0500
+++ b/Makethird 2018-10-08 00:02:27.443126830 -0500
@@ -3,9 +3,9 @@
ifeq ($(USE_SYSTEM_LIBS),yes)
USE_SYSTEM_FREETYPE := yes
USE_SYSTEM_HARFBUZZ := yes
- USE_SYSTEM_JBIG2DEC := yes
+ USE_SYSTEM_JBIG2DEC := no
USE_SYSTEM_JPEGXR := no # not available
- USE_SYSTEM_LCMS2 := no # lcms2mt is strongly preferred
+ USE_SYSTEM_LCMS2 := yes # lcms2mt is strongly preferred
USE_SYSTEM_LIBJPEG := yes
USE_SYSTEM_MUJS := no # not available
USE_SYSTEM_OPENJPEG := yes
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment