pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
mupdf: Remove wip/mupdf, used to update print/mupdf
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Fri Dec 21 13:49:36 2018 +0100
Changeset: a9740c1bf296c897aba391f9df967285ee03f316
Modified Files:
Makefile
Removed Files:
mupdf/COMMIT_MSG
mupdf/DESCR
mupdf/Makefile
mupdf/PLIST
mupdf/buildlink3.mk
mupdf/distinfo
mupdf/files/mupdf.pc
mupdf/options.mk
mupdf/patches/patch-Makethird
mupdf/patches/patch-ab
mupdf/patches/patch-ac
mupdf/patches/patch-ae
mupdf/patches/patch-platform_gl_gl-app.h
mupdf/patches/patch-platform_gl_gl-main.c
mupdf/patches/patch-source_fitz_load-jpx.c
mupdf/patches/patch-thirdparty_mujs_Makefile
Log Message:
mupdf: Remove wip/mupdf, used to update print/mupdf
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a9740c1bf296c897aba391f9df967285ee03f316
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
mupdf/COMMIT_MSG | 55 -----
mupdf/DESCR | 18 --
mupdf/Makefile | 67 -----
mupdf/PLIST | 127 ----------
mupdf/buildlink3.mk | 33 ---
mupdf/distinfo | 14 --
mupdf/files/mupdf.pc | 10 -
mupdf/options.mk | 28 ---
mupdf/patches/patch-Makethird | 17 --
mupdf/patches/patch-ab | 145 -----------
mupdf/patches/patch-ac | 349 ---------------------------
mupdf/patches/patch-ae | 82 -------
mupdf/patches/patch-platform_gl_gl-app.h | 20 --
mupdf/patches/patch-platform_gl_gl-main.c | 15 --
mupdf/patches/patch-source_fitz_load-jpx.c | 53 ----
mupdf/patches/patch-thirdparty_mujs_Makefile | 62 -----
17 files changed, 1096 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 3b96f25891..90767ee778 100644
--- a/Makefile
+++ b/Makefile
@@ -2213,7 +2213,6 @@ SUBDIR+= munin-c-git
SUBDIR+= munin-common
SUBDIR+= munin-master
SUBDIR+= munin-node
-SUBDIR+= mupdf
SUBDIR+= mupen64
SUBDIR+= mupen64-base
SUBDIR+= mupen64-plugin-input
diff --git a/mupdf/COMMIT_MSG b/mupdf/COMMIT_MSG
deleted file mode 100644
index 6e9ff4d561..0000000000
--- a/mupdf/COMMIT_MSG
+++ /dev/null
@@ -1,55 +0,0 @@
-mupdf: Update print/mupdf to 1.14.0
-
-pkgsrc changes:
- - Pass USE_SYSTEM_LIBS=yes via MAKE_ENV in order to honor system (pkgsrc)
- packages {C,LD}FLAGS
- - Rewrite the logic to disable lcms2 in patch-ab and inject -DNO_ICC
- directly via CFLAGS
-
-Changes:
-MuPDF 1.14.0
-------------
-* New features:
- * Added "Source Han Serif" CJK fallback font.
- * Added more scripts to the Noto fallback fonts.
- * Multi-page PNM support.
- * "mutool show" now supports a path syntax for selecting objects to show.
-
-* Build system simplifications:
- * Auto-generated CMap, ICC, and JS source files are checked in to git.
- * Embedded CMap resources are now generated by a python script.
- * Embedded font resources are linked directly if using GNU ld or windows.
- * Namegen tool replaced by use of C macros.
- * Simplified Makefile.
-
-* Annotation editing:
- * New annotation editing mode in mupdf-gl.
- * Can create, edit, and delete most annotation types.
- * Can create appearance streams for most annotation types.
- * Can create appearance streams for Tx form fields.
- * Can create appearance streams for Ch form fields.
-
-* Form filling in mupdf-gl:
- * Can click buttons, checkboxes, and radioboxes.
- * Can fill out text fields using dialog box.
- * Can select choice options using dialog box.
- * Can verify and sign digital signatures.
-
-* Improved UI for mupdf-gl:
- * Password dialog.
- * Error dialog.
- * Open/save file dialog.
- * Snap selection to words or lines by holding control or control+shift.
- * Save and restore current location, bookmarks, and navigation history.
-
-* Bug fixes:
- * Improved CJK character fallback handling in EPUB.
-
-* API changes:
- * Pass rectangle and matrix structs by value.
- * Replaced PDF_NAME_Xxx macros with PDF_NAME(Xxx).
- * Added PDF_TRUE, PDF_FALSE, and PDF_NULL constant pdf_obj* macros.
- * Added helper functions: pdf_dict_get_int, etc.
- * Removed 'doc' argument in pdf_new_int, etc.
- * Quads instead of rects when highlighting and searching text.
- * mutool run: Pass arguments to script in scriptArgs global.
diff --git a/mupdf/DESCR b/mupdf/DESCR
deleted file mode 100644
index 4cf060a654..0000000000
--- a/mupdf/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-MuPDF is a lightweight PDF, XPS, and E-book viewer.
-
-The renderer in MuPDF is tailored for high quality anti-aliased
-graphics. It renders text with metrics and spacing accurate to
-within fractions of a pixel for the highest fidelity in reproducing
-the look of a printed page on screen. MuPDF is also small, fast,
-and yet complete.
-
-MuPDF supports PDF 1.7 with transparency, encryption, hyperlinks,
-annotations, searching and more. MuPDF also reads many other document
-and e-book formats, such as XPS, OpenXPS, CBZ, EPUB and FictionBook
-2.
-
-MuPDF is written modularly, so features can be added and removed
-by integrators if they so desire.
-
-Since the 1.2 release of MuPDF, we have optional support for
-interactive features such as form filling, javascript and transitions.
diff --git a/mupdf/Makefile b/mupdf/Makefile
deleted file mode 100644
index 2d9a7fa36c..0000000000
--- a/mupdf/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile,v 1.61 2018/08/16 18:54:31 adam Exp $
-
-DISTNAME= mupdf-1.14.0-source
-PKGNAME= ${DISTNAME:S/-source//}
-CATEGORIES= print
-MASTER_SITES= https://mupdf.com/downloads/archive/
-
-MAINTAINER= leot%NetBSD.org@localhost
-HOMEPAGE= https://mupdf.com/
-COMMENT= Lightweight PDF, XPS and E-book viewer and toolkit
-LICENSE= gnu-agpl-v3
-
-USE_LANGUAGES= c99
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config gmake
-
-INSTALLATION_DIRS+= bin include lib/pkgconfig
-INSTALL_MAKE_FLAGS+= prefix=${PREFIX}
-INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
-MAKE_FLAGS+= XCFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+= build=release
-MAKE_ENV+= HAVE_LIBCRYPTO=no # Needs openssl-1.1.0
-MAKE_ENV+= USE_SYSTEM_LIBS=yes
-
-CFLAGS+= -DJBIG_NO_MEMENTO
-CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
-
-.include "options.mk"
-
-# Remove thirdparty directory in order to use the libraries provided by pkgsrc
-# mujs directory is an exception and should not be removed (MuJS is the
-# default Javascript interpreter for mupdf).
-post-extract:
- ${RM} -fr \
- ${WRKSRC}/thirdparty/curl \
- ${WRKSRC}/thirdparty/freeglut \
- ${WRKSRC}/thirdparty/freetype \
- ${WRKSRC}/thirdparty/harfbuzz \
- ${WRKSRC}/thirdparty/jbig2dec \
- ${WRKSRC}/thirdparty/lcms2 \
- ${WRKSRC}/thirdparty/libjpeg \
- ${WRKSRC}/thirdparty/openjpeg \
- ${WRKSRC}/thirdparty/zlib
-
-post-build:
- sed -e "s,@PREFIX@,${PREFIX}," -e "s,@VERSION@,${PKGVERSION_NOREV}," \
- ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
-
-BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.7
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/harfbuzz/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jbig2dec/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-# XXX: Needs lcms2-2.9 that ATM is not in pkgsrc.
-#BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9
-#.include "../../graphics/lcms2/buildlink3.mk"
-.include "../../graphics/openjpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mupdf/PLIST b/mupdf/PLIST
deleted file mode 100644
index 54628ab7c2..0000000000
--- a/mupdf/PLIST
+++ /dev/null
@@ -1,127 +0,0 @@
-@comment $NetBSD$
-bin/mjsgen
-bin/mujstest
-bin/mupdf
-${PLIST.opengl}bin/mupdf-gl
-bin/muraster
-bin/mutool
-include/mupdf/fitz.h
-include/mupdf/fitz/annotation.h
-include/mupdf/fitz/archive.h
-include/mupdf/fitz/band-writer.h
-include/mupdf/fitz/bidi.h
-include/mupdf/fitz/bitmap.h
-include/mupdf/fitz/buffer.h
-include/mupdf/fitz/color-management.h
-include/mupdf/fitz/colorspace.h
-include/mupdf/fitz/compress.h
-include/mupdf/fitz/compressed-buffer.h
-include/mupdf/fitz/config.h
-include/mupdf/fitz/context.h
-include/mupdf/fitz/crypt.h
-include/mupdf/fitz/device.h
-include/mupdf/fitz/display-list.h
-include/mupdf/fitz/document.h
-include/mupdf/fitz/filter.h
-include/mupdf/fitz/font.h
-include/mupdf/fitz/geometry.h
-include/mupdf/fitz/getopt.h
-include/mupdf/fitz/glyph-cache.h
-include/mupdf/fitz/glyph.h
-include/mupdf/fitz/hash.h
-include/mupdf/fitz/image.h
-include/mupdf/fitz/link.h
-include/mupdf/fitz/outline.h
-include/mupdf/fitz/output-pcl.h
-include/mupdf/fitz/output-pclm.h
-include/mupdf/fitz/output-png.h
-include/mupdf/fitz/output-pnm.h
-include/mupdf/fitz/output-ps.h
-include/mupdf/fitz/output-psd.h
-include/mupdf/fitz/output-pwg.h
-include/mupdf/fitz/output-svg.h
-include/mupdf/fitz/output-tga.h
-include/mupdf/fitz/output.h
-include/mupdf/fitz/path.h
-include/mupdf/fitz/pixmap.h
-include/mupdf/fitz/pool.h
-include/mupdf/fitz/separation.h
-include/mupdf/fitz/shade.h
-include/mupdf/fitz/store.h
-include/mupdf/fitz/stream.h
-include/mupdf/fitz/string-util.h
-include/mupdf/fitz/structured-text.h
-include/mupdf/fitz/system.h
-include/mupdf/fitz/text.h
-include/mupdf/fitz/track-usage.h
-include/mupdf/fitz/transition.h
-include/mupdf/fitz/tree.h
-include/mupdf/fitz/util.h
-include/mupdf/fitz/version.h
-include/mupdf/fitz/writer.h
-include/mupdf/fitz/xml.h
-include/mupdf/memento.h
-include/mupdf/pdf-tools.h
-include/mupdf/pdf.h
-include/mupdf/pdf/annot.h
-include/mupdf/pdf/clean.h
-include/mupdf/pdf/cmap.h
-include/mupdf/pdf/crypt.h
-include/mupdf/pdf/document.h
-include/mupdf/pdf/event.h
-include/mupdf/pdf/field.h
-include/mupdf/pdf/font.h
-include/mupdf/pdf/interpret.h
-include/mupdf/pdf/javascript.h
-include/mupdf/pdf/name-table.h
-include/mupdf/pdf/object.h
-include/mupdf/pdf/output-pdf.h
-include/mupdf/pdf/page.h
-include/mupdf/pdf/parse.h
-include/mupdf/pdf/resource.h
-include/mupdf/pdf/widget.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/pkgconfig/mupdf.pc
-man/man1/mupdf.1
-man/man1/mutool.1
-share/doc/mupdf/CHANGES
-share/doc/mupdf/COPYING
-share/doc/mupdf/README
-share/doc/mupdf/android-sdk.html
-share/doc/mupdf/artifex-logo.png
-share/doc/mupdf/building.html
-share/doc/mupdf/coding-overview.html
-share/doc/mupdf/coding-progressive.html
-share/doc/mupdf/coding-style.html
-share/doc/mupdf/examples/bbox-device.js
-share/doc/mupdf/examples/create-thumbnail.js
-share/doc/mupdf/examples/draw-device.js
-share/doc/mupdf/examples/draw-document.js
-share/doc/mupdf/examples/example.c
-share/doc/mupdf/examples/fix-s22pdf.js
-share/doc/mupdf/examples/jpx-to-pdf.js
-share/doc/mupdf/examples/multi-threaded.c
-share/doc/mupdf/examples/pdf-create-lowlevel.js
-share/doc/mupdf/examples/pdf-create.js
-share/doc/mupdf/examples/pdf-merge.js
-share/doc/mupdf/examples/trace-device.js
-share/doc/mupdf/index.html
-share/doc/mupdf/manual-mupdf-gl.html
-share/doc/mupdf/manual-mutool-clean.html
-share/doc/mupdf/manual-mutool-convert.html
-share/doc/mupdf/manual-mutool-create.html
-share/doc/mupdf/manual-mutool-draw.html
-share/doc/mupdf/manual-mutool-extract.html
-share/doc/mupdf/manual-mutool-merge.html
-share/doc/mupdf/manual-mutool-portfolio.html
-share/doc/mupdf/manual-mutool-run.html
-share/doc/mupdf/manual-mutool-show.html
-share/doc/mupdf/manual-mutool-trace.html
-share/doc/mupdf/style.css
-share/doc/mupdf/template.html
-share/doc/mupdf/thirdparty.html
diff --git a/mupdf/buildlink3.mk b/mupdf/buildlink3.mk
deleted file mode 100644
index cdaa1fb59c..0000000000
--- a/mupdf/buildlink3.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.25 2018/08/16 18:54:31 adam Exp $
-
-BUILDLINK_TREE+= mupdf
-
-.if !defined(MUPDF_BUILDLINK3_MK)
-MUPDF_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.14.0
-BUILDLINK_PKGSRCDIR.mupdf?= ../../wip/mupdf
-
-pkgbase := mupdf
-.include "../../mk/pkg-build-options.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl)
-.include "../../www/curl/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.mupdf:Mopengl)
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
-.endif
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/harfbuzz/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jbig2dec/buildlink3.mk"
-.include "../../graphics/openjpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.endif # MUPDF_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -mupdf
diff --git a/mupdf/distinfo b/mupdf/distinfo
deleted file mode 100644
index 16510e359d..0000000000
--- a/mupdf/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.40 2018/05/06 13:19:10 leot Exp $
-
-SHA1 (mupdf-1.14.0-source.tar.gz) = 289023cd4d10cc42177cd5ee3f20a936f35c84a4
-RMD160 (mupdf-1.14.0-source.tar.gz) = 5b0d14594da547dd80332b96dad93477b6a5d096
-SHA512 (mupdf-1.14.0-source.tar.gz) = 9a8c5d7ce8336fd2cc2d49574a9f3909900e77a734e804380c17a30df1b10bb9c35d781f43dd70b423bf3c607575ef5a901bb70c1b6ce703fe27e03818fc2a62
-Size (mupdf-1.14.0-source.tar.gz) = 55652044 bytes
-SHA1 (patch-Makethird) = 33b7ccf235e971c44e159a687cecc033155957ba
-SHA1 (patch-ab) = 5ef190923d648165cdf29174f1521bd069c7e6f9
-SHA1 (patch-ac) = 4f685e425bff4d257ca3bce3d2b536d5cea1e8aa
-SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
-SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
-SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
-SHA1 (patch-thirdparty_mujs_Makefile) = fc7cbbbeb2a59c4322e2ed46e12cf3dddfd21d28
diff --git a/mupdf/files/mupdf.pc b/mupdf/files/mupdf.pc
deleted file mode 100644
index d4ce121d0c..0000000000
--- a/mupdf/files/mupdf.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: mupdf
-Description: library for PDF files
-Version: @VERSION@
-Libs: -Wl,-R${libdir} -L${libdir} -lmupdf -lmupdf-third -lmupdf-threads -lmupdf-pkcs7
-Cflags: -I${includedir}
diff --git a/mupdf/options.mk b/mupdf/options.mk
deleted file mode 100644
index aee17a80a9..0000000000
--- a/mupdf/options.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2017/12/18 15:06:33 leot Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf
-PKG_SUPPORTED_OPTIONS= curl opengl
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= opengl
-
-#
-# curl support
-#
-.if !empty(PKG_OPTIONS:Mcurl)
-.include "../../www/curl/buildlink3.mk"
-.else
-MAKE_ENV+= HAVE_CURL=no
-.endif
-
-#
-# glut support
-#
-.if !empty(PKG_OPTIONS:Mopengl)
-PLIST.opengl= yes
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
-.else
-MAKE_ENV+= HAVE_GLUT=no
-.endif
diff --git a/mupdf/patches/patch-Makethird b/mupdf/patches/patch-Makethird
deleted file mode 100644
index 71e5f99a1e..0000000000
--- a/mupdf/patches/patch-Makethird
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Makethird,v 1.8 2017/12/18 15:06:34 leot Exp $
-
-- mujs building support with libtool
-- Avoid the internal lcms2 version provided and honors SYS_LCMS2_{CFLAGS,LIBS}.
- These are handled in patches/patch-ab.
-
---- Makethird.orig 2018-09-25 12:39:17.000000000 +0000
-+++ Makethird
-@@ -229,7 +229,7 @@ else
- THIRD_SRC += thirdparty/mujs/one.c
- THIRD_CFLAGS += -Ithirdparty/mujs
-
--$(OUT)/thirdparty/mujs/%.o: thirdparty/mujs/%.c
-+$(OUT)/thirdparty/mujs/%.lo: thirdparty/mujs/%.c
- $(CC_CMD)
-
- endif
diff --git a/mupdf/patches/patch-ab b/mupdf/patches/patch-ab
deleted file mode 100644
index 04835599ba..0000000000
--- a/mupdf/patches/patch-ab
+++ /dev/null
@@ -1,145 +0,0 @@
-$NetBSD: patch-ab,v 1.17 2018/05/06 13:19:10 leot Exp $
-
-- Handle the various operating systems in the same way avoiding hardcoding
-- Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
- `USE_TOOLS+= objcopy' the objcopy-ing fails as follow:
- OBJCOPY build/release/resources/fonts/urw/Dingbats.cff.o
- build/release/resources/fonts/urw/Dingbats.cff.o:1: warning: NUL character seen; rest of line ignored
- build/release/resources/fonts/urw/Dingbats.cff.o:1: *** missing separator. Stop.
- (also for other fonts)). This needs to be investigated further.
-- Avoid internal version of freeglut and try to pick it up via pkg-config and
- set SYS_GLUT_{CFLAGS,LIBS} accordingly.
-- Avoid internal version of lcms2 and try to pick it up via pkg-config and
- set SYS_LCMS2_{CFLAGS,LIBS} accordingly.
- If no lcms2 is available just pass `-DNO_ICC' to disable it via
- CFLAGS.
-
---- Makerules.orig 2018-09-25 12:39:17.000000000 +0000
-+++ Makerules
-@@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW)
- OS := $(OS:Windows_NT=MINGW)
- OS := $(OS:Darwin=MACOS)
-
--ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
-- # clang does not support these in combination with -fembed-bitcode
-- CFLAGS += -ffunction-sections -fdata-sections
--endif
--
--ifeq ($(OS),MACOS)
-- LDREMOVEUNREACH := -Wl,-dead_strip
--else
-- LDREMOVEUNREACH := -Wl,--gc-sections
--endif
--
- SANITIZE_FLAGS += -fsanitize=address
- SANITIZE_FLAGS += -fsanitize=leak
-
-@@ -72,77 +61,63 @@ SYS_MUJS_LIBS := -lmujs
- SYS_OPENJPEG_LIBS := -lopenjp2
- SYS_ZLIB_LIBS := -lz
-
--ifeq ($(OS),MINGW)
-- WINDRES := windres
-- HAVE_WIN32 := yes
--
--else ifeq ($(OS),MACOS)
-- HAVE_GLUT := yes
-- SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
-- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
-- CC = xcrun cc
-- AR = xcrun ar
-- LD = xcrun ld
-- RANLIB = xcrun ranlib
-+HAVE_OBJCOPY := no
-
--else ifeq ($(OS),Linux)
-- HAVE_OBJCOPY := yes
--
-- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
-+ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
-- endif
-- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
-+endif
-+ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
-- endif
-- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
-+endif
-+ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
-- endif
-- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
-+else
-+ CFLAGS += -DNO_ICC
-+endif
-+ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
-- endif
-- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
-+endif
-+ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
-- endif
-- ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
-+endif
-+ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-- endif
-+endif
-
-- HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
-- ifeq ($(HAVE_CURL),yes)
-+HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
-+ifeq ($(HAVE_CURL),yes)
- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-- endif
-+endif
-
-- HAVE_GLUT := yes
-- ifeq ($(HAVE_GLUT),yes)
-- SYS_GLUT_CFLAGS :=
-- SYS_GLUT_LIBS := -lglut -lGL
-- endif
-+ifeq "$(shell pkg-config --exists glut && pkg-config --exists gl && echo yes)" "yes"
-+HAVE_GLUT ?= yes
-+SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
-+SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
-+endif
-
-- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-- ifeq ($(HAVE_X11),yes)
-+HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-+ifeq ($(HAVE_X11),yes)
- X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- X11_LIBS := $(shell pkg-config --libs x11 xext)
-- endif
-+endif
-
-- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
-- ifeq ($(HAVE_LIBCRYPTO),yes)
-+HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
-+ifeq ($(HAVE_LIBCRYPTO),yes)
- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-- endif
-+endif
-
-- HAVE_PTHREAD := yes
-- ifeq ($(HAVE_PTHREAD),yes)
-+HAVE_PTHREAD := yes
-+ifeq ($(HAVE_PTHREAD),yes)
- PTHREAD_CFLAGS :=
- PTHREAD_LIBS := -lpthread
-- endif
--
- endif
-
- # The following section has various cross compilation configurations.
diff --git a/mupdf/patches/patch-ac b/mupdf/patches/patch-ac
deleted file mode 100644
index bb30c8144b..0000000000
--- a/mupdf/patches/patch-ac
+++ /dev/null
@@ -1,349 +0,0 @@
-$NetBSD: patch-ac,v 1.19 2018/05/06 13:19:10 leot Exp $
-
-- libtool support
-- Install target cleanup
-- Also install muthreads and mupkcs7 libraries (needed by various tools)
-- Do not force `-O0' flag when building
-- Get rid of unused VERSION variable and `version:' target (otherwise `git' can
- be invoked during the building phase)
-- Install only one `mupdf' binary, prefer the featureful one and always
- install it as `mupdf'.
-- Install all EXTRA_APPS (muraster, mujstest, mjsgen)
-
---- Makefile.orig 2018-09-25 12:39:17.000000000 +0000
-+++ Makefile
-@@ -51,68 +51,68 @@ 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) -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) -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 $^
- WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
- OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
-
- # --- Rules ---
-
--$(OUT)/%.a :
-+$(OUT)/%.la :
- $(AR_CMD)
- $(RANLIB_CMD)
-
- $(OUT)/%.exe: %.c
- $(LINK_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) $(THREADING_CFLAGS)
-
--$(OUT)/source/helpers/pkcs7/%.o : source/helpers/pkcs7/%.c
-+$(OUT)/source/helpers/pkcs7/%.lo : source/helpers/pkcs7/%.c
- $(CC_CMD) $(LIBCRYPTO_CFLAGS)
-
--$(OUT)/source/tools/%.o : source/tools/%.c
-+$(OUT)/source/tools/%.lo : source/tools/%.c
- $(CC_CMD) -Wall $(THIRD_CFLAGS) $(THREADING_CFLAGS)
-
--$(OUT)/generated/%.o : generated/%.c
-- $(CC_CMD) -O0
-+$(OUT)/generated/%.lo : generated/%.c
-+ $(CC_CMD)
-
--$(OUT)/platform/x11/%.o : platform/x11/%.c
-+$(OUT)/platform/x11/%.lo : platform/x11/%.c
- $(CC_CMD) -Wall $(X11_CFLAGS)
-
--$(OUT)/platform/x11/curl/%.o : platform/x11/%.c
-+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c
- $(CC_CMD) -Wall $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
-
--$(OUT)/platform/gl/%.o : platform/gl/%.c
-+$(OUT)/platform/gl/%.lo : platform/gl/%.c
- $(CC_CMD) -Wall $(THIRD_CFLAGS) $(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) -Wall -Wdeclaration-after-statement -DHAVE_OBJCOPY $(THIRD_CFLAGS)
- endif
-
--$(OUT)/source/%.o : source/%.c
-+$(OUT)/source/%.lo : source/%.c
- $(CC_CMD) -Wall -Wdeclaration-after-statement $(THIRD_CFLAGS)
-
--$(OUT)/platform/%.o : platform/%.c
-+$(OUT)/platform/%.lo : platform/%.c
- $(CC_CMD) -Wall
-
--$(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_SRC:%.c=$(OUT)/%.lo)
-+THIRD_OBJ := $(THIRD_OBJ:%.cc=$(OUT)/%.lo)
-
- MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
- MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
-@@ -122,14 +122,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht
- MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
- MUPDF_SRC += $(sort $(wildcard source/gprf/*.c))
-
--MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.o)
-+MUPDF_OBJ := $(MUPDF_SRC:%.c=$(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-check.c
- 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 ---
-
-@@ -156,7 +156,7 @@ ifeq ($(HAVE_OBJCOPY),yes)
- $(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)
- endif
-
- generate: $(FONT_GEN)
-@@ -190,17 +190,17 @@ generate: source/pdf/js/util.js.h
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
--THREAD_LIB = $(OUT)/libmupdf-threads.a
--PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-+MUPDF_LIB = $(OUT)/libmupdf.la
-+THIRD_LIB = $(OUT)/libmupdf-third.la
-+THREAD_LIB = $(OUT)/libmupdf-threads.la
-+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.la
-
- $(MUPDF_LIB) : $(MUPDF_OBJ)
- $(THIRD_LIB) : $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
-
- # --- Main tools and viewers ---
-
-@@ -211,7 +211,7 @@ 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
- $(MUTOOL_EXE) : $(MUTOOL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
-@@ -219,28 +219,27 @@ INSTALL_APPS += $(MUTOOL_EXE)
-
- ifeq ($(HAVE_GLUT),yes)
- MUVIEW_GLUT_SRC += $(sort $(wildcard platform/gl/*.c))
-- MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.o)
-- MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl
-+ MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.lo)
-+ MUVIEW_GLUT_EXE := $(OUT)/platform/gl/mupdf-gl
- $(MUVIEW_GLUT_EXE) : $(MUVIEW_GLUT_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(GLUT_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(WIN32_LDFLAGS) $(GLUT_LIBS)
- INSTALL_APPS += $(MUVIEW_GLUT_EXE)
- endif
-
- ifeq ($(HAVE_X11),yes)
-- MUVIEW_X11_EXE := $(OUT)/mupdf-x11
-- 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)/platform/x11/mupdf
-+ 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)
-- INSTALL_APPS += $(MUVIEW_X11_EXE)
- endif
-
- ifeq ($(HAVE_WIN32),yes)
- MUVIEW_WIN32_EXE := $(OUT)/mupdf-w32
-- 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)
- INSTALL_APPS += $(MUVIEW_WIN32_EXE)
-@@ -248,19 +247,19 @@ endif
-
- # --- Extra tools and viewers ---
-
--MURASTER_OBJ := $(OUT)/source/tools/muraster.o
-+MURASTER_OBJ := $(OUT)/source/tools/muraster.lo
- MURASTER_EXE := $(OUT)/muraster
- $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS)
- EXTRA_APPS += $(MURASTER_EXE)
-
--MJSGEN_OBJ := $(OUT)/source/tools/mjsgen.o
-+MJSGEN_OBJ := $(OUT)/source/tools/mjsgen.lo
- MJSGEN_EXE := $(OUT)/mjsgen
- $(MJSGEN_EXE) : $(MJSGEN_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
- $(LINK_CMD) $(THIRD_LIBS)
- EXTRA_APPS += $(MJSGEN_EXE)
-
--MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
-+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
- MUJSTEST_EXE := $(OUT)/mujstest
- $(MUJSTEST_EXE) : $(MUJSTEST_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS)
-@@ -268,33 +267,38 @@ EXTRA_APPS += $(MUJSTEST_EXE)
-
- ifeq ($(HAVE_X11),yes)
- ifeq ($(HAVE_CURL),yes)
-- MUVIEW_X11_CURL_EXE := $(OUT)/mupdf-x11-curl
-- 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_EXE := $(OUT)/platform/x11/curl/mupdf
-+ 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_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(CURL_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(CURL_LIBS) $(LIBCRYPTO_LIBS)
-- EXTRA_APPS += $(MUVIEW_X11_CURL_EXE)
- endif
- endif
-
-+ifeq "$(HAVE_CURL)" "yes"
-+INSTALL_APPS += $(MUVIEW_X11_CURL_EXE)
-+else ifeq "$(HAVE_X11)" "yes"
-+INSTALL_APPS += $(MUVIEW_X11_EXE)
-+endif
-+
- # --- Generated dependencies ---
-
---include $(MUPDF_OBJ:%.o=%.d)
---include $(PKCS7_OBJ:%.o=%.d)
---include $(THREAD_OBJ:%.o=%.d)
---include $(THIRD_OBJ:%.o=%.d)
---include $(GLUT_OBJ:%.o=%.d)
---include $(CURL_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 $(GLUT_OBJ:%.lo=%.d)
-+-include $(CURL_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 ---
-
-@@ -305,10 +309,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 ---
-
-@@ -336,28 +340,30 @@ apps: $(INSTALL_APPS)
- extra-apps: $(EXTRA_APPS)
- extra: extra-libs extra-apps
-
--install: libs apps
-- install -d $(DESTDIR)$(incdir)/mupdf
-- install -d $(DESTDIR)$(incdir)/mupdf/fitz
-- install -d $(DESTDIR)$(incdir)/mupdf/pdf
-- install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
-- install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
-- install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
--
-- install -d $(DESTDIR)$(libdir)
-- install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
--
-- install -d $(DESTDIR)$(bindir)
-- install $(INSTALL_APPS) $(DESTDIR)$(bindir)
--
-- install -d $(DESTDIR)$(mandir)/man1
-- install docs/man/*.1 $(DESTDIR)$(mandir)/man1
--
-- install -d $(DESTDIR)$(docdir)
-- install -d $(DESTDIR)$(docdir)/examples
-- install README COPYING CHANGES $(DESTDIR)$(docdir)
-- install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
-- install docs/examples/* $(DESTDIR)$(docdir)/examples
-+install: libs apps extra-apps
-+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(incdir) $(DESTDIR)$(incdir)/mupdf $(DESTDIR)$(incdir)/mupdf/fitz $(DESTDIR)$(incdir)/mupdf/pdf
-+ ${BSD_INSTALL_DATA} include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
-+ ${BSD_INSTALL_DATA} include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
-+ ${BSD_INSTALL_DATA} include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
-+
-+ ${BSD_INSTALL_LIB_DIR} $(DESTDIR)$(libdir)
-+ for f in $(INSTALL_LIBS); do \
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f $(DESTDIR)$(libdir); \
-+ done
-+
-+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
-+ for f in $(INSTALL_APPS) $(EXTRA_APPS); do \
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $$f $(DESTDIR)$(bindir); \
-+ done
-+
-+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1
-+ ${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1
-+
-+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)
-+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)/examples
-+ ${BSD_INSTALL_DATA} README COPYING CHANGES $(DESTDIR)$(docdir)
-+ ${BSD_INSTALL_DATA} docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
-+ ${BSD_INSTALL_DATA} docs/examples/* $(DESTDIR)$(docdir)/examples
-
- tarball:
- bash scripts/archive.sh
diff --git a/mupdf/patches/patch-ae b/mupdf/patches/patch-ae
deleted file mode 100644
index 41a0419c49..0000000000
--- a/mupdf/patches/patch-ae
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2016/02/04 11:50:24 leot Exp $
-
-Avoid namespace conflicts with bswap(3).
-
---- source/fitz/crypt-sha2.c.orig 2015-11-10 16:19:51.000000000 +0000
-+++ source/fitz/crypt-sha2.c
-@@ -17,7 +17,7 @@ static inline int isbigendian(void)
- return *(char*)&one == 0;
- }
-
--static inline unsigned int bswap32(unsigned int num)
-+static inline unsigned int mup_bswap32(unsigned int num)
- {
- return ( (((num) << 24))
- | (((num) << 8) & 0x00FF0000)
-@@ -25,7 +25,7 @@ static inline unsigned int bswap32(unsig
- | (((num) >> 24)) );
- }
-
--static inline uint64_t bswap64(uint64_t num)
-+static inline uint64_t mup_bswap64(uint64_t num)
- {
- return ( (((num) << 56))
- | (((num) << 40) & 0x00FF000000000000ULL)
-@@ -99,7 +99,7 @@ transform256(unsigned int state[8], unsi
- /* ensure big-endian integers */
- if (!isbigendian())
- for (j = 0; j < 16; j++)
-- data[j] = bswap32(data[j]);
-+ data[j] = mup_bswap32(data[j]);
-
- /* Copy state[] to working vars. */
- memcpy(T, state, sizeof(T));
-@@ -192,8 +192,8 @@ void fz_sha256_final(fz_sha256 *context,
-
- if (!isbigendian())
- {
-- context->buffer.u32[14] = bswap32(context->count[1]);
-- context->buffer.u32[15] = bswap32(context->count[0]);
-+ context->buffer.u32[14] = mup_bswap32(context->count[1]);
-+ context->buffer.u32[15] = mup_bswap32(context->count[0]);
- }
- else
- {
-@@ -204,7 +204,7 @@ void fz_sha256_final(fz_sha256 *context,
-
- if (!isbigendian())
- for (j = 0; j < 8; j++)
-- context->state[j] = bswap32(context->state[j]);
-+ context->state[j] = mup_bswap32(context->state[j]);
-
- memcpy(digest, &context->state[0], 32);
- memset(context, 0, sizeof(fz_sha256));
-@@ -271,7 +271,7 @@ transform512(uint64_t state[8], uint64_t
- /* ensure big-endian integers */
- if (!isbigendian())
- for (j = 0; j < 16; j++)
-- data[j] = bswap64(data[j]);
-+ data[j] = mup_bswap64(data[j]);
-
- /* Copy state[] to working vars. */
- memcpy(T, state, sizeof(T));
-@@ -364,8 +364,8 @@ void fz_sha512_final(fz_sha512 *context,
-
- if (!isbigendian())
- {
-- context->buffer.u64[14] = bswap64(context->count[1]);
-- context->buffer.u64[15] = bswap64(context->count[0]);
-+ context->buffer.u64[14] = mup_bswap64(context->count[1]);
-+ context->buffer.u64[15] = mup_bswap64(context->count[0]);
- }
- else
- {
-@@ -376,7 +376,7 @@ void fz_sha512_final(fz_sha512 *context,
-
- if (!isbigendian())
- for (j = 0; j < 8; j++)
-- context->state[j] = bswap64(context->state[j]);
-+ context->state[j] = mup_bswap64(context->state[j]);
-
- memcpy(digest, &context->state[0], 64);
- memset(context, 0, sizeof(fz_sha512));
diff --git a/mupdf/patches/patch-platform_gl_gl-app.h b/mupdf/patches/patch-platform_gl_gl-app.h
deleted file mode 100644
index 6a468692ed..0000000000
--- a/mupdf/patches/patch-platform_gl_gl-app.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-- Do not force freeglut GLUT implementation to every non-APPLE platforms.
-- Adjust the glut.h include.
-
---- platform/gl/gl-app.h.orig 2018-09-25 12:39:17.000000000 +0000
-+++ platform/gl/gl-app.h
-@@ -7,11 +7,7 @@ void win_install(void);
- #include "mupdf/ucdn.h"
- #include "mupdf/pdf.h" /* for pdf specifics and forms */
-
--#ifndef __APPLE__
--#include <GL/freeglut.h>
--#else
--#include <GLUT/glut.h>
--#endif
-+#include <GL/glut.h>
-
- /* UI */
-
diff --git a/mupdf/patches/patch-platform_gl_gl-main.c b/mupdf/patches/patch-platform_gl_gl-main.c
deleted file mode 100644
index 2993456c86..0000000000
--- a/mupdf/patches/patch-platform_gl_gl-main.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-glutLeaveMainLoop() is present only on freeglut, define it otherwise.
-
---- platform/gl/gl-main.c.orig 2018-10-03 11:29:14.000000000 +0000
-+++ platform/gl/gl-main.c
-@@ -16,7 +16,7 @@
- char *realpath(const char *path, char *resolved_path); /* in gl-file.c */
- #endif
-
--#ifdef __APPLE__
-+#ifndef FREEGLUT
- static void cleanup(void);
- void glutLeaveMainLoop(void)
- {
diff --git a/mupdf/patches/patch-source_fitz_load-jpx.c b/mupdf/patches/patch-source_fitz_load-jpx.c
deleted file mode 100644
index c5967f971d..0000000000
--- a/mupdf/patches/patch-source_fitz_load-jpx.c
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-- MuPDF does some locking around its allocation calls; it overrides openjpeg's
- allocators to do this locking too. However mupdf tries to manually align things
- in a way that doesn't match what openjpeg does, which we noticed when frees
- were segfaulting because the addresses didn't match up.
-
- In the case of the openjpeg port it's relying on malloc(3)'s guarantee
- "The allocated space is suitably aligned (after possible pointer coercion)
- for storage of any type of object" so patch mupdf to do the same.
-
- Fixes crash noticed by jca@ in https://www.broadband-forum.org/technical/download/TR-177.pdf
-
- From OpenBSD ports textproc/mupdf/patch-source_fitz_load-jpx_c,v 1.5.
-
---- source/fitz/load-jpx.c.orig 2018-09-25 12:39:17.000000000 +0000
-+++ source/fitz/load-jpx.c
-@@ -577,19 +577,7 @@ void opj_free(void *ptr)
-
- static void * opj_aligned_malloc_n(size_t alignment, size_t size)
- {
-- uint8_t *ptr;
-- int off;
--
-- if (size == 0)
-- return NULL;
--
-- size += alignment + sizeof(uint8_t);
-- ptr = opj_malloc(size);
-- if (ptr == NULL)
-- return NULL;
-- off = alignment-(((int)(intptr_t)ptr) & (alignment - 1));
-- ptr[off-1] = off;
-- return ptr + off;
-+ return opj_malloc(size);
- }
-
- void * opj_aligned_malloc(size_t size)
-@@ -604,13 +592,7 @@ void * opj_aligned_32_malloc(size_t size
-
- void opj_aligned_free(void* ptr_)
- {
-- uint8_t *ptr = (uint8_t *)ptr_;
-- uint8_t off;
-- if (ptr == NULL)
-- return;
--
-- off = ptr[-1];
-- opj_free((void *)(((unsigned char *)ptr) - off));
-+ opj_free(ptr_);
- }
-
- #if 0
diff --git a/mupdf/patches/patch-thirdparty_mujs_Makefile b/mupdf/patches/patch-thirdparty_mujs_Makefile
deleted file mode 100644
index 9c2fa8ba18..0000000000
--- a/mupdf/patches/patch-thirdparty_mujs_Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-thirdparty_mujs_Makefile,v 1.4 2018/05/06 13:19:10 leot Exp $
-
-- Add libtool support to mujs.
-- Avoid to set (unused) VERSION variable.
-
---- thirdparty/mujs/Makefile.orig 2018-09-11 10:47:31.000000000 +0000
-+++ thirdparty/mujs/Makefile
-@@ -7,12 +7,6 @@ bindir ?= $(prefix)/bin
- incdir ?= $(prefix)/include
- libdir ?= $(prefix)/lib
-
--ifeq "$(wildcard .git)" ".git"
-- VERSION := $(shell git describe --tags --always)
--else
-- VERSION := $(shell basename $$PWD | sed -e s,^mujs-,,)
--endif
--
- # Compiler flags for various configurations:
-
- CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-@@ -64,15 +58,15 @@ one.c: $(SRCS)
-
- jsdump.c: astnames.h opnames.h
-
--$(OUT)/%.o: %.c $(HDRS)
-+$(OUT)/%.lo: %.c $(HDRS)
- @ mkdir -p $(dir $@)
- $(CC) $(CFLAGS) -o $@ -c $<
-
--$(OUT)/libmujs.o: one.c $(HDRS)
-+$(OUT)/libmujs.lo: one.c $(HDRS)
- @ mkdir -p $(dir $@)
- $(CC) $(CFLAGS) -o $@ -c $<
-
--$(OUT)/libmujs.a: $(OUT)/libmujs.o
-+$(OUT)/libmujs.la: $(OUT)/libmujs.lo
- @ mkdir -p $(dir $@)
- $(AR) cr $@ $^
-
-@@ -80,11 +74,11 @@ $(OUT)/libmujs.so: one.c $(HDRS)
- @ mkdir -p $(dir $@)
- $(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
-
--$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
-+$(OUT)/mujs: $(OUT)/libmujs.lo $(OUT)/main.lo
- @ mkdir -p $(dir $@)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
-
--$(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o
-+$(OUT)/mujs-pp: $(OUT)/libmujs.lo $(OUT)/pp.lo
- @ mkdir -p $(dir $@)
- $(CC) $(LDFLAGS) -o $@ $^ -lm
-
-@@ -110,7 +104,7 @@ install-common: release
- install -m 755 build/release/mujs $(DESTDIR)$(bindir)
-
- install-static: install-common
-- install -m 644 build/release/libmujs.a $(DESTDIR)$(libdir)
-+ install -m 644 build/release/libmujs.la $(DESTDIR)$(libdir)
-
- install-shared: install-common
- install -m 755 build/release/libmujs.so $(DESTDIR)$(libdir)
Home |
Main Index |
Thread Index |
Old Index