git: 8a47062d2f9a - main - graphics/mupdf: update to 1.23.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Nov 2023 17:44:10 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8a47062d2f9a82624cfcd155038df1603286d985
commit 8a47062d2f9a82624cfcd155038df1603286d985
Author: Zsolt Udvari <uzsolt@uzsolt.hu>
AuthorDate: 2023-11-27 08:20:35 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-11-27 17:43:42 +0000
graphics/mupdf: update to 1.23.6
ChangeLog: https://mupdf.com/releases/history.html
PR: 275315
Reported by: uzsolt@uzsolt.hu (maintainer)
---
graphics/mupdf/Makefile | 6 +-
graphics/mupdf/distinfo | 6 +-
graphics/mupdf/files/patch-Makerules | 150 +++++++++++------------------------
graphics/mupdf/pkg-plist | 34 ++------
4 files changed, 56 insertions(+), 140 deletions(-)
diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index c5af0a1ad89a..a77fdc979784 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -1,11 +1,9 @@
PORTNAME= mupdf
-DISTVERSION= 1.20.3
-PORTREVISION= 1
+DISTVERSION= 1.23.6
DISTVERSIONSUFFIX= -source
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://www.mupdf.com/downloads/ \
- http://www.mupdf.com/downloads/archive/
+MASTER_SITES= http://www.mupdf.com/downloads/archive/
MAINTAINER= uzsolt@uzsolt.hu
COMMENT= Lightweight PDF viewer and toolkit
diff --git a/graphics/mupdf/distinfo b/graphics/mupdf/distinfo
index 87e979bad365..94bd86c847b7 100644
--- a/graphics/mupdf/distinfo
+++ b/graphics/mupdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667131678
-SHA256 (mupdf-1.20.3-source.tar.gz) = 6b60070f6eec20e8d87d2b5cd22cf49020311a3cf15ee10998e3e5f5f984b1eb
-SIZE (mupdf-1.20.3-source.tar.gz) = 88457290
+TIMESTAMP = 1700849414
+SHA256 (mupdf-1.23.6-source.tar.gz) = ac11eb859dd404488e5153cdc9651bb4341e5baaf4d3b3f27e2afc82f9aadc29
+SIZE (mupdf-1.23.6-source.tar.gz) = 55310697
diff --git a/graphics/mupdf/files/patch-Makerules b/graphics/mupdf/files/patch-Makerules
index 3878e5d9a25c..d03a83bbeb7d 100644
--- a/graphics/mupdf/files/patch-Makerules
+++ b/graphics/mupdf/files/patch-Makerules
@@ -1,106 +1,46 @@
---- Makerules.orig 2018-10-04 09:19:28 UTC
+--- Makerules.orig 2023-11-24 18:10:54 UTC
+++ Makerules
-@@ -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,59 @@ else ifeq ($(OS),Linux)
- PTHREAD_LIBS := -lpthread
- endif
-
--endif
-+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
-+ HAVE_GLUT := yes
-+ 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
-
- # The following section has various cross compilation configurations.
- #
+@@ -331,3 +331,43 @@ ifeq "$(OS)" "ios"
+ LD = xcrun ld
+ RANLIB = xcrun ranlib
+ endif
++
++
++# added from FreeBSD ports
++PTHREAD_LIBS := -lthr
++USE_SYSTEM_CURL := yes
++SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
++SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++USE_SYSTEM_FREETYPE := yes
++SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
++SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
++HAVE_GLUT := yes
++USE_SYSTEM_GLUT := yes
++SYS_GLUT_CFLAGS := $(shell pkg-config --cflags gl glut)
++SYS_GLUT_LIBS := $(shell pkg-config --libs gl glut)
++USE_SYSTEM_HARFBUZZ := yes
++SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
++SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++USE_SYSTEM_JBIG2DEC := yes
++SYS_JBIG2DEC_CFLAGS := $(shell pkg-config --cflags jbig2dec)
++SYS_JIB2DEC_LIBS := $(shell pkg-config --libs jbig2dec)
++USE_SYSTEM_LCMS2 := no
++HAVE_LIBCRYPTO := no
++SYS_LIBCRYPTO_CFLAGS :=
++SYS_LIBCRYPTO_LIBS :=
++USE_SYSTEM_LIBJPEG := yes
++SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
++SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++USE_SYSTEM_OPENJPEG := yes
++SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
++SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
++HAVE_OPENSSL_SSL := no
++HAVE_PTHREAD := yes
++SYS_PTHREAD_CFLAGS :=
++SYS_PTHREAD_LIBS := -lpthread
++HAVE_X11 := yes
++X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
++X11_LIBS := $(shell pkg-config --libs x11 xext)
++USE_SYSTEM_ZLIB := yes
++SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
++SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist
index 18de275c5b51..f22e40634d55 100644
--- a/graphics/mupdf/pkg-plist
+++ b/graphics/mupdf/pkg-plist
@@ -37,6 +37,8 @@ include/mupdf/fitz/pool.h
include/mupdf/fitz/separation.h
include/mupdf/fitz/shade.h
include/mupdf/fitz/store.h
+include/mupdf/fitz/story-writer.h
+include/mupdf/fitz/story.h
include/mupdf/fitz/stream.h
include/mupdf/fitz/string-util.h
include/mupdf/fitz/structured-text.h
@@ -79,20 +81,14 @@ man/man1/mutool.1.gz
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/android-library.html
-%%PORTDOCS%%%%DOCSDIR%%/artifex-logo.png
-%%PORTDOCS%%%%DOCSDIR%%/building.html
-%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html
-%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html
-%%PORTDOCS%%%%DOCSDIR%%/coding-style.html
-%%PORTDOCS%%%%DOCSDIR%%/ecosystem.css
-%%PORTDOCS%%%%DOCSDIR%%/ecosystem.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/SnarkFront.svg
%%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/huntingofthesnark.png
%%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js
%%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c
%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js
@@ -102,24 +98,6 @@ man/man1/mutool.1.gz
%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-merge.js
%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-portfolio.js
%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-trace.js
+%%PORTDOCS%%%%DOCSDIR%%/examples/storytest.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/storytest.js
%%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/library.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-clean.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-convert.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-create.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-draw.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-extract.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-info.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-merge.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-pages.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-poster.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-run.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-show.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-sign.html
-%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-trace.html
-%%PORTDOCS%%%%DOCSDIR%%/mutool.html
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/thirdparty.html
-%%PORTDOCS%%%%DOCSDIR%%/viewers.html