pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print/mupdf
Module Name: pkgsrc
Committed By: wiz
Date: Sat Apr 29 08:17:54 UTC 2023
Modified Files:
pkgsrc/print/mupdf: Makefile PLIST buildlink3.mk distinfo
pkgsrc/print/mupdf/patches: patch-Makethird patch-ac
Log Message:
mupdf: reduce local patches
In particular, mostly libtoolization and installed libraries.
Only user, zathura-pdf-mupdf, still builds fine.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/mupdf/PLIST
cvs rdiff -u -r1.48 -r1.49 pkgsrc/print/mupdf/buildlink3.mk
cvs rdiff -u -r1.62 -r1.63 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/mupdf/patches/patch-Makethird
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/mupdf/patches/patch-ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.101 pkgsrc/print/mupdf/Makefile:1.102
--- pkgsrc/print/mupdf/Makefile:1.101 Mon Apr 24 07:50:56 2023
+++ pkgsrc/print/mupdf/Makefile Sat Apr 29 08:17:53 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.101 2023/04/24 07:50:56 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2023/04/29 08:17:53 wiz Exp $
DISTNAME= mupdf-1.21.1-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print
MASTER_SITES= https://mupdf.com/downloads/archive/
@@ -12,7 +12,6 @@ COMMENT= Lightweight PDF, XPS and E-book
LICENSE= gnu-agpl-v3
USE_LANGUAGES= c99 c++
-USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
INSTALLATION_DIRS+= bin include lib/pkgconfig
@@ -52,6 +51,7 @@ post-build:
post-install:
${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+ ${MV} ${DESTDIR}${PREFIX}/bin/mupdf-x11 ${DESTDIR}${PREFIX}/bin/mupdf
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.7
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/print/mupdf/PLIST
diff -u pkgsrc/print/mupdf/PLIST:1.24 pkgsrc/print/mupdf/PLIST:1.25
--- pkgsrc/print/mupdf/PLIST:1.24 Tue Jan 3 15:48:38 2023
+++ pkgsrc/print/mupdf/PLIST Sat Apr 29 08:17:53 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2023/01/03 15:48:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2023/04/29 08:17:53 wiz Exp $
bin/mupdf
${PLIST.curl}bin/mupdf-curl
${PLIST.opengl}bin/mupdf-gl
@@ -74,10 +74,8 @@ include/mupdf/pdf/parse.h
include/mupdf/pdf/resource.h
include/mupdf/pdf/xref.h
include/mupdf/ucdn.h
-lib/libmupdf-pkcs7.la
-lib/libmupdf-third.la
-lib/libmupdf-threads.la
-lib/libmupdf.la
+lib/libmupdf-third.a
+lib/libmupdf.a
lib/pkgconfig/mupdf.pc
man/man1/mupdf.1
man/man1/mutool.1
Index: pkgsrc/print/mupdf/buildlink3.mk
diff -u pkgsrc/print/mupdf/buildlink3.mk:1.48 pkgsrc/print/mupdf/buildlink3.mk:1.49
--- pkgsrc/print/mupdf/buildlink3.mk:1.48 Wed Apr 19 08:08:40 2023
+++ pkgsrc/print/mupdf/buildlink3.mk Sat Apr 29 08:17:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.48 2023/04/19 08:08:40 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.49 2023/04/29 08:17:53 wiz Exp $
BUILDLINK_TREE+= mupdf
@@ -6,9 +6,11 @@ BUILDLINK_TREE+= mupdf
MUPDF_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.14.0
-BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.21.1nb2
+BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.21.1nb4
BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
+BUILDLINK_DEPMETHOD.mupdf?= build
+
pkgbase := mupdf
.include "../../mk/pkg-build-options.mk"
Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.62 pkgsrc/print/mupdf/distinfo:1.63
--- pkgsrc/print/mupdf/distinfo:1.62 Tue Jan 3 15:48:38 2023
+++ pkgsrc/print/mupdf/distinfo Sat Apr 29 08:17:53 2023
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.62 2023/01/03 15:48:38 wiz Exp $
+$NetBSD: distinfo,v 1.63 2023/04/29 08:17:53 wiz Exp $
BLAKE2s (mupdf-1.21.1-source.tar.gz) = 8f787d54a075775c6c48e07aac494a2b59591ca95c324b598458d0ba7bb82fb9
SHA512 (mupdf-1.21.1-source.tar.gz) = 11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
Size (mupdf-1.21.1-source.tar.gz) = 57243762 bytes
SHA1 (patch-Makelists) = 474ad296aa550272b9d734e2b001af1371ae06ad
-SHA1 (patch-Makethird) = fdddf41a3c44a1fda04c7ce1b51284dd918e3c54
+SHA1 (patch-Makethird) = 6c0359df0809e658c3c6568d85a98b02158f2e3e
SHA1 (patch-ab) = acbb4e8a34ccad701323a521600f361175668b9e
-SHA1 (patch-ac) = d3d70857bdffa9e4264444c2047f1ad909f141ce
+SHA1 (patch-ac) = b66ee5026bebec1fc428b847de6672e8d90b7e16
SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78
SHA1 (patch-scripts_hexdump.sh) = 1f1299e24ffa5e6bf040f73b75dc49dd6f5272c4
Index: pkgsrc/print/mupdf/patches/patch-Makethird
diff -u pkgsrc/print/mupdf/patches/patch-Makethird:1.14 pkgsrc/print/mupdf/patches/patch-Makethird:1.15
--- pkgsrc/print/mupdf/patches/patch-Makethird:1.14 Thu Sep 1 13:56:53 2022
+++ pkgsrc/print/mupdf/patches/patch-Makethird Sat Apr 29 08:17:53 2023
@@ -1,7 +1,6 @@
-$NetBSD: patch-Makethird,v 1.14 2022/09/01 13:56:53 nia Exp $
+$NetBSD: patch-Makethird,v 1.15 2023/04/29 08:17:53 wiz Exp $
- Avoid to need third party lcms2
-- Add mujs building support with libtool
--- Makethird.orig 2022-06-14 12:19:22.000000000 +0000
+++ Makethird
@@ -18,12 +17,3 @@ $NetBSD: patch-Makethird,v 1.14 2022/09/
endif
# --- MuJS ---
-@@ -241,7 +235,7 @@ endif
- THIRD_CFLAGS += $(EXTRACT_CFLAGS)
- THIRD_LIBS += $(EXTRACT_LIBS)
- THIRD_SRC += $(EXTRACT_SRC)
--$(OUT)/thirdparty/extract/%.o: thirdparty/extract/%.c
-+$(OUT)/thirdparty/extract/%.lo: thirdparty/extract/%.c
- $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(EXTRACT_CFLAGS) $(ZLIB_CFLAGS) $(EXTRACT_BUILD_CFLAGS)
-
- # The first python3 command in the next two rules returns 0 (success) iff
Index: pkgsrc/print/mupdf/patches/patch-ac
diff -u pkgsrc/print/mupdf/patches/patch-ac:1.29 pkgsrc/print/mupdf/patches/patch-ac:1.30
--- pkgsrc/print/mupdf/patches/patch-ac:1.29 Sun Jul 24 10:13:38 2022
+++ pkgsrc/print/mupdf/patches/patch-ac Sat Apr 29 08:17:53 2023
@@ -1,153 +1,11 @@
-$NetBSD: patch-ac,v 1.29 2022/07/24 10:13:38 leot Exp $
+$NetBSD: patch-ac,v 1.30 2023/04/29 08:17:53 wiz Exp $
-- libtool support
- Install target cleanup
- Also install muthreads and mupkcs7 libraries (needed by various tools)
-- Do not force `-O0' flag when building
- Use sh instead of bash
-- Get rid of unused VERSION variable and `version:' target (otherwise `git' can
- be invoked during the building phase)
-- Install mupdf with curl support as `mupdf-curl'
--- Makefile.orig 2022-06-14 12:19:22.000000000 +0000
+++ Makefile
-@@ -54,13 +54,13 @@ ifneq ($(verbose),yes)
- endif
-
- MKTGTDIR = mkdir -p $(dir $@)
--CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
--CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) $(XCXXFLAGS) -MMD -MP -o $@ -c $<
--AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^
-+CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
-+CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(XCXXFLAGS) -MMD -MP -o $@ -c $<
-+AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ -version-info 0:0:0 -rpath $(PREFIX)/lib $^
- ifdef RANLIB
- RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@
- endif
--LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p --exclude=platform/python --exclude=platform/c++
- WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
- OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z noexecstack -o $@ $<
-@@ -68,7 +68,7 @@ GENDEF_CMD = $(QUIET_GENDEF) gendef - $<
- DLLTOOL_CMD = $(QUIET_DLLTOOL) dlltool -d $< -D $(notdir $(^:%.def=%.dll)) -l $@
-
- ifeq ($(shared),yes)
--LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ \
-+LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ \
- $(filter-out %.$(SO),$^) \
- $(sort $(patsubst %,-L%,$(dir $(filter %.$(SO),$^)))) \
- $(patsubst lib%.$(SO),-l%,$(notdir $(filter %.$(SO),$^))) \
-@@ -77,7 +77,7 @@ endif
-
- # --- Rules ---
-
--$(OUT)/%.a :
-+$(OUT)/%.la :
- $(AR_CMD)
- $(RANLIB_CMD)
-
-@@ -93,39 +93,39 @@ $(OUT)/%.def: $(OUT)/%.$(SO)
- $(OUT)/%_$(SO).a: $(OUT)/%.def
- $(DLLTOOL_CMD)
-
--$(OUT)/source/helpers/mu-threads/%.o : source/helpers/mu-threads/%.c
-+$(OUT)/source/helpers/mu-threads/%.lo : source/helpers/mu-threads/%.c
- $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(THREADING_CFLAGS)
-
--$(OUT)/source/helpers/pkcs7/%.o : source/helpers/pkcs7/%.c
-+$(OUT)/source/helpers/pkcs7/%.lo : source/helpers/pkcs7/%.c
- $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(LIBCRYPTO_CFLAGS)
-
--$(OUT)/source/tools/%.o : source/tools/%.c
-+$(OUT)/source/tools/%.lo : source/tools/%.c
- $(CC_CMD) $(WARNING_CFLAGS) $(THIRD_CFLAGS) $(THREADING_CFLAGS)
-
--$(OUT)/generated/%.o : generated/%.c
-- $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) -O0
-+$(OUT)/generated/%.lo : generated/%.c
-+ $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS)
-
--$(OUT)/platform/x11/%.o : platform/x11/%.c
-+$(OUT)/platform/x11/%.lo : platform/x11/%.c
- $(CC_CMD) $(WARNING_CFLAGS) $(X11_CFLAGS)
-
--$(OUT)/platform/x11/curl/%.o : platform/x11/%.c
-+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c
- $(CC_CMD) $(WARNING_CFLAGS) $(X11_CFLAGS) $(CURL_CFLAGS)
-
--$(OUT)/platform/gl/%.o : platform/gl/%.c
-+$(OUT)/platform/gl/%.lo : platform/gl/%.c
- $(CC_CMD) $(WARNING_CFLAGS) $(THIRD_CFLAGS) $(THIRD_GLUT_CFLAGS)
-
- ifeq ($(HAVE_OBJCOPY),yes)
-- $(OUT)/source/fitz/noto.o : source/fitz/noto.c
-+ $(OUT)/source/fitz/noto.lo : source/fitz/noto.c
- $(CC_CMD) $(WARNING_CFLAGS) -Wdeclaration-after-statement -DHAVE_OBJCOPY $(LIB_CFLAGS) $(THIRD_CFLAGS)
- endif
-
--$(OUT)/source/fitz/memento.o : source/fitz/memento.c
-+$(OUT)/source/fitz/memento.lo : source/fitz/memento.c
- $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(THIRD_CFLAGS) -DMEMENTO_MUPDF_HACKS
-
--$(OUT)/source/%.o : source/%.c
-+$(OUT)/source/%.lo : source/%.c
- $(CC_CMD) $(WARNING_CFLAGS) -Wdeclaration-after-statement $(LIB_CFLAGS) $(THIRD_CFLAGS)
-
--$(OUT)/source/%.o : source/%.cpp
-+$(OUT)/source/%.lo : source/%.cpp
- $(CXX_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(THIRD_CFLAGS)
-
- ifeq ($(HAVE_TESSERACT),yes)
-@@ -133,22 +133,22 @@ $(OUT)/source/fitz/tessocr.o : source/fi
- $(CXX_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(THIRD_CFLAGS) $(TESSERACT_CFLAGS) $(TESSERACT_DEFINES) $(TESSERACT_LANGFLAGS)
- endif
-
--$(OUT)/platform/%.o : platform/%.c
-+$(OUT)/platform/%.lo : platform/%.c
- $(CC_CMD) $(WARNING_CFLAGS)
-
--$(OUT)/%.o: %.rc
-+$(OUT)/%.lo: %.rc
- $(WINDRES_CMD)
-
--.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
-+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
- .PRECIOUS : $(OUT)/%.exe # Keep intermediates from chained rules
-
- # --- File lists ---
-
--THIRD_OBJ := $(THIRD_SRC:%.c=$(OUT)/%.o)
--THIRD_OBJ := $(THIRD_OBJ:%.cc=$(OUT)/%.o)
--THIRD_OBJ := $(THIRD_OBJ:%.cpp=$(OUT)/%.o)
-+THIRD_OBJ := $(THIRD_SRC:%.c=$(OUT)/%.lo)
-+THIRD_OBJ := $(THIRD_OBJ:%.cc=$(OUT)/%.lo)
-+THIRD_OBJ := $(THIRD_OBJ:%.cpp=$(OUT)/%.lo)
-
--THIRD_GLUT_OBJ := $(THIRD_GLUT_SRC:%.c=$(OUT)/%.o)
-+THIRD_GLUT_OBJ := $(THIRD_GLUT_SRC:%.c=$(OUT)/%.lo)
-
- MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
- MUPDF_SRC += $(sort $(wildcard source/fitz/*.cpp))
-@@ -159,14 +159,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht
- MUPDF_SRC += $(sort $(wildcard source/reflow/*.c))
- MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
-
--MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.o)
--MUPDF_OBJ := $(MUPDF_OBJ:%.cpp=$(OUT)/%.o)
-+MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.lo)
-+MUPDF_OBJ := $(MUPDF_OBJ:%.cpp=$(OUT)/%.lo)
-
- THREAD_SRC := source/helpers/mu-threads/mu-threads.c
--THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.o)
-+THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.lo)
-
- PKCS7_SRC += source/helpers/pkcs7/pkcs7-openssl.c
--PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
-+PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.lo)
-
- # --- Generated embedded font files ---
-
@@ -181,19 +181,19 @@ FONT_BIN += $(sort $(wildcard resources/
FONT_GEN := $(FONT_BIN:%=generated/%.c)
@@ -162,175 +20,16 @@ $NetBSD: patch-ac,v 1.29 2022/07/24 10:1
+generated/%.ttc.c : %.ttc $(HEXDUMP_SH) ; $(QUIET_GEN) $(MKTGTDIR) ; sh $(HEXDUMP_SH) > $@ $<
ifeq ($(HAVE_OBJCOPY),yes)
-- MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o)
-- $(OUT)/%.cff.o : %.cff ; $(OBJCOPY_CMD)
-- $(OUT)/%.otf.o : %.otf ; $(OBJCOPY_CMD)
-- $(OUT)/%.ttf.o : %.ttf ; $(OBJCOPY_CMD)
-- $(OUT)/%.ttc.o : %.ttc ; $(OBJCOPY_CMD)
-+ MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.lo)
-+ $(OUT)/%.cff.lo : %.cff ; $(OBJCOPY_CMD)
-+ $(OUT)/%.otf.lo : %.otf ; $(OBJCOPY_CMD)
-+ $(OUT)/%.ttf.lo : %.ttf ; $(OBJCOPY_CMD)
-+ $(OUT)/%.ttc.lo : %.ttc ; $(OBJCOPY_CMD)
+ MUPDF_OBJ += $(FONT_BIN:%=$(OUT)/%.o)
+ $(OUT)/%.cff.o : %.cff ; $(OBJCOPY_CMD)
+ $(OUT)/%.otf.o : %.otf ; $(OBJCOPY_CMD)
+ $(OUT)/%.ttf.o : %.ttf ; $(OBJCOPY_CMD)
+ $(OUT)/%.ttc.o : %.ttc ; $(OBJCOPY_CMD)
else
-- MUPDF_OBJ += $(FONT_GEN:%.c=$(OUT)/%.o)
-+ MUPDF_OBJ += $(FONT_GEN:%.c=$(OUT)/%.lo)
+ MUPDF_OBJ += $(FONT_GEN:%.c=$(OUT)/%.o)
endif
generate: $(FONT_GEN)
-@@ -247,24 +247,24 @@ else
- LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB)
- endif
- ifneq ($(USE_SYSTEM_GLUT),yes)
--THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
-+THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.la
- endif
--THREAD_LIB = $(OUT)/libmupdf-threads.a
--PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-+THREAD_LIB = $(OUT)/libmupdf-threads.la
-+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.la
-
- $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- else
--MUPDF_LIB = $(OUT)/libmupdf.a
--LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+MUPDF_LIB = $(OUT)/libmupdf.la
-+LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
-+THIRD_LIB = $(OUT)/libmupdf-third.la
- ifneq ($(USE_SYSTEM_GLUT),yes)
--THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
-+THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.la
- endif
--THREAD_LIB = $(OUT)/libmupdf-threads.a
--PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-+THREAD_LIB = $(OUT)/libmupdf-threads.la
-+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.la
-
- $(MUPDF_LIB) : $(MUPDF_OBJ)
- $(THIRD_LIB) : $(THIRD_OBJ)
-@@ -287,13 +287,13 @@ MUTOOL_SRC += source/tools/murun.c
- MUTOOL_SRC += source/tools/mutrace.c
- MUTOOL_SRC += source/tools/cmapdump.c
- MUTOOL_SRC += $(sort $(wildcard source/tools/pdf*.c))
--MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.o)
-+MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.lo)
- MUTOOL_EXE := $(OUT)/mutool$(EXE)
- $(MUTOOL_EXE) : $(MUTOOL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
- TOOL_APPS += $(MUTOOL_EXE)
-
--MURASTER_OBJ := $(OUT)/source/tools/muraster.o
-+MURASTER_OBJ := $(OUT)/source/tools/muraster.lo
- MURASTER_EXE := $(OUT)/muraster$(EXE)
- $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
-@@ -301,7 +301,7 @@ TOOL_APPS += $(MURASTER_EXE)
-
- ifeq ($(HAVE_GLUT),yes)
- MUVIEW_GLUT_SRC += $(sort $(wildcard platform/gl/*.c))
-- MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.o)
-+ MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.lo)
- MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl$(EXE)
- $(MUVIEW_GLUT_EXE) : $(MUVIEW_GLUT_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THIRD_GLUT_LIB) $(PKCS7_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(WIN32_LDFLAGS) $(THIRD_GLUT_LIBS)
-@@ -309,10 +309,10 @@ ifeq ($(HAVE_GLUT),yes)
- endif
-
- ifeq ($(HAVE_X11),yes)
-- MUVIEW_X11_EXE := $(OUT)/mupdf-x11$(EXE)
-- MUVIEW_X11_OBJ += $(OUT)/platform/x11/pdfapp.o
-- MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.o
-- MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.o
-+ MUVIEW_X11_EXE := $(OUT)/mupdf$(EXE)
-+ MUVIEW_X11_OBJ += $(OUT)/platform/x11/pdfapp.lo
-+ MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.lo
-+ MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.lo
- $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS)
- VIEW_APPS += $(MUVIEW_X11_EXE)
-@@ -320,9 +320,9 @@ endif
-
- ifeq ($(HAVE_WIN32),yes)
- MUVIEW_WIN32_EXE := $(OUT)/mupdf-w32$(EXE)
-- MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/pdfapp.o
-- MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_main.o
-- MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_res.o
-+ MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/pdfapp.lo
-+ MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_main.lo
-+ MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_res.lo
- $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS)
- VIEW_APPS += $(MUVIEW_WIN32_EXE)
-@@ -331,12 +331,12 @@ endif
- ifeq ($(HAVE_X11),yes)
- ifeq ($(HAVE_CURL),yes)
- ifeq ($(HAVE_PTHREAD),yes)
-- MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-x11-curl$(EXE)
-- MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/pdfapp.o
-- MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_main.o
-- MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.o
-- MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/curl_stream.o
-- MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/prog_stream.o
-+ MUVIEW_X11_CURL_EXE := $(OUT)/mupdf$(EXE)
-+ MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/pdfapp.lo
-+ MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_main.lo
-+ MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.lo
-+ MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/curl_stream.lo
-+ MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/prog_stream.lo
- $(MUVIEW_X11_CURL_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(CURL_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS) $(CURL_LIBS) $(PTHREAD_LIBS)
- VIEW_APPS += $(MUVIEW_X11_CURL_EXE)
-@@ -346,19 +346,19 @@ endif
-
- # --- Generated dependencies ---
-
---include $(MUPDF_OBJ:%.o=%.d)
---include $(PKCS7_OBJ:%.o=%.d)
---include $(THREAD_OBJ:%.o=%.d)
---include $(THIRD_OBJ:%.o=%.d)
---include $(THIRD_GLUT_OBJ:%.o=%.d)
--
---include $(MUTOOL_OBJ:%.o=%.d)
---include $(MUVIEW_GLUT_OBJ:%.o=%.d)
---include $(MUVIEW_X11_OBJ:%.o=%.d)
---include $(MUVIEW_WIN32_OBJ:%.o=%.d)
-+-include $(MUPDF_OBJ:%.lo=%.d)
-+-include $(PKCS7_OBJ:%.lo=%.d)
-+-include $(THREAD_OBJ:%.lo=%.d)
-+-include $(THIRD_OBJ:%.lo=%.d)
-+-include $(THIRD_GLUT_OBJ:%.lo=%.d)
-+
-+-include $(MUTOOL_OBJ:%.lo=%.d)
-+-include $(MUVIEW_GLUT_OBJ:%.lo=%.d)
-+-include $(MUVIEW_X11_OBJ:%.lo=%.d)
-+-include $(MUVIEW_WIN32_OBJ:%.lo=%.d)
-
---include $(MURASTER_OBJ:%.o=%.d)
---include $(MUVIEW_X11_CURL_OBJ:%.o=%.d)
-+-include $(MURASTER_OBJ:%.lo=%.d)
-+-include $(MUVIEW_X11_CURL_OBJ:%.lo=%.d)
-
- # --- Examples ---
-
-@@ -371,10 +371,10 @@ $(OUT)/multi-threaded: docs/examples/mul
-
- # --- Update version string header ---
-
--VERSION = $(shell git describe --tags)
--
--version:
-- sed -i~ -e '/FZ_VERSION /s/".*"/"'$(VERSION)'"/' include/mupdf/fitz/version.h
-+#VERSION = $(shell git describe --tags)
-+#
-+#version:
-+# sed -i~ -e '/FZ_VERSION /s/".*"/"'$(VERSION)'"/' include/mupdf/fitz/version.h
-
- # --- Format man pages ---
-
@@ -402,30 +402,34 @@ tools: $(TOOL_APPS)
apps: $(TOOL_APPS) $(VIEW_APPS)
@@ -352,7 +51,7 @@ $NetBSD: patch-ac,v 1.29 2022/07/24 10:1
- install -m 644 $(LIBS_TO_INSTALL_IN_LIB) $(DESTDIR)$(libdir)
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libdir)
+ for f in $(LIBS_TO_INSTALL_IN_LIB); do \
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir); \
++ ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir); \
+ done
endif
@@ -361,7 +60,7 @@ $NetBSD: patch-ac,v 1.29 2022/07/24 10:1
- install -m 755 $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(bindir)
+ for f in $(LIBS_TO_INSTALL_IN_BIN) $(TOOL_APPS) $(VIEW_APPS); do \
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(bindir); \
++ ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(bindir); \
+ done
install-docs:
Home |
Main Index |
Thread Index |
Old Index