diff options
| author | Daniel Sabogal <dsabogalcc@gmail.com> | 2017-04-11 13:26:36 -0400 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-04-20 10:37:51 +0000 |
| commit | 9993cf9be978a22205ee895a252ed36bd6021e76 (patch) | |
| tree | 69e22aa0e027d355d2cff909aa13eb3bb379d487 /main/mupdf/shared-lib.patch | |
| parent | efd3fc99eda2cd0399aaf36fe649a6b6674fc160 (diff) | |
| download | aports-9993cf9be978a22205ee895a252ed36bd6021e76.tar.bz2 aports-9993cf9be978a22205ee895a252ed36bd6021e76.tar.xz | |
main/mupdf: upgrade to 1.11
Move muraster to mupdf-tools
Diffstat (limited to 'main/mupdf/shared-lib.patch')
| -rw-r--r-- | main/mupdf/shared-lib.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/main/mupdf/shared-lib.patch b/main/mupdf/shared-lib.patch index d0e364d247..a73d885364 100644 --- a/main/mupdf/shared-lib.patch +++ b/main/mupdf/shared-lib.patch @@ -1,22 +1,32 @@ ---- mupdf-1.9a-source/Makefile.orig -+++ mupdf-1.9a-source/Makefile -@@ -16,6 +16,7 @@ +--- mupdf-1.11-source/Makefile.orig ++++ mupdf-1.11-source/Makefile +@@ -15,6 +15,7 @@ # 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 -Igenerated +CFLAGS += -fPIC LIBS += $(XLIBS) -lm LIBS += $(FREETYPE_LIBS) -@@ -52,6 +53,7 @@ +@@ -73,6 +74,7 @@ CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $< AR_CMD = $(QUIET_AR) $(AR) cr $@ $^ LINK_CMD = $(QUIET_LINK) $(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 $^ +@@ -88,6 +90,9 @@ + $(AR_CMD) + $(RANLIB_CMD) + ++$(OUT)/%.so.0: $(OUT)/%.a ++ $(LINK_SHARED_CMD) ++ + $(OUT)/%.exe: $(OUT)/%.o | $(ALL_DIR) + $(LINK_CMD) -@@ -141,8 +143,8 @@ +@@ -300,8 +305,8 @@ # --- Library --- @@ -24,16 +34,6 @@ -THIRD_LIB = $(OUT)/libmupdfthird.a +MUPDF_LIB = $(OUT)/libmupdf.so.0 +THIRD_LIB = $(OUT)/libmupdfthird.so.0 + THREAD_LIB = $(OUT)/libmuthreads.a - MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) - THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) -@@ -161,6 +163,9 @@ - $(RM_CMD) - $(AR_CMD) - $(RANLIB_CMD) -+ -+$(OUT)/%.so.0 : $(OUT)/%.a -+ $(LINK_SHARED_CMD) - - $(OUT)/%: $(OUT)/%.o - $(LINK_CMD) + MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) |