aboutsummaryrefslogtreecommitdiffstats
path: root/main/mupdf/shared-lib.patch
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2019-05-03 17:29:24 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-05 20:00:15 +0000
commit010d7fa4c9668479e240424fdce30687394b1193 (patch)
tree9258beb9571421a907bd3d3c01bf57bf078c77e4 /main/mupdf/shared-lib.patch
parent381bf6b18103cf9c66b233f7a607e50d09638e34 (diff)
downloadaports-010d7fa4c9668479e240424fdce30687394b1193.tar.bz2
aports-010d7fa4c9668479e240424fdce30687394b1193.tar.xz
main/mupdf: upgrade to 1.14.0
remove 0001-fix-build-on-big-endian.patch fixed shared-lib.patch add note about linking problem of /usr/lib/libmupdf.so.0
Diffstat (limited to 'main/mupdf/shared-lib.patch')
-rw-r--r--main/mupdf/shared-lib.patch32
1 files changed, 16 insertions, 16 deletions
diff --git a/main/mupdf/shared-lib.patch b/main/mupdf/shared-lib.patch
index a3d039a575..436b334ff3 100644
--- a/main/mupdf/shared-lib.patch
+++ b/main/mupdf/shared-lib.patch
@@ -1,6 +1,6 @@
---- mupdf-1.12.0-source/Makefile.orig
-+++ mupdf-1.12.0-source/Makefile
-@@ -14,7 +14,7 @@
+--- a/Makefile 2018-10-04 09:19:28.000000000 +0000
++++ b/Makefile 2018-10-04 09:19:28.000000000 +0000
+@@ -20,7 +20,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.
@@ -8,33 +8,33 @@
+CFLAGS += $(XCFLAGS) -Iinclude -fPIC
LIBS += $(XLIBS) -lm
- LIBS += $(FREETYPE_LIBS)
-@@ -75,6 +75,7 @@
- CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
- AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
- LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ ifneq ($(threading),no)
+@@ -58,6 +58,7 @@
+ RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@
+ endif
+ LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+LINK_SHARED_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -shared -Wl,-soname,$(notdir $@) -o $@ $^ $(LIBS)
- MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
- RM_CMD = $(QUIET_RM) rm -f $@
TAGS_CMD = $(QUIET_TAGS) ctags $^
-@@ -90,6 +91,9 @@
+ WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
+ OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
+@@ -68,6 +69,9 @@
$(AR_CMD)
$(RANLIB_CMD)
+$(OUT)/%.so.0: $(OUT)/%.a
+ $(LINK_SHARED_CMD)
+
- $(OUT)/%.exe: $(OUT)/%.o | $(ALL_DIR)
+ $(OUT)/%.exe: %.c
$(LINK_CMD)
-@@ -312,8 +316,8 @@
+@@ -190,8 +194,8 @@
# --- Library ---
-MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdfthird.a
+-THIRD_LIB = $(OUT)/libmupdf-third.a
+MUPDF_LIB = $(OUT)/libmupdf.so.0
+THIRD_LIB = $(OUT)/libmupdfthird.so.0
- THREAD_LIB = $(OUT)/libmuthreads.a
+ THREAD_LIB = $(OUT)/libmupdf-threads.a
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
- MUPDF_OBJ := \