--- graphics/mupdf/Makefile (revision 486387) +++ graphics/mupdf/Makefile (working copy) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= mupdf -PORTVERSION= 1.13.0 +PORTVERSION= 1.14.0 DISTVERSIONSUFFIX= -source -PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/ \ @@ -20,18 +19,19 @@ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjbig2dec.so:graphics/jbig2dec \ + libjpeg.so:graphics/jpeg-turbo \ libopenjp2.so:graphics/openjpeg -USES= cpe compiler:c++11-lang gmake jpeg pkgconfig -MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \ - SOVERSION=${PORTVERSION} -ALL_TARGET= all extra +USES= cpe compiler:c++11-lang gl gmake jpeg pkgconfig USE_XORG= x11 xcursor xext xinerama xrandr USE_GL= gl glut USE_LDCONFIG= yes -CFLAGS+= `pkg-config --cflags libopenjp2` -I${WRKSRC}/include/mupdf -fPIC # pkg-config to avoid the conflict with openjpeg15 -LIBS+= -L${LOCALBASE}/lib +MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \ + XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \ + XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \ + SOVERSION=${PORTVERSION} +ALL_TARGET= all extra CPE_VENDOR= artifex @@ -51,14 +51,6 @@ @${REINPLACE_CMD} -e 's/-pipe -O2 //' \ ${WRKSRC}/Makerules @${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird - @${RM} -r ${WRKSRC}/thirdparty/curl \ - ${WRKSRC}/thirdparty/freetype \ - ${WRKSRC}/thirdparty/freeglut \ - ${WRKSRC}/thirdparty/harfbuzz \ - ${WRKSRC}/thirdparty/jbig2dec \ - ${WRKSRC}/thirdparty/libjpeg \ - ${WRKSRC}/thirdparty/openjpeg \ - ${WRKSRC}/thirdparty/zlib post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf @@ -65,12 +57,11 @@ ${INSTALL_PROGRAM} \ ${WRKSRC}/build/release/mjsgen \ ${WRKSRC}/build/release/mujstest \ - ${WRKSRC}/build/release/mupdf-x11-curl \ ${WRKSRC}/build/release/muraster \ ${STAGEDIR}${PREFIX}/bin ${LN} -s libmupdf.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdf.so - ${LN} -s libmupdfthird.so.${PORTVERSION} \ - ${STAGEDIR}${PREFIX}/lib/libmupdfthird.so + ${LN} -s libmupdf-third.so.${PORTVERSION} \ + ${STAGEDIR}${PREFIX}/lib/libmupdf-third.so .include --- graphics/mupdf/distinfo (revision 486387) +++ graphics/mupdf/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529321680 -SHA256 (mupdf-1.13.0-source.tar.gz) = 071c6962cbee1136188da62136596a9d704b81e35fe617cd34874bbb0ae7ca09 -SIZE (mupdf-1.13.0-source.tar.gz) = 51425034 +TIMESTAMP = 1542296614 +SHA256 (mupdf-1.14.0-source.tar.gz) = c443483a678c3fc258fa4adc124146225d0bb443c522619faadebf6b363d7724 +SIZE (mupdf-1.14.0-source.tar.gz) = 55654104 --- graphics/mupdf/files/patch-Makefile (revision 486387) +++ graphics/mupdf/files/patch-Makefile (working copy) @@ -1,27 +1,22 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $ ---- Makefile.orig 2017-12-13 14:00:30 UTC +--- Makefile.orig 2018-10-04 09:19:28 UTC +++ Makefile -@@ -312,8 +312,8 @@ generate: $(JAVASCRIPT_GEN) +@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h # --- Library --- -MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdfthird.a -+MUPDF_LIB = libmupdf.so.$(SOVERSION) -+THIRD_LIB = libmupdfthird.so.$(SOVERSION) - THREAD_LIB = $(OUT)/libmuthreads.a +-THIRD_LIB = $(OUT)/libmupdf-third.a ++MUPDF_LIB = $(OUT)/libmupdf.so.$(SOVERSION) ++THIRD_LIB = $(OUT)/libmupdf-third.so.$(SOVERSION) + THREAD_LIB = $(OUT)/libmupdf-threads.a + PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a - MUPDF_OBJ := \ -@@ -344,7 +344,11 @@ THIRD_OBJ := \ - THREAD_OBJ := $(THREAD_OBJ) - -$(MUPDF_LIB) : $(MUPDF_OBJ) +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS) -+ ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOVERSION) $(THIRD_LIB) : $(THIRD_OBJ) -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS) -+ ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOVERSION) $(THREAD_LIB) : $(THREAD_OBJ) + $(PKCS7_LIB) : $(PKCS7_OBJ) - INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) --- graphics/mupdf/files/patch-Makerules (revision 486387) +++ graphics/mupdf/files/patch-Makerules (working copy) @@ -1,37 +1,105 @@ ---- Makerules.orig 2018-06-18 11:40:10 UTC +--- Makerules.orig 2018-10-04 09:19:28 UTC +++ Makerules -@@ -87,7 +87,7 @@ LD = xcrun ld - RANLIB_CMD = xcrun ranlib $@ +@@ -24,28 +24,28 @@ ifeq ($(build),debug) + CFLAGS += -pipe -g + LDFLAGS += -g $(LDREMOVEUNREACH) + else ifeq ($(build),release) +- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer ++ CFLAGS += -DNDEBUG -fomit-frame-pointer + LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s + else ifeq ($(build),small) + CFLAGS += -pipe -Os -DNDEBUG -fomit-frame-pointer + LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s + else ifeq ($(build),valgrind) +- CFLAGS += -pipe -O2 -DNDEBUG -DPACIFY_VALGRIND -fno-omit-frame-pointer ++ CFLAGS += -DNDEBUG -DPACIFY_VALGRIND -fno-omit-frame-pointer + LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s + else ifeq ($(build),sanitize) + CFLAGS += -pipe -g -fno-omit-frame-pointer $(SANITIZE_FLAGS) + LDFLAGS += -g $(SANITIZE_FLAGS) + else ifeq ($(build),sanitize-release) +- CFLAGS += -pipe -O2 -DNDEBUG -fno-omit-frame-pointer $(SANITIZE_FLAGS) ++ CFLAGS += -DNDEBUG -fno-omit-frame-pointer $(SANITIZE_FLAGS) + LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s $(SANITIZE_FLAGS) + else ifeq ($(build),profile) +- CFLAGS += -pipe -O2 -DNDEBUG -pg ++ CFLAGS += -DNDEBUG -pg + LDFLAGS += -pg + else ifeq ($(build),coverage) + CFLAGS += -pipe -g -pg -fprofile-arcs -ftest-coverage + LIBS += -lgcov + else ifeq ($(build),native) +- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native ++ CFLAGS += -DNDEBUG -fomit-frame-pointer -march=native + LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s + else ifeq ($(build),memento) + CFLAGS += -pipe -g -DMEMENTO +@@ -55,7 +55,7 @@ else ifeq ($(build),memento) + LIBS += -ldl + endif + else ifeq ($(build),gperf) +- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -DGPERF ++ CFLAGS += -DNDEBUG -fomit-frame-pointer -DGPERF + LIBS += -lprofiler + else + $(error unknown build setting: '$(build)') +@@ -143,7 +143,58 @@ else ifeq ($(OS),Linux) + PTHREAD_LIBS := -lpthread + endif - # Linux uses pkg-config for system libraries. --else ifeq "$(OS)" "Linux" -+else ifeq "$(OS)" "FreeBSD" - - HAVE_PTHREAD := yes - SYS_PTHREAD_CFLAGS := -@@ -97,21 +97,15 @@ HAVE_GLUT := yes - SYS_GLUT_CFLAGS := - SYS_GLUT_LIBS := -lglut -lGL - --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) --SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) -endif -+HAVE_LIBCRYPTO := no -+SYS_LIBCRYPTO_CFLAGS := -+SYS_LIBCRYPTO_LIBS := ++else ifeq ($(OS),FreeBSD) ++ PTHREAD_LIBS := -lthr ++# alphabetical order ++ # curl ++ USE_SYSTEM_CURL := yes ++ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) ++ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) ++ # freetype ++ USE_SYSTEM_FREETYPE := yes ++ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) ++ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) ++ # glut ++ USE_SYSTEM_GLUT := yes ++ SYS_GLUT_CFLAGS := ++ SYS_GLUT_LIBS := -lglut -lGL ++ # harfbuzz ++ USE_SYSTEM_HARFBUZZ := yes ++ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) ++ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) ++ # jbig2dec ++ USE_SYSTEM_JBIG2DEC := yes ++ SYS_JBIG2DEC_CFLAGS := ++ SYS_JIB2DEC_LIBS := -ljbig2dec ++ # lcms2 - needs a patched version of lcms2 ++ USE_SYSTEM_LCMS2 := no ++ # libcrypto ++ HAVE_LIBCRYPTO := no ++ SYS_LIBCRYPTO_CFLAGS := ++ SYS_LIBCRYPTO_LIBS := ++ # libjpeg ++ USE_SYSTEM_LIBJPEG := yes ++ SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) ++ SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg) ++ # openjpeg ++ USE_SYSTEM_OPENJPEG := yes ++ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) ++ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) ++ # openssl ++ HAVE_OPENSSL_SSL := no ++ # pthread ++ HAVE_PTHREAD := yes ++ SYS_PTHREAD_CFLAGS := ++ SYS_PTHREAD_LIBS := -lpthread ++ # x11 ++ HAVE_X11 := yes ++ X11_CFLAGS := $(shell pkg-config --cflags x11 xext) ++ X11_LIBS := $(shell pkg-config --libs x11 xext) ++ # zlib ++ USE_SYSTEM_ZLIB := yes ++ SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) ++ SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) ++endif # FreeBSD - ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" - HAVE_CURL := yes - SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) - SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) --ifeq "$(shell pkg-config --exists openssl && echo yes)" "yes" --HAVE_OPENSSL_SSL := yes --SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl) --SYS_CURL_DEPS += $(shell pkg-config --libs openssl) --endif -+HAVE_OPENSSL_SSL := no - endif - SYS_CURL_DEPS += -lpthread -lrt - + # The following section has various cross compilation configurations. + # --- graphics/mupdf/files/patch-thirdparty_lcms2_src_cmsmd5.c (revision 486387) +++ graphics/mupdf/files/patch-thirdparty_lcms2_src_cmsmd5.c (working copy) @@ -1,4 +1,4 @@ ---- thirdparty/lcms2/src/cmsmd5.c.orig 2018-10-31 19:49:39 UTC +--- thirdparty/lcms2/src/cmsmd5.c.orig 2018-01-23 19:37:31 UTC +++ thirdparty/lcms2/src/cmsmd5.c @@ -29,7 +29,7 @@ #ifdef CMS_USE_BIG_ENDIAN @@ -9,7 +9,7 @@ { do { -@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number +@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, c } #else @@ -18,7 +18,7 @@ #endif -@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cms +@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Nu } memmove(p, buf, t); @@ -27,7 +27,7 @@ MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); buf += t; -@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cms +@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Nu while (len >= 64) { memmove(ctx->in, buf, 64); @@ -36,7 +36,7 @@ MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); buf += 64; len -= 64; -@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Han +@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, if (count < 8) { memset(p, 0, count); --- graphics/mupdf/pkg-plist (revision 486387) +++ graphics/mupdf/pkg-plist (working copy) @@ -1,8 +1,6 @@ bin/mjsgen bin/mujstest bin/mupdf -bin/mupdf-gl -bin/mupdf-x11-curl bin/muraster bin/mutool include/mupdf/fitz.h @@ -64,7 +62,6 @@ include/mupdf/pdf-tools.h include/mupdf/pdf.h include/mupdf/pdf/annot.h -include/mupdf/pdf/appearance.h include/mupdf/pdf/clean.h include/mupdf/pdf/cmap.h include/mupdf/pdf/crypt.h @@ -85,8 +82,8 @@ include/mupdf/ucdn.h lib/libmupdf.so lib/libmupdf.so.%%SOVERSION%% -lib/libmupdfthird.so -lib/libmupdfthird.so.%%SOVERSION%% +lib/libmupdf-third.so +lib/libmupdf-third.so.%%SOVERSION%% man/man1/mupdf.1.gz man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGES @@ -98,10 +95,12 @@ %%PORTDOCS%%%%DOCSDIR%%/coding-overview.html %%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html %%PORTDOCS%%%%DOCSDIR%%/coding-style.html +%%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js %%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js %%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js %%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js %%PORTDOCS%%%%DOCSDIR%%/examples/example.c +%%PORTDOCS%%%%DOCSDIR%%/examples/fix-s22pdf.js %%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js %%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js --- graphics/zathura-pdf-mupdf/Makefile (revision 486387) +++ graphics/zathura-pdf-mupdf/Makefile (working copy) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= zathura-pdf-mupdf -PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTVERSION= 0.3.4 CATEGORIES= graphics MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/ \ - http://www.madpilot.net/~mad/pwmt.org/ + http://www.madpilot.net/~mad/pwmt.org/ \ + http://freebsd.uzsolt.hu/src/ MAINTAINER= uzsolt@uzsolt.hu COMMENT= MuPDF render PDF plugin for Zathura PDF viewer @@ -23,18 +23,20 @@ libmupdf.so:graphics/mupdf \ libopenjp2.so:graphics/openjpeg -PLIST_FILES= lib/zathura/libpdf-mupdf.so \ - share/applications/org.pwmt.zathura-pdf-mupdf.desktop \ - share/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml - #MAKE_ARGS= OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto" -USES= compiler:c11 desktop-file-utils gmake jpeg meson pkgconfig tar:xz +USES= compiler:c11 desktop-file-utils gmake gnome jpeg meson pkgconfig tar:xz +MESON_ARGS+= -Dlink-external=true USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 USE_LDCONFIG= yes +PLIST_FILES= lib/zathura/libpdf-mupdf.so \ + share/applications/org.pwmt.zathura-pdf-mupdf.desktop \ + share/appdata/org.pwmt.zathura-pdf-mupdf.metainfo.xml + CONFLICTS_INSTALL= zathura-pdf-poppler-[0-9]* post-patch: ${REINPLACE_CMD} "s@\(cc.find_library(.*\))@\1,dirs:'${PREFIX}/lib')@" ${WRKSRC}/meson.build + ${REINPLACE_CMD} "s@join_paths(datadir, 'metainfo')@join_paths(datadir, 'appdata')@" ${WRKSRC}/meson.build .include --- graphics/zathura-pdf-mupdf/distinfo (revision 486387) +++ graphics/zathura-pdf-mupdf/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531483831 -SHA256 (zathura-pdf-mupdf-0.3.3.tar.xz) = 52b02ceee272a47f7ef9c2b73cc4f6fb480c02fdce0e7f6b7c8e93ad6ac46dfd -SIZE (zathura-pdf-mupdf-0.3.3.tar.xz) = 7880 +TIMESTAMP = 1543771885 +SHA256 (zathura-pdf-mupdf-0.3.4.tar.xz) = d64331b9be43e42dce1d113746c62e4e6e9c9a2b4df77889e4bfc743be2dcd98 +SIZE (zathura-pdf-mupdf-0.3.4.tar.xz) = 8092