Mon Nov 28 14:40:42 2016 UTC ()
Update print/mupdf to mupdf-1.10

pkgsrc changes:
 * Update DESCR and COMMENT to better reflect current status of MuPDF
 * Delete security patches addressing CVE-2016-6265 and CVE-2016-6525,
   fixed upstream.
 * Bump BUILDLINK_A[BP]I_DEPENDS.mupdf (no longer compatible with 1.9 API)

Changes:
List of changes in MuPDF 1.10

* Headline changes:
  * FictionBook (FB2) e-book support.
  * Simple SVG parser (a small subset of SVG only).
  * mutool convert: a new document conversion tool and interface.
  * Multi-threaded rendering in mudraw.
  * Luratech decoders for JBIG2 and JPEG2000 (commercial releases only).
  * Optional JPEG-XR support (not included by default for security reasons).
  * Updated base 14 fonts from URW.
  * New CJK font with language specific variants.
  * Hyperlink support in EPUB.

* Reduced memory use:
  * New tool muraster: example printer driver with limited RAM usage and automatic banding.
  * Alpha channel is now optional in pixmaps.
  * More aggressive purging of cached objects.
  * Partial image decoding for lower memory use when banding.

* Reduced code size when building with a subset of features:
  * Reduced default set of built-in CMap tables to the minimum required.
  * FZ_ENABLE_PDF, _XPS, _JS, to disable features at compile time.
  * Function level linking.

* Interface changes and cleanups:
  * Dropped pdf object generation numbers from public interfaces.
  * Simplified PDF page, xobject, and annotation internals.
  * Closing and freeing devices and writers are now separate steps.
  * Improved PDF annotation editing interface (still a work in progress).
  * Document writer interface.
  * Banded image writer interface.

* Mobile viewers:
  * New JNI interfaces to match capabilities of 'mutool run' javascript.
  * New android and desktop java examples using new JNI interface.


(leot)
diff -r1.1.1.1 -r1.2 pkgsrc/print/mupdf/DESCR
diff -r1.40 -r1.41 pkgsrc/print/mupdf/Makefile
diff -r1.12 -r1.13 pkgsrc/print/mupdf/PLIST
diff -r1.12 -r1.13 pkgsrc/print/mupdf/buildlink3.mk
diff -r1.27 -r1.28 pkgsrc/print/mupdf/distinfo
diff -r1.9 -r1.10 pkgsrc/print/mupdf/files/mupdf.pc
diff -r1.12 -r1.13 pkgsrc/print/mupdf/patches/patch-ab
diff -r1.14 -r1.15 pkgsrc/print/mupdf/patches/patch-ac
diff -r1.3 -r1.4 pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c
diff -r1.1 -r0 pkgsrc/print/mupdf/patches/patch-source_pdf_pdf-shade.c
diff -r1.1 -r0 pkgsrc/print/mupdf/patches/patch-source_pdf_pdf-xref.c
cvs diff -r1.1.1.1 -r1.2 pkgsrc/print/mupdf/DESCR (expand / switch to unified diff)

--- pkgsrc/print/mupdf/DESCR 2010/02/18 10:07:32 1.1.1.1
+++ pkgsrc/print/mupdf/DESCR 2016/11/28 14:40:42 1.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1MuPDF is a lightweight PDF viewer and toolkit written in portable C. 1MuPDF is a lightweight PDF, XPS, and E-book viewer.
2 2
3The renderer in MuPDF is tailored for high quality anti-aliased 3The renderer in MuPDF is tailored for high quality anti-aliased
4graphics. MuPDF renders text with metrics and spacing accurate to 4graphics. It renders text with metrics and spacing accurate to
5within fractions of a pixel for the highest fidelity in reproducing 5within fractions of a pixel for the highest fidelity in reproducing
6the look of a printed page on screen. 6the look of a printed page on screen. MuPDF is also small, fast,
 7and yet complete.
7 8
8MuPDF has a small footprint. A binary that includes the standard 9MuPDF supports PDF 1.7 with transparency, encryption, hyperlinks,
9Roman fonts is only one megabyte. A build with full CJK support 10annotations, searching and more. MuPDF also reads many other document
10(including an Asian font) is approximately five megabytes. 11and e-book formats, such as XPS, OpenXPS, CBZ, EPUB and FictionBook
 122.
11 13
12MuPDF has support for all non-interactive PDF 1.7 features, and 14MuPDF is written modularly, so features can be added and removed
13the toolkit provides a simple API for accessing the internal 15by integrators if they so desire.
14structures of the PDF document. Example code for navigating 16
15interactive links and bookmarks, encrypting PDF files, extracting 17Since the 1.2 release of MuPDF, we have optional support for
16fonts, images, and searchable text, and rendering pages to image 18interactive features such as form filling, javascript and transitions.
17files is provided. 
cvs diff -r1.40 -r1.41 pkgsrc/print/mupdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/mupdf/Makefile 2016/10/07 18:25:33 1.40
+++ pkgsrc/print/mupdf/Makefile 2016/11/28 14:40:42 1.41
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.40 2016/10/07 18:25:33 adam Exp $ 1# $NetBSD: Makefile,v 1.41 2016/11/28 14:40:42 leot Exp $
2 2
3DISTNAME= mupdf-1.9a-source 3DISTNAME= mupdf-1.10-source
4PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
5PKGREVISION= 4 
6CATEGORIES= print 5CATEGORIES= print
7MASTER_SITES= http://mupdf.com/downloads/archive/ 6MASTER_SITES= http://mupdf.com/downloads/archive/
8 7
9MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
10HOMEPAGE= http://mupdf.com/ 9HOMEPAGE= http://mupdf.com/
11COMMENT= Lightweight PDF viewer and toolkit 10COMMENT= Lightweight PDF, XPS and E-book viewer and toolkit
12LICENSE= gnu-agpl-v3 11LICENSE= gnu-agpl-v3
13 12
14USE_LANGUAGES= c99 13USE_LANGUAGES= c99
15USE_LIBTOOL= yes 14USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config gmake 15USE_TOOLS+= pkg-config gmake
17 16
18INSTALLATION_DIRS+= bin include lib/pkgconfig 17INSTALLATION_DIRS+= bin include lib/pkgconfig
19INSTALL_MAKE_FLAGS+= prefix=${PREFIX} 18INSTALL_MAKE_FLAGS+= prefix=${PREFIX}
20INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} 19INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
21LDFLAGS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib 20LDFLAGS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib
22MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 21MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
23MAKE_FLAGS+= XCFLAGS=${CFLAGS:Q} 22MAKE_FLAGS+= XCFLAGS=${CFLAGS:Q}
24MAKE_FLAGS+= build=release 23MAKE_FLAGS+= build=release
cvs diff -r1.12 -r1.13 pkgsrc/print/mupdf/PLIST (expand / switch to unified diff)

--- pkgsrc/print/mupdf/PLIST 2016/04/27 12:34:58 1.12
+++ pkgsrc/print/mupdf/PLIST 2016/11/28 14:40:42 1.13
@@ -1,25 +1,28 @@ @@ -1,25 +1,28 @@
1@comment $NetBSD: PLIST,v 1.12 2016/04/27 12:34:58 leot Exp $ 1@comment $NetBSD: PLIST,v 1.13 2016/11/28 14:40:42 leot Exp $
2bin/mujstest 2bin/mujstest
3bin/mupdf 3bin/mupdf
4${PLIST.glfw}bin/mupdf-gl 4${PLIST.glfw}bin/mupdf-gl
 5bin/muraster
5bin/mutool 6bin/mutool
6include/mupdf/fitz.h 7include/mupdf/fitz.h
7include/mupdf/fitz/annotation.h 8include/mupdf/fitz/annotation.h
 9include/mupdf/fitz/archive.h
8include/mupdf/fitz/bidi.h 10include/mupdf/fitz/bidi.h
9include/mupdf/fitz/bitmap.h 11include/mupdf/fitz/bitmap.h
10include/mupdf/fitz/buffer.h 12include/mupdf/fitz/buffer.h
11include/mupdf/fitz/colorspace.h 13include/mupdf/fitz/colorspace.h
12include/mupdf/fitz/compressed-buffer.h 14include/mupdf/fitz/compressed-buffer.h
 15include/mupdf/fitz/config.h
13include/mupdf/fitz/context.h 16include/mupdf/fitz/context.h
14include/mupdf/fitz/crypt.h 17include/mupdf/fitz/crypt.h
15include/mupdf/fitz/device.h 18include/mupdf/fitz/device.h
16include/mupdf/fitz/display-list.h 19include/mupdf/fitz/display-list.h
17include/mupdf/fitz/document.h 20include/mupdf/fitz/document.h
18include/mupdf/fitz/filter.h 21include/mupdf/fitz/filter.h
19include/mupdf/fitz/font.h 22include/mupdf/fitz/font.h
20include/mupdf/fitz/function.h 23include/mupdf/fitz/function.h
21include/mupdf/fitz/getopt.h 24include/mupdf/fitz/getopt.h
22include/mupdf/fitz/glyph-cache.h 25include/mupdf/fitz/glyph-cache.h
23include/mupdf/fitz/glyph.h 26include/mupdf/fitz/glyph.h
24include/mupdf/fitz/hash.h 27include/mupdf/fitz/hash.h
25include/mupdf/fitz/image.h 28include/mupdf/fitz/image.h
@@ -35,58 +38,60 @@ include/mupdf/fitz/output-svg.h @@ -35,58 +38,60 @@ include/mupdf/fitz/output-svg.h
35include/mupdf/fitz/output-tga.h 38include/mupdf/fitz/output-tga.h
36include/mupdf/fitz/output.h 39include/mupdf/fitz/output.h
37include/mupdf/fitz/path.h 40include/mupdf/fitz/path.h
38include/mupdf/fitz/pixmap.h 41include/mupdf/fitz/pixmap.h
39include/mupdf/fitz/pool.h 42include/mupdf/fitz/pool.h
40include/mupdf/fitz/separation.h 43include/mupdf/fitz/separation.h
41include/mupdf/fitz/shade.h 44include/mupdf/fitz/shade.h
42include/mupdf/fitz/store.h 45include/mupdf/fitz/store.h
43include/mupdf/fitz/stream.h 46include/mupdf/fitz/stream.h
44include/mupdf/fitz/string.h 47include/mupdf/fitz/string.h
45include/mupdf/fitz/structured-text.h 48include/mupdf/fitz/structured-text.h
46include/mupdf/fitz/system.h 49include/mupdf/fitz/system.h
47include/mupdf/fitz/text.h 50include/mupdf/fitz/text.h
 51include/mupdf/fitz/track-usage.h
48include/mupdf/fitz/transition.h 52include/mupdf/fitz/transition.h
49include/mupdf/fitz/tree.h 53include/mupdf/fitz/tree.h
50include/mupdf/fitz/ucdn.h 54include/mupdf/fitz/ucdn.h
51include/mupdf/fitz/unzip.h 
52include/mupdf/fitz/util.h 55include/mupdf/fitz/util.h
53include/mupdf/fitz/version.h 56include/mupdf/fitz/version.h
 57include/mupdf/fitz/writer.h
54include/mupdf/fitz/xml.h 58include/mupdf/fitz/xml.h
55include/mupdf/html.h 59include/mupdf/html.h
56include/mupdf/memento.h 60include/mupdf/memento.h
57include/mupdf/pdf-tools.h 61include/mupdf/pdf-tools.h
58include/mupdf/pdf.h 62include/mupdf/pdf.h
59include/mupdf/pdf/annot.h 63include/mupdf/pdf/annot.h
60include/mupdf/pdf/appearance.h 64include/mupdf/pdf/appearance.h
61include/mupdf/pdf/clean.h 65include/mupdf/pdf/clean.h
62include/mupdf/pdf/cmap.h 66include/mupdf/pdf/cmap.h
63include/mupdf/pdf/crypt.h 67include/mupdf/pdf/crypt.h
64include/mupdf/pdf/document.h 68include/mupdf/pdf/document.h
65include/mupdf/pdf/event.h 69include/mupdf/pdf/event.h
66include/mupdf/pdf/field.h 70include/mupdf/pdf/field.h
67include/mupdf/pdf/font.h 71include/mupdf/pdf/font.h
68include/mupdf/pdf/graft.h 
69include/mupdf/pdf/interpret.h 72include/mupdf/pdf/interpret.h
70include/mupdf/pdf/javascript.h 73include/mupdf/pdf/javascript.h
71include/mupdf/pdf/name-table.h 74include/mupdf/pdf/name-table.h
72include/mupdf/pdf/object.h 75include/mupdf/pdf/object.h
73include/mupdf/pdf/output-pdf.h 76include/mupdf/pdf/output-pdf.h
74include/mupdf/pdf/page.h 77include/mupdf/pdf/page.h
75include/mupdf/pdf/parse.h 78include/mupdf/pdf/parse.h
76include/mupdf/pdf/resource.h 79include/mupdf/pdf/resource.h
77include/mupdf/pdf/widget.h 80include/mupdf/pdf/widget.h
78include/mupdf/pdf/xref.h 81include/mupdf/pdf/xref.h
79include/mupdf/xps.h 82include/mupdf/svg.h
80lib/libmupdf.la 83lib/libmupdf.la
81lib/libmupdfthird.la 84lib/libmupdfthird.la
 85lib/libmutools.la
82lib/pkgconfig/mupdf.pc 86lib/pkgconfig/mupdf.pc
83man/man1/mupdf.1 87man/man1/mupdf.1
84man/man1/mutool.1 88man/man1/mutool.1
85share/doc/mupdf/CHANGES 89share/doc/mupdf/CHANGES
86share/doc/mupdf/COPYING 90share/doc/mupdf/COPYING
87share/doc/mupdf/README 91share/doc/mupdf/README
88share/doc/mupdf/naming.txt 92share/doc/mupdf/naming.txt
89share/doc/mupdf/overview.txt 93share/doc/mupdf/overview.txt
90share/doc/mupdf/progressive.txt 94share/doc/mupdf/progressive.txt
91share/doc/mupdf/refcount.txt 95share/doc/mupdf/refcount.txt
92share/doc/mupdf/thirdparty.txt 96share/doc/mupdf/thirdparty.txt
 97share/doc/mupdf/types.txt
cvs diff -r1.12 -r1.13 pkgsrc/print/mupdf/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/print/mupdf/buildlink3.mk 2016/10/07 18:25:33 1.12
+++ pkgsrc/print/mupdf/buildlink3.mk 2016/11/28 14:40:42 1.13
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.12 2016/10/07 18:25:33 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.13 2016/11/28 14:40:42 leot Exp $
2 2
3BUILDLINK_TREE+= mupdf 3BUILDLINK_TREE+= mupdf
4 4
5.if !defined(MUPDF_BUILDLINK3_MK) 5.if !defined(MUPDF_BUILDLINK3_MK)
6MUPDF_BUILDLINK3_MK:= 6MUPDF_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.9a 8BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.10
9BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.9anb4 9BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.10
10BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf 10BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
11 11
12pkgbase := mupdf 12pkgbase := mupdf
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl) 15.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl)
16.include "../../www/curl/buildlink3.mk" 16.include "../../www/curl/buildlink3.mk"
17.include "../../mk/pthread.buildlink3.mk" 17.include "../../mk/pthread.buildlink3.mk"
18.endif 18.endif
19 19
20.if !empty(PKG_BUILD_OPTIONS.mupdf:Mglfw) 20.if !empty(PKG_BUILD_OPTIONS.mupdf:Mglfw)
21.include "../../graphics/glut/buildlink3.mk" 21.include "../../graphics/glut/buildlink3.mk"
22.include "../../graphics/glfw/buildlink3.mk" 22.include "../../graphics/glfw/buildlink3.mk"
cvs diff -r1.27 -r1.28 pkgsrc/print/mupdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/mupdf/distinfo 2016/08/03 08:50:17 1.27
+++ pkgsrc/print/mupdf/distinfo 2016/11/28 14:40:42 1.28
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
1$NetBSD: distinfo,v 1.27 2016/08/03 08:50:17 leot Exp $ 1$NetBSD: distinfo,v 1.28 2016/11/28 14:40:42 leot Exp $
2 2
3SHA1 (mupdf-1.9a-source.tar.gz) = f2b3c21e5060d6ec56ea0d0c32b0feac7eac0e5f 3SHA1 (mupdf-1.10-source.tar.gz) = 570350f46c00fa091972832b620a43c1ae6a3408
4RMD160 (mupdf-1.9a-source.tar.gz) = 0cb0d098c603b16be217e42299052a928d95c3fc 4RMD160 (mupdf-1.10-source.tar.gz) = 49a66c9eb0cc8b11343b2dab0cb71155a415745a
5SHA512 (mupdf-1.9a-source.tar.gz) = 9f804fd65c2dc6b7a3bd73961b1f1a8bf93d52903cccf6302acd6982dfa433125a3b8e77b808984921aee097877280fa21aafb87468cd0a8e4cfa900284a262b 5SHA512 (mupdf-1.10-source.tar.gz) = 91dc77f1f785c960a4f70ee3f617b1ddda32c85015eb053c004ab3a90b899634c7e08e7eaa617a6b7b41910bb5e7e9e725fe636890e94098db1d5b61ed2b3c43
6Size (mupdf-1.9a-source.tar.gz) = 20493793 bytes 6Size (mupdf-1.10-source.tar.gz) = 42265171 bytes
7SHA1 (patch-Makethird) = 0a5951d543755c42053013f03b1c573b5da9c82c 7SHA1 (patch-Makethird) = 0a5951d543755c42053013f03b1c573b5da9c82c
8SHA1 (patch-ab) = c1ee4dd0b79aa0d905c0a0b634fbd016c063cd64 8SHA1 (patch-ab) = 7bee583086078359ce04eacd9db3b4f03737a7bb
9SHA1 (patch-ac) = 51b62ef8ff3e6c44ad954b2405bd982f9d682d37 9SHA1 (patch-ac) = d75afe8b05b85d042dc1baeaf8a9988f2e60338a
10SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede 10SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
11SHA1 (patch-source_fitz_load-jpx.c) = cb33828a6ca638c1b61ff017708a41cc586d1b0e 11SHA1 (patch-source_fitz_load-jpx.c) = fbe6814536d37835a4daa5bb90b1f6cf8698f807
12SHA1 (patch-source_pdf_pdf-shade.c) = 9baba48f468e0827b77c25c05b226c763cf4975f 
13SHA1 (patch-source_pdf_pdf-xref.c) = 406c7a664b7171eb5ca7c5a09aac6be549a8fbb5 
14SHA1 (patch-thirdparty_mujs_Makefile) = f1da7cdf2c9e2e4bbac3e80ef486204a39b27e34 12SHA1 (patch-thirdparty_mujs_Makefile) = f1da7cdf2c9e2e4bbac3e80ef486204a39b27e34
cvs diff -r1.9 -r1.10 pkgsrc/print/mupdf/files/mupdf.pc (expand / switch to unified diff)

--- pkgsrc/print/mupdf/files/mupdf.pc 2016/04/27 12:34:58 1.9
+++ pkgsrc/print/mupdf/files/mupdf.pc 2016/11/28 14:40:42 1.10
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1prefix=@PREFIX@ 1prefix=@PREFIX@
2exec_prefix=${prefix} 2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib 3libdir=${exec_prefix}/lib
4includedir=${prefix}/include 4includedir=${prefix}/include
5 5
6Name: mupdf 6Name: mupdf
7Description: library for PDF files 7Description: library for PDF files
8Version: 1.9a 8Version: 1.10
9Libs: -Wl,-R${libdir} -L${libdir} -lmupdf 9Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
10Cflags: -I${includedir} 10Cflags: -I${includedir}
cvs diff -r1.12 -r1.13 pkgsrc/print/mupdf/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ab 2016/04/27 12:34:58 1.12
+++ pkgsrc/print/mupdf/patches/patch-ab 2016/11/28 14:40:42 1.13
@@ -1,81 +1,86 @@ @@ -1,81 +1,86 @@
1$NetBSD: patch-ab,v 1.12 2016/04/27 12:34:58 leot Exp $ 1$NetBSD: patch-ab,v 1.13 2016/11/28 14:40:42 leot Exp $
2 2
3o Handle the various operating systems in the same way avoiding hardcoding 3o Handle the various operating systems in the same way avoiding hardcoding
4o Properly recognize glfw support 4o Properly recognize glfw support
5 5
6--- Makerules.orig 2016-04-06 12:06:53.000000000 +0000 6--- Makerules.orig 2016-11-21 10:21:11.000000000 +0000
7+++ Makerules 7+++ Makerules
8@@ -43,46 +43,6 @@ ifeq "$(largefile)" "yes" 8@@ -60,51 +60,6 @@ ifeq "$(largefile)" "yes"
9 CFLAGS += -DFZ_LARGEFILE 9 CFLAGS += -DFZ_LARGEFILE
10 endif 10 endif
11  11
12-# Windows (MINGW) build doesn't use system libraries. 12-# Windows (MINGW) build doesn't use system libraries.
13-ifeq "$(OS)" "MINGW" 13-ifeq "$(OS)" "MINGW"
14- 14-
 15-WINDRES = windres
15-HAVE_X11 ?= no 16-HAVE_X11 ?= no
 17-HAVE_WIN32 = yes
 18-CC=gcc
 19-# Add flags required for Harfbuzz because of missing strdup
 20-CFLAGS+= -U__STRICT_ANSI__
16- 21-
17-# Mac OS X doesn't have pkg-config so we hard code paths. 22-# Mac OS X doesn't have pkg-config so we hard code paths.
18-else ifeq "$(OS)" "MACOS" 23-else ifeq "$(OS)" "MACOS"
19- 24-
20-HAVE_X11 ?= yes 25-HAVE_X11 ?= no
21-HAVE_PTHREADS ?= yes 26-HAVE_PTHREADS ?= yes
22- 27-
23-# Mac OS X deprecated openssl, so the default is to not include it. 28-# Mac OS X deprecated libcrypto, so the default is to not include it.
24-HAVE_OPENSSL ?= no 29-HAVE_LIBCRYTO ?= no
25-SYS_OPENSSL_CFLAGS = 30-SYS_LIBCRYPTO_CFLAGS =
26-SYS_OPENSSL_LIBS = 31-SYS_LIBCRYPTO_LIBS =
27-ifeq "$(HAVE_OPENSSL)" "yes" 32-ifeq "$(HAVE_LIBCRYPTO)" "yes"
28-SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL 33-SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO
29-SYS_OPENSSL_LIBS = -lcrypto 34-SYS_LIBCRYPTO_LIBS = -lcrypto
30-endif 35-endif
31- 36-
32-SYS_CURL_DEPS = -lpthread 37-SYS_CURL_DEPS = -lpthread
33- 38-
34-SYS_X11_CFLAGS = -I/usr/X11R6/include 39-SYS_X11_CFLAGS = -I/usr/X11R6/include
35-SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext 40-SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
36- 41-
37-SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags) 42-SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags)
38-SYS_FREETYPE_LIBS = $(shell freetype-config --libs) 43-SYS_FREETYPE_LIBS = $(shell freetype-config --libs)
39-SYS_OPENJPEG_LIBS = -lopenjpeg 44-SYS_OPENJPEG_LIBS = -lopenjpeg
40-SYS_JBIG2DEC_LIBS = -ljbig2dec 45-SYS_JBIG2DEC_LIBS = -ljbig2dec
41-SYS_JPEG_LIBS = -ljpeg 46-SYS_JPEG_LIBS = -ljpeg
42-SYS_ZLIB_LIBS = -lz 47-SYS_ZLIB_LIBS = -lz
43- 48-
44-CC = xcrun cc 49-CC = xcrun cc
45-AR = xcrun ar 50-AR = xcrun ar
46-LD = xcrun ld 51-LD = xcrun ld
47-RANLIB_CMD = xcrun ranlib $@ 52-RANLIB_CMD = xcrun ranlib $@
48- 53-
49-# Linux uses pkg-config for system libraries. 54-# Linux uses pkg-config for system libraries.
50-else ifeq "$(OS)" "Linux" 55-else ifeq "$(OS)" "Linux"
51- 56-
52 HAVE_X11 ?= yes 
53 HAVE_PTHREADS ?= yes 57 HAVE_PTHREADS ?= yes
54  58
55@@ -101,6 +61,17 @@ SYS_CURL_DEPS = -lpthread -lrt 59 ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
56 SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext) 60@@ -131,6 +86,17 @@ SYS_X11_CFLAGS = $(shell pkg-config --cf
57 SYS_X11_LIBS = $(shell pkg-config --libs x11 xext) 61 SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
 62 endif
58  63
59+ifeq "$(shell pkg-config --exists glut && echo yes)" "yes" 64+ifeq "$(shell pkg-config --exists glut && echo yes)" "yes"
60+SYS_GLUT_CFLAGS = $(shell pkg-config --cflags glut) 65+SYS_GLUT_CFLAGS = $(shell pkg-config --cflags glut)
61+SYS_GLUT_LIBS = $(shell pkg-config --libs glut) 66+SYS_GLUT_LIBS = $(shell pkg-config --libs glut)
62+endif 67+endif
63+ 68+
64+ifeq "$(shell pkg-config --exists glfw3 && echo yes)" "yes" 69+ifeq "$(shell pkg-config --exists glfw3 && echo yes)" "yes"
65+HAVE_GLFW = yes 70+HAVE_GLFW = yes
66+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3) 71+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3)
67+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3) 72+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3)
68+endif 73+endif
69+ 74+
 75 ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
70 SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz) 76 SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
71 SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz) 77 SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
72 SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) 78@@ -150,8 +116,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec
73@@ -111,8 +82,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec 
74 SYS_JPEG_LIBS = -ljpeg 79 SYS_JPEG_LIBS = -ljpeg
75 SYS_ZLIB_LIBS = -lz 80 SYS_ZLIB_LIBS = -lz
76  81
77-endif 82-endif
78- 83-
79 # The following section is an example of how to simply do cross-compilation 84 # The following section is an example of how to simply do cross-compilation
80 # using these Makefiles. It builds for a beagleboard running ARM linux, 85 # using these Makefiles. It builds for a beagleboard running ARM linux,
81 # compiling on windows with the CodeSourcery G++ compilers. 86 # compiling on windows with the CodeSourcery G++ compilers.
cvs diff -r1.14 -r1.15 pkgsrc/print/mupdf/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-ac 2016/04/27 12:34:58 1.14
+++ pkgsrc/print/mupdf/patches/patch-ac 2016/11/28 14:40:42 1.15
@@ -1,99 +1,99 @@ @@ -1,99 +1,99 @@
1$NetBSD: patch-ac,v 1.14 2016/04/27 12:34:58 leot Exp $ 1$NetBSD: patch-ac,v 1.15 2016/11/28 14:40:42 leot Exp $
2 2
3o libtool support  3o libtool support
4o Install target cleanup 4o Install target cleanup
5o Do not force `-O0' flag when building 5o Do not force `-O0' flag when building
 6o Install MUTOOL_LIB as part of INSTALL_LIBS
6o Install only one "mupdf" binary, prefer the featureful one and always 7o Install only one "mupdf" binary, prefer the featureful one and always
7 install it as "mupdf" 8 install it as "mupdf"
8 9
9--- Makefile.orig 2016-04-21 11:14:32.000000000 +0000 10--- Makefile.orig 2016-11-21 10:21:11.000000000 +0000
10+++ Makefile 11+++ Makefile
11@@ -38,22 +38,12 @@ CFLAGS += $(ZLIB_CFLAGS) 12@@ -42,26 +42,12 @@ CFLAGS += $(ZLIB_CFLAGS)
12  13
13 # --- Commands --- 14 # --- Commands ---
14  15
15-ifneq "$(verbose)" "yes" 16-ifneq "$(verbose)" "yes"
16-QUIET_AR = @ echo ' ' ' ' AR $@ ; 17-QUIET_AR = @ echo ' ' ' ' AR $@ ;
17-QUIET_CC = @ echo ' ' ' ' CC $@ ; 18-QUIET_CC = @ echo ' ' ' ' CC $@ ;
18-QUIET_CXX = @ echo ' ' ' ' CXX $@ ; 19-QUIET_CXX = @ echo ' ' ' ' CXX $@ ;
19-QUIET_GEN = @ echo ' ' ' ' GEN $@ ; 20-QUIET_GEN = @ echo ' ' ' ' GEN $@ ;
20-QUIET_LINK = @ echo ' ' ' ' LINK $@ ; 21-QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
21-QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ; 22-QUIET_MKDIR = @ echo ' ' ' ' MKDIR $@ ;
22-QUIET_RM = @ echo ' ' ' ' RM $@ ; 23-QUIET_RM = @ echo ' ' ' ' RM $@ ;
 24-QUIET_TAGS = @ echo ' ' ' ' TAGS $@ ;
 25-QUIET_WINDRES = @ echo ' ' ' ' WINDRES $@ ;
23-endif 26-endif
24- 27-
25-CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $< 28-CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
26-CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $< 29-CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
27-AR_CMD = $(QUIET_AR) $(AR) cr $@ $^ 30-AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
28-LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) 31-LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
29-MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ 32-MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
30-RM_CMD = $(QUIET_RM) rm -f $@ 33-RM_CMD = $(QUIET_RM) rm -f $@
 34-TAGS_CMD = $(QUIET_TAGS) ctags $^
 35-WINDRES_CMD = $(QUIET_WINDRES) $(WINDRES) $< $@
31+CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $< 36+CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
32+CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $< 37+CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $<
33+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^ 38+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
34+LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) 39+LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
35+MKDIR_CMD = mkdir -p $@ 40+MKDIR_CMD = mkdir -p $@
36+RM_CMD = rm -f $@ 41+RM_CMD = rm -f $@
37  42
38 # --- File lists --- 43 # --- File lists ---
39  44
40@@ -89,17 +79,17 @@ XPS_SRC_HDR := $(wildcard source/xps/*.h 45@@ -98,13 +84,13 @@ SVG_SRC_HDR := $(wildcard source/svg/*.h
41 HTML_SRC_HDR := $(wildcard source/html/*.h) 46 HTML_SRC_HDR := $(wildcard source/html/*.h)
42 GPRF_SRC_HDR := $(wildcard source/gprf/*.h) 47 GPRF_SRC_HDR := $(wildcard source/gprf/*.h)
43  48
44-FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC)))) 49-FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC))))
45-PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC)))) 50-PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC))))
46-XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC)))) 51-XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC))))
 52-SVG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(SVG_SRC))))
47-CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC)))) 53-CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC))))
48-HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC)))) 54-HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC))))
49-GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC)))) 55-GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(GPRF_SRC))))
50+FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC)))) 56+FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC))))
51+PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC)))) 57+PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC))))
52+XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC)))) 58+XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC))))
 59+SVG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(SVG_SRC))))
53+CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC)))) 60+CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC))))
54+HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC)))) 61+HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC))))
55+GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(GPRF_SRC)))) 62+GPRF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(GPRF_SRC))))
56  63
57 ifeq "$(HAVE_MUJS)" "yes" 
58-PDF_OBJ += $(OUT)/pdf/js/pdf-js.o 
59+PDF_OBJ += $(OUT)/pdf/js/pdf-js.lo 
60 else 
61-PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o 
62+PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.lo 
63 endif 
64  
65 $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR) 64 $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
66@@ -123,7 +113,7 @@ FONT_GEN_SIL := $(subst resources/fonts/ 65 $(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
 66@@ -130,7 +116,7 @@ FONT_GEN_SIL := $(subst resources/fonts/
67  67
68 FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_URW) $(FONT_BIN_SIL) 68 FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_HAN) $(FONT_BIN_URW) $(FONT_BIN_SIL)
69 FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_URW) $(FONT_GEN_SIL) 69 FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_HAN) $(FONT_GEN_URW) $(FONT_GEN_SIL)
70-FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .o, $(basename $(FONT_GEN)))) 70-FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .o, $(basename $(FONT_GEN))))
71+FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .lo, $(basename $(FONT_GEN)))) 71+FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .lo, $(basename $(FONT_GEN))))
72  72
73 $(GEN)/%.c : resources/fonts/droid/%.ttc $(FONTDUMP) 73 $(GEN)/%.c : resources/fonts/droid/%.ttf $(FONTDUMP)
74 $(QUIET_GEN) $(FONTDUMP) $@ $< 74 $(QUIET_GEN) $(FONTDUMP) $@ $<
75@@ -141,8 +131,8 @@ $(FONT_GEN_URW) : $(FONT_BIN_URW) 75@@ -152,8 +138,8 @@ $(FONT_GEN_SIL) : $(FONT_BIN_SIL)
76  76
77 # --- Library --- 77 # --- Library ---
78  78
79-MUPDF_LIB = $(OUT)/libmupdf.a 79-MUPDF_LIB = $(OUT)/libmupdf.a
80-THIRD_LIB = $(OUT)/libmupdfthird.a 80-THIRD_LIB = $(OUT)/libmupdfthird.a
81+MUPDF_LIB = $(OUT)/libmupdf.la 81+MUPDF_LIB = $(OUT)/libmupdf.la
82+THIRD_LIB = $(OUT)/libmupdfthird.la 82+THIRD_LIB = $(OUT)/libmupdfthird.la
83  83
84 MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) 84 MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
85 THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) 85 THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
86@@ -157,39 +147,39 @@ INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB 86@@ -168,39 +154,39 @@ INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB
87 $(ALL_DIR) $(OUT) $(GEN) : 87 $(ALL_DIR) $(OUT) $(GEN) :
88 $(MKDIR_CMD) 88 $(MKDIR_CMD)
89  89
90-$(OUT)/%.a : 90-$(OUT)/%.a :
91+$(OUT)/%.la : 91+$(OUT)/%.la :
92 $(RM_CMD) 92 $(RM_CMD)
93 $(AR_CMD) 93 $(AR_CMD)
94 $(RANLIB_CMD) 94 $(RANLIB_CMD)
95  95
96-$(OUT)/%: $(OUT)/%.o 96-$(OUT)/%: $(OUT)/%.o
97+$(OUT)/%: $(OUT)/%.lo 97+$(OUT)/%: $(OUT)/%.lo
98 $(LINK_CMD) 98 $(LINK_CMD)
99  99
@@ -110,140 +110,151 @@ o Install only one "mupdf" binary, prefe @@ -110,140 +110,151 @@ o Install only one "mupdf" binary, prefe
110 $(CC_CMD) 110 $(CC_CMD)
111  111
112-$(OUT)/fonts/%.o : $(GEN)/%.c | $(ALL_DIR) 112-$(OUT)/fonts/%.o : $(GEN)/%.c | $(ALL_DIR)
113- $(CC_CMD) -O0 113- $(CC_CMD) -O0
114+$(OUT)/fonts/%.lo : $(GEN)/%.c | $(ALL_DIR) 114+$(OUT)/fonts/%.lo : $(GEN)/%.c | $(ALL_DIR)
115+ $(CC_CMD) 115+ $(CC_CMD)
116  116
117-$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR) 117-$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR)
118+$(OUT)/platform/x11/%.lo : platform/x11/%.c | $(ALL_DIR) 118+$(OUT)/platform/x11/%.lo : platform/x11/%.c | $(ALL_DIR)
119 $(CC_CMD) $(X11_CFLAGS) 119 $(CC_CMD) $(X11_CFLAGS)
120  120
121-$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT) 121-$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT)
122+$(OUT)/platform/x11/%.lo: platform/x11/%.rc | $(OUT) 122+$(OUT)/platform/x11/%.lo: platform/x11/%.rc | $(OUT)
123 windres $< $@ 123 $(WINDRES_CMD)
124  124
125-$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR) 125-$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
126+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR) 126+$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR)
127 $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL 127 $(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
128  128
129-$(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR) 129-$(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR)
130+$(OUT)/platform/gl/%.lo : platform/gl/%.c | $(ALL_DIR) 130+$(OUT)/platform/gl/%.lo : platform/gl/%.c | $(ALL_DIR)
131 $(CC_CMD) $(GLFW_CFLAGS) 131 $(CC_CMD) $(GLFW_CFLAGS)
132  132
133-.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules 133-.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
134+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules 134+.PRECIOUS : $(OUT)/%.lo # Keep intermediates from chained rules
135  135
136 # --- Generated CMap and JavaScript files --- 136 # --- Generated CMap and JavaScript files ---
137  137
138@@ -240,16 +230,16 @@ endif 138@@ -251,51 +237,53 @@ endif
139  139
140 generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN) 140 generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN)
141  141
142-$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN) 142-$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN)
143-$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN) 143-$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN)
144-$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN) 144-$(OUT)/pdf/pdf-js.o : $(JAVASCRIPT_GEN)
145-$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h 145-$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h
146-$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h 146-$(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
147+$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN) 147+$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN)
148+$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN) 148+$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN)
149+$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN) 149+$(OUT)/pdf/pdf-js.lo : $(JAVASCRIPT_GEN)
150+$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h 150+$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h
151+$(OUT)/cmapdump.lo : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h 151+$(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
152  152
153 # --- Tools and Apps --- 153 # --- Tools and Apps ---
154  154
155 MUTOOL := $(addprefix $(OUT)/, mutool) 155 MUTOOL := $(OUT)/mutool
156-MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o murun.o pdfclean.o pdfcreate.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o pdfmerge.o) 156-MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o muconvert.o mudraw.o murun.o)
157+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo mudraw.lo murun.lo pdfclean.lo pdfcreate.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo pdfpages.lo pdfmerge.lo) 157-MUTOOL_OBJ += $(addprefix $(OUT)/tools/, pdfclean.o pdfcreate.o pdfextract.o pdfinfo.o pdfmerge.o pdfposter.o pdfpages.o pdfshow.o)
 158+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo muconvert.lo mudraw.lo murun.lo)
 159+MUTOOL_OBJ += $(addprefix $(OUT)/tools/, pdfclean.lo pdfcreate.lo pdfextract.lo pdfinfo.lo pdfmerge.lo pdfposter.lo pdfpages.lo pdfshow.lo)
158 $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) 160 $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
159 $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB) 161-MUTOOL_LIB = $(OUT)/libmutools.a
160 $(MUTOOL) : $(MUTOOL_OBJ) 162+MUTOOL_LIB = $(OUT)/libmutools.la
161@@ -257,27 +247,27 @@ $(MUTOOL) : $(MUTOOL_OBJ) 163 $(MUTOOL_LIB) : $(MUTOOL_OBJ)
 164 $(MUTOOL) : $(MUTOOL_LIB) $(MUPDF_LIB) $(THIRD_LIB)
 165 $(LINK_CMD)
 166
 167+INSTALL_LIBS += $(MUTOOL_LIB)
 168+
 169 MURASTER := $(OUT)/muraster
 170-MURASTER_OBJ := $(addprefix $(OUT)/tools/, muraster.o)
 171+MURASTER_OBJ := $(addprefix $(OUT)/tools/, muraster.lo)
 172 $(MURASTER_OBJ): $(FITZ_HDR)
 173 $(MURASTER) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
 174 $(LINK_CMD)
162  175
163 MJSGEN := $(OUT)/mjsgen 176 MJSGEN := $(OUT)/mjsgen
164 $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB) 177-MJSGEN_OBJ := $(addprefix $(OUT)/tools/, mjsgen.o)
165-$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o) 178+MJSGEN_OBJ := $(addprefix $(OUT)/tools/, mjsgen.lo)
166+$(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.lo) 179 $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
 180 $(MJSGEN) : $(MJSGEN_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
167 $(LINK_CMD) 181 $(LINK_CMD)
168  182
169 MUJSTEST := $(OUT)/mujstest 183 MUJSTEST := $(OUT)/mujstest
170-MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o) 184-MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
171+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo) 185+MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
172 $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR) 186 $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
173 $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB) 187 $(MUJSTEST) : $(MUJSTEST_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
174 $(MUJSTEST) : $(MUJSTEST_OBJ) 
175 $(LINK_CMD) 188 $(LINK_CMD)
176  189
177 ifeq "$(HAVE_X11)" "yes" 190 ifeq "$(HAVE_X11)" "yes"
178-MUVIEW_X11 := $(OUT)/mupdf-x11 191-MUVIEW_X11 := $(OUT)/mupdf-x11
179-MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) 192-MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
180+MUVIEW_X11 := $(OUT)/platform/x11/mupdf 193+MUVIEW_X11 := $(OUT)/platform/x11/mupdf
181+MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo) 194+MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo)
182 $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR) 195 $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
183 $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB) 196 $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
184 $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) 
185 $(LINK_CMD) $(X11_LIBS) 197 $(LINK_CMD) $(X11_LIBS)
186  198
187 ifeq "$(HAVE_GLFW)" "yes" 
188-MUVIEW_GLFW := $(OUT)/mupdf-gl 
189-MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o) 
190+MUVIEW_GLFW := $(OUT)/platform/gl/mupdf-gl 
191+MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.lo gl-input.lo gl-main.lo) 
192 $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h 
193 $(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB) 
194 $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) 
195@@ -285,8 +275,8 @@ $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) 
196 endif 
197  
198 ifeq "$(HAVE_CURL)" "yes" 199 ifeq "$(HAVE_CURL)" "yes"
199-MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl 200-MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
200-MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) 201-MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
201+MUVIEW_X11_CURL := $(OUT)/platform/x11/curl/mupdf 202+MUVIEW_X11_CURL := $(OUT)/platform/x11/curl/mupdf
202+MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo) 203+MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo)
203 $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR) 204 $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
204 $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB) 205 $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB)
205 $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) 206 $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
206@@ -296,17 +286,26 @@ endif 207@@ -303,8 +291,8 @@ endif
 208 endif
 209
 210 ifeq "$(HAVE_GLFW)" "yes"
 211-MUVIEW_GLFW := $(OUT)/mupdf-gl
 212-MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o)
 213+MUVIEW_GLFW := $(OUT)/platform/gl/mupdf-gl
 214+MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.lo gl-input.lo gl-main.lo)
 215 $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
 216 $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB)
 217 $(LINK_CMD) $(GLFW_LIBS)
 218@@ -312,16 +300,25 @@ endif
207  219
208 ifeq "$(HAVE_WIN32)" "yes" 220 ifeq "$(HAVE_WIN32)" "yes"
209 MUVIEW_WIN32 := $(OUT)/mupdf 221 MUVIEW_WIN32 := $(OUT)/mupdf
210-MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o) 222-MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
211+MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo) 223+MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo)
212 $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR) 224 $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
213 $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB) 225 $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
214 $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) 
215 $(LINK_CMD) $(WIN32_LIBS) 226 $(LINK_CMD) $(WIN32_LIBS)
216 endif 227 endif
217  228
218-MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW) 229-MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW)
219+MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) 230+MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32)
220 MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL) 231 MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL)
221  232
222-INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL) 233-INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MURASTER) $(MUJSTEST) $(MUVIEW_CURL)
223+INSTALL_APPS := $(MUTOOL) $(MUJSTEST) 234+INSTALL_APPS := $(MUTOOL) $(MURASTER) $(MUJSTEST)
224+ifeq "$(HAVE_CURL)" "yes" 235+ifeq "$(HAVE_CURL)" "yes"
225+INSTALL_APPS += $(MUVIEW_CURL) 236+INSTALL_APPS += $(MUVIEW_CURL)
226+else ifeq "$(HAVE_X11)" "yes" 237+else ifeq "$(HAVE_X11)" "yes"
227+INSTALL_APPS += $(MUVIEW) 238+INSTALL_APPS += $(MUVIEW)
228+endif 239+endif
229+ 240+
230+ifeq "$(HAVE_GLFW)" "yes" 241+ifeq "$(HAVE_GLFW)" "yes"
231+INSTALL_APPS += $(MUVIEW_GLFW) 242+INSTALL_APPS += $(MUVIEW_GLFW)
232+endif 243+endif
233  244
234 # --- Examples --- 245 # --- Examples ---
235  246
236@@ -349,24 +348,26 @@ libs: $(INSTALL_LIBS) 247@@ -364,24 +361,26 @@ libs: $(INSTALL_LIBS)
237 apps: $(INSTALL_APPS) 248 apps: $(INSTALL_APPS)
238  249
239 install: libs apps 250 install: libs apps
240- install -d $(DESTDIR)$(incdir)/mupdf 251- install -d $(DESTDIR)$(incdir)/mupdf
241- install -d $(DESTDIR)$(incdir)/mupdf/fitz 252- install -d $(DESTDIR)$(incdir)/mupdf/fitz
242- install -d $(DESTDIR)$(incdir)/mupdf/pdf 253- install -d $(DESTDIR)$(incdir)/mupdf/pdf
243- install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf 254- install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
244- install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz 255- install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
245- install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf 256- install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
246- 257-
247- install -d $(DESTDIR)$(libdir) 258- install -d $(DESTDIR)$(libdir)
248- install $(INSTALL_LIBS) $(DESTDIR)$(libdir) 259- install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
249- 260-
cvs diff -r1.3 -r1.4 pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c (expand / switch to unified diff)

--- pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c 2016/07/15 12:32:33 1.3
+++ pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c 2016/11/28 14:40:42 1.4
@@ -1,28 +1,16 @@ @@ -1,28 +1,16 @@
1$NetBSD: patch-source_fitz_load-jpx.c,v 1.3 2016/07/15 12:32:33 leot Exp $ 1$NetBSD: patch-source_fitz_load-jpx.c,v 1.4 2016/11/28 14:40:42 leot Exp $
2 2
3 o Restrict OPJ_STATIC to Windows (avoid linking errors due to hidden symbols) 3Restrict OPJ_STATIC to Windows (avoid linking errors due to hidden symbols)
4 o Fix build with openjpeg-2.1. 
5 I have misgivings about the code though. 
6 4
7--- source/fitz/load-jpx.c.orig 2016-04-21 11:14:32.000000000 +0000 5--- source/fitz/load-jpx.c.orig 2016-11-08 19:06:14.000000000 +0000
8+++ source/fitz/load-jpx.c 6+++ source/fitz/load-jpx.c
9@@ -3,7 +3,9 @@ 7@@ -484,7 +484,9 @@ fz_load_jpx_info(fz_context *ctx, unsign
10 /* Without the definition of OPJ_STATIC, compilation fails on windows 8 /* Without the definition of OPJ_STATIC, compilation fails on windows
11 * due to the use of __stdcall. We believe it is required on some 9 * due to the use of __stdcall. We believe it is required on some
12 * linux toolchains too. */ 10 * linux toolchains too. */
13+#ifdef _WIN32 11+#ifdef _WIN32
14 #define OPJ_STATIC 12 #define OPJ_STATIC
15+#endif 13+#endif
16 #ifndef _MSC_VER 14 #ifndef _MSC_VER
17 #define OPJ_HAVE_STDINT_H 15 #define OPJ_HAVE_STDINT_H
18 #endif 16 #endif
19@@ -117,7 +119,8 @@ fz_load_jpx(fz_context *ctx, unsigned ch 
20 opj_stream_set_read_function(stream, fz_opj_stream_read); 
21 opj_stream_set_skip_function(stream, fz_opj_stream_skip); 
22 opj_stream_set_seek_function(stream, fz_opj_stream_seek); 
23- opj_stream_set_user_data(stream, &sb); 
24+ /* XXX: sb is on the stack, so no user data free-er needed; I'm not sure that placing it on the stack will work though? */ 
25+ opj_stream_set_user_data(stream, &sb, NULL); 
26 /* Set the length to avoid an assert */ 
27 opj_stream_set_user_data_length(stream, size); 
28  
File Deleted: pkgsrc/print/mupdf/patches/Attic/patch-source_pdf_pdf-shade.c
File Deleted: pkgsrc/print/mupdf/patches/Attic/patch-source_pdf_pdf-xref.c