pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/mupdf mupdf: Update to 1.16.0

details:   https://anonhg.NetBSD.org/pkgsrc/rev/89335d84922f
branches:  trunk
changeset: 399140:89335d84922f
user:      leot <leot%pkgsrc.org@localhost>
date:      Sat Aug 03 14:47:41 2019 +0000

description:
mupdf: Update to 1.16.0

pkgsrc changes:
 - (re)add curl option to build mupdf with curl support (disabled by default).
   Unlike previous versions that supported curl now mupdf with curl support is
   installed as a separate binary as `mupdf-curl' as done by upstream.

Changes:
1.16.0
------
api: Major overhaul of color management architecture.
api: Improved functions to verify/sign PDF documents.
api: Number tree accessor function pdf_lookup_number.
api: Parse and handle more options for PWG output.
api: Removed obsolete gproof document type.
api: User callbacks for warning and error messages.

epub: Changed default page size to A5.
epub: Draw embedded SVG documents in EPUB/XHTML.
epub: New Noto fonts covering more unicode scripts.
epub: Support small-caps font-variant.
pdf: Add Redact annotation type and function to apply redactions.
pdf: Add/remove/change encryption and password when saving PDF files.
pdf: Improvements to text handling in PDF filter processor.
pdf: MP and DP operators now call begin/end_layer device methods.
pdf: New and improved progressive loading.
svg: Draw external images in SVG documents.

mutool show: Add 'form' selector to list PDF form fields.
mutool sign: Sign PDF documents from the command line.
mutool sign: Verify signatures in PDF documents from the command line.
viewer: Option to save a script of user actions for replay with mutool run.
viewer: Runtime toggle for ICC and spot rendering.
viewer: Tooltip when hovering over a link in mupdf-gl.

diffstat:

 print/mupdf/Makefile                                |   7 +-
 print/mupdf/PLIST                                   |   8 +-
 print/mupdf/buildlink3.mk                           |   6 +-
 print/mupdf/distinfo                                |  17 ++--
 print/mupdf/options.mk                              |  14 +++-
 print/mupdf/patches/patch-Makethird                 |  18 ++++-
 print/mupdf/patches/patch-ab                        |  40 +++++++----
 print/mupdf/patches/patch-ac                        |  72 +++++++++++++++-----
 print/mupdf/patches/patch-source_fitz_list-device.c |  48 --------------
 9 files changed, 125 insertions(+), 105 deletions(-)

diffs (truncated from 476 to 300 lines):

diff -r e2b01fb9a806 -r 89335d84922f print/mupdf/Makefile
--- a/print/mupdf/Makefile      Sat Aug 03 12:51:22 2019 +0000
+++ b/print/mupdf/Makefile      Sat Aug 03 14:47:41 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2019/07/06 11:27:48 leot Exp $
+# $NetBSD: Makefile,v 1.70 2019/08/03 14:47:41 leot Exp $
 
-DISTNAME=      mupdf-1.15.0-source
+DISTNAME=      mupdf-1.16.0-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES=  https://mupdf.com/downloads/archive/
 
@@ -25,7 +24,6 @@
 MAKE_ENV+=             HAVE_LIBCRYPTO=no       # Needs openssl-1.1.0
 MAKE_ENV+=             USE_SYSTEM_LIBS=yes
 
-CFLAGS+=       -DJBIG_NO_MEMENTO
 CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
 
 .include "options.mk"
@@ -35,6 +33,7 @@
 # default Javascript interpreter for mupdf).
 post-extract:
        ${RM} -fr \
+           ${WRKSRC}/thirdparty/curl \
            ${WRKSRC}/thirdparty/freeglut \
            ${WRKSRC}/thirdparty/freetype \
            ${WRKSRC}/thirdparty/harfbuzz \
diff -r e2b01fb9a806 -r 89335d84922f print/mupdf/PLIST
--- a/print/mupdf/PLIST Sat Aug 03 12:51:22 2019 +0000
+++ b/print/mupdf/PLIST Sat Aug 03 14:47:41 2019 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.18 2019/05/12 12:27:02 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/08/03 14:47:41 leot Exp $
 bin/mupdf
+${PLIST.curl}bin/mupdf-curl
 ${PLIST.opengl}bin/mupdf-gl
 bin/muraster
 bin/mutool
@@ -9,8 +10,7 @@
 include/mupdf/fitz/bidi.h
 include/mupdf/fitz/bitmap.h
 include/mupdf/fitz/buffer.h
-include/mupdf/fitz/color-management.h
-include/mupdf/fitz/colorspace.h
+include/mupdf/fitz/color.h
 include/mupdf/fitz/compress.h
 include/mupdf/fitz/compressed-buffer.h
 include/mupdf/fitz/config.h
@@ -81,10 +81,10 @@
 share/doc/mupdf/COPYING
 share/doc/mupdf/README
 share/doc/mupdf/android-sdk.html
-share/doc/mupdf/api-changes.html
 share/doc/mupdf/artifex-logo.png
 share/doc/mupdf/building.html
 share/doc/mupdf/coding-overview.html
+share/doc/mupdf/coding-progressive.html
 share/doc/mupdf/coding-style.html
 share/doc/mupdf/examples/bbox-device.js
 share/doc/mupdf/examples/create-thumbnail.js
diff -r e2b01fb9a806 -r 89335d84922f print/mupdf/buildlink3.mk
--- a/print/mupdf/buildlink3.mk Sat Aug 03 12:51:22 2019 +0000
+++ b/print/mupdf/buildlink3.mk Sat Aug 03 14:47:41 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2019/05/13 11:03:58 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2019/08/03 14:47:41 leot Exp $
 
 BUILDLINK_TREE+=       mupdf
 
@@ -12,6 +12,10 @@
 pkgbase := mupdf
 .include "../../mk/pkg-build-options.mk"
 
+.if !empty(PKG_BUILD_OPTIONS.mupdf:Mcurl)
+.include "../../www/curl/buildlink3.mk"
+.endif
+
 .if !empty(PKG_BUILD_OPTIONS.mupdf:Mopengl)
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
diff -r e2b01fb9a806 -r 89335d84922f print/mupdf/distinfo
--- a/print/mupdf/distinfo      Sat Aug 03 12:51:22 2019 +0000
+++ b/print/mupdf/distinfo      Sat Aug 03 14:47:41 2019 +0000
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.46 2019/07/06 11:27:48 leot Exp $
+$NetBSD: distinfo,v 1.47 2019/08/03 14:47:41 leot Exp $
 
-SHA1 (mupdf-1.15.0-source.tar.gz) = 4354a1c7245d4351ba604a4deed4a4ecf3e27492
-RMD160 (mupdf-1.15.0-source.tar.gz) = 892247f12a9e85d384c6cbc6c5a394d36e783158
-SHA512 (mupdf-1.15.0-source.tar.gz) = d44091e67c4772cad7bb90d66f6da6e05fed376ff5965636ff56eac4ca2faf262f75e80b34514ce52e6141af585cbb0095d5113d20f5b379e548c31fb664c287
-Size (mupdf-1.15.0-source.tar.gz) = 53023898 bytes
-SHA1 (patch-Makethird) = 3d339e860c45bedc074106fa510f64eb3118cd1a
-SHA1 (patch-ab) = 4824dcf66e7692212cb327515d48e281029564f7
-SHA1 (patch-ac) = 94294d03a0ad31e2e4063fca05e02bc6e2713bec
+SHA1 (mupdf-1.16.0-source.tar.gz) = 18f069b7cc125e53f541163ac305c588c94dea97
+RMD160 (mupdf-1.16.0-source.tar.gz) = b3d96cc1cc381c9e95f516680a9c64b17e388bc5
+SHA512 (mupdf-1.16.0-source.tar.gz) = d3eaa9cb4b13af6c35826a878eb8a80707e1ba402665d7f38a93343c09e36aef6a38b67eee70a0cdd74e037282defa12b377f49cb5837de7cf0aff8a5ebcf4ac
+Size (mupdf-1.16.0-source.tar.gz) = 60805124 bytes
+SHA1 (patch-Makethird) = 027f69be8ab3bb29535d3315d85c2d5d32a4dccf
+SHA1 (patch-ab) = 18bc9e283624ec810662d29309db9a8dd9268bb8
+SHA1 (patch-ac) = 97442b78e52e57b783d93771c6002702dda38e8f
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = f8682b54821a560b2ba1082bcf215eeefb549644
 SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
-SHA1 (patch-source_fitz_list-device.c) = ea8ca9df49c16a91546ab05e8f3e57b1308c2278
 SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
 SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb
diff -r e2b01fb9a806 -r 89335d84922f print/mupdf/options.mk
--- a/print/mupdf/options.mk    Sat Aug 03 12:51:22 2019 +0000
+++ b/print/mupdf/options.mk    Sat Aug 03 14:47:41 2019 +0000
@@ -1,11 +1,19 @@
-# $NetBSD: options.mk,v 1.7 2019/05/12 12:27:02 ryoon Exp $
+# $NetBSD: options.mk,v 1.8 2019/08/03 14:47:41 leot Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mupdf
-PKG_SUPPORTED_OPTIONS= opengl
+PKG_SUPPORTED_OPTIONS= curl opengl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           opengl
+PLIST_VARS+=           curl opengl
+
+#
+# curl support
+#
+.if !empty(PKG_OPTIONS:Mcurl)
+PLIST.curl=    yes
+.include "../../www/curl/buildlink3.mk"
+.endif
 
 #
 # glut support
diff -r e2b01fb9a806 -r 89335d84922f print/mupdf/patches/patch-Makethird
--- a/print/mupdf/patches/patch-Makethird       Sat Aug 03 12:51:22 2019 +0000
+++ b/print/mupdf/patches/patch-Makethird       Sat Aug 03 14:47:41 2019 +0000
@@ -1,10 +1,20 @@
-$NetBSD: patch-Makethird,v 1.10 2019/05/13 11:03:58 leot Exp $
+$NetBSD: patch-Makethird,v 1.11 2019/08/03 14:47:41 leot Exp $
 
-mujs building support with libtool
+- Do not pass thirdparty lcms2 CFLAGS (mupdf is always built without lcms2)
+- mujs building support with libtool
 
---- Makethird.orig     2018-09-25 12:39:17.000000000 +0000
+--- Makethird.orig     2019-07-23 12:23:08.000000000 +0000
 +++ Makethird
-@@ -229,7 +229,7 @@ else
+@@ -216,8 +216,6 @@ else
+ 
+ THIRD_SRC += $(sort $(wildcard thirdparty/lcms2/src/cms*.c))
+ 
+-THIRD_CFLAGS += -Ithirdparty/lcms2/include -DHAVE_LCMS2MT
+-
+ $(OUT)/thirdparty/lcms2/%.o: thirdparty/lcms2/%.c
+       $(CC_CMD) -Ithirdparty/lcms2/include
+ 
+@@ -233,7 +231,7 @@ else
  THIRD_SRC += thirdparty/mujs/one.c
  THIRD_CFLAGS += -Ithirdparty/mujs
  
diff -r e2b01fb9a806 -r 89335d84922f print/mupdf/patches/patch-ab
--- a/print/mupdf/patches/patch-ab      Sat Aug 03 12:51:22 2019 +0000
+++ b/print/mupdf/patches/patch-ab      Sat Aug 03 14:47:41 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.20 2019/05/13 11:03:58 leot Exp $
+$NetBSD: patch-ab,v 1.21 2019/08/03 14:47:41 leot Exp $
 
 - Handle the various operating systems in the same way avoiding hardcoding
 - Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
@@ -14,7 +14,7 @@
   If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
   CFLAGS.
 
---- Makerules.orig     2019-05-06 11:53:09.000000000 +0000
+--- Makerules.orig     2019-07-23 12:23:08.000000000 +0000
 +++ Makerules
 @@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW)
  OS := $(OS:Windows_NT=MINGW)
@@ -34,7 +34,7 @@
  SANITIZE_FLAGS += -fsanitize=address
  SANITIZE_FLAGS += -fsanitize=leak
  
-@@ -72,52 +61,40 @@ SYS_MUJS_LIBS := -lmujs
+@@ -72,77 +61,63 @@ SYS_MUJS_LIBS := -lmujs
  SYS_OPENJPEG_LIBS := -lopenjp2
  SYS_ZLIB_LIBS := -lz
  
@@ -50,11 +50,11 @@
 -  AR = xcrun ar
 -  LD = xcrun ld
 -  RANLIB = xcrun ranlib
--
++HAVE_OBJCOPY := no
+ 
 -else ifeq ($(OS),Linux)
 -  HAVE_OBJCOPY := yes
-+HAVE_OBJCOPY := no
- 
+-
 -  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
 +ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
        SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
@@ -94,22 +94,34 @@
 -  endif
 +endif
  
+-  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
+-  ifeq ($(HAVE_SYS_CURL),yes)
++HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++ifeq ($(HAVE_SYS_CURL),yes)
+       SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+       SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
+-  endif
++endif
+ 
 -  HAVE_GLUT := yes
 -  ifeq ($(HAVE_GLUT),yes)
 -      SYS_GLUT_CFLAGS :=
 -      SYS_GLUT_LIBS := -lglut -lGL
 -  endif
-+ifeq ($(shell pkg-config --exists glut && echo yes),yes)
-+  HAVE_GLUT ?= yes
-+  SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
-+  SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
++HAVE_GLUT ?= $(shell pkg-config --exists glut && echo yes)
++ifeq ($(HAVE_GLUT),yes)
++      SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
++      SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
 +endif
  
-   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-   ifeq ($(HAVE_X11),yes)
-@@ -125,18 +102,16 @@ else ifeq ($(OS),Linux)
+-  HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
+-  ifeq ($(HAVE_X11),yes)
++HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
++ifeq ($(HAVE_X11),yes)
+       X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
        X11_LIBS := $(shell pkg-config --libs x11 xext)
-   endif
+-  endif
++endif
  
 -  HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
 -  ifeq ($(HAVE_LIBCRYPTO),yes)
diff -r e2b01fb9a806 -r 89335d84922f print/mupdf/patches/patch-ac
--- a/print/mupdf/patches/patch-ac      Sat Aug 03 12:51:22 2019 +0000
+++ b/print/mupdf/patches/patch-ac      Sat Aug 03 14:47:41 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.23 2019/05/17 05:45:10 wiz Exp $
+$NetBSD: patch-ac,v 1.24 2019/08/03 14:47:41 leot Exp $
 
 - libtool support 
 - Install target cleanup
@@ -6,10 +6,11 @@
 - Do not force `-O0' flag when building
 - Get rid of unused VERSION variable and `version:' target (otherwise `git' can
   be invoked during the building phase)
+- Install mupdf with curl support as `mupdf-curl'
 
---- Makefile.orig      2019-05-06 11:53:09.000000000 +0000
+--- Makefile.orig      2019-07-26 14:10:07.000000000 +0000
 +++ Makefile
-@@ -51,65 +51,65 @@ ifneq ($(verbose),yes)
+@@ -51,68 +51,68 @@ ifneq ($(verbose),yes)
  endif
  
  MKTGTDIR = mkdir -p $(dir $@)
@@ -51,14 +52,17 @@
        $(CC_CMD) -Wall $(THIRD_CFLAGS) $(THREADING_CFLAGS)
  
 -$(OUT)/generated/%.o : generated/%.c
--      $(CC_CMD) -O0
 +$(OUT)/generated/%.lo : generated/%.c
-+      $(CC_CMD)
+       $(CC_CMD) -O0
  
 -$(OUT)/platform/x11/%.o : platform/x11/%.c
 +$(OUT)/platform/x11/%.lo : platform/x11/%.c
        $(CC_CMD) -Wall $(X11_CFLAGS)
  
+-$(OUT)/platform/x11/curl/%.o : platform/x11/%.c
++$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c
+       $(CC_CMD) -Wall $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
+ 
 -$(OUT)/platform/gl/%.o : platform/gl/%.c
 +$(OUT)/platform/gl/%.lo : platform/gl/%.c
        $(CC_CMD) -Wall $(THIRD_CFLAGS) $(GLUT_CFLAGS)
@@ -94,9 +98,9 @@
  
  MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
  MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
-@@ -119,14 +119,14 @@ MUPDF_SRC += $(sort $(wildcard source/ht
+@@ -121,14 +121,14 @@ MUPDF_SRC += $(sort $(wildcard source/sv
+ MUPDF_SRC += $(sort $(wildcard source/html/*.c))
  MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
Home | Main Index | Thread Index | Old Index