pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print/mupdf
Module Name: pkgsrc
Committed By: leot
Date: Thu May 7 20:42:57 UTC 2020
Modified Files:
pkgsrc/print/mupdf: Makefile PLIST buildlink3.mk distinfo
pkgsrc/print/mupdf/patches: patch-ab patch-ac
patch-platform_gl_gl-app.h patch-platform_gl_gl-main.c
patch-source_fitz_load-jpx.c patch-thirdparty_mujs_Makefile
Removed Files:
pkgsrc/print/mupdf/patches: patch-platform_x11_pdfapp.c
Log Message:
mupdf: Update to 1.17.0
pkgsrc changes:
- Remove patches/patch-platform_x11_pdfapp.c, no longer needed
Changes:
1.17.0
------
api: Improved accessors for markup/ink/polygon annotation data.
api: Chapter based API for faster EPUB loading.
api: Add more documentation to header files.
api: Improved digital signature signing and verification.
api: Validate changes in a signed PDF file.
build: Moved windows build to VS2019 solution.
pdf: Redaction now works on images and links as well as text.
pdf: Greek, Cyrillic, Chinese, Japanese, and Korean scripts in forms and annotations.
pdf: File attachment annotations.
pdf: Use CCITT Fax compression for 1-bit images when creating PDF files.
epub: More forgiving XHTML parsing.
epub: Accelerator files to cache chapter data for faster EPUB loading.
epub: Optimized memory use.
mutool run: Edit Markup, Ink, and Polygon annotation data.
mutool run: Fill out form fields.
viewer: Ask for confirmation before closing a PDF with unsaved changes.
viewer: Embed and extract file attachment annotations.
library: Miscellaneous bugfixes.
library: Fixes to store operation.
thirdparty: Updated Harfbuzz to 2.6.4.
thirdparty: Updated jbig2dec to 0.18.
thirdparty: Updated MuJS to 1.0.7.
thirdparty: Updated OpenJPEG to 2.3.1.
thirdparty: Updated cURL to 7.66.0 (windows only).
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/mupdf/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/print/mupdf/buildlink3.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/mupdf/patches/patch-ab
cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/mupdf/patches/patch-ac
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c
cvs rdiff -u -r1.1 -r0 pkgsrc/print/mupdf/patches/patch-platform_x11_pdfapp.c
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.82 pkgsrc/print/mupdf/Makefile:1.83
--- pkgsrc/print/mupdf/Makefile:1.82 Wed May 6 14:04:12 2020
+++ pkgsrc/print/mupdf/Makefile Thu May 7 20:42:56 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2020/05/06 14:04:12 adam Exp $
+# $NetBSD: Makefile,v 1.83 2020/05/07 20:42:56 leot Exp $
-DISTNAME= mupdf-1.16.1-source
+DISTNAME= mupdf-1.17.0-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 9
CATEGORIES= print
MASTER_SITES= https://mupdf.com/downloads/archive/
Index: pkgsrc/print/mupdf/PLIST
diff -u pkgsrc/print/mupdf/PLIST:1.19 pkgsrc/print/mupdf/PLIST:1.20
--- pkgsrc/print/mupdf/PLIST:1.19 Sat Aug 3 14:47:41 2019
+++ pkgsrc/print/mupdf/PLIST Thu May 7 20:42:56 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2019/08/03 14:47:41 leot Exp $
+@comment $NetBSD: PLIST,v 1.20 2020/05/07 20:42:56 leot Exp $
bin/mupdf
${PLIST.curl}bin/mupdf-curl
${PLIST.opengl}bin/mupdf-gl
@@ -28,6 +28,7 @@ include/mupdf/fitz/glyph.h
include/mupdf/fitz/hash.h
include/mupdf/fitz/image.h
include/mupdf/fitz/link.h
+include/mupdf/fitz/log.h
include/mupdf/fitz/outline.h
include/mupdf/fitz/output-svg.h
include/mupdf/fitz/output.h
Index: pkgsrc/print/mupdf/buildlink3.mk
diff -u pkgsrc/print/mupdf/buildlink3.mk:1.37 pkgsrc/print/mupdf/buildlink3.mk:1.38
--- pkgsrc/print/mupdf/buildlink3.mk:1.37 Wed May 6 14:04:12 2020
+++ pkgsrc/print/mupdf/buildlink3.mk Thu May 7 20:42:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.37 2020/05/06 14:04:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2020/05/07 20:42:56 leot Exp $
BUILDLINK_TREE+= mupdf
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= mupdf
MUPDF_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.14.0
-BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.16.1nb9
+BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.17.0
BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
pkgbase := mupdf
Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.50 pkgsrc/print/mupdf/distinfo:1.51
--- pkgsrc/print/mupdf/distinfo:1.50 Thu Dec 12 14:35:55 2019
+++ pkgsrc/print/mupdf/distinfo Thu May 7 20:42:56 2020
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.50 2019/12/12 14:35:55 leot Exp $
+$NetBSD: distinfo,v 1.51 2020/05/07 20:42:56 leot Exp $
-SHA1 (mupdf-1.16.1-source.tar.gz) = ccbef63c3d43d6a866b7978db5674dc4b1719f0f
-RMD160 (mupdf-1.16.1-source.tar.gz) = 4787d4699504cab9e3fee9884f1faaa410f805c9
-SHA512 (mupdf-1.16.1-source.tar.gz) = d4e789bd7b1ba8f01bff1e68df3a980c79230e0a28d6d6e709169a2822ac6240aad185c2d8d4f55ba8d2451e5738801f6b490683c239543d27efc4e960a673e7
-Size (mupdf-1.16.1-source.tar.gz) = 60805318 bytes
+SHA1 (mupdf-1.17.0-source.tar.gz) = 3d7db1aaeef5dc61143e2d89e78c3b1a66866b35
+RMD160 (mupdf-1.17.0-source.tar.gz) = 98c5473e78a48ece1fb2c6c49e5ded007ba42dab
+SHA512 (mupdf-1.17.0-source.tar.gz) = a049c4dde20d42d4165959c58434a838581413b89afe0c4e72f40dc54097966b995357eece5e81d87b5d64f24c57c5778bc5b9a7b668057d01b736fc17bc3cb3
+Size (mupdf-1.17.0-source.tar.gz) = 65510829 bytes
SHA1 (patch-Makethird) = 027f69be8ab3bb29535d3315d85c2d5d32a4dccf
-SHA1 (patch-ab) = 18bc9e283624ec810662d29309db9a8dd9268bb8
-SHA1 (patch-ac) = 97442b78e52e57b783d93771c6002702dda38e8f
+SHA1 (patch-ab) = 6f6764288ce71f452364ef70db8d7cb532c9fc00
+SHA1 (patch-ac) = 3128a383a7ece0330e6fa05b396087d2b17f58d9
SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-platform_gl_gl-app.h) = 09064acf631f5e850cd65cb51ab5315485fb4200
-SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
-SHA1 (patch-platform_x11_pdfapp.c) = e731d1d99d21ecdfd6172d7b5ed5ba1be2ef6a75
-SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
-SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb
+SHA1 (patch-platform_gl_gl-app.h) = 48f48f13c9a6376231de25aa63411560ea9d91ca
+SHA1 (patch-platform_gl_gl-main.c) = c760d16f0ac4a9b09800869d22b7324724bc007b
+SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb
+SHA1 (patch-thirdparty_mujs_Makefile) = 8ff3cc67a60b648841b074846bd6e7de943fd034
Index: pkgsrc/print/mupdf/patches/patch-ab
diff -u pkgsrc/print/mupdf/patches/patch-ab:1.21 pkgsrc/print/mupdf/patches/patch-ab:1.22
--- pkgsrc/print/mupdf/patches/patch-ab:1.21 Sat Aug 3 14:47:41 2019
+++ pkgsrc/print/mupdf/patches/patch-ab Thu May 7 20:42:56 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.21 2019/08/03 14:47:41 leot Exp $
+$NetBSD: patch-ab,v 1.22 2020/05/07 20:42:56 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 @@ $NetBSD: patch-ab,v 1.21 2019/08/03 14:4
If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
CFLAGS.
---- Makerules.orig 2019-07-23 12:23:08.000000000 +0000
+--- Makerules.orig 2020-05-05 11:29:09.000000000 +0000
+++ Makerules
@@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW)
OS := $(OS:Windows_NT=MINGW)
@@ -31,12 +31,12 @@ $NetBSD: patch-ab,v 1.21 2019/08/03 14:4
- LDREMOVEUNREACH := -Wl,--gc-sections
-endif
-
- SANITIZE_FLAGS += -fsanitize=address
- SANITIZE_FLAGS += -fsanitize=leak
+ CFLAGS += -Wsign-compare
-@@ -72,77 +61,63 @@ SYS_MUJS_LIBS := -lmujs
- SYS_OPENJPEG_LIBS := -lopenjp2
- SYS_ZLIB_LIBS := -lz
+ SANITIZE_FLAGS += -fsanitize=address
+@@ -78,77 +67,63 @@ ifneq "$(CLUSTER)" ""
+ CFLAGS += -DCLUSTER
+ endif
-ifeq ($(OS),MINGW)
- WINDRES := windres
Index: pkgsrc/print/mupdf/patches/patch-ac
diff -u pkgsrc/print/mupdf/patches/patch-ac:1.24 pkgsrc/print/mupdf/patches/patch-ac:1.25
--- pkgsrc/print/mupdf/patches/patch-ac:1.24 Sat Aug 3 14:47:41 2019
+++ pkgsrc/print/mupdf/patches/patch-ac Thu May 7 20:42:57 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.24 2019/08/03 14:47:41 leot Exp $
+$NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
- libtool support
- Install target cleanup
@@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.24 2019/08/03 14:4
be invoked during the building phase)
- Install mupdf with curl support as `mupdf-curl'
---- Makefile.orig 2019-07-26 14:10:07.000000000 +0000
+--- Makefile.orig 2020-05-05 11:29:09.000000000 +0000
+++ Makefile
@@ -51,68 +51,68 @@ ifneq ($(verbose),yes)
endif
@@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.24 2019/08/03 14:4
endif
-LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- TAGS_CMD = $(QUIET_TAGS) ctags -R
+ TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p
WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
@@ -173,8 +173,8 @@ $NetBSD: patch-ac,v 1.24 2019/08/03 14:4
-MURASTER_OBJ := $(OUT)/source/tools/muraster.o
+MURASTER_OBJ := $(OUT)/source/tools/muraster.lo
MURASTER_EXE := $(OUT)/muraster
- $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
- $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS)
+ $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB)
+ $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
@@ -224,7 +224,7 @@ TOOL_APPS += $(MURASTER_EXE)
ifeq ($(HAVE_GLUT),yes)
@@ -263,7 +263,7 @@ $NetBSD: patch-ac,v 1.24 2019/08/03 14:4
# --- Examples ---
-@@ -292,10 +292,10 @@ $(OUT)/multi-threaded: docs/examples/mul
+@@ -294,10 +294,10 @@ $(OUT)/multi-threaded: docs/examples/mul
# --- Update version string header ---
@@ -278,7 +278,7 @@ $NetBSD: patch-ac,v 1.24 2019/08/03 14:4
# --- Format man pages ---
-@@ -323,27 +323,30 @@ tools: $(TOOL_APPS)
+@@ -325,27 +325,30 @@ tools: $(TOOL_APPS)
apps: $(TOOL_APPS) $(VIEW_APPS)
install: libs apps
Index: pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h
diff -u pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h:1.3 pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h:1.4
--- pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h:1.3 Mon Sep 23 12:17:04 2019
+++ pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h Thu May 7 20:42:57 2020
@@ -1,20 +1,19 @@
-$NetBSD: patch-platform_gl_gl-app.h,v 1.3 2019/09/23 12:17:04 nia Exp $
+$NetBSD: patch-platform_gl_gl-app.h,v 1.4 2020/05/07 20:42:57 leot Exp $
- Do not force freeglut GLUT implementation to every non-APPLE platforms.
- Adjust the glut.h include.
---- platform/gl/gl-app.h.orig 2018-09-25 12:39:17.000000000 +0000
+--- platform/gl/gl-app.h.orig 2020-05-05 11:29:09.000000000 +0000
+++ platform/gl/gl-app.h
@@ -7,11 +7,7 @@ void win_install(void);
#include "mupdf/ucdn.h"
#include "mupdf/pdf.h" /* for pdf specifics and forms */
-#ifndef __APPLE__
--#include <GL/freeglut.h>
+ #include <GL/freeglut.h>
-#else
-#include <GLUT/glut.h>
-#endif
-+#include <GL/freeglut.h>
/* UI */
Index: pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c
diff -u pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c:1.2 pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c:1.3
--- pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c:1.2 Thu Oct 4 19:02:33 2018
+++ pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c Thu May 7 20:42:57 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-platform_gl_gl-main.c,v 1.2 2018/10/04 19:02:33 leot Exp $
+$NetBSD: patch-platform_gl_gl-main.c,v 1.3 2020/05/07 20:42:57 leot Exp $
glutLeaveMainLoop() is present only on freeglut, define it otherwise.
---- platform/gl/gl-main.c.orig 2018-10-03 11:29:14.000000000 +0000
+--- platform/gl/gl-main.c.orig 2020-05-05 11:29:09.000000000 +0000
+++ platform/gl/gl-main.c
-@@ -16,7 +16,7 @@
- char *realpath(const char *path, char *resolved_path); /* in gl-file.c */
+@@ -26,7 +26,7 @@
+ #include <direct.h> /* for getcwd */
#endif
-#ifdef __APPLE__
Index: pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c
diff -u pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.9 pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.10
--- pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.9 Thu Oct 4 19:02:33 2018
+++ pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c Thu May 7 20:42:57 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-source_fitz_load-jpx.c,v 1.9 2018/10/04 19:02:33 leot Exp $
+$NetBSD: patch-source_fitz_load-jpx.c,v 1.10 2020/05/07 20:42:57 leot Exp $
- MuPDF does some locking around its allocation calls; it overrides openjpeg's
allocators to do this locking too. However mupdf tries to manually align things
@@ -13,14 +13,14 @@ $NetBSD: patch-source_fitz_load-jpx.c,v
From OpenBSD ports textproc/mupdf/patch-source_fitz_load-jpx_c,v 1.5.
---- source/fitz/load-jpx.c.orig 2018-09-25 12:39:17.000000000 +0000
+--- source/fitz/load-jpx.c.orig 2020-05-05 11:29:09.000000000 +0000
+++ source/fitz/load-jpx.c
-@@ -577,19 +577,7 @@ void opj_free(void *ptr)
+@@ -584,19 +584,7 @@ void opj_free(void *ptr)
static void * opj_aligned_malloc_n(size_t alignment, size_t size)
{
- uint8_t *ptr;
-- int off;
+- size_t off;
-
- if (size == 0)
- return NULL;
@@ -30,13 +30,13 @@ $NetBSD: patch-source_fitz_load-jpx.c,v
- if (ptr == NULL)
- return NULL;
- off = alignment-(((int)(intptr_t)ptr) & (alignment - 1));
-- ptr[off-1] = off;
+- ptr[off-1] = (uint8_t)off;
- return ptr + off;
+ return opj_malloc(size);
}
void * opj_aligned_malloc(size_t size)
-@@ -604,13 +592,7 @@ void * opj_aligned_32_malloc(size_t size
+@@ -611,13 +599,7 @@ void * opj_aligned_32_malloc(size_t size
void opj_aligned_free(void* ptr_)
{
Index: pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile
diff -u pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.6 pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.7
--- pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.6 Sun May 12 12:27:02 2019
+++ pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile Thu May 7 20:42:57 2020
@@ -1,9 +1,9 @@
-$NetBSD: patch-thirdparty_mujs_Makefile,v 1.6 2019/05/12 12:27:02 ryoon Exp $
+$NetBSD: patch-thirdparty_mujs_Makefile,v 1.7 2020/05/07 20:42:57 leot Exp $
- Add libtool support to mujs.
- Avoid to set (unused) VERSION variable.
---- thirdparty/mujs/Makefile.orig 2019-04-04 10:41:04.000000000 +0000
+--- thirdparty/mujs/Makefile.orig 2020-03-17 13:10:18.000000000 +0000
+++ thirdparty/mujs/Makefile
@@ -7,12 +7,6 @@ bindir ?= $(prefix)/bin
incdir ?= $(prefix)/include
@@ -18,6 +18,15 @@ $NetBSD: patch-thirdparty_mujs_Makefile,
# Compiler flags for various configurations:
CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
+@@ -51,7 +45,7 @@ HDRS := $(wildcard js*.h mujs.h utf.h re
+
+ default: shell
+ shell: $(OUT)/mujs $(OUT)/mujs-pp
+-static: $(OUT)/libmujs.a
++static: $(OUT)/libmujs.la
+ shared: $(OUT)/libmujs.so
+
+ astnames.h: jsparse.h
@@ -65,15 +59,15 @@ one.c: $(SRCS)
jsdump.c: astnames.h opnames.h
@@ -51,12 +60,14 @@ $NetBSD: patch-thirdparty_mujs_Makefile,
@ mkdir -p $(dir $@)
$(CC) $(LDFLAGS) -o $@ $^ -lm
-@@ -112,7 +106,7 @@ install-common: shell $(OUT)/mujs.pc
+@@ -111,8 +105,8 @@ install-common: $(OUT)/mujs $(OUT)/mujs.
+ install -m 644 $(OUT)/mujs.pc $(DESTDIR)$(libdir)/pkgconfig
install -m 755 $(OUT)/mujs $(DESTDIR)$(bindir)
- install-static: install-common static
+-install-static: install-common $(OUT)/libmujs.a
- install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir)
++install-static: install-common $(OUT)/libmujs.la
+ ${LIBTOOL} --mode=install $(OUT)/libmujs.la $(DESTDIR)$(libdir)
- install-shared: install-common shared
+ install-shared: install-common $(OUT)/libmujs.so
install -m 755 $(OUT)/libmujs.so $(DESTDIR)$(libdir)
Home |
Main Index |
Thread Index |
Old Index