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 print/mupdf to 1.12.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/c5f2367df264
branches: trunk
changeset: 372833:c5f2367df264
user: leot <leot%pkgsrc.org@localhost>
date: Mon Dec 18 15:06:33 2017 +0000
description:
mupdf: Update print/mupdf to 1.12.0
pkgsrc changes:
- Add support for the `opengl' option via graphics/glut and remove the `glfw'
option to follow upstream changes. Adjust options.mk and buildlink3.mk
accordingly.
- Add patches/patch-platform_gl_gl-app.h to not force freeglut GLUT
implementation to every non-APPLE platforms (glut also works!) and adjust the
glut.h include.
- Add a commented out lcms2 bl3 inclusion entry, lcms2>=2.9 is needed (due
"lcms2art.h" et al. inclusion, so disable it for now)
- Explain the OPJ_STATIC comment in patches/patch-source_fitz_load-jpx.c
a bit more in depth... ...this will hopefully save some time to
debug opj_* undefined symbols when trying to link libmupdf and
accidently omitting the patches/patch-source_fitz_load-jpx.c
hunk (for extra debugging stories fun, if OPJ_STATIC is defined
some opj_* symbols are defined while others are not defined,
making the debugging of that problem more naughty!).
- Inject HAVE_{CURL,GLUT} variables via MAKE_ENV in options.mk to avoid
depending on www/curl and graphics/glut (yes, that's a bit kludgy
but unfortunately mupdf doesn't have a configure and so there
isn't a more sensible way to do it). This is needed to avoid
building mupdf-gl for native X.org where the glut.pc pkg-config
file is available at build time. Also adjust patches/patch-ab
accordingly.
- Remove patches/patch-CVE*, they are no longer needed (all applied in 1.12.0)
- Bump BUILDLINK_API_DEPENDS.mupdf to 1.12.0 (there were several API changes
from 1.11 to 1.12.0) and remove the now redundant and no longer needed
BUILDLINK_ABI_DEPENDS.mupdf.
Changes:
List of changes in MuPDF 1.12.0
* Color management:
* LCMS2 library for color management.
* CMYK rendering with overprint simulation.
* Spot color rendering.
* Transparency rendering fixes.
* Structured text output improvements:
* Reworked structured text API.
* Faster text searching.
* Highlight and copy text by selecting lines instead of by area.
* New semantic XHTML output format.
* New layout preserving HTML output format.
* Features and improvements:
* Improved non-AA rendering with new scan converter.
* Improved LARGEFILE support.
* Improved TIFF support.
* Improved documentation.
* PCLm output.
* PSD output.
* New "mutool trace" tool.
* New "mutool sign" tool (work in progress).
* Text redaction (work in progress).
* Lots of bug fixes.
diffstat:
print/mupdf/Makefile | 11 +-
print/mupdf/PLIST | 51 +++-
print/mupdf/buildlink3.mk | 9 +-
print/mupdf/distinfo | 27 +-
print/mupdf/files/mupdf.pc | 2 +-
print/mupdf/options.mk | 19 +-
print/mupdf/patches/patch-CVE-2017-14685 | 20 -
print/mupdf/patches/patch-CVE-2017-14686 | 19 -
print/mupdf/patches/patch-CVE-2017-14687 | 101 ---------
print/mupdf/patches/patch-CVE-2017-15369 | 39 ---
print/mupdf/patches/patch-CVE-2017-15587 | 18 -
print/mupdf/patches/patch-Makethird | 22 +-
print/mupdf/patches/patch-ab | 89 ++++----
print/mupdf/patches/patch-ac | 219 ++++++++++----------
print/mupdf/patches/patch-platform_gl_gl-app.h | 20 +
print/mupdf/patches/patch-source_fitz_load-jpx.c | 13 +-
print/mupdf/patches/patch-thirdparty_mujs_Makefile | 6 +-
17 files changed, 273 insertions(+), 412 deletions(-)
diffs (truncated from 1079 to 300 lines):
diff -r a51f14bebc35 -r c5f2367df264 print/mupdf/Makefile
--- a/print/mupdf/Makefile Mon Dec 18 15:06:26 2017 +0000
+++ b/print/mupdf/Makefile Mon Dec 18 15:06:33 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2017/10/25 11:00:03 leot Exp $
+# $NetBSD: Makefile,v 1.55 2017/12/18 15:06:33 leot Exp $
-DISTNAME= mupdf-1.11-source
+DISTNAME= mupdf-1.12.0-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 5
CATEGORIES= print
MASTER_SITES= https://mupdf.com/downloads/archive/
@@ -34,10 +33,11 @@
post-extract:
${RM} -fr \
${WRKSRC}/thirdparty/curl \
+ ${WRKSRC}/thirdparty/freeglut \
${WRKSRC}/thirdparty/freetype \
- ${WRKSRC}/thirdparty/glfw \
${WRKSRC}/thirdparty/harfbuzz \
${WRKSRC}/thirdparty/jbig2dec \
+ ${WRKSRC}/thirdparty/lcms2 \
${WRKSRC}/thirdparty/libjpeg \
${WRKSRC}/thirdparty/openjpeg \
${WRKSRC}/thirdparty/zlib
@@ -54,6 +54,9 @@
.include "../../graphics/jbig2dec/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
+# XXX: Needs lcms2-2.9 that ATM is not in pkgsrc.
+#BUILDLINK_API_DEPENDS.lcms2+= lcms2>=2.9
+#.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/openjpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
diff -r a51f14bebc35 -r c5f2367df264 print/mupdf/PLIST
--- a/print/mupdf/PLIST Mon Dec 18 15:06:26 2017 +0000
+++ b/print/mupdf/PLIST Mon Dec 18 15:06:33 2017 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.14 2017/04/12 13:03:08 leot Exp $
+@comment $NetBSD: PLIST,v 1.15 2017/12/18 15:06:33 leot Exp $
+bin/mjsgen
bin/mujstest
bin/mupdf
-${PLIST.glfw}bin/mupdf-gl
+${PLIST.opengl}bin/mupdf-gl
bin/muraster
bin/mutool
include/mupdf/fitz.h
@@ -11,7 +12,9 @@
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/compress.h
include/mupdf/fitz/compressed-buffer.h
include/mupdf/fitz/config.h
include/mupdf/fitz/context.h
@@ -21,7 +24,6 @@
include/mupdf/fitz/document.h
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
@@ -31,9 +33,11 @@
include/mupdf/fitz/link.h
include/mupdf/fitz/outline.h
include/mupdf/fitz/output-pcl.h
+include/mupdf/fitz/output-pclm.h
include/mupdf/fitz/output-png.h
include/mupdf/fitz/output-pnm.h
include/mupdf/fitz/output-ps.h
+include/mupdf/fitz/output-psd.h
include/mupdf/fitz/output-pwg.h
include/mupdf/fitz/output-svg.h
include/mupdf/fitz/output-tga.h
@@ -52,12 +56,10 @@
include/mupdf/fitz/track-usage.h
include/mupdf/fitz/transition.h
include/mupdf/fitz/tree.h
-include/mupdf/fitz/ucdn.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
include/mupdf/pdf-tools.h
include/mupdf/pdf.h
@@ -80,7 +82,7 @@
include/mupdf/pdf/resource.h
include/mupdf/pdf/widget.h
include/mupdf/pdf/xref.h
-include/mupdf/svg.h
+include/mupdf/ucdn.h
lib/libmupdf.la
lib/libmupdfthird.la
lib/libmuthreads.la
@@ -90,9 +92,34 @@
share/doc/mupdf/CHANGES
share/doc/mupdf/COPYING
share/doc/mupdf/README
-share/doc/mupdf/naming.txt
-share/doc/mupdf/overview.txt
-share/doc/mupdf/progressive.txt
-share/doc/mupdf/refcount.txt
-share/doc/mupdf/thirdparty.txt
-share/doc/mupdf/types.txt
+share/doc/mupdf/android-sdk.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/create-thumbnail.js
+share/doc/mupdf/examples/draw-device.js
+share/doc/mupdf/examples/draw-document.js
+share/doc/mupdf/examples/example.c
+share/doc/mupdf/examples/jpx-to-pdf.js
+share/doc/mupdf/examples/multi-threaded.c
+share/doc/mupdf/examples/pdf-create-lowlevel.js
+share/doc/mupdf/examples/pdf-create.js
+share/doc/mupdf/examples/pdf-merge.js
+share/doc/mupdf/examples/trace-device.js
+share/doc/mupdf/index.html
+share/doc/mupdf/manual-mupdf-gl.html
+share/doc/mupdf/manual-mutool-clean.html
+share/doc/mupdf/manual-mutool-convert.html
+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-merge.html
+share/doc/mupdf/manual-mutool-portfolio.html
+share/doc/mupdf/manual-mutool-run.html
+share/doc/mupdf/manual-mutool-show.html
+share/doc/mupdf/manual-mutool-trace.html
+share/doc/mupdf/style.css
+share/doc/mupdf/template.html
+share/doc/mupdf/thirdparty.html
diff -r a51f14bebc35 -r c5f2367df264 print/mupdf/buildlink3.mk
--- a/print/mupdf/buildlink3.mk Mon Dec 18 15:06:26 2017 +0000
+++ b/print/mupdf/buildlink3.mk Mon Dec 18 15:06:33 2017 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.20 2017/08/24 20:03:00 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2017/12/18 15:06:33 leot Exp $
BUILDLINK_TREE+= mupdf
.if !defined(MUPDF_BUILDLINK3_MK)
MUPDF_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.11
-BUILDLINK_ABI_DEPENDS.mupdf?= mupdf>=1.11nb3
+BUILDLINK_API_DEPENDS.mupdf+= mupdf>=1.12.0
BUILDLINK_PKGSRCDIR.mupdf?= ../../print/mupdf
pkgbase := mupdf
@@ -16,9 +15,9 @@
.include "../../www/curl/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.mupdf:Mglfw)
+.if !empty(PKG_BUILD_OPTIONS.mupdf:Mopengl)
.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glfw/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
.endif
.include "../../devel/zlib/buildlink3.mk"
diff -r a51f14bebc35 -r c5f2367df264 print/mupdf/distinfo
--- a/print/mupdf/distinfo Mon Dec 18 15:06:26 2017 +0000
+++ b/print/mupdf/distinfo Mon Dec 18 15:06:33 2017 +0000
@@ -1,18 +1,13 @@
-$NetBSD: distinfo,v 1.38 2017/10/25 11:00:03 leot Exp $
+$NetBSD: distinfo,v 1.39 2017/12/18 15:06:33 leot Exp $
-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-CVE-2017-14685) = c84be44c21ca29e0d0a455e0d7efe9a38ac46fb5
-SHA1 (patch-CVE-2017-14686) = b573adc7baa25a2f8b2068b1833f4cc17f38f3eb
-SHA1 (patch-CVE-2017-14687) = 651efafea77050216645ded2e2d3592970713b74
-SHA1 (patch-CVE-2017-15369) = 37bc5e52c67591b04640c03f5a227c278a26aa11
-SHA1 (patch-CVE-2017-15587) = 3bdafc7647148b0b29d37804a14306ea4458a529
-SHA1 (patch-Makethird) = a4d1bb3c8d509a84803c9b60521fd9b6b17b9717
-SHA1 (patch-ab) = a18b1e5b82454bdf06e23185e619b7f8c7a24290
-SHA1 (patch-ac) = c2decf6eae4c6343636439c7d7f6621826fc4e3c
+SHA1 (mupdf-1.12.0-source.tar.gz) = 0daee66600023de2bda2f1928a97a8515c17d2d2
+RMD160 (mupdf-1.12.0-source.tar.gz) = 9d36991f260c55c28ffc7f3b1d2acee84f735407
+SHA512 (mupdf-1.12.0-source.tar.gz) = 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
+Size (mupdf-1.12.0-source.tar.gz) = 51508917 bytes
+SHA1 (patch-Makethird) = 77820f7344e00140a9792b5a6a3ddb1afa01b7bb
+SHA1 (patch-ab) = 0aafa5815fc0907e3ddcc8f0e7c83510a82669d8
+SHA1 (patch-ac) = 799efd894505fd960953905e61022411e8adf1ef
SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-scripts_hexdump.c) = 65a029086f429a1f8568066a712c1d8e0106c867
-SHA1 (patch-source_fitz_load-jpx.c) = 57f22296a519d9e0ab9247fd5e742e2390a63fd5
-SHA1 (patch-thirdparty_mujs_Makefile) = cd6a20d56020ae5028f95e24e75f5e4a62127f9f
+SHA1 (patch-platform_gl_gl-app.h) = 6e5e547df27ecb2b82cadd71489d2eb9138c1ce2
+SHA1 (patch-source_fitz_load-jpx.c) = 18b47e3b478183c8e85a6ad1e6cabbbf48cf9f6b
+SHA1 (patch-thirdparty_mujs_Makefile) = 713946f25ae1ea44878b19b9430324e3d9f98990
diff -r a51f14bebc35 -r c5f2367df264 print/mupdf/files/mupdf.pc
--- a/print/mupdf/files/mupdf.pc Mon Dec 18 15:06:26 2017 +0000
+++ b/print/mupdf/files/mupdf.pc Mon Dec 18 15:06:33 2017 +0000
@@ -5,6 +5,6 @@
Name: mupdf
Description: library for PDF files
-Version: 1.11
+Version: 1.12.0
Libs: -Wl,-R${libdir} -L${libdir} -lmupdf -lmupdfthird -lmuthreads
Cflags: -I${includedir}
diff -r a51f14bebc35 -r c5f2367df264 print/mupdf/options.mk
--- a/print/mupdf/options.mk Mon Dec 18 15:06:26 2017 +0000
+++ b/print/mupdf/options.mk Mon Dec 18 15:06:33 2017 +0000
@@ -1,25 +1,28 @@
-# $NetBSD: options.mk,v 1.5 2017/04/12 13:03:08 leot Exp $
+# $NetBSD: options.mk,v 1.6 2017/12/18 15:06:33 leot Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf
-PKG_SUPPORTED_OPTIONS= curl glfw
+PKG_SUPPORTED_OPTIONS= curl opengl
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= glfw
+PLIST_VARS+= opengl
#
# curl support
#
.if !empty(PKG_OPTIONS:Mcurl)
.include "../../www/curl/buildlink3.mk"
+.else
+MAKE_ENV+= HAVE_CURL=no
.endif
#
-# glfw support
+# glut support
#
-.if !empty(PKG_OPTIONS:Mglfw)
-PLIST.glfw= yes
+.if !empty(PKG_OPTIONS:Mopengl)
+PLIST.opengl= yes
.include "../../graphics/MesaLib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glfw+= glfw>=3.2.1
-.include "../../graphics/glfw/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.else
+MAKE_ENV+= HAVE_GLUT=no
.endif
diff -r a51f14bebc35 -r c5f2367df264 print/mupdf/patches/patch-CVE-2017-14685
--- a/print/mupdf/patches/patch-CVE-2017-14685 Mon Dec 18 15:06:26 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-CVE-2017-14685,v 1.1 2017/10/25 11:00:03 leot Exp $
-
-Fix 698539: Don't use xps font if it could not be loaded.
-(AKA CVE-2017-14685)
-
-xps_load_links_in_glyphs did not cope with font loading failures.
-
-From upstream commit ab1a420613dec93c686acbee2c165274e922f82a
-
---- source/xps/xps-link.c.orig
-+++ source/xps/xps-link.c
-@@ -91,6 +91,8 @@ xps_load_links_in_glyphs(fz_context *ctx, xps_document *doc, const fz_matrix *ct
- bidi_level = atoi(bidi_level_att);
-
- font = xps_lookup_font(ctx, doc, base_uri, font_uri_att, style_att);
-+ if (!font)
-+ return;
- text = xps_parse_glyphs_imp(ctx, doc, &local_ctm, font, fz_atof(font_size_att),
- fz_atof(origin_x_att), fz_atof(origin_y_att),
- is_sideways, bidi_level, indices_att, unicode_att);
diff -r a51f14bebc35 -r c5f2367df264 print/mupdf/patches/patch-CVE-2017-14686
--- a/print/mupdf/patches/patch-CVE-2017-14686 Mon Dec 18 15:06:26 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-CVE-2017-14686,v 1.1 2017/10/25 11:00:03 leot Exp $
-
-Fix bug 698540: Check name, comment and meta size field signs.
-(AKA CVE-2017-14686)
-
-From upstream commit 0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1
-
---- source/fitz/unzip.c.orig
-+++ source/fitz/unzip.c
-@@ -141,6 +141,9 @@ static void read_zip_dir_imp(fz_context *ctx, fz_zip_archive *zip, int start_off
- (void) fz_read_int32_le(ctx, file); /* ext file atts */
- offset = fz_read_int32_le(ctx, file);
-
-+ if (namesize < 0 || metasize < 0 || commentsize < 0)
Home |
Main Index |
Thread Index |
Old Index