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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/mupdf Update print/mupdf to 1.11
From: leot <leot%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:59:46 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/105ef879218f
branches:  trunk
changeset: 360968:105ef879218f
user:      leot <leot%pkgsrc.org@localhost>
date:      Wed Apr 12 13:03:08 2017 +0000

description:
Update print/mupdf to 1.11

Changes:
List of changes in MuPDF 1.11
-----------------------------
* This is primarily a bug fix release.
* Split Android and iOS viewers into separate projects:
   - mupdf-viewer-ios.git has the iOS viewer.
   - mupdf-viewer-android-old.git has the Android viewer.
   - mupdf-viewer-android-nui.git has a new advanced Android viewer.
   - mupdf-viewer-android-mini.git has a new minimalist Android viewer.
* PDF portfolio support with command line tool "mutool portfolio".
* Add callbacks to load fallback fonts from the system.
* Use system fonts in Android to reduce install size.
* Flag to disable publisher styles in EPUB layout.
* Improved SVG output.

diffstat:

 print/mupdf/Makefile                               |    8 +-
 print/mupdf/PLIST                                  |    9 +-
 print/mupdf/buildlink3.mk                          |    9 +-
 print/mupdf/distinfo                               |   24 +-
 print/mupdf/files/mupdf.pc                         |    4 +-
 print/mupdf/options.mk                             |    6 +-
 print/mupdf/patches/patch-Makethird                |    8 +-
 print/mupdf/patches/patch-ab                       |   86 ++--
 print/mupdf/patches/patch-ac                       |  305 ++++++++++++--------
 print/mupdf/patches/patch-source_fitz_load-jpx.c   |   18 +-
 print/mupdf/patches/patch-source_fitz_pixmap.c     |   44 ---
 print/mupdf/patches/patch-source_tools_mudraw.c    |   17 -
 print/mupdf/patches/patch-thirdparty_mujs_Makefile |   22 +-
 print/mupdf/patches/patch-thirdparty_mujs_jsdate.c |   27 -
 print/mupdf/patches/patch-thirdparty_mujs_jsrun.c  |   21 -
 15 files changed, 280 insertions(+), 328 deletions(-)

diffs (truncated from 937 to 300 lines):

diff -r f4468c50029b -r 105ef879218f print/mupdf/Makefile
--- a/print/mupdf/Makefile      Wed Apr 12 12:57:18 2017 +0000
+++ b/print/mupdf/Makefile      Wed Apr 12 13:03:08 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2017/02/12 06:24:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2017/04/12 13:03:08 leot Exp $
 
-DISTNAME=      mupdf-1.10a-source
+DISTNAME=      mupdf-1.11-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   5
 CATEGORIES=    print
 MASTER_SITES=  http://mupdf.com/downloads/archive/
 
@@ -38,7 +37,7 @@
            ${WRKSRC}/thirdparty/glfw \
            ${WRKSRC}/thirdparty/harfbuzz \
            ${WRKSRC}/thirdparty/jbig2dec \
-           ${WRKSRC}/thirdparty/jpeg \
+           ${WRKSRC}/thirdparty/libjpeg \
            ${WRKSRC}/thirdparty/openjpeg \
            ${WRKSRC}/thirdparty/zlib
 
@@ -53,6 +52,7 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jbig2dec/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff -r f4468c50029b -r 105ef879218f print/mupdf/PLIST
--- a/print/mupdf/PLIST Wed Apr 12 12:57:18 2017 +0000
+++ b/print/mupdf/PLIST Wed Apr 12 13:03:08 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/11/28 14:40:42 leot Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/04/12 13:03:08 leot Exp $
 bin/mujstest
 bin/mupdf
 ${PLIST.glfw}bin/mupdf-gl
@@ -7,6 +7,7 @@
 include/mupdf/fitz.h
 include/mupdf/fitz/annotation.h
 include/mupdf/fitz/archive.h
+include/mupdf/fitz/band-writer.h
 include/mupdf/fitz/bidi.h
 include/mupdf/fitz/bitmap.h
 include/mupdf/fitz/buffer.h
@@ -21,13 +22,13 @@
 include/mupdf/fitz/filter.h
 include/mupdf/fitz/font.h
 include/mupdf/fitz/function.h
+include/mupdf/fitz/geometry.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
@@ -44,7 +45,7 @@
 include/mupdf/fitz/shade.h
 include/mupdf/fitz/store.h
 include/mupdf/fitz/stream.h
-include/mupdf/fitz/string.h
+include/mupdf/fitz/string-util.h
 include/mupdf/fitz/structured-text.h
 include/mupdf/fitz/system.h
 include/mupdf/fitz/text.h
@@ -82,7 +83,7 @@
 include/mupdf/svg.h
 lib/libmupdf.la
 lib/libmupdfthird.la
-lib/libmutools.la
+lib/libmuthreads.la
 lib/pkgconfig/mupdf.pc
 man/man1/mupdf.1
 man/man1/mutool.1
diff -r f4468c50029b -r 105ef879218f print/mupdf/buildlink3.mk
--- a/print/mupdf/buildlink3.mk Wed Apr 12 12:57:18 2017 +0000
+++ b/print/mupdf/buildlink3.mk Wed Apr 12 13:03:08 2017 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.17 2017/02/12 06:24:48 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2017/04/12 13:03:08 leot Exp $
 
 BUILDLINK_TREE+=       mupdf
 
 .if !defined(MUPDF_BUILDLINK3_MK)
 MUPDF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.10a
-BUILDLINK_ABI_DEPENDS.mupdf?=  mupdf>=1.10anb5
+BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.11
 BUILDLINK_PKGSRCDIR.mupdf?=    ../../print/mupdf
 
 pkgbase := mupdf
@@ -14,11 +13,10 @@
 
 .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/MesaLib/buildlink3.mk"
 .include "../../graphics/glfw/buildlink3.mk"
 .endif
 
@@ -29,6 +27,7 @@
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .endif # MUPDF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -mupdf
diff -r f4468c50029b -r 105ef879218f print/mupdf/distinfo
--- a/print/mupdf/distinfo      Wed Apr 12 12:57:18 2017 +0000
+++ b/print/mupdf/distinfo      Wed Apr 12 13:03:08 2017 +0000
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.31 2017/02/11 09:39:05 leot Exp $
+$NetBSD: distinfo,v 1.32 2017/04/12 13:03:08 leot Exp $
 
-SHA1 (mupdf-1.10a-source.tar.gz) = 1c3a6e1d4406912004b8e2c09435199e6b425191
-RMD160 (mupdf-1.10a-source.tar.gz) = bfb482681c6804db8a0fd9ec46b16ac6f9fffdf2
-SHA512 (mupdf-1.10a-source.tar.gz) = 8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec
-Size (mupdf-1.10a-source.tar.gz) = 42264707 bytes
-SHA1 (patch-Makethird) = 0a5951d543755c42053013f03b1c573b5da9c82c
-SHA1 (patch-ab) = 7bee583086078359ce04eacd9db3b4f03737a7bb
-SHA1 (patch-ac) = d75afe8b05b85d042dc1baeaf8a9988f2e60338a
+SHA1 (mupdf-1.11-source.tar.gz) = f782d36aaa896319207e81953e5a622201477b5b
+RMD160 (mupdf-1.11-source.tar.gz) = 573307473a1ac81aca4519b0e57a7111aae7803f
+SHA512 (mupdf-1.11-source.tar.gz) = 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
+Size (mupdf-1.11-source.tar.gz) = 40156070 bytes
+SHA1 (patch-Makethird) = a4d1bb3c8d509a84803c9b60521fd9b6b17b9717
+SHA1 (patch-ab) = d348b41bf3c35c78c22e9816d860f1894910b2c9
+SHA1 (patch-ac) = 9b0c368d05a436f94118efce517fea69c82898e7
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-source_fitz_load-jpx.c) = fbe6814536d37835a4daa5bb90b1f6cf8698f807
-SHA1 (patch-source_fitz_pixmap.c) = d0b3e44780fd64381424e367e5233ce1013dc974
-SHA1 (patch-source_tools_mudraw.c) = 99b827e39767559a8d5b6b380f0bbb100f5125e7
-SHA1 (patch-thirdparty_mujs_Makefile) = f1da7cdf2c9e2e4bbac3e80ef486204a39b27e34
-SHA1 (patch-thirdparty_mujs_jsdate.c) = 020fcb9d1e77bd7ba10943070673d53bbcee573b
-SHA1 (patch-thirdparty_mujs_jsrun.c) = 79f730436b1f67780468c10096d3dbfb5e14d5a5
+SHA1 (patch-source_fitz_load-jpx.c) = 773ec1ef6b1632a10ff7c8ff76081e89bdcad593
+SHA1 (patch-thirdparty_mujs_Makefile) = cd6a20d56020ae5028f95e24e75f5e4a62127f9f
diff -r f4468c50029b -r 105ef879218f print/mupdf/files/mupdf.pc
--- a/print/mupdf/files/mupdf.pc        Wed Apr 12 12:57:18 2017 +0000
+++ b/print/mupdf/files/mupdf.pc        Wed Apr 12 13:03:08 2017 +0000
@@ -5,6 +5,6 @@
 
 Name: mupdf
 Description: library for PDF files
-Version: 1.10a
-Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
+Version: 1.11
+Libs: -Wl,-R${libdir} -L${libdir} -lmupdf -lmupdfthird -lmuthreads
 Cflags: -I${includedir}
diff -r f4468c50029b -r 105ef879218f print/mupdf/options.mk
--- a/print/mupdf/options.mk    Wed Apr 12 12:57:18 2017 +0000
+++ b/print/mupdf/options.mk    Wed Apr 12 13:03:08 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2016/02/04 11:50:24 leot Exp $
+# $NetBSD: options.mk,v 1.5 2017/04/12 13:03:08 leot Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mupdf
 PKG_SUPPORTED_OPTIONS= curl glfw
@@ -12,7 +12,6 @@
 #
 .if !empty(PKG_OPTIONS:Mcurl)
 .include "../../www/curl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .endif
 
 #
@@ -20,6 +19,7 @@
 #
 .if !empty(PKG_OPTIONS:Mglfw)
 PLIST.glfw=    yes
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glfw+=   glfw>=3.2.1
 .include "../../graphics/glfw/buildlink3.mk"
 .endif
diff -r f4468c50029b -r 105ef879218f print/mupdf/patches/patch-Makethird
--- a/print/mupdf/patches/patch-Makethird       Wed Apr 12 12:57:18 2017 +0000
+++ b/print/mupdf/patches/patch-Makethird       Wed Apr 12 13:03:08 2017 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makethird,v 1.6 2016/04/27 12:34:58 leot Exp $
+$NetBSD: patch-Makethird,v 1.7 2017/04/12 13:03:08 leot Exp $
 
 o mujs building support with libtool
 
---- Makethird.orig     2016-04-06 12:06:53.000000000 +0000
+--- Makethird.orig     2017-03-31 14:23:45.000000000 +0000
 +++ Makethird
-@@ -24,13 +24,13 @@ ifneq "$(wildcard $(MUJS_DIR)/README)" "
- MUJS_OUT := $(OUT)/mujs
+@@ -26,13 +26,13 @@ ifneq "$(wildcard $(MUJS_DIR)/README)" "
+ MUJS_OUT := $(OUT)/thirdparty/mujs
  MUJS_SRC := one.c
  
 -MUJS_OBJ := $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o))
diff -r f4468c50029b -r 105ef879218f print/mupdf/patches/patch-ab
--- a/print/mupdf/patches/patch-ab      Wed Apr 12 12:57:18 2017 +0000
+++ b/print/mupdf/patches/patch-ab      Wed Apr 12 13:03:08 2017 +0000
@@ -1,20 +1,20 @@
-$NetBSD: patch-ab,v 1.13 2016/11/28 14:40:42 leot Exp $
+$NetBSD: patch-ab,v 1.14 2017/04/12 13:03:08 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.orig     2017-04-05 11:02:21.000000000 +0000
 +++ Makerules
-@@ -60,51 +60,6 @@ ifeq "$(largefile)" "yes"
+@@ -64,54 +64,6 @@ ifeq "$(largefile)" "yes"
  CFLAGS += -DFZ_LARGEFILE
  endif
  
 -# Windows (MINGW) build doesn't use system libraries.
 -ifeq "$(OS)" "MINGW"
 -
--WINDRES = windres
+-WINDRES := windres
 -HAVE_X11 ?= no
--HAVE_WIN32 = yes
+-HAVE_WIN32 := yes
 -CC=gcc
 -# Add flags required for Harfbuzz because of missing strdup
 -CFLAGS+= -U__STRICT_ANSI__
@@ -23,61 +23,61 @@
 -else ifeq "$(OS)" "MACOS"
 -
 -HAVE_X11 ?= no
--HAVE_PTHREADS ?= yes
+-
+-HAVE_PTHREAD := yes
+-SYS_PTHREAD_CFLAGS :=
+-SYS_PTHREAD_LIBS := -lpthread
 -
 -# Mac OS X deprecated libcrypto, so the default is to not include it.
--HAVE_LIBCRYTO ?= no
--SYS_LIBCRYPTO_CFLAGS =
--SYS_LIBCRYPTO_LIBS =
+-HAVE_LIBCRYTO := no
+-SYS_LIBCRYPTO_CFLAGS :=
+-SYS_LIBCRYPTO_LIBS :=
 -ifeq "$(HAVE_LIBCRYPTO)" "yes"
--SYS_LIBCRYPTO_CFLAGS = -DHAVE_LIBCRYPTO
--SYS_LIBCRYPTO_LIBS = -lcrypto
+-SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO
+-SYS_LIBCRYPTO_LIBS := -lcrypto
 -endif
 -
--SYS_CURL_DEPS = -lpthread
+-SYS_CURL_DEPS := -lpthread
 -
--SYS_X11_CFLAGS = -I/usr/X11R6/include
--SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
+-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
+-SYS_FREETYPE_CFLAGS := $(shell freetype-config --cflags)
+-SYS_FREETYPE_LIBS := $(shell freetype-config --libs)
+-SYS_OPENJPEG_LIBS := -lopenjpeg
+-SYS_JBIG2DEC_LIBS := -ljbig2dec
+-SYS_LIBJPEG_LIBS := -ljpeg
+-SYS_ZLIB_LIBS := -lz
 -
--CC = xcrun cc
--AR = xcrun ar
--LD = xcrun ld
--RANLIB_CMD = xcrun ranlib $@
+-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)
+ HAVE_PTHREAD := yes
+ SYS_PTHREAD_CFLAGS :=
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated print/mupdf to 1.11
Next by Date: [pkgsrc/trunk]: pkgsrc/print/zathura-pdf-mupdf Bump PKGREVISION for mupdf-1.1...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated print/mupdf to 1.11
Next by Thread: [pkgsrc/trunk]: pkgsrc/print/zathura-pdf-mupdf Bump PKGREVISION for mupdf-1.1...
Indexes:
Home | Main Index | Thread Index | Old Index