CVS commit: pkgsrc/print/mupdf

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print/mupdf
From: "Leonardo Taccari" <leot%netbsd.org@localhost>
Date: Sun, 6 May 2018 13:19:10 +0000

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun May  6 13:19:10 UTC 2018

Modified Files:
        pkgsrc/print/mupdf: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/print/mupdf/files: mupdf.pc
        pkgsrc/print/mupdf/patches: patch-ab patch-ac
            patch-source_fitz_load-jpx.c patch-thirdparty_mujs_Makefile
Added Files:
        pkgsrc/print/mupdf/patches: patch-platform_gl_gl-main.c

Log Message:
mupdf: Update print/mupdf to 1.13.0

pkgsrc changes:
 - Directly override VERSION in files/mupdf.pc in the post-build phase
   (to avoid an extra manual step for every mupdf update)
 - Get rid of OPJ_STATIC patch hunk in patches/patch-source_fitz_load-jpx.c (it
   is no more needed, because the `-DOPJ_STATIC' is now passed in Makefile-s
   when the bundled openjpeg is used).
 - Pass HAVE_LIBCRYPTO=no to avoid requiring openssl>=1.1.0.

Changes:
1.13.0
------
* This is primarily a bugfix release.
* New "mutool sign" tool for showing and verifying digital signatures.
* Chinese, Japanese, Korean, Cyrillic, and Greek font support in mutool create.
* Improvements to annotation editing API.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/mupdf/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/print/mupdf/buildlink3.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/mupdf/files/mupdf.pc
cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/mupdf/patches/patch-ab
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/mupdf/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c
cvs rdiff -u -r1.3 -r1.4 \
    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.59 pkgsrc/print/mupdf/Makefile:1.60
--- pkgsrc/print/mupdf/Makefile:1.59    Sun Apr 29 21:31:22 2018
+++ pkgsrc/print/mupdf/Makefile Sun May  6 13:19:10 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2018/04/29 21:31:22 adam Exp $
+# $NetBSD: Makefile,v 1.60 2018/05/06 13:19:10 leot Exp $
 
-DISTNAME=      mupdf-1.12.0-source
+DISTNAME=      mupdf-1.13.0-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   3
 CATEGORIES=    print
 MASTER_SITES=  https://mupdf.com/downloads/archive/
 
@@ -22,6 +21,7 @@ LDFLAGS+=             ${COMPILER_RPATH_FLAG}${X11BA
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=           build=release
+MAKE_ENV+=             HAVE_LIBCRYPTO=no       # Needs openssl-1.1.0
 
 CFLAGS+=       -DJBIG_NO_MEMENTO
 CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
@@ -44,7 +44,8 @@ post-extract:
            ${WRKSRC}/thirdparty/zlib
 
 post-build:
-       sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
+       sed -e "s,@PREFIX@,${PREFIX}," -e "s,@VERSION@,${PKGVERSION_NOREV}," \
+            ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig

Index: pkgsrc/print/mupdf/PLIST
diff -u pkgsrc/print/mupdf/PLIST:1.15 pkgsrc/print/mupdf/PLIST:1.16
--- pkgsrc/print/mupdf/PLIST:1.15       Mon Dec 18 15:06:33 2017
+++ pkgsrc/print/mupdf/PLIST    Sun May  6 13:19:10 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2017/12/18 15:06:33 leot Exp $
+@comment $NetBSD: PLIST,v 1.16 2018/05/06 13:19:10 leot Exp $
 bin/mjsgen
 bin/mujstest
 bin/mupdf
@@ -85,6 +85,7 @@ include/mupdf/pdf/xref.h
 include/mupdf/ucdn.h
 lib/libmupdf.la
 lib/libmupdfthird.la
+lib/libmupkcs7.la
 lib/libmuthreads.la
 lib/pkgconfig/mupdf.pc
 man/man1/mupdf.1

Index: pkgsrc/print/mupdf/buildlink3.mk
diff -u pkgsrc/print/mupdf/buildlink3.mk:1.23 pkgsrc/print/mupdf/buildlink3.mk:1.24
--- pkgsrc/print/mupdf/buildlink3.mk:1.23       Sun Apr 29 21:31:22 2018
+++ pkgsrc/print/mupdf/buildlink3.mk    Sun May  6 13:19:10 2018
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.23 2018/04/29 21:31:22 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2018/05/06 13:19:10 leot Exp $
 
 BUILDLINK_TREE+=       mupdf
 
 .if !defined(MUPDF_BUILDLINK3_MK)
 MUPDF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.12.0
-BUILDLINK_ABI_DEPENDS.mupdf?=  mupdf>=1.12.0nb3
+BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.13.0
 BUILDLINK_PKGSRCDIR.mupdf?=    ../../print/mupdf
 
 pkgbase := mupdf

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.39 pkgsrc/print/mupdf/distinfo:1.40
--- pkgsrc/print/mupdf/distinfo:1.39    Mon Dec 18 15:06:33 2017
+++ pkgsrc/print/mupdf/distinfo Sun May  6 13:19:10 2018
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.39 2017/12/18 15:06:33 leot Exp $
+$NetBSD: distinfo,v 1.40 2018/05/06 13:19:10 leot Exp $
 
-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 (mupdf-1.13.0-source.tar.gz) = d4fe867dbdef2e1a465e66cbbd1efb4b1285ef48
+RMD160 (mupdf-1.13.0-source.tar.gz) = 078e972c2f41a34308a52af24ac5ddbf41471342
+SHA512 (mupdf-1.13.0-source.tar.gz) = d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
+Size (mupdf-1.13.0-source.tar.gz) = 51425034 bytes
 SHA1 (patch-Makethird) = 77820f7344e00140a9792b5a6a3ddb1afa01b7bb
-SHA1 (patch-ab) = 0aafa5815fc0907e3ddcc8f0e7c83510a82669d8
-SHA1 (patch-ac) = 799efd894505fd960953905e61022411e8adf1ef
+SHA1 (patch-ab) = 5ca9de36a7f38cdcf0578cded98cdd54bed78ab5
+SHA1 (patch-ac) = 0c140ee7f0a86bc300c91845da0bd3bf5f0b7c14
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 6e5e547df27ecb2b82cadd71489d2eb9138c1ce2
-SHA1 (patch-source_fitz_load-jpx.c) = 18b47e3b478183c8e85a6ad1e6cabbbf48cf9f6b
-SHA1 (patch-thirdparty_mujs_Makefile) = 713946f25ae1ea44878b19b9430324e3d9f98990
+SHA1 (patch-platform_gl_gl-main.c) = 526c3e8c1c548490ef97f59e491b237f803f250e
+SHA1 (patch-source_fitz_load-jpx.c) = b507c1ebab027167af363c9f0f64d8690ea75ff3
+SHA1 (patch-thirdparty_mujs_Makefile) = d3e163bcc4e3d2509401b87e5da8eddb35394dc9

Index: pkgsrc/print/mupdf/files/mupdf.pc
diff -u pkgsrc/print/mupdf/files/mupdf.pc:1.13 pkgsrc/print/mupdf/files/mupdf.pc:1.14
--- pkgsrc/print/mupdf/files/mupdf.pc:1.13      Mon Dec 18 15:06:33 2017
+++ pkgsrc/print/mupdf/files/mupdf.pc   Sun May  6 13:19:10 2018
@@ -5,6 +5,6 @@ includedir=${prefix}/include
 
 Name: mupdf
 Description: library for PDF files
-Version: 1.12.0
-Libs: -Wl,-R${libdir} -L${libdir} -lmupdf -lmupdfthird -lmuthreads
+Version: @VERSION@
+Libs: -Wl,-R${libdir} -L${libdir} -lmupdf -lmupdfthird -lmuthreads -lmupkcs7
 Cflags: -I${includedir}

Index: pkgsrc/print/mupdf/patches/patch-ab
diff -u pkgsrc/print/mupdf/patches/patch-ab:1.16 pkgsrc/print/mupdf/patches/patch-ab:1.17
--- pkgsrc/print/mupdf/patches/patch-ab:1.16    Mon Dec 18 15:06:34 2017
+++ pkgsrc/print/mupdf/patches/patch-ab Sun May  6 13:19:10 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.16 2017/12/18 15:06:34 leot Exp $
+$NetBSD: patch-ab,v 1.17 2018/05/06 13:19:10 leot Exp $
 
 - Handle the various operating systems in the same way avoiding hardcoding
 - Avoid internal version of freeglut and try to pick it up via pkg-config and
@@ -8,9 +8,9 @@ $NetBSD: patch-ab,v 1.16 2017/12/18 15:0
   If no lcms2 is available just pass `-DNO_ICC' to disable it via
   SYS_LCMS2_CFLAGS.
 
---- Makerules.orig     2017-11-23 11:42:45.000000000 +0000
+--- Makerules.orig     2018-04-12 13:14:06.000000000 +0000
 +++ Makerules
-@@ -62,41 +62,10 @@ else
+@@ -65,38 +65,10 @@ else
  $(error unknown build setting: '$(build)')
  endif
  
@@ -20,9 +20,6 @@ $NetBSD: patch-ab,v 1.16 2017/12/18 15:0
 -WINDRES := windres
 -HAVE_X11 ?= no
 -HAVE_WIN32 := yes
--CC=gcc
--# Add flags required for Harfbuzz because of missing strdup
--CFLAGS+= -U__STRICT_ANSI__
 -
 -# Mac OS X doesn't have pkg-config so we hard code paths.
 -else ifeq "$(OS)" "MACOS"
@@ -49,10 +46,10 @@ $NetBSD: patch-ab,v 1.16 2017/12/18 15:0
 -SYS_GLUT_CFLAGS :=
 -SYS_GLUT_LIBS := -lglut -lGL
 -
- ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
  HAVE_LIBCRYPTO := yes
  SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
-@@ -113,7 +82,6 @@ SYS_CURL_CFLAGS += $(shell pkg-config --
+@@ -113,7 +85,6 @@ SYS_CURL_CFLAGS += $(shell pkg-config --
  SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
  endif
  endif
@@ -60,7 +57,7 @@ $NetBSD: patch-ab,v 1.16 2017/12/18 15:0
  
  ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
  HAVE_X11 := yes
-@@ -121,6 +89,12 @@ SYS_X11_CFLAGS := $(shell pkg-config --c
+@@ -121,6 +92,12 @@ SYS_X11_CFLAGS := $(shell pkg-config --c
  SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
  endif
  
@@ -73,7 +70,7 @@ $NetBSD: patch-ab,v 1.16 2017/12/18 15:0
  ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
  SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
  SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
-@@ -136,12 +110,17 @@ SYS_OPENJPEG_CFLAGS := $(shell pkg-confi
+@@ -136,12 +113,17 @@ SYS_OPENJPEG_CFLAGS := $(shell pkg-confi
  SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
  endif
  

Index: pkgsrc/print/mupdf/patches/patch-ac
diff -u pkgsrc/print/mupdf/patches/patch-ac:1.18 pkgsrc/print/mupdf/patches/patch-ac:1.19
--- pkgsrc/print/mupdf/patches/patch-ac:1.18    Mon Dec 18 15:06:34 2017
+++ pkgsrc/print/mupdf/patches/patch-ac Sun May  6 13:19:10 2018
@@ -1,22 +1,23 @@
-$NetBSD: patch-ac,v 1.18 2017/12/18 15:06:34 leot Exp $
+$NetBSD: patch-ac,v 1.19 2018/05/06 13:19:10 leot Exp $
 
 - libtool support 
 - Install target cleanup
-- Also install muthreads library (needed by various tools)
+- Also install muthreads and mupkcs7 libraries (needed by various tools)
 - 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 only one `mupdf' binary, prefer the featureful one and always
   install it as `mupdf'.
+- Install all EXTRA_APPS (muraster, mujstest, mjsgen)
 
---- Makefile.orig      2017-11-23 11:42:45.000000000 +0000
+--- Makefile.orig      2018-04-12 13:14:06.000000000 +0000
 +++ Makefile
-@@ -71,10 +71,10 @@ QUIET_TAGS = @ echo ' ' ' ' TAGS $@ ;
+@@ -72,10 +72,10 @@ QUIET_TAGS = @ echo ' ' ' ' TAGS $@ ;
  QUIET_WINDRES = @ echo ' ' ' ' WINDRES $@ ;
  endif
  
 -CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
--CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
+-CXX_CMD = $(QUIET_CXX) $(CXX) $(filter-out -Wdeclaration-after-statement,$(CFLAGS)) -o $@ -c $<
 -AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
 -LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 +CC_CMD = $(QUIET_CC) ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
@@ -26,7 +27,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
  RM_CMD = $(QUIET_RM) rm -f $@
  TAGS_CMD = $(QUIET_TAGS) ctags $^
-@@ -85,42 +85,42 @@ WINDRES_CMD = $(QUIET_WINDRES) $(WINDRES
+@@ -86,45 +86,45 @@ WINDRES_CMD = $(QUIET_WINDRES) $(WINDRES
  $(ALL_DIR) $(OUT) generated :
        $(MKDIR_CMD)
  
@@ -40,10 +41,14 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
 +$(OUT)/%.exe: $(OUT)/%.lo | $(ALL_DIR)
        $(LINK_CMD)
  
--$(OUT)/source/helpers/%.o : source/helpers/%.c | $(ALL_DIR)
-+$(OUT)/source/helpers/%.lo : source/helpers/%.c | $(ALL_DIR)
+-$(OUT)/source/helpers/mu-threads/%.o : source/helpers/mu-threads/%.c | $(ALL_DIR)
++$(OUT)/source/helpers/mu-threads/%.lo : source/helpers/mu-threads/%.c | $(ALL_DIR)
        $(CC_CMD) $(THREADING_CFLAGS)
  
+-$(OUT)/source/helpers/pkcs7/%.o : source/helpers/pkcs7/%.c | $(ALL_DIR)
++$(OUT)/source/helpers/pkcs7/%.lo : source/helpers/pkcs7/%.c | $(ALL_DIR)
+       $(CC_CMD)
+ 
 -$(OUT)/source/tools/%.o : source/tools/%.c | $(ALL_DIR)
 +$(OUT)/source/tools/%.lo : source/tools/%.c | $(ALL_DIR)
        $(CC_CMD) $(THREADING_CFLAGS)
@@ -82,7 +87,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  
  # --- File lists ---
  
-@@ -144,14 +144,14 @@ SVG_SRC_HDR := $(wildcard source/svg/*.h
+@@ -153,16 +153,16 @@ SVG_SRC_HDR := $(wildcard source/svg/*.h
  HTML_SRC_HDR := $(wildcard source/html/*.h)
  GPRF_SRC_HDR := $(wildcard source/gprf/*.h)
  
@@ -94,6 +99,8 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
 -HTML_OBJ := $(HTML_SRC:%.c=$(OUT)/%.o)
 -GPRF_OBJ := $(GPRF_SRC:%.c=$(OUT)/%.o)
 -THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.o)
+-PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+-SIGNATURE_OBJ := $(OUT)/platform/x11/pdfapp.o $(OUT)/source/tools/pdfsign.o
 +FITZ_OBJ := $(FITZ_SRC:%.c=$(OUT)/%.lo)
 +PDF_OBJ := $(PDF_SRC:%.c=$(OUT)/%.lo)
 +XPS_OBJ := $(XPS_SRC:%.c=$(OUT)/%.lo)
@@ -102,10 +109,12 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
 +HTML_OBJ := $(HTML_SRC:%.c=$(OUT)/%.lo)
 +GPRF_OBJ := $(GPRF_SRC:%.c=$(OUT)/%.lo)
 +THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.lo)
++PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.lo)
++SIGNATURE_OBJ := $(OUT)/platform/x11/pdfapp.lo $(OUT)/source/tools/pdfsign.lo
  
  $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
  $(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
-@@ -177,7 +177,7 @@ ifneq "$(CROSSCOMPILE)" "yes"
+@@ -190,7 +190,7 @@ ifneq "$(CROSSCOMPILE)" "yes"
  $(NAME_GEN) : $(NAMEDUMP_EXE)
  endif
  
@@ -114,7 +123,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  
  generate: $(NAME_GEN)
  
-@@ -199,7 +199,7 @@ FONT_GEN_SIL := $(subst resources/fonts/
+@@ -212,7 +212,7 @@ FONT_GEN_SIL := $(subst resources/fonts/
  
  FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_HAN) $(FONT_BIN_URW) $(FONT_BIN_SIL)
  FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_HAN) $(FONT_GEN_URW) $(FONT_GEN_SIL)
@@ -123,7 +132,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  
  generated/%.c : resources/fonts/droid/%.ttf $(HEXDUMP_EXE) | generated
        $(QUIET_GEN) $(HEXDUMP_EXE) -s $@ $<
-@@ -229,7 +229,7 @@ generate: $(FONT_GEN)
+@@ -242,7 +242,7 @@ generate: $(FONT_GEN)
  
  ICC_BIN := resources/icc/gray.icc resources/icc/rgb.icc resources/icc/cmyk.icc resources/icc/lab.icc
  ICC_GEN := generated/icc-profiles.c
@@ -132,7 +141,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  
  $(ICC_OBJ) : $(ICC_GEN)
  $(ICC_GEN) : $(ICC_BIN) | generated
-@@ -255,7 +255,7 @@ CMAP_GEN := \
+@@ -268,7 +268,7 @@ CMAP_GEN := \
        generated/pdf-cmap-extra.c \
        generated/pdf-cmap-utf8.c \
        generated/pdf-cmap-utf32.c
@@ -141,7 +150,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  
  generated/pdf-cmap-cjk.c : $(CMAP_CJK_SRC) | generated
        $(QUIET_GEN) $(CMAPDUMP_EXE) $@ $(CMAP_CJK_SRC)
-@@ -274,7 +274,7 @@ endif
+@@ -287,7 +287,7 @@ endif
  
  generate: $(CMAP_GEN)
  
@@ -150,7 +159,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
        $(NAME_GEN) \
        include/mupdf/pdf/cmap.h \
        source/fitz/context.c \
-@@ -297,7 +297,7 @@ $(OUT)/scripts/cmapdump.o : \
+@@ -310,7 +310,7 @@ $(OUT)/scripts/cmapdump.o : \
  
  JAVASCRIPT_SRC := source/pdf/pdf-js-util.js
  JAVASCRIPT_GEN := generated/pdf-js-util.c
@@ -159,25 +168,27 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  
  $(JAVASCRIPT_GEN) : $(JAVASCRIPT_SRC) | generated
        $(QUIET_GEN) $(HEXDUMP_EXE) -0 $@ $(JAVASCRIPT_SRC)
-@@ -312,9 +312,9 @@ generate: $(JAVASCRIPT_GEN)
+@@ -325,10 +325,10 @@ generate: $(JAVASCRIPT_GEN)
  
  # --- Library ---
  
 -MUPDF_LIB = $(OUT)/libmupdf.a
 -THIRD_LIB = $(OUT)/libmupdfthird.a
 -THREAD_LIB = $(OUT)/libmuthreads.a
+-PKCS7_LIB = $(OUT)/libmupkcs7.a
 +MUPDF_LIB = $(OUT)/libmupdf.la
 +THIRD_LIB = $(OUT)/libmupdfthird.la
 +THREAD_LIB = $(OUT)/libmuthreads.la
++PKCS7_LIB = $(OUT)/libmupkcs7.la
  
  MUPDF_OBJ := \
        $(FITZ_OBJ) \
-@@ -347,46 +347,46 @@ $(MUPDF_LIB) : $(MUPDF_OBJ)
- $(THIRD_LIB) : $(THIRD_OBJ)
+@@ -360,46 +360,46 @@ $(THIRD_LIB) : $(THIRD_OBJ)
  $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
  
 -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
  
  # --- Tools and Apps ---
  
@@ -187,7 +198,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
 -MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.o)
 +MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.lo)
  $(MUTOOL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUTOOL_EXE) : $(MUTOOL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
+ $(MUTOOL_EXE) : $(MUTOOL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
        $(LINK_CMD) $(THREADING_LIBS)
  
  MURASTER_EXE := $(OUT)/muraster
@@ -208,7 +219,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
 -MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
 +MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
  $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUJSTEST_EXE) : $(MUJSTEST_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
+ $(MUJSTEST_EXE) : $(MUJSTEST_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
        $(LINK_CMD)
  
  ifeq "$(HAVE_X11)" "yes"
@@ -217,7 +228,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
 +MUVIEW_X11_EXE := $(OUT)/platform/x11/mupdf
 +MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.lo x11_image.lo pdfapp.lo)
  $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
+ $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
        $(LINK_CMD) $(X11_LIBS)
  
  ifeq "$(HAVE_CURL)" "yes"
@@ -226,9 +237,9 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
 +MUVIEW_X11_CURL_EXE := $(OUT)/platform/x11/curl/mupdf
 +MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.lo x11_image.lo pdfapp.lo curl_stream.lo)
  $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUVIEW_X11_CURL_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB)
+ $(MUVIEW_X11_CURL_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB) $(PKCS7_LIB)
        $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
-@@ -394,8 +394,8 @@ endif
+@@ -407,8 +407,8 @@ endif
  endif
  
  ifeq "$(HAVE_GLUT)" "yes"
@@ -239,25 +250,26 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  $(MUVIEW_GLUT_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
  $(MUVIEW_GLUT_EXE) : $(MUVIEW_GLUT_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(GLUT_LIB)
        $(LINK_CMD) $(GLUT_LIB) $(GLUT_LIBS)
-@@ -403,7 +403,7 @@ endif
+@@ -416,7 +416,7 @@ endif
  
  ifeq "$(HAVE_WIN32)" "yes"
  MUVIEW_WIN32_EXE := $(OUT)/mupdf
 -MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
 +MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo)
  $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
- $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
+ $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
        $(LINK_CMD) $(WIN32_LIBS)
-@@ -412,11 +412,20 @@ endif
+@@ -425,11 +425,21 @@ endif
  MUVIEW_EXE := $(MUVIEW_X11_EXE) $(MUVIEW_WIN32_EXE) $(MUVIEW_GLUT_EXE)
  MUVIEW_CURL_EXE := $(MUVIEW_X11_CURL_EXE) $(MUVIEW_WIN32_CURL_EXE)
  
 -INSTALL_APPS := $(MUTOOL_EXE) $(MUVIEW_EXE)
 +INSTALL_APPS := $(MUTOOL_EXE)
- INSTALL_APPS += $(MURASTER_EXE)
--INSTALL_APPS += $(MUVIEW_CURL_EXE)
- INSTALL_APPS += $(MUJSTEST_EXE)
- INSTALL_APPS += $(MJSGEN_EXE)
+ EXTRA_APPS += $(MURASTER_EXE)
+-EXTRA_APPS += $(MUVIEW_CURL_EXE)
+ EXTRA_APPS += $(MUJSTEST_EXE)
+ EXTRA_APPS += $(MJSGEN_EXE)
++INSTALL_APPS += $(EXTRA_APPS)
 + 
 +ifeq "$(HAVE_CURL)" "yes"
 +INSTALL_APPS += $(MUVIEW_CURL_EXE)
@@ -271,7 +283,7 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  
  # --- Examples ---
  
-@@ -429,10 +438,10 @@ $(OUT)/multi-threaded: docs/examples/mul
+@@ -442,10 +452,10 @@ $(OUT)/multi-threaded: docs/examples/mul
  
  # --- Update version string header ---
  
@@ -286,8 +298,8 @@ $NetBSD: patch-ac,v 1.18 2017/12/18 15:0
  
  # --- Format man pages ---
  
-@@ -459,27 +468,29 @@ libs: $(INSTALL_LIBS)
- apps: $(INSTALL_APPS)
+@@ -474,27 +484,29 @@ extra-apps: $(EXTRA_APPS)
+ extra: extra-libs extra-apps
  
  install: libs apps
 -      install -d $(DESTDIR)$(incdir)/mupdf

Index: pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c
diff -u pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.7 pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.8
--- pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.7 Mon Dec 18 15:06:34 2017
+++ pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c     Sun May  6 13:19:10 2018
@@ -1,7 +1,4 @@
-$NetBSD: patch-source_fitz_load-jpx.c,v 1.7 2017/12/18 15:06:34 leot Exp $
-
-- Restrict OPJ_STATIC to Windows. 
-  This avoid linking errors due to opj_* hidden symbols when linking libmupdf.
+$NetBSD: patch-source_fitz_load-jpx.c,v 1.8 2018/05/06 13:19:10 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
@@ -16,28 +13,18 @@ $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        2017-11-23 11:42:45.000000000 +0000
+--- source/fitz/load-jpx.c.orig        2018-04-12 13:14:06.000000000 +0000
 +++ source/fitz/load-jpx.c
-@@ -445,7 +445,9 @@ fz_load_jpx_info(fz_context *ctx, const 
- 
- #else /* HAVE_LURATECH */
- 
-+#if defined(_WIN32) || defined(_WIN64)
- #define OPJ_STATIC
-+#endif
- #define OPJ_HAVE_INTTYPES_H
- #if !defined(_MSC_VER) || _MSC_VER >= 1600
- #define OPJ_HAVE_STDINT_H
-@@ -555,30 +557,14 @@ void opj_free(void *ptr)
+@@ -548,30 +548,14 @@ void opj_free(void *ptr)
  
  void * opj_aligned_malloc(size_t size)
  {
 -      uint8_t *ptr;
 -      int off;
--
+ 
 -      if (size == 0)
 -              return NULL;
- 
+-
 -      size += 16 + sizeof(uint8_t);
 -      ptr = opj_malloc(size);
 -      if (ptr == NULL)

Index: pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile
diff -u pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.3 pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.4
--- pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile:1.3       Mon Dec 18 15:06:34 2017
+++ pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile   Sun May  6 13:19:10 2018
@@ -1,59 +1,53 @@
-$NetBSD: patch-thirdparty_mujs_Makefile,v 1.3 2017/12/18 15:06:34 leot Exp $
+$NetBSD: patch-thirdparty_mujs_Makefile,v 1.4 2018/05/06 13:19:10 leot Exp $
 
 - Add libtool support to mujs.
 - Avoid to set (unused) VERSION variable.
 
---- thirdparty/mujs/Makefile.orig      2017-03-29 13:56:39.000000000 +0000
+--- thirdparty/mujs/Makefile.orig      2018-01-24 15:55:49.000000000 +0000
 +++ thirdparty/mujs/Makefile
-@@ -1,6 +1,6 @@
- SRCS := $(wildcard js*.c utf*.c regexp.c)
- HDRS := $(wildcard js*.h mujs.h utf.h regexp.h)
--OBJS := $(SRCS:%.c=build/%.o)
-+OBJS := $(SRCS:%.c=build/%.lo)
- 
- prefix ?= /usr/local
- bindir ?= $(prefix)/bin
-@@ -41,16 +41,16 @@ jsdump.c: astnames.h opnames.h
- build:
-       mkdir -p build
+@@ -7,12 +7,6 @@ bindir ?= $(prefix)/bin
+ incdir ?= $(prefix)/include
+ libdir ?= $(prefix)/lib
+ 
+-ifeq "$(wildcard .git)" ".git"
+-VERSION := $(shell git describe --tags --always)
+-else
+-VERSION := $(shell basename $$PWD | sed -e s,^mujs-,,)
+-endif
+-
+ # Compiler flags for various configurations:
+ 
+ CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
+@@ -63,19 +57,19 @@ jsdump.c: astnames.h opnames.h
+ $(OUT):
+       mkdir -p $(OUT)
+ 
+-$(OUT)/main.o: main.c $(HDRS)
++$(OUT)/main.lo: main.c $(HDRS)
+       $(CC) $(CFLAGS) -o $@ -c $<
  
--build/%.o: %.c $(HDRS)
-+build/%.lo: %.c $(HDRS)
+-$(OUT)/libmujs.o: one.c $(HDRS)
++$(OUT)/libmujs.lo: one.c $(HDRS)
        $(CC) $(CFLAGS) -o $@ -c $<
  
--build/libmujs.a: $(OBJS)
-+build/libmujs.la: $(OBJS)
+-$(OUT)/libmujs.a: $(OUT)/libmujs.o
++$(OUT)/libmujs.la: $(OUT)/libmujs.lo
        $(AR) cru $@ $^
  
--build/mujs: build/main.o build/libmujs.a
-+build/mujs: build/main.lo build/libmujs.la
-       $(CC) $(LDFLAGS) -o $@ $^ -lm
+ $(OUT)/libmujs.so: one.c $(HDRS)
+       $(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
  
--build/mujsone: build/main.o build/one.o
-+build/mujsone: build/main.lo build/one.lo
+-$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
++$(OUT)/mujs: $(OUT)/libmujs.lo $(OUT)/main.lo
        $(CC) $(LDFLAGS) -o $@ $^ -lm
  
- install: release
-@@ -58,15 +58,15 @@ install: release
-       install -d $(DESTDIR)$(libdir)
-       install -d $(DESTDIR)$(bindir)
-       install mujs.h $(DESTDIR)$(incdir)
--      install build/libmujs.a $(DESTDIR)$(libdir)
-+      install build/libmujs.la $(DESTDIR)$(libdir)
-       install build/mujs $(DESTDIR)$(bindir)
- 
--VERSION = $(shell git describe --tags --always)
--
--tarball:
--      git archive --format=zip --prefix=mujs-$(VERSION)/ HEAD > mujs-$(VERSION).zip
--      git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | gzip > mujs-$(VERSION).tar.gz
--      git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | xz > mujs-$(VERSION).tar.xz
-+#VERSION = $(shell git describe --tags --always)
-+#
-+#tarball:
-+#     git archive --format=zip --prefix=mujs-$(VERSION)/ HEAD > mujs-$(VERSION).zip
-+#     git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | gzip > mujs-$(VERSION).tar.gz
-+#     git archive --format=tar --prefix=mujs-$(VERSION)/ HEAD | xz > mujs-$(VERSION).tar.xz
+ $(OUT)/mujs.pc:
+@@ -100,7 +94,7 @@ install-common: release
+       install -m 755 build/release/mujs $(DESTDIR)$(bindir)
+ 
+ install-static: install-common
+-      install -m 644 build/release/libmujs.a $(DESTDIR)$(libdir)
++      install -m 644 build/release/libmujs.la $(DESTDIR)$(libdir)
  
- tags: $(SRCS) main.c $(HDRS)
-       ctags $^
+ install-shared: install-common
+       install -m 755 build/release/libmujs.so $(DESTDIR)$(libdir)

Added files:

Index: pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c
diff -u /dev/null pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c:1.1
--- /dev/null   Sun May  6 13:19:10 2018
+++ pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c      Sun May  6 13:19:10 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-platform_gl_gl-main.c,v 1.1 2018/05/06 13:19:10 leot Exp $
+
+glutSetOption() is available only on freeglut.
+
+--- platform/gl/gl-main.c.orig 2018-04-12 13:14:06.000000000 +0000
++++ platform/gl/gl-main.c
+@@ -1674,7 +1674,9 @@ int main(int argc, char **argv)
+ 
+       /* Init GLUT */
+ 
++#if defined(FREEGLUT)
+       glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
++#endif
+ 
+       glutInitErrorFunc(on_error);
+       glutInitWarningFunc(on_warning);

Prev by Date: CVS commit: [pkgsrc-2018Q1] pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: [pkgsrc-2018Q1] pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index