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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/mupdf mupdf: Update to 1.19.0
From: leot <leot%pkgsrc.org@localhost>
Date: Sat, 23 Oct 2021 16:21:56 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/86d4c1afa8d6
branches:  trunk
changeset: 768461:86d4c1afa8d6
user:      leot <leot%pkgsrc.org@localhost>
date:      Sat Oct 23 15:22:07 2021 +0000

description:
mupdf: Update to 1.19.0

Changes:
1.19.0
------
 * Removed support for Luratech JBIG2 and JPEG2000 decoders.
 * Added 'extract' library for more output options:
     Added DOCX output format
     Added ODT output format
 * Notable new features:
     Journal for undo and redo
     Snapshot for auto-save and restore (for backgrounding mobile apps)
     Reflow document wrapper
     Rollover appearance for annotations and widgets
     Customize appearance of signed digital signatures
     Progress and cancel callbacks to OCR functions
     Create signature form fields
 * Minor new features:
     Support CJK fonts in pdfwrite output
     Support JBIG2 images in pdfwrite output
     Support opacity for all markup annotation types
     High-DPI aware UI in mupdf-gl
     mutool extract -a option to embed SMasks as alpha channel
 * API changes:
     Removed pdf_widget type alias (was always same as pdf_annot)
     Updated annotation 'dirty' logic
     Fix typo in function and type names: designated name -> distinguished name
     More functions available to 'mutool run'
     More functions available to Java library
 * New unicode scripts and fonts for EPUB:
     Dogra, Elymaic, Gondi, Hanifi Rohingya, Masaram Gondi,
     Medefaidrin, Nushu, Nyiakeng Puachue Hmong, Old Sogdian,
     Sogdian, Soyombo, Wancho, Yezidi, and Zanabazar Square.
 * C++ and Python bindings:
     C++ and Python bindings now work on Windows.
     Python bindings are available as pre-built binaries on pypi.org.
     Added demo PDF viewer using the Python MuPDF bindings and PyQt.
     Better access to data in generated wrapper classes.
     Improved handling of out-parameters in generated Python.
     Text representation of POD types via C++ operator<< and Python str().
     Fixed ref-counting bug in iterators.
     Updates for new MuPDF functions.

diffstat:

 print/mupdf/Makefile                               |    7 +-
 print/mupdf/PLIST                                  |    8 +-
 print/mupdf/buildlink3.mk                          |    4 +-
 print/mupdf/distinfo                               |   20 +-
 print/mupdf/patches/patch-Makelists                |   25 +++
 print/mupdf/patches/patch-Makethird                |   51 ++++--
 print/mupdf/patches/patch-ab                       |   68 ++++++---
 print/mupdf/patches/patch-ac                       |  154 ++++++++++++--------
 print/mupdf/patches/patch-source_fitz_color-lcms.c |   15 ++
 print/mupdf/patches/patch-source_pdf_pdf-parse.c   |   28 ---
 print/mupdf/patches/patch-source_pdf_pdf-xref.c    |   24 ---
 print/mupdf/patches/patch-thirdparty_mujs_Makefile |   20 +-
 12 files changed, 241 insertions(+), 183 deletions(-)

diffs (truncated from 827 to 300 lines):

diff -r f3c7afce5482 -r 86d4c1afa8d6 print/mupdf/Makefile
--- a/print/mupdf/Makefile      Sat Oct 23 12:05:48 2021 +0000
+++ b/print/mupdf/Makefile      Sat Oct 23 15:22:07 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2021/09/29 19:00:12 adam Exp $
+# $NetBSD: Makefile,v 1.89 2021/10/23 15:22:07 leot Exp $
 
-DISTNAME=      mupdf-1.18.0-source
+DISTNAME=      mupdf-1.19.0-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   3
 CATEGORIES=    print
 MASTER_SITES=  https://mupdf.com/downloads/archive/
 
@@ -39,9 +38,11 @@
            ${WRKSRC}/thirdparty/gumbo-parser \
            ${WRKSRC}/thirdparty/harfbuzz \
            ${WRKSRC}/thirdparty/jbig2dec \
+           ${WRKSRC}/thirdparty/leptonica \
            ${WRKSRC}/thirdparty/lcms2 \
            ${WRKSRC}/thirdparty/libjpeg \
            ${WRKSRC}/thirdparty/openjpeg \
+           ${WRKSRC}/thirdparty/tesseract \
            ${WRKSRC}/thirdparty/zlib
 
 post-build:
diff -r f3c7afce5482 -r 86d4c1afa8d6 print/mupdf/PLIST
--- a/print/mupdf/PLIST Sat Oct 23 12:05:48 2021 +0000
+++ b/print/mupdf/PLIST Sat Oct 23 15:22:07 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2020/10/08 22:50:16 leot Exp $
+@comment $NetBSD: PLIST,v 1.22 2021/10/23 15:22:07 leot Exp $
 bin/mupdf
 ${PLIST.curl}bin/mupdf-curl
 ${PLIST.opengl}bin/mupdf-gl
@@ -19,6 +19,7 @@
 include/mupdf/fitz/device.h
 include/mupdf/fitz/display-list.h
 include/mupdf/fitz/document.h
+include/mupdf/fitz/export.h
 include/mupdf/fitz/filter.h
 include/mupdf/fitz/font.h
 include/mupdf/fitz/geometry.h
@@ -65,7 +66,6 @@
 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
@@ -112,9 +112,13 @@
 share/doc/mupdf/manual-mutool-create.html
 share/doc/mupdf/manual-mutool-draw.html
 share/doc/mupdf/manual-mutool-extract.html
+share/doc/mupdf/manual-mutool-info.html
 share/doc/mupdf/manual-mutool-merge.html
+share/doc/mupdf/manual-mutool-pages.html
+share/doc/mupdf/manual-mutool-poster.html
 share/doc/mupdf/manual-mutool-run.html
 share/doc/mupdf/manual-mutool-show.html
+share/doc/mupdf/manual-mutool-sign.html
 share/doc/mupdf/manual-mutool-trace.html
 share/doc/mupdf/style.css
 share/doc/mupdf/template.html
diff -r f3c7afce5482 -r 86d4c1afa8d6 print/mupdf/buildlink3.mk
--- a/print/mupdf/buildlink3.mk Sat Oct 23 12:05:48 2021 +0000
+++ b/print/mupdf/buildlink3.mk Sat Oct 23 15:22:07 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.42 2021/09/29 19:00:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2021/10/23 15:22:07 leot Exp $
 
 BUILDLINK_TREE+=       mupdf
 
@@ -6,7 +6,7 @@
 MUPDF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.14.0
-BUILDLINK_ABI_DEPENDS.mupdf?=  mupdf>=1.18.0nb3
+BUILDLINK_ABI_DEPENDS.mupdf?=  mupdf>=1.19.0
 BUILDLINK_PKGSRCDIR.mupdf?=    ../../print/mupdf
 
 pkgbase := mupdf
diff -r f3c7afce5482 -r 86d4c1afa8d6 print/mupdf/distinfo
--- a/print/mupdf/distinfo      Sat Oct 23 12:05:48 2021 +0000
+++ b/print/mupdf/distinfo      Sat Oct 23 15:22:07 2021 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.54 2021/10/07 14:48:59 nia Exp $
+$NetBSD: distinfo,v 1.55 2021/10/23 15:22:07 leot Exp $
 
-RMD160 (mupdf-1.18.0-source.tar.gz) = 59fce4cd71417510ed997ce518e34f426e981951
-SHA512 (mupdf-1.18.0-source.tar.gz) = dd3d413badc5ea50ee100a39aa0265f2d096006e6466f3029ef5f4902e7a9f8e9f958b78ae484524233217ae6ef6ecf56431b8ac462d603a050c4e490503aef1
-Size (mupdf-1.18.0-source.tar.gz) = 72621417 bytes
-SHA1 (patch-Makethird) = 4d9eeba69db25be49d1652b826312a66eb8e2d5a
-SHA1 (patch-ab) = 7c4c8f809dcd79a75fbb6f2411596893cbd62b43
-SHA1 (patch-ac) = a65476612d200647342a870689205c241aeeb144
+RMD160 (mupdf-1.19.0-source.tar.gz) = 517eea21fd85bb0650dc1db10c881dee5f02794a
+SHA512 (mupdf-1.19.0-source.tar.gz) = c6bb0e4331212d5d01d2f5e04f7e981b195c144d282db99ddd3ae263ae2e5ff09a727b0b5a50942f1a21cacb46b23f76ff9fe00b67f5fab1eebe9d66158c5d09
+Size (mupdf-1.19.0-source.tar.gz) = 90778757 bytes
+SHA1 (patch-Makelists) = 474ad296aa550272b9d734e2b001af1371ae06ad
+SHA1 (patch-Makethird) = 415a3fe6e0e58a948565b9098c8325e85d19d561
+SHA1 (patch-ab) = 3323dd627001e76c47e6b231b2d93952e3c3acf3
+SHA1 (patch-ac) = 1bcbb499dd00cef04d3123daefe2d7b92b567054
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 48f48f13c9a6376231de25aa63411560ea9d91ca
 SHA1 (patch-platform_gl_gl-main.c) = c760d16f0ac4a9b09800869d22b7324724bc007b
+SHA1 (patch-source_fitz_color-lcms.c) = a43f5046063c68dea16824b9364c386505b6fadd
 SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb
-SHA1 (patch-source_pdf_pdf-parse.c) = 39441caeae75b61ff0b56aa839047dde34b05108
-SHA1 (patch-source_pdf_pdf-xref.c) = 7d7a9650f63061edbc7659ce65401569642bd6e6
-SHA1 (patch-thirdparty_mujs_Makefile) = 8ff3cc67a60b648841b074846bd6e7de943fd034
+SHA1 (patch-thirdparty_mujs_Makefile) = e959ad04995bf2268563d2c2939edd5dba12e4b2
diff -r f3c7afce5482 -r 86d4c1afa8d6 print/mupdf/patches/patch-Makelists
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/mupdf/patches/patch-Makelists       Sat Oct 23 15:22:07 2021 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-Makelists,v 1.1 2021/10/23 15:22:07 leot Exp $
+
+Avoid to unconditionally pass -DHAVE_* flags: this breaks lcms2 that
+gets recognized as lcms2mt.
+
+--- Makelists.orig     2021-10-05 10:44:43.000000000 +0000
++++ Makelists
+@@ -130,7 +130,7 @@ HARFBUZZ_SRC += thirdparty/harfbuzz/src/
+ 
+ JPEGXR_CFLAGS += -Ithirdparty/jpegxr
+ JPEGXR_CFLAGS += -Ithirdparty/jpegxr/Software
+-JPEGXR_CFLAGS += -DHAVE_JPEGXR
++#JPEGXR_CFLAGS += -DHAVE_JPEGXR
+ 
+ JPEGXR_BUILD_CFLAGS += -Wno-tautological-compare
+ 
+@@ -186,7 +186,7 @@ LIBJPEG_SRC += thirdparty/libjpeg/jutils
+ # --- LCMS2 (multi-threaded fork) ---
+ 
+ LCMS2_CFLAGS += -Ithirdparty/lcms2/include
+-LCMS2_CFLAGS += -DHAVE_LCMS2MT
++#LCMS2_CFLAGS += -DHAVE_LCMS2MT
+ 
+ LCMS2_SRC += thirdparty/lcms2/src/cmsalpha.c
+ LCMS2_SRC += thirdparty/lcms2/src/cmscam02.c
diff -r f3c7afce5482 -r 86d4c1afa8d6 print/mupdf/patches/patch-Makethird
--- a/print/mupdf/patches/patch-Makethird       Sat Oct 23 12:05:48 2021 +0000
+++ b/print/mupdf/patches/patch-Makethird       Sat Oct 23 15:22:07 2021 +0000
@@ -1,25 +1,38 @@
-$NetBSD: patch-Makethird,v 1.12 2020/10/08 22:50:16 leot Exp $
+$NetBSD: patch-Makethird,v 1.13 2021/10/23 15:22:07 leot Exp $
+
+- Avoid to need third party lcms2
+- Add mujs building support with libtool
 
-- Do not pass thirdparty lcms2 CFLAGS (mupdf is always built without lcms2)
-- mujs building support with libtool
-
---- Makethird.orig     2020-10-07 10:35:03.000000000 +0000
+--- Makethird.orig     2021-10-05 10:44:43.000000000 +0000
 +++ Makethird
-@@ -284,8 +284,6 @@ else
+@@ -120,12 +120,6 @@ endif
+ ifeq ($(USE_SYSTEM_LCMS2),yes)
+   THIRD_CFLAGS += $(SYS_LCMS2_CFLAGS)
+   THIRD_LIBS += $(SYS_LCMS2_LIBS)
+-else
+-  THIRD_CFLAGS += $(LCMS2_CFLAGS)
+-  THIRD_LIBS += $(LCMS2_LIBS)
+-  THIRD_SRC += $(LCMS2_SRC)
+-$(OUT)/thirdparty/lcms2/%.o: thirdparty/lcms2/%.c
+-      $(CC_CMD) $(LIB_CFLAGS) $(LCMS2_CFLAGS) $(LCMS2_BUILD_CFLAGS)
+ endif
  
- 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) $(LIB_CFLAGS) -Ithirdparty/lcms2/include
- 
-@@ -301,7 +299,7 @@ else
- THIRD_SRC += thirdparty/mujs/one.c
- THIRD_CFLAGS += -Ithirdparty/mujs
- 
+ # --- MuJS ---
+@@ -137,7 +131,7 @@ else
+   THIRD_CFLAGS += $(MUJS_CFLAGS)
+   THIRD_LIBS += $(MUJS_LIBS)
+   THIRD_SRC += $(MUJS_SRC)
 -$(OUT)/thirdparty/mujs/%.o: thirdparty/mujs/%.c
 +$(OUT)/thirdparty/mujs/%.lo: thirdparty/mujs/%.c
-       $(CC_CMD) $(LIB_CFLAGS)
+       $(CC_CMD) $(LIB_CFLAGS) $(MUJS_CFLAGS) $(MUJS_BUILD_CFLAGS)
+ endif
  
- endif
+@@ -241,7 +235,7 @@ endif
+ THIRD_CFLAGS += $(EXTRACT_CFLAGS)
+ THIRD_LIBS += $(EXTRACT_LIBS)
+ THIRD_SRC += $(EXTRACT_SRC)
+-$(OUT)/thirdparty/extract/%.o: thirdparty/extract/%.c
++$(OUT)/thirdparty/extract/%.lo: thirdparty/extract/%.c
+       $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) $(EXTRACT_CFLAGS) $(ZLIB_CFLAGS) $(EXTRACT_BUILD_CFLAGS)
+ 
+ # The first python3 command in the next two rules returns 0 (success) iff
diff -r f3c7afce5482 -r 86d4c1afa8d6 print/mupdf/patches/patch-ab
--- a/print/mupdf/patches/patch-ab      Sat Oct 23 12:05:48 2021 +0000
+++ b/print/mupdf/patches/patch-ab      Sat Oct 23 15:22:07 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.23 2020/10/08 22:50:16 leot Exp $
+$NetBSD: patch-ab,v 1.24 2021/10/23 15:22:07 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,11 +14,11 @@
   If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
   CFLAGS.
 
---- Makerules.orig     2020-10-07 10:35:03.000000000 +0000
+--- Makerules.orig     2021-10-05 10:44:43.000000000 +0000
 +++ Makerules
-@@ -6,19 +6,6 @@ OS := $(OS:MSYS%=MINGW)
- OS := $(OS:Windows_NT=MINGW)
- OS := $(OS:Darwin=MACOS)
+@@ -27,29 +27,6 @@ endif
+ 
+ # System specific features
  
 -ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
 -  # clang does not support these in combination with -fembed-bitcode
@@ -30,13 +30,23 @@
 -  SO := dylib
 -else
 -  LDREMOVEUNREACH := -Wl,--gc-sections
--  SO := so
+-  ifeq ($(OS),MINGW)
+-    SO := dll
+-  else
+-    SO := so
+-  endif
 -endif
 -
- CFLAGS += -Wsign-compare
+-ifeq "$(OS)" "ios"
+-  NEONFLAGS =
+-else
+-  NEONFLAGS = -mneon
+-endif
+-
+ SANITIZE_FLAGS += -fsanitize=address
+ SANITIZE_FLAGS += -fsanitize=leak
  
- SANITIZE_FLAGS += -fsanitize=address
-@@ -102,93 +89,79 @@ ifneq "$(CLUSTER)" ""
+@@ -132,103 +109,79 @@ ifneq "$(CLUSTER)" ""
    CFLAGS += -DCLUSTER
  endif
  
@@ -53,10 +63,20 @@
 -  LD = xcrun ld
 -  RANLIB = xcrun ranlib
 -
+-  ifeq (, $(shell which pkg-config))
+-    $(warning "No pkg-config found, install it for proper integration of libcrypto")
+-  else
+-    HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
+-    ifeq ($(HAVE_LIBCRYPTO),yes)
+-        LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+-        LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+-    endif
+-  endif
++HAVE_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)
@@ -102,19 +122,19 @@
 -  endif
 +endif
  
--  HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
--  ifeq ($(HAVE_LEPTONICA),yes)
-+HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
-+ifeq ($(HAVE_LEPTONICA),yes)
+-  HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
+-  ifeq ($(HAVE_SYS_LEPTONICA),yes)
++HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
++ifeq ($(HAVE_SYS_LEPTONICA),yes)
        SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
        SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
 -  endif
 +endif
  
--  HAVE_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes)
--  ifeq ($(HAVE_TESSERACT),yes)
-+HAVE_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes)
-+ifeq ($(HAVE_TESSERACT),yes)
+-  HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes)
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated audio/mpg123-pulse to 1.29.2
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated print/mupdf to 1.19.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated audio/mpg123-pulse to 1.29.2
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated print/mupdf to 1.19.0
Indexes:
Home | Main Index | Thread Index | Old Index