pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
-{mupdf,zathura-pdf-mupdf}: used to update print/{mupdf,zathura-pdf-mupdf}
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Mon Nov 28 16:16:03 2016 +0100
Changeset: 127fb1526edfa117be68996f83c76a5250678c94
Modified Files:
Makefile
Removed Files:
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-source_fitz_load-jpx.c
mupdf/patches/patch-thirdparty_mujs_Makefile
zathura-pdf-mupdf/DESCR
zathura-pdf-mupdf/Makefile
zathura-pdf-mupdf/PLIST
zathura-pdf-mupdf/distinfo
zathura-pdf-mupdf/patches/patch-document.c
zathura-pdf-mupdf/patches/patch-image.c
zathura-pdf-mupdf/patches/patch-index.c
zathura-pdf-mupdf/patches/patch-links.c
zathura-pdf-mupdf/patches/patch-page.c
zathura-pdf-mupdf/patches/patch-plugin.h
zathura-pdf-mupdf/patches/patch-render.c
zathura-pdf-mupdf/patches/patch-search.c
zathura-pdf-mupdf/patches/patch-utils.c
Log Message:
-{mupdf,zathura-pdf-mupdf}: used to update print/{mupdf,zathura-pdf-mupdf}
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=127fb1526edfa117be68996f83c76a5250678c94
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 -
mupdf/DESCR | 17 --
mupdf/Makefile | 58 ------
mupdf/PLIST | 97 ---------
mupdf/buildlink3.mk | 30 ---
mupdf/distinfo | 12 --
mupdf/files/mupdf.pc | 10 -
mupdf/options.mk | 25 ---
mupdf/patches/patch-Makethird | 23 ---
mupdf/patches/patch-ab | 86 --------
mupdf/patches/patch-ac | 289 ---------------------------
mupdf/patches/patch-ae | 82 --------
mupdf/patches/patch-source_fitz_load-jpx.c | 16 --
mupdf/patches/patch-thirdparty_mujs_Makefile | 47 -----
zathura-pdf-mupdf/DESCR | 2 -
zathura-pdf-mupdf/Makefile | 28 ---
zathura-pdf-mupdf/PLIST | 3 -
zathura-pdf-mupdf/distinfo | 15 --
zathura-pdf-mupdf/patches/patch-document.c | 33 ---
zathura-pdf-mupdf/patches/patch-image.c | 15 --
zathura-pdf-mupdf/patches/patch-index.c | 106 ----------
zathura-pdf-mupdf/patches/patch-links.c | 67 -------
zathura-pdf-mupdf/patches/patch-page.c | 36 ----
zathura-pdf-mupdf/patches/patch-plugin.h | 17 --
zathura-pdf-mupdf/patches/patch-render.c | 35 ----
zathura-pdf-mupdf/patches/patch-search.c | 15 --
zathura-pdf-mupdf/patches/patch-utils.c | 23 ---
27 files changed, 1189 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index a4104b7..31163e2 100644
--- a/Makefile
+++ b/Makefile
@@ -1908,7 +1908,6 @@ SUBDIR+= munge
SUBDIR+= munin-common
SUBDIR+= munin-master
SUBDIR+= munin-node
-SUBDIR+= mupdf
SUBDIR+= mupen64
SUBDIR+= mupen64-base
SUBDIR+= mupen64-plugin-input
@@ -4417,7 +4416,6 @@ SUBDIR+= zabbix-server
SUBDIR+= zabbix-server-mysql
SUBDIR+= zabbix-server-pgsql
SUBDIR+= zapping
-SUBDIR+= zathura-pdf-mupdf
SUBDIR+= zbackup
SUBDIR+= zbar
SUBDIR+= zenity
diff --git a/mupdf/DESCR b/mupdf/DESCR
deleted file mode 100644
index 41c10d3..0000000
--- a/mupdf/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-MuPDF is a lightweight PDF viewer and toolkit written in portable C.
-
-The renderer in MuPDF is tailored for high quality anti-aliased
-graphics. MuPDF 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 has a small footprint. A binary that includes the standard
-Roman fonts is only one megabyte. A build with full CJK support
-(including an Asian font) is approximately five megabytes.
-
-MuPDF has support for all non-interactive PDF 1.7 features, and
-the toolkit provides a simple API for accessing the internal
-structures of the PDF document. Example code for navigating
-interactive links and bookmarks, encrypting PDF files, extracting
-fonts, images, and searchable text, and rendering pages to image
-files is provided.
diff --git a/mupdf/Makefile b/mupdf/Makefile
deleted file mode 100644
index 91064b0..0000000
--- a/mupdf/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.40 2016/10/07 18:25:33 adam Exp $
-
-DISTNAME= mupdf-1.10-source
-PKGNAME= ${DISTNAME:S/-source//}
-CATEGORIES= print
-MASTER_SITES= http://mupdf.com/downloads/archive/
-
-MAINTAINER= leot%NetBSD.org@localhost
-HOMEPAGE= http://mupdf.com/
-COMMENT= Lightweight PDF 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
-
-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/freetype \
- ${WRKSRC}/thirdparty/glfw \
- ${WRKSRC}/thirdparty/harfbuzz \
- ${WRKSRC}/thirdparty/jbig2dec \
- ${WRKSRC}/thirdparty/jpeg \
- ${WRKSRC}/thirdparty/openjpeg \
- ${WRKSRC}/thirdparty/zlib
-
-post-build:
- sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
-
-.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 "../../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 0cc17a5..0000000
--- a/mupdf/PLIST
+++ /dev/null
@@ -1,97 +0,0 @@
-@comment $NetBSD$
-bin/mujstest
-bin/mupdf
-${PLIST.glfw}bin/mupdf-gl
-bin/muraster
-bin/mutool
-include/mupdf/fitz.h
-include/mupdf/fitz/annotation.h
-include/mupdf/fitz/archive.h
-include/mupdf/fitz/bidi.h
-include/mupdf/fitz/bitmap.h
-include/mupdf/fitz/buffer.h
-include/mupdf/fitz/colorspace.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/function.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/math.h
-include/mupdf/fitz/outline.h
-include/mupdf/fitz/output-pcl.h
-include/mupdf/fitz/output-png.h
-include/mupdf/fitz/output-pnm.h
-include/mupdf/fitz/output-ps.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.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/ucdn.h
-include/mupdf/fitz/util.h
-include/mupdf/fitz/version.h
-include/mupdf/fitz/writer.h
-include/mupdf/fitz/xml.h
-include/mupdf/html.h
-include/mupdf/memento.h
-include/mupdf/pdf-tools.h
-include/mupdf/pdf.h
-include/mupdf/pdf/annot.h
-include/mupdf/pdf/appearance.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/svg.h
-lib/libmupdf.la
-lib/libmupdfthird.la
-lib/libmutools.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/naming.txt
-share/doc/mupdf/overview.txt
-share/doc/mupdf/progressive.txt
-share/doc/mupdf/refcount.txt
-share/doc/mupdf/thirdparty.txt
-share/doc/mupdf/types.txt
diff --git a/mupdf/buildlink3.mk b/mupdf/buildlink3.mk
deleted file mode 100644
index 2d47b30..0000000
--- a/mupdf/buildlink3.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2016/10/07 18:25:33 adam Exp $
-
-BUILDLINK_TREE+= mupdf
-
-.if !defined(MUPDF_BUILDLINK3_MK)
-MUPDF_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.10
-BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.10
-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"
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.mupdf:Mglfw)
-.include "../../graphics/glut/buildlink3.mk"
-.include "../../graphics/glfw/buildlink3.mk"
-.endif
-
-.include "../../graphics/jbig2dec/buildlink3.mk"
-.include "../../graphics/openjpeg/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.endif # MUPDF_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -mupdf
diff --git a/mupdf/distinfo b/mupdf/distinfo
deleted file mode 100644
index e7fef47..0000000
--- a/mupdf/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.27 2016/08/03 08:50:17 leot Exp $
-
-SHA1 (mupdf-1.10-source.tar.gz) = 570350f46c00fa091972832b620a43c1ae6a3408
-RMD160 (mupdf-1.10-source.tar.gz) = 49a66c9eb0cc8b11343b2dab0cb71155a415745a
-SHA512 (mupdf-1.10-source.tar.gz) = 91dc77f1f785c960a4f70ee3f617b1ddda32c85015eb053c004ab3a90b899634c7e08e7eaa617a6b7b41910bb5e7e9e725fe636890e94098db1d5b61ed2b3c43
-Size (mupdf-1.10-source.tar.gz) = 42265171 bytes
-SHA1 (patch-Makethird) = 0a5951d543755c42053013f03b1c573b5da9c82c
-SHA1 (patch-ab) = 7bee583086078359ce04eacd9db3b4f03737a7bb
-SHA1 (patch-ac) = d75afe8b05b85d042dc1baeaf8a9988f2e60338a
-SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-source_fitz_load-jpx.c) = fbe6814536d37835a4daa5bb90b1f6cf8698f807
-SHA1 (patch-thirdparty_mujs_Makefile) = f1da7cdf2c9e2e4bbac3e80ef486204a39b27e34
diff --git a/mupdf/files/mupdf.pc b/mupdf/files/mupdf.pc
deleted file mode 100644
index c34f5dc..0000000
--- 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: 1.9a
-Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
-Cflags: -I${includedir}
diff --git a/mupdf/options.mk b/mupdf/options.mk
deleted file mode 100644
index a8a22fb..0000000
--- a/mupdf/options.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2016/02/04 11:50:24 leot Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf
-PKG_SUPPORTED_OPTIONS= curl glfw
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= glfw
-
-#
-# curl support
-#
-.if !empty(PKG_OPTIONS:Mcurl)
-.include "../../www/curl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-
-#
-# glfw support
-#
-.if !empty(PKG_OPTIONS:Mglfw)
-PLIST.glfw= yes
-.include "../../graphics/glut/buildlink3.mk"
-.include "../../graphics/glfw/buildlink3.mk"
-.endif
diff --git a/mupdf/patches/patch-Makethird b/mupdf/patches/patch-Makethird
deleted file mode 100644
index 6c5db23..0000000
--- a/mupdf/patches/patch-Makethird
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-Makethird,v 1.6 2016/04/27 12:34:58 leot Exp $
-
-o mujs building support with libtool
-
---- Makethird.orig 2016-04-06 12:06:53.000000000 +0000
-+++ Makethird
-@@ -24,13 +24,13 @@ ifneq "$(wildcard $(MUJS_DIR)/README)" "
- MUJS_OUT := $(OUT)/mujs
- MUJS_SRC := one.c
-
--MUJS_OBJ := $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o))
-+MUJS_OBJ := $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.lo))
-
--$(MUJS_OUT)/one.o: $(wildcard $(MUJS_DIR)/js*.c $(MUJS_DIR)/utf*.c $(MUJS_DIR)/regex.c $(MUJS_DIR)/*.h)
-+$(MUJS_OUT)/one.lo: $(wildcard $(MUJS_DIR)/js*.c $(MUJS_DIR)/utf*.c $(MUJS_DIR)/regex.c $(MUJS_DIR)/*.h)
-
- $(MUJS_OUT):
- $(MKDIR_CMD)
--$(MUJS_OUT)/%.o: $(MUJS_DIR)/%.c | $(MUJS_OUT)
-+$(MUJS_OUT)/%.lo: $(MUJS_DIR)/%.c | $(MUJS_OUT)
- $(CC_CMD)
-
- MUJS_CFLAGS := -I$(MUJS_DIR)
diff --git a/mupdf/patches/patch-ab b/mupdf/patches/patch-ab
deleted file mode 100644
index 7ef3d9d..0000000
--- a/mupdf/patches/patch-ab
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2016/04/27 12:34:58 leot Exp $
-
-o Handle the various operating systems in the same way avoiding hardcoding
-o Properly recognize glfw support
-
---- Makerules.orig 2016-11-21 10:21:11.000000000 +0000
-+++ Makerules
-@@ -60,51 +60,6 @@ ifeq "$(largefile)" "yes"
- CFLAGS += -DFZ_LARGEFILE
- endif
-
--# Windows (MINGW) build doesn't use system libraries.
--ifeq "$(OS)" "MINGW"
--
--WINDRES = windres
--HAVE_X11 ?= no
--HAVE_WIN32 = yes
--CC=gcc
--# Add flags required for Harfbuzz because of missing strdup
--CFLAGS+= -U__STRICT_ANSI__
--
--# Mac OS X doesn't have pkg-config so we hard code paths.
--else ifeq "$(OS)" "MACOS"
--
--HAVE_X11 ?= no
--HAVE_PTHREADS ?= yes
--
--# Mac OS X deprecated libcrypto, so the default is to not include it.
--HAVE_LIBCRYTO ?= no
--SYS_LIBCRYPTO_CFLAGS =
--SYS_LIBCRYPTO_LIBS =
--ifeq "$(HAVE_LIBCRYPTO)" "yes"
--SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO
--SYS_LIBCRYPTO_LIBS = -lcrypto
--endif
--
--SYS_CURL_DEPS = -lpthread
--
--SYS_X11_CFLAGS = -I/usr/X11R6/include
--SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
--
--SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags)
--SYS_FREETYPE_LIBS = $(shell freetype-config --libs)
--SYS_OPENJPEG_LIBS = -lopenjpeg
--SYS_JBIG2DEC_LIBS = -ljbig2dec
--SYS_JPEG_LIBS = -ljpeg
--SYS_ZLIB_LIBS = -lz
--
--CC = xcrun cc
--AR = xcrun ar
--LD = xcrun ld
--RANLIB_CMD = xcrun ranlib $@
--
--# Linux uses pkg-config for system libraries.
--else ifeq "$(OS)" "Linux"
--
- HAVE_PTHREADS ?= yes
-
- ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
-@@ -131,6 +86,17 @@ SYS_X11_CFLAGS = $(shell pkg-config --cf
- SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
- endif
-
-+ifeq "$(shell pkg-config --exists glut && echo yes)" "yes"
-+SYS_GLUT_CFLAGS = $(shell pkg-config --cflags glut)
-+SYS_GLUT_LIBS = $(shell pkg-config --libs glut)
-+endif
-+
-+ifeq "$(shell pkg-config --exists glfw3 && echo yes)" "yes"
-+HAVE_GLFW = yes
-+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3)
-+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3)
-+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)
-@@ -150,8 +116,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-
--endif
--
- # The following section is an example of how to simply do cross-compilation
- # using these Makefiles. It builds for a beagleboard running ARM linux,
- # compiling on windows with the CodeSourcery G++ compilers.
diff --git a/mupdf/patches/patch-ac b/mupdf/patches/patch-ac
deleted file mode 100644
index 3150556..0000000
--- a/mupdf/patches/patch-ac
+++ /dev/null
@@ -1,289 +0,0 @@
-$NetBSD: patch-ac,v 1.14 2016/04/27 12:34:58 leot Exp $
-
-o libtool support
-o Install target cleanup
-o Do not force `-O0' flag when building
-o Install MUTOOL_LIB as part of INSTALL_LIBS
-o Install only one "mupdf" binary, prefer the featureful one and always
- install it as "mupdf"
-
---- Makefile.orig 2016-11-21 10:21:11.000000000 +0000
-+++ Makefile
-@@ -42,26 +42,12 @@ CFLAGS += $(ZLIB_CFLAGS)
-
- # --- Commands ---
-
--ifneq "$(verbose)" "yes"
--QUIET_AR = @ echo ' ' ' ' AR $@ ;
--QUIET_CC = @ echo ' ' ' ' CC $@ ;
--QUIET_CXX = @ echo ' ' ' ' CXX $@ ;
--QUIET_GEN = @ echo ' ' ' ' GEN $@ ;
--QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
--QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ;
--QUIET_RM = @ echo ' ' ' ' RM $@ ;
--QUIET_TAGS = @ echo ' ' ' ' TAGS $@ ;
--QUIET_WINDRES = @ echo ' ' ' ' WINDRES $@ ;
--endif
--
--CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
--CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
--AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
--LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
--MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
--RM_CMD = $(QUIET_RM) rm -f $@
--TAGS_CMD = $(QUIET_TAGS) ctags $^
--WINDRES_CMD = $(QUIET_WINDRES) $(WINDRES) $< $@
-+CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
-+CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $<
-+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
-+LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-+MKDIR_CMD = mkdir -p $@
-+RM_CMD = rm -f $@
-
- # --- File lists ---
-
-@@ -98,13 +84,13 @@ SVG_SRC_HDR := $(wildcard source/svg/*.h
- HTML_SRC_HDR := $(wildcard source/html/*.h)
- GPRF_SRC_HDR := $(wildcard source/gprf/*.h)
-
--FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC))))
--PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC))))
--XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC))))
--SVG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(SVG_SRC))))
--CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC))))
--HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC))))
--GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC))))
-+FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC))))
-+PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC))))
-+XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC))))
-+SVG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(SVG_SRC))))
-+CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC))))
-+HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC))))
-+GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(GPRF_SRC))))
-
- $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
- $(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
-@@ -130,7 +116,7 @@ FONT_GEN_SIL := $(subst resources/fonts/
-
- FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_HAN) $(FONT_BIN_URW) $(FONT_BIN_SIL)
- FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_HAN) $(FONT_GEN_URW) $(FONT_GEN_SIL)
--FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .o, $(basename $(FONT_GEN))))
-+FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .lo, $(basename $(FONT_GEN))))
-
- $(GEN)/%.c : resources/fonts/droid/%.ttf $(FONTDUMP)
- $(QUIET_GEN) $(FONTDUMP) $@ $<
-@@ -152,8 +138,8 @@ $(FONT_GEN_SIL) : $(FONT_BIN_SIL)
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdfthird.a
-+MUPDF_LIB = $(OUT)/libmupdf.la
-+THIRD_LIB = $(OUT)/libmupdfthird.la
-
- MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
- THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
-@@ -168,39 +154,39 @@ INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB
- $(ALL_DIR) $(OUT) $(GEN) :
- $(MKDIR_CMD)
-
--$(OUT)/%.a :
-+$(OUT)/%.la :
- $(RM_CMD)
- $(AR_CMD)
- $(RANLIB_CMD)
-
--$(OUT)/%: $(OUT)/%.o
-+$(OUT)/%: $(OUT)/%.lo
- $(LINK_CMD)
-
--$(OUT)/%.o : source/%.c | $(ALL_DIR)
-+$(OUT)/%.lo : source/%.c | $(ALL_DIR)
- $(CC_CMD)
-
--$(OUT)/%.o : source/%.cpp | $(ALL_DIR)
-+$(OUT)/%.lo : source/%.cpp | $(ALL_DIR)
- $(CXX_CMD)
-
--$(OUT)/%.o : scripts/%.c | $(OUT)
-+$(OUT)/%.lo : scripts/%.c | $(OUT)
- $(CC_CMD)
-
--$(OUT)/fonts/%.o : $(GEN)/%.c | $(ALL_DIR)
-- $(CC_CMD) -O0
-+$(OUT)/fonts/%.lo : $(GEN)/%.c | $(ALL_DIR)
-+ $(CC_CMD)
-
--$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR)
-+$(OUT)/platform/x11/%.lo : platform/x11/%.c | $(ALL_DIR)
- $(CC_CMD) $(X11_CFLAGS)
-
--$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT)
-+$(OUT)/platform/x11/%.lo: platform/x11/%.rc | $(OUT)
- $(WINDRES_CMD)
-
--$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
-+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR)
- $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
-
--$(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR)
-+$(OUT)/platform/gl/%.lo : platform/gl/%.c | $(ALL_DIR)
- $(CC_CMD) $(GLFW_CFLAGS)
-
--.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
-+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
-
- # --- Generated CMap and JavaScript files ---
-
-@@ -251,51 +237,53 @@ endif
-
- generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN)
-
--$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN)
--$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN)
--$(OUT)/pdf/pdf-js.o : $(JAVASCRIPT_GEN)
--$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h
--$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/fitz/context.c source/fitz/error.c source/fitz/memory.c source/fitz/output.c source/fitz/string.c source/fitz/buffer.c source/fitz/stream-open.c source/fitz/stream-read.c source/fitz/strtod.c source/fitz/strtof.c source/fitz/ftoa.c source/fitz/printf.c source/fitz/time.c source/pdf/pdf-lex.c source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h
-+$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN)
-+$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN)
-+$(OUT)/pdf/pdf-js.lo : $(JAVASCRIPT_GEN)
-+$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h
-+$(OUT)/cmapdump.lo : include/mupdf/pdf/cmap.h source/fitz/context.c source/fitz/error.c source/fitz/memory.c source/fitz/output.c source/fitz/string.c source/fitz/buffer.c source/fitz/stream-open.c source/fitz/stream-read.c source/fitz/strtod.c source/fitz/strtof.c source/fitz/ftoa.c source/fitz/printf.c source/fitz/time.c source/pdf/pdf-lex.c source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h
-
- # --- Tools and Apps ---
-
- MUTOOL := $(OUT)/mutool
--MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o muconvert.o mudraw.o murun.o)
--MUTOOL_OBJ += $(addprefix $(OUT)/tools/, pdfclean.o pdfcreate.o pdfextract.o pdfinfo.o pdfmerge.o pdfposter.o pdfpages.o pdfshow.o)
-+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo muconvert.lo mudraw.lo murun.lo)
-+MUTOOL_OBJ += $(addprefix $(OUT)/tools/, pdfclean.lo pdfcreate.lo pdfextract.lo pdfinfo.lo pdfmerge.lo pdfposter.lo pdfpages.lo pdfshow.lo)
- $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
--MUTOOL_LIB = $(OUT)/libmutools.a
-+MUTOOL_LIB = $(OUT)/libmutools.la
- $(MUTOOL_LIB) : $(MUTOOL_OBJ)
- $(MUTOOL) : $(MUTOOL_LIB) $(MUPDF_LIB) $(THIRD_LIB)
- $(LINK_CMD)
-
-+INSTALL_LIBS += $(MUTOOL_LIB)
-+
- MURASTER := $(OUT)/muraster
--MURASTER_OBJ := $(addprefix $(OUT)/tools/, muraster.o)
-+MURASTER_OBJ := $(addprefix $(OUT)/tools/, muraster.lo)
- $(MURASTER_OBJ): $(FITZ_HDR)
- $(MURASTER) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
- $(LINK_CMD)
-
- MJSGEN := $(OUT)/mjsgen
--MJSGEN_OBJ := $(addprefix $(OUT)/tools/, mjsgen.o)
-+MJSGEN_OBJ := $(addprefix $(OUT)/tools/, mjsgen.lo)
- $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
- $(MJSGEN) : $(MJSGEN_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
- $(LINK_CMD)
-
- MUJSTEST := $(OUT)/mujstest
--MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
-+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
- $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUJSTEST) : $(MUJSTEST_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
- $(LINK_CMD)
-
- ifeq "$(HAVE_X11)" "yes"
--MUVIEW_X11 := $(OUT)/mupdf-x11
--MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
-+MUVIEW_X11 := $(OUT)/platform/x11/mupdf
-+MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo)
- $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
- $(LINK_CMD) $(X11_LIBS)
-
- ifeq "$(HAVE_CURL)" "yes"
--MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
--MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
-+MUVIEW_X11_CURL := $(OUT)/platform/x11/curl/mupdf
-+MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo)
- $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB)
- $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
-@@ -303,8 +291,8 @@ endif
- endif
-
- ifeq "$(HAVE_GLFW)" "yes"
--MUVIEW_GLFW := $(OUT)/mupdf-gl
--MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o)
-+MUVIEW_GLFW := $(OUT)/platform/gl/mupdf-gl
-+MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.lo gl-input.lo gl-main.lo)
- $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
- $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB)
- $(LINK_CMD) $(GLFW_LIBS)
-@@ -312,16 +300,25 @@ endif
-
- ifeq "$(HAVE_WIN32)" "yes"
- MUVIEW_WIN32 := $(OUT)/mupdf
--MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
-+MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo)
- $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
- $(LINK_CMD) $(WIN32_LIBS)
- endif
-
--MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW)
-+MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32)
- MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL)
-
--INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MURASTER) $(MUJSTEST) $(MUVIEW_CURL)
-+INSTALL_APPS := $(MUTOOL) $(MURASTER) $(MUJSTEST)
-+ifeq "$(HAVE_CURL)" "yes"
-+INSTALL_APPS += $(MUVIEW_CURL)
-+else ifeq "$(HAVE_X11)" "yes"
-+INSTALL_APPS += $(MUVIEW)
-+endif
-+
-+ifeq "$(HAVE_GLFW)" "yes"
-+INSTALL_APPS += $(MUVIEW_GLFW)
-+endif
-
- # --- Examples ---
-
-@@ -364,24 +361,26 @@ libs: $(INSTALL_LIBS)
- apps: $(INSTALL_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)
-+ ${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); do \
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $$f $(DESTDIR)$(bindir); \
-+ done
-
-- install -d $(DESTDIR)$(mandir)/man1
-- install docs/man/*.1 $(DESTDIR)$(mandir)/man1
-+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(mandir)/man1
-+ ${BSD_INSTALL_MAN} docs/man/*.1 $(DESTDIR)$(mandir)/man1
-
-- install -d $(DESTDIR)$(docdir)
-- install README COPYING CHANGES docs/*.txt $(DESTDIR)$(docdir)
-+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(docdir)
-+ ${BSD_INSTALL_DATA} README COPYING CHANGES docs/*.txt $(DESTDIR)$(docdir)
-
- tarball:
- bash scripts/archive.sh
diff --git a/mupdf/patches/patch-ae b/mupdf/patches/patch-ae
deleted file mode 100644
index 41a0419..0000000
--- 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-source_fitz_load-jpx.c b/mupdf/patches/patch-source_fitz_load-jpx.c
deleted file mode 100644
index a09eac7..0000000
--- a/mupdf/patches/patch-source_fitz_load-jpx.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Restrict OPJ_STATIC to Windows (avoid linking errors due to hidden symbols)
-
---- source/fitz/load-jpx.c.orig 2016-11-08 19:06:14.000000000 +0000
-+++ source/fitz/load-jpx.c
-@@ -484,7 +484,9 @@ fz_load_jpx_info(fz_context *ctx, unsign
- /* Without the definition of OPJ_STATIC, compilation fails on windows
- * due to the use of __stdcall. We believe it is required on some
- * linux toolchains too. */
-+#ifdef _WIN32
- #define OPJ_STATIC
-+#endif
- #ifndef _MSC_VER
- #define OPJ_HAVE_STDINT_H
- #endif
diff --git a/mupdf/patches/patch-thirdparty_mujs_Makefile b/mupdf/patches/patch-thirdparty_mujs_Makefile
deleted file mode 100644
index 334af5c..0000000
--- a/mupdf/patches/patch-thirdparty_mujs_Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-thirdparty_mujs_Makefile,v 1.1 2016/04/27 12:34:58 leot Exp $
-
-o Add libtool support lo mujs.
-o Avoid to set (unused) VERSION variable.
-
---- thirdparty/mujs/Makefile.orig 2016-03-01 20:52:00.000000000 +0000
-+++ thirdparty/mujs/Makefile
-@@ -41,16 +41,16 @@ jsdump.c: astnames.h opnames.h
- build:
- mkdir -p build
-
--build/%.o: %.c $(HDRS)
-+build/%.lo: %.c $(HDRS)
- $(CC) $(CFLAGS) -o $@ -c $<
-
--build/libmujs.a: $(OBJS)
-+build/libmujs.la: $(OBJS)
- $(AR) cru $@ $^
-
--build/mujs: build/main.o build/libmujs.a
-+build/mujs: build/main.lo build/libmujs.la
- $(CC) $(LDFLAGS) -o $@ $^ -lm
-
--build/mujsone: build/main.o build/one.o
-+build/mujsone: build/main.o build/one.lo
- $(CC) $(LDFLAGS) -o $@ $^ -lm
-
- install: release
-@@ -61,12 +61,12 @@ install: release
- install build/libmujs.a $(DESTDIR)$(libdir)
- install build/mujs $(DESTDIR)$(bindir)
-
--VERSION = $(shell git describe --tags --always)
--
--tarball:
-- git archive --format=zip --prefix=mujs-$(VERSION)/ HEAD > mujs-$(VERSION).zip
-- git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | gzip > mujs-$(VERSION).tar.gz
-- git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | xz > mujs-$(VERSION).tar.xz
-+#VERSION = $(shell git describe --tags --always)
-+#
-+#tarball:
-+# git archive --format=zip --prefix=mujs-$(VERSION)/ HEAD > mujs-$(VERSION).zip
-+# git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | gzip > mujs-$(VERSION).tar.gz
-+# git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | xz > mujs-$(VERSION).tar.xz
-
- tags: $(SRCS) main.c $(HDRS)
- ctags $^
diff --git a/zathura-pdf-mupdf/DESCR b/zathura-pdf-mupdf/DESCR
deleted file mode 100644
index 3c71cd5..0000000
--- a/zathura-pdf-mupdf/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The zathura-pdf-mupdf plugin adds PDF support to zathura by using the
-mupdf rendering library.
diff --git a/zathura-pdf-mupdf/Makefile b/zathura-pdf-mupdf/Makefile
deleted file mode 100644
index 7f023eb..0000000
--- a/zathura-pdf-mupdf/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2016/10/07 18:26:09 adam Exp $
-#
-
-DISTNAME= zathura-pdf-mupdf-0.3.0
-PKGREVISION= 5
-CATEGORIES= print
-MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/
-
-MAINTAINER= leot%NetBSD.org@localhost
-HOMEPAGE= http://pwmt.org/projects/zathura-pdf-mupdf/
-COMMENT= Add PDF support to zathura using mupdf rendering engine
-LICENSE= zlib
-
-CONFLICTS+= zathura-pdf-poppler-[0-9]*
-
-USE_TOOLS+= pkg-config gmake
-USE_LIBTOOL= yes
-
-CPPFLAGS+= -D_XOPEN_SOURCE=600
-
-MAKE_ENV+= MUPDF_LIB="-lmupdf -lmupdfthird"
-
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../wip/mupdf/buildlink3.mk"
-.include "../../print/zathura/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/zathura-pdf-mupdf/PLIST b/zathura-pdf-mupdf/PLIST
deleted file mode 100644
index 4ef2958..0000000
--- a/zathura-pdf-mupdf/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/02/14 14:01:49 leot Exp $
-lib/zathura/pdf.so
-share/applications/zathura-pdf-mupdf.desktop
diff --git a/zathura-pdf-mupdf/distinfo b/zathura-pdf-mupdf/distinfo
deleted file mode 100644
index 1e1386e..0000000
--- a/zathura-pdf-mupdf/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.3 2016/04/27 12:38:45 leot Exp $
-
-SHA1 (zathura-pdf-mupdf-0.3.0.tar.gz) = ae0be41ea7c75b8ddc083fe01f1366673ea9751a
-RMD160 (zathura-pdf-mupdf-0.3.0.tar.gz) = 377e7848a5ea7f43f020e131aacc24c51453bf8f
-SHA512 (zathura-pdf-mupdf-0.3.0.tar.gz) = c83eef453176c6317be338260e311c39e049b8ae1ae719445c6303725b4e993758ed3f3a61f0af31032d09f1f2f03574f862d24e36b27fa38732e0b6c7aa18ea
-Size (zathura-pdf-mupdf-0.3.0.tar.gz) = 9914 bytes
-SHA1 (patch-document.c) = ed5a34515767482b83c9cb3f3a20d1c492a80307
-SHA1 (patch-image.c) = 15e60ede84c3b9a5f4d9b927bb5572c78a4409c3
-SHA1 (patch-index.c) = 8ec60bb5965abbc9d91be63305bf6b5a5244b30c
-SHA1 (patch-links.c) = 9e133625f5c45a9dd490d15bd19ae3529999a990
-SHA1 (patch-page.c) = bc3bd7325f4005986182949c5e66b1ee3040431b
-SHA1 (patch-plugin.h) = 8b12c096d265b397ae9f3a8aee7057a23dea3def
-SHA1 (patch-render.c) = c65ec3d6e9622149d987798b69c680c886b7f970
-SHA1 (patch-search.c) = 1cbed6cc8a8cf672e6330bd2e91e0976f90bc352
-SHA1 (patch-utils.c) = 914ca7ea673be3bcb1a76661762ac7e343f57264
diff --git a/zathura-pdf-mupdf/patches/patch-document.c b/zathura-pdf-mupdf/patches/patch-document.c
deleted file mode 100644
index 5654fd9..0000000
--- a/zathura-pdf-mupdf/patches/patch-document.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-document.c,v 1.2 2016/04/27 12:38:45 leot Exp $
-
-o Correct the glib-2.0 include header file path.
-o Update to mupdf-1.10 API
-
---- document.c.orig 2016-02-14 22:49:46.000000000 +0000
-+++ document.c
-@@ -3,10 +3,9 @@
- #define _POSIX_C_SOURCE 1
-
- #include <mupdf/fitz.h>
--#include <mupdf/xps.h>
- #include <mupdf/pdf.h>
-
--#include <glib-2.0/glib.h>
-+#include <glib.h>
-
- #include "plugin.h"
-
-@@ -109,12 +108,7 @@ pdf_document_save_as(zathura_document_t*
- }
-
- fz_try (mupdf_document->ctx) {
-- /* fz_write_document claims to accepts NULL as third argument but doesn't.
-- * pdf_write_document does not check if the third arguments is NULL for some
-- * options. */
--
-- fz_write_options opts = { 0 }; /* just use the default options */
-- fz_write_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts);
-+ pdf_save_document(mupdf_document->ctx, pdf_specifics(mupdf_document->ctx, mupdf_document->document), (char*) path, NULL);
- } fz_catch (mupdf_document->ctx) {
- return ZATHURA_ERROR_UNKNOWN;
- }
diff --git a/zathura-pdf-mupdf/patches/patch-image.c b/zathura-pdf-mupdf/patches/patch-image.c
deleted file mode 100644
index ff798e4..0000000
--- a/zathura-pdf-mupdf/patches/patch-image.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-image.c,v 1.1 2016/04/27 12:38:45 leot Exp $
-
-Update to mupdf-1.10 API.
-
---- image.c.orig 2016-02-14 22:49:46.000000000 +0000
-+++ image.c
-@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t*
- fz_pixmap* pixmap = NULL;
- cairo_surface_t* surface = NULL;
-
-- pixmap = fz_new_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
-+ pixmap = fz_get_pixmap_from_image(mupdf_page->ctx, mupdf_image, NULL, NULL, NULL, NULL);
- if (pixmap == NULL) {
- goto error_free;
- }
diff --git a/zathura-pdf-mupdf/patches/patch-index.c b/zathura-pdf-mupdf/patches/patch-index.c
deleted file mode 100644
index 78655c8..0000000
--- a/zathura-pdf-mupdf/patches/patch-index.c
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD$
-
-Update to mupdf-1.10 API.
-
---- index.c.orig 2016-02-14 22:49:46.000000000 +0000
-+++ index.c
-@@ -6,7 +6,7 @@
-
- #include "plugin.h"
-
--static void build_index(fz_outline* outline, girara_tree_node_t* root);
-+static void build_index(mupdf_document_t* mupdf_document, fz_outline* outline, girara_tree_node_t* root);
-
- girara_tree_node_t*
- pdf_document_index_generate(zathura_document_t* document, mupdf_document_t* mupdf_document, zathura_error_t* error)
-@@ -29,7 +29,7 @@ pdf_document_index_generate(zathura_docu
-
- /* generate index */
- girara_tree_node_t* root = girara_node_new(zathura_index_element_new("ROOT"));
-- build_index(outline, root);
-+ build_index(mupdf_document, outline, root);
-
- /* free outline */
- fz_drop_outline(mupdf_document->ctx, outline);
-@@ -38,7 +38,7 @@ pdf_document_index_generate(zathura_docu
- }
-
- static void
--build_index(fz_outline* outline, girara_tree_node_t* root)
-+build_index(mupdf_document_t* mupdf_document, fz_outline* outline, girara_tree_node_t* root)
- {
- if (outline == NULL || root == NULL) {
- return;
-@@ -50,49 +50,24 @@ build_index(fz_outline* outline, girara_
- zathura_link_type_t type = ZATHURA_LINK_INVALID;
- zathura_rectangle_t rect = { .x1 = 0, .y1 = 0, .x2 = 0, .y2 = 0 };
-
-- switch (outline->dest.kind) {
-- case FZ_LINK_NONE:
-- type = ZATHURA_LINK_NONE;
-- break;
-- case FZ_LINK_URI:
-+ if (fz_is_external_link(mupdf_document->ctx, outline->uri)) {
- type = ZATHURA_LINK_URI;
-- target.value = outline->dest.ld.uri.uri;
-- break;
-- case FZ_LINK_GOTO:
-+ target.value = outline->uri;
-+ } else if (outline->uri) {
-+ float tx, ty;
-+ tx = 0.0;
-+ ty = 0.0;
- type = ZATHURA_LINK_GOTO_DEST;
-- target.page_number = outline->dest.ld.gotor.page;
-+ target.page_number = 0;
- target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;
-- target.left = 0;
-- target.top = 0;
-+ target.left = 0.0;
-+ target.top = 0.0;
- target.scale = 0.0;
-- {
-- int gflags = outline->dest.ld.gotor.flags;
-- if (gflags & fz_link_flag_l_valid) {
-- target.left = outline->dest.ld.gotor.lt.x;
-- }
-- if (gflags & fz_link_flag_t_valid) {
-- target.top = outline->dest.ld.gotor.lt.y;
-- }
-- /* if (gflags & fz_link_flag_r_is_zoom) { */
-- /* target.scale = outline->dest.ld.gotor.rb.x; */
-- /* } */
-- }
-- break;
-- case FZ_LINK_LAUNCH:
-- type = ZATHURA_LINK_LAUNCH;
-- target.value = outline->dest.ld.launch.file_spec;
-- break;
-- case FZ_LINK_NAMED:
-- type = ZATHURA_LINK_NAMED;
-- target.value = outline->dest.ld.named.named;
-- break;
-- case FZ_LINK_GOTOR:
-- type = ZATHURA_LINK_GOTO_REMOTE;
-- target.value = outline->dest.ld.gotor.file_spec;
-- break;
-- default:
-- outline = outline->next; // TODO: Don't skip unknown type
-- continue;
-+ target.page_number = fz_resolve_link(mupdf_document->ctx, mupdf_document->document, outline->uri, &tx, &ty);
-+ target.left = tx;
-+ target.top = ty;
-+ } else {
-+ type = ZATHURA_LINK_NONE;
- }
-
- index_element->link = zathura_link_new(type, rect, target);
-@@ -104,7 +79,7 @@ build_index(fz_outline* outline, girara_
- girara_tree_node_t* node = girara_node_append_data(root, index_element);
-
- if (outline->down != NULL) {
-- build_index(outline->down, node);
-+ build_index(mupdf_document, outline->down, node);
- }
-
- outline = outline->next;
diff --git a/zathura-pdf-mupdf/patches/patch-links.c b/zathura-pdf-mupdf/patches/patch-links.c
deleted file mode 100644
index 59932a2..0000000
--- a/zathura-pdf-mupdf/patches/patch-links.c
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD$
-
-Update to mupdf-1.10 API.
-
---- links.c.orig 2016-02-14 22:49:46.000000000 +0000
-+++ links.c
-@@ -44,48 +44,22 @@ pdf_page_links_get(zathura_page_t* page,
- zathura_link_target_t target = { 0 };
-
- char* buffer = NULL;
-- switch (link->dest.kind) {
-- case FZ_LINK_NONE:
-- type = ZATHURA_LINK_NONE;
-- break;
-- case FZ_LINK_URI:
-+ if (fz_is_external_link(mupdf_document->ctx, link->uri)) {
- type = ZATHURA_LINK_URI;
-- target.value = link->dest.ld.uri.uri;
-- break;
-- case FZ_LINK_GOTO:
-+ target.value = link->uri;
-+ } else {
-+ float tx, ty;
-+ tx = 0.0;
-+ ty = 0.0;
- type = ZATHURA_LINK_GOTO_DEST;
-- target.page_number = link->dest.ld.gotor.page;
-+ target.page_number = 0;
- target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;
-- target.left = 0;
-- target.top = 0;
-+ target.left = 0.0;
-+ target.top = 0.0;
- target.scale = 0.0;
-- {
-- int gflags = link->dest.ld.gotor.flags;
-- if (gflags & fz_link_flag_l_valid) {
-- target.left = link->dest.ld.gotor.lt.x;
-- }
-- if (gflags & fz_link_flag_t_valid) {
-- target.top = link->dest.ld.gotor.lt.y;
-- }
-- /* if (gflags & fz_link_flag_r_is_zoom) { */
-- /* target.scale = link->dest.ld.gotor.rb.x; */
-- /* } */
-- }
-- break;
-- case FZ_LINK_LAUNCH:
-- type = ZATHURA_LINK_LAUNCH;
-- target.value = link->dest.ld.launch.file_spec;
-- break;
-- case FZ_LINK_NAMED:
-- type = ZATHURA_LINK_NAMED;
-- target.value = link->dest.ld.named.named;
-- break;
-- case FZ_LINK_GOTOR:
-- type = ZATHURA_LINK_GOTO_REMOTE;
-- target.value = link->dest.ld.gotor.file_spec;
-- break;
-- default:
-- continue;
-+ target.page_number = fz_resolve_link(mupdf_document->ctx, mupdf_document->document, link->uri, &tx, &ty);
-+ target.left = tx;
-+ target.top = ty;
- }
-
- zathura_link_t* zathura_link = zathura_link_new(type, position, target);
diff --git a/zathura-pdf-mupdf/patches/patch-page.c b/zathura-pdf-mupdf/patches/patch-page.c
deleted file mode 100644
index 56db594..0000000
--- a/zathura-pdf-mupdf/patches/patch-page.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-page.c,v 1.1 2016/04/27 12:38:45 leot Exp $
-
-Update to mupdf-1.10 API.
-
---- page.c.orig 2016-02-14 22:49:46.000000000 +0000
-+++ page.c
-@@ -43,12 +43,13 @@ pdf_page_init(zathura_page_t* page)
- /* setup text */
- mupdf_page->extracted_text = false;
-
-- mupdf_page->text = fz_new_text_page(mupdf_page->ctx);
-+ fz_rect rect;
-+ mupdf_page->text = fz_new_stext_page(mupdf_page->ctx, &rect);
- if (mupdf_page->text == NULL) {
- goto error_free;
- }
-
-- mupdf_page->sheet = fz_new_text_sheet(mupdf_page->ctx);
-+ mupdf_page->sheet = fz_new_stext_sheet(mupdf_page->ctx);
- if (mupdf_page->sheet == NULL) {
- goto error_free;
- }
-@@ -74,11 +75,11 @@ pdf_page_clear(zathura_page_t* page, mup
-
- if (mupdf_page != NULL) {
- if (mupdf_page->text != NULL) {
-- fz_drop_text_page(mupdf_page->ctx, mupdf_page->text);
-+ fz_drop_stext_page(mupdf_page->ctx, mupdf_page->text);
- }
-
- if (mupdf_page->sheet != NULL) {
-- fz_drop_text_sheet(mupdf_page->ctx, mupdf_page->sheet);
-+ fz_drop_stext_sheet(mupdf_page->ctx, mupdf_page->sheet);
- }
-
- if (mupdf_page->page != NULL) {
diff --git a/zathura-pdf-mupdf/patches/patch-plugin.h b/zathura-pdf-mupdf/patches/patch-plugin.h
deleted file mode 100644
index 2a6c80e..0000000
--- a/zathura-pdf-mupdf/patches/patch-plugin.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-plugin.h,v 1.1 2016/04/27 12:38:45 leot Exp $
-
-Update to mupdf-1.10 API.
-
---- plugin.h.orig 2016-02-14 22:49:46.000000000 +0000
-+++ plugin.h
-@@ -21,8 +21,8 @@ typedef struct mupdf_page_s
- {
- fz_page* page; /**< Reference to the mupdf page */
- fz_context* ctx; /**< Context */
-- fz_text_sheet* sheet; /**< Text sheet */
-- fz_text_page* text; /**< Page text */
-+ fz_stext_sheet* sheet; /**< Text sheet */
-+ fz_stext_page* text; /**< Page text */
- fz_rect bbox; /**< Bbox */
- bool extracted_text; /**< If text has already been extracted */
- } mupdf_page_t;
diff --git a/zathura-pdf-mupdf/patches/patch-render.c b/zathura-pdf-mupdf/patches/patch-render.c
deleted file mode 100644
index ddaf2ec..0000000
--- a/zathura-pdf-mupdf/patches/patch-render.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-Update to mupdf-1.10 API.
-
---- render.c.orig 2016-02-14 22:49:46.000000000 +0000
-+++ render.c
-@@ -20,7 +20,10 @@ pdf_page_render_to_buffer(mupdf_document
- return ZATHURA_ERROR_UNKNOWN;
- }
-
-- fz_display_list* display_list = fz_new_display_list(mupdf_page->ctx);
-+ fz_irect irect = { .x1 = page_width, .y1 = page_height };
-+ fz_rect rect = { .x1 = page_width, .y1 = page_height };
-+
-+ fz_display_list* display_list = fz_new_display_list(mupdf_page->ctx, &rect);
- fz_device* device = fz_new_list_device(mupdf_page->ctx, display_list);
-
- fz_try (mupdf_document->ctx) {
-@@ -33,14 +36,11 @@ pdf_page_render_to_buffer(mupdf_document
-
- fz_drop_device(mupdf_page->ctx, device);
-
-- fz_irect irect = { .x1 = page_width, .y1 = page_height };
-- fz_rect rect = { .x1 = page_width, .y1 = page_height };
--
- fz_colorspace* colorspace = fz_device_bgr(mupdf_document->ctx);
-- fz_pixmap* pixmap = fz_new_pixmap_with_bbox_and_data(mupdf_page->ctx, colorspace, &irect, image);
-+ fz_pixmap* pixmap = fz_new_pixmap_with_bbox_and_data(mupdf_page->ctx, colorspace, &irect, 1, image);
- fz_clear_pixmap_with_value(mupdf_page->ctx, pixmap, 0xFF);
-
-- device = fz_new_draw_device(mupdf_page->ctx, pixmap);
-+ device = fz_new_draw_device(mupdf_page->ctx, NULL, pixmap);
- fz_run_display_list(mupdf_page->ctx, display_list, device, &fz_identity, &rect, NULL);
- fz_drop_device(mupdf_page->ctx, device);
-
diff --git a/zathura-pdf-mupdf/patches/patch-search.c b/zathura-pdf-mupdf/patches/patch-search.c
deleted file mode 100644
index 1e6d011..0000000
--- a/zathura-pdf-mupdf/patches/patch-search.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-search.c,v 1.1 2016/04/27 12:38:45 leot Exp $
-
-Update to mupdf-1.10 API.
-
---- search.c.orig 2016-02-14 22:49:46.000000000 +0000
-+++ search.c
-@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* pag
- }
-
- fz_rect* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_rect));
-- int num_results = fz_search_text_page(mupdf_page->ctx, mupdf_page->text,
-+ int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
- (char*) text, hit_bbox, N_SEARCH_RESULTS);
-
- for (int i = 0; i < num_results; i++) {
diff --git a/zathura-pdf-mupdf/patches/patch-utils.c b/zathura-pdf-mupdf/patches/patch-utils.c
deleted file mode 100644
index f929b94..0000000
--- a/zathura-pdf-mupdf/patches/patch-utils.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-utils.c,v 1.1 2016/04/27 12:38:45 leot Exp $
-
-Update to mupdf-1.10 API.
-
---- utils.c.orig 2016-02-14 22:49:46.000000000 +0000
-+++ utils.c
-@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t
- fz_device* text_device = NULL;
-
- fz_try (mupdf_page->ctx) {
-- text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
-+ text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text, NULL);
-
- /* Disable FZ_IGNORE_IMAGE to collect image blocks */
- fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);
-@@ -23,6 +23,7 @@ mupdf_page_extract_text(mupdf_document_t
- fz_scale(&ctm, 1.0, 1.0);
- fz_run_page(mupdf_page->ctx, mupdf_page->page, text_device, &ctm, NULL);
- } fz_always (mupdf_document->ctx) {
-+ fz_close_device(mupdf_page->ctx, text_device);
- fz_drop_device(mupdf_page->ctx, text_device);
- } fz_catch(mupdf_document->ctx) {
- }
Home |
Main Index |
Thread Index |
Old Index