pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/mupdf Update print/mupdf to mupdf-1.10
details: https://anonhg.NetBSD.org/pkgsrc/rev/e1ff41091e8f
branches: trunk
changeset: 355335:e1ff41091e8f
user: leot <leot%pkgsrc.org@localhost>
date: Mon Nov 28 14:40:42 2016 +0000
description:
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.
diffstat:
print/mupdf/DESCR | 25 ++--
print/mupdf/Makefile | 7 +-
print/mupdf/PLIST | 13 +-
print/mupdf/buildlink3.mk | 6 +-
print/mupdf/distinfo | 18 +-
print/mupdf/files/mupdf.pc | 2 +-
print/mupdf/patches/patch-ab | 37 +++--
print/mupdf/patches/patch-ac | 129 ++++++++++++----------
print/mupdf/patches/patch-source_fitz_load-jpx.c | 22 +---
print/mupdf/patches/patch-source_pdf_pdf-shade.c | 15 --
print/mupdf/patches/patch-source_pdf_pdf-xref.c | 23 ----
11 files changed, 133 insertions(+), 164 deletions(-)
diffs (truncated from 599 to 300 lines):
diff -r a29505cc34cc -r e1ff41091e8f print/mupdf/DESCR
--- a/print/mupdf/DESCR Mon Nov 28 13:57:26 2016 +0000
+++ b/print/mupdf/DESCR Mon Nov 28 14:40:42 2016 +0000
@@ -1,17 +1,18 @@
-MuPDF is a lightweight PDF viewer and toolkit written in portable C.
+MuPDF is a lightweight PDF, XPS, and E-book viewer.
The renderer in MuPDF is tailored for high quality anti-aliased
-graphics. MuPDF renders text with metrics and spacing accurate to
+graphics. It renders text with metrics and spacing accurate to
within fractions of a pixel for the highest fidelity in reproducing
-the look of a printed page on screen.
+the look of a printed page on screen. MuPDF is also small, fast,
+and yet complete.
-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 supports PDF 1.7 with transparency, encryption, hyperlinks,
+annotations, searching and more. MuPDF also reads many other document
+and e-book formats, such as XPS, OpenXPS, CBZ, EPUB and FictionBook
+2.
-MuPDF 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.
+MuPDF is written modularly, so features can be added and removed
+by integrators if they so desire.
+
+Since the 1.2 release of MuPDF, we have optional support for
+interactive features such as form filling, javascript and transitions.
diff -r a29505cc34cc -r e1ff41091e8f print/mupdf/Makefile
--- a/print/mupdf/Makefile Mon Nov 28 13:57:26 2016 +0000
+++ b/print/mupdf/Makefile Mon Nov 28 14:40:42 2016 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.40 2016/10/07 18:25:33 adam Exp $
+# $NetBSD: Makefile,v 1.41 2016/11/28 14:40:42 leot Exp $
-DISTNAME= mupdf-1.9a-source
+DISTNAME= mupdf-1.10-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 4
CATEGORIES= print
MASTER_SITES= http://mupdf.com/downloads/archive/
MAINTAINER= leot%NetBSD.org@localhost
HOMEPAGE= http://mupdf.com/
-COMMENT= Lightweight PDF viewer and toolkit
+COMMENT= Lightweight PDF, XPS and E-book viewer and toolkit
LICENSE= gnu-agpl-v3
USE_LANGUAGES= c99
diff -r a29505cc34cc -r e1ff41091e8f print/mupdf/PLIST
--- a/print/mupdf/PLIST Mon Nov 28 13:57:26 2016 +0000
+++ b/print/mupdf/PLIST Mon Nov 28 14:40:42 2016 +0000
@@ -1,15 +1,18 @@
-@comment $NetBSD: PLIST,v 1.12 2016/04/27 12:34:58 leot Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/11/28 14:40:42 leot Exp $
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
@@ -45,12 +48,13 @@
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/unzip.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
@@ -65,7 +69,6 @@
include/mupdf/pdf/event.h
include/mupdf/pdf/field.h
include/mupdf/pdf/font.h
-include/mupdf/pdf/graft.h
include/mupdf/pdf/interpret.h
include/mupdf/pdf/javascript.h
include/mupdf/pdf/name-table.h
@@ -76,9 +79,10 @@
include/mupdf/pdf/resource.h
include/mupdf/pdf/widget.h
include/mupdf/pdf/xref.h
-include/mupdf/xps.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
@@ -90,3 +94,4 @@
share/doc/mupdf/progressive.txt
share/doc/mupdf/refcount.txt
share/doc/mupdf/thirdparty.txt
+share/doc/mupdf/types.txt
diff -r a29505cc34cc -r e1ff41091e8f print/mupdf/buildlink3.mk
--- a/print/mupdf/buildlink3.mk Mon Nov 28 13:57:26 2016 +0000
+++ b/print/mupdf/buildlink3.mk Mon Nov 28 14:40:42 2016 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.12 2016/10/07 18:25:33 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2016/11/28 14:40:42 leot Exp $
BUILDLINK_TREE+= mupdf
.if !defined(MUPDF_BUILDLINK3_MK)
MUPDF_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.9a
-BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.9anb4
+BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.10
+BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.10
BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
pkgbase := mupdf
diff -r a29505cc34cc -r e1ff41091e8f print/mupdf/distinfo
--- a/print/mupdf/distinfo Mon Nov 28 13:57:26 2016 +0000
+++ b/print/mupdf/distinfo Mon Nov 28 14:40:42 2016 +0000
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.27 2016/08/03 08:50:17 leot Exp $
+$NetBSD: distinfo,v 1.28 2016/11/28 14:40:42 leot Exp $
-SHA1 (mupdf-1.9a-source.tar.gz) = f2b3c21e5060d6ec56ea0d0c32b0feac7eac0e5f
-RMD160 (mupdf-1.9a-source.tar.gz) = 0cb0d098c603b16be217e42299052a928d95c3fc
-SHA512 (mupdf-1.9a-source.tar.gz) = 9f804fd65c2dc6b7a3bd73961b1f1a8bf93d52903cccf6302acd6982dfa433125a3b8e77b808984921aee097877280fa21aafb87468cd0a8e4cfa900284a262b
-Size (mupdf-1.9a-source.tar.gz) = 20493793 bytes
+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) = c1ee4dd0b79aa0d905c0a0b634fbd016c063cd64
-SHA1 (patch-ac) = 51b62ef8ff3e6c44ad954b2405bd982f9d682d37
+SHA1 (patch-ab) = 7bee583086078359ce04eacd9db3b4f03737a7bb
+SHA1 (patch-ac) = d75afe8b05b85d042dc1baeaf8a9988f2e60338a
SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-source_fitz_load-jpx.c) = cb33828a6ca638c1b61ff017708a41cc586d1b0e
-SHA1 (patch-source_pdf_pdf-shade.c) = 9baba48f468e0827b77c25c05b226c763cf4975f
-SHA1 (patch-source_pdf_pdf-xref.c) = 406c7a664b7171eb5ca7c5a09aac6be549a8fbb5
+SHA1 (patch-source_fitz_load-jpx.c) = fbe6814536d37835a4daa5bb90b1f6cf8698f807
SHA1 (patch-thirdparty_mujs_Makefile) = f1da7cdf2c9e2e4bbac3e80ef486204a39b27e34
diff -r a29505cc34cc -r e1ff41091e8f print/mupdf/files/mupdf.pc
--- a/print/mupdf/files/mupdf.pc Mon Nov 28 13:57:26 2016 +0000
+++ b/print/mupdf/files/mupdf.pc Mon Nov 28 14:40:42 2016 +0000
@@ -5,6 +5,6 @@
Name: mupdf
Description: library for PDF files
-Version: 1.9a
+Version: 1.10
Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
Cflags: -I${includedir}
diff -r a29505cc34cc -r e1ff41091e8f print/mupdf/patches/patch-ab
--- a/print/mupdf/patches/patch-ab Mon Nov 28 13:57:26 2016 +0000
+++ b/print/mupdf/patches/patch-ab Mon Nov 28 14:40:42 2016 +0000
@@ -1,32 +1,37 @@
-$NetBSD: patch-ab,v 1.12 2016/04/27 12:34:58 leot Exp $
+$NetBSD: patch-ab,v 1.13 2016/11/28 14:40:42 leot Exp $
o Handle the various operating systems in the same way avoiding hardcoding
o Properly recognize glfw support
---- Makerules.orig 2016-04-06 12:06:53.000000000 +0000
+--- Makerules.orig 2016-11-21 10:21:11.000000000 +0000
+++ Makerules
-@@ -43,46 +43,6 @@ ifeq "$(largefile)" "yes"
+@@ -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 ?= yes
+-HAVE_X11 ?= no
-HAVE_PTHREADS ?= yes
-
--# Mac OS X deprecated openssl, so the default is to not include it.
--HAVE_OPENSSL ?= no
--SYS_OPENSSL_CFLAGS =
--SYS_OPENSSL_LIBS =
--ifeq "$(HAVE_OPENSSL)" "yes"
--SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL
--SYS_OPENSSL_LIBS = -lcrypto
+-# 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
@@ -49,12 +54,12 @@
-# Linux uses pkg-config for system libraries.
-else ifeq "$(OS)" "Linux"
-
- HAVE_X11 ?= yes
HAVE_PTHREADS ?= yes
-@@ -101,6 +61,17 @@ SYS_CURL_DEPS = -lpthread -lrt
- SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
+ 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)
@@ -67,10 +72,10 @@
+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)
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
-@@ -111,8 +82,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec
+@@ -150,8 +116,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec
SYS_JPEG_LIBS = -ljpeg
SYS_ZLIB_LIBS = -lz
diff -r a29505cc34cc -r e1ff41091e8f print/mupdf/patches/patch-ac
--- a/print/mupdf/patches/patch-ac Mon Nov 28 13:57:26 2016 +0000
+++ b/print/mupdf/patches/patch-ac Mon Nov 28 14:40:42 2016 +0000
@@ -1,14 +1,15 @@
-$NetBSD: patch-ac,v 1.14 2016/04/27 12:34:58 leot Exp $
+$NetBSD: patch-ac,v 1.15 2016/11/28 14:40:42 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-04-21 11:14:32.000000000 +0000
+--- Makefile.orig 2016-11-21 10:21:11.000000000 +0000
+++ Makefile
-@@ -38,22 +38,12 @@ CFLAGS += $(ZLIB_CFLAGS)
+@@ -42,26 +42,12 @@ CFLAGS += $(ZLIB_CFLAGS)
# --- Commands ---
@@ -20,6 +21,8 @@
-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 $<
@@ -28,6 +31,8 @@
-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 $^
@@ -37,42 +42,37 @@
# --- File lists ---
-@@ -89,17 +79,17 @@ XPS_SRC_HDR := $(wildcard source/xps/*.h
Home |
Main Index |
Thread Index |
Old Index