<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d121c916eeca7788a8f53a84a5c45c1fd2a471a5">https://github.com/macports/macports-ports/commit/d121c916eeca7788a8f53a84a5c45c1fd2a471a5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d121c916eeca7788a8f53a84a5c45c1fd2a471a5
</span>Author: Mark Mentovai <mark@chromium.org>
AuthorDate: Tue May 3 23:36:16 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mupdf: update to 1.19.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This also switches the libmupdf build from a static library (libmupdf.a)
</span><span style='display:block; white-space:pre;color:#404040;'> to a shared library (libmupdf.dylib).
</span>---
graphics/mupdf/Portfile | 17 ++++++++++-------
graphics/mupdf/files/patch-Makerules.diff | 25 ++++++++++++++++++++-----
2 files changed, 30 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/Portfile b/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b15c5a933b6..6a757170b1d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name mupdf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.17.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.19.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
platforms darwin
maintainers {gmail.com:starkhalo @harciga} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,13 +31,14 @@ homepage https://www.mupdf.com/
</span> master_sites ${homepage}downloads/archive/
distname ${name}-${version}-source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 98c5473e78a48ece1fb2c6c49e5ded007ba42dab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 00e33fa89cb42f1ef9e3bb73671b1cb6d210f5159bd68168fa5c89ceb24dd48e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 65510829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a6e91c264749cbc1587d9d3356dc13f604d0b6c0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9f56a3b04cf477c9d042d4cd3c8b28a5383e75a1dbf1828e16e606dc9586d0ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 91675366
</span>
depends_build port:pkgconfig
depends_lib port:freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gumbo-parser \
</span> path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
port:jbig2dec \
path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,13 +59,15 @@ build.args-append CC=${configure.cc} \
</span> HAVE_X11=no \
USE_SYSTEM_LIBS=yes \
build=release \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- verbose=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verbose=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shared
</span>
destroot.destdir prefix=${destroot}${prefix}
destroot.args-append \
HAVE_GLUT=yes \
HAVE_X11=no \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_SYSTEM_LIBS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_SYSTEM_LIBS=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shared=yes
</span>
variant x11 {
depends_lib-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/patch-Makerules.diff b/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b0049b327f..58c032cc3e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makerules.orig 2020-05-05 04:29:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makerules 2020-10-01 15:52:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,13 +86,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makerules.orig 2022-05-03 23:26:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makerules 2022-05-04 00:28:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_prefix += shared-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_CFLAGS = -fPIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS),MACOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_LDFLAGS = -dynamiclib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIB_LDFLAGS = -dynamiclib -Wl,-install_name,$(PREFIX)/lib/libmupdf.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_LDFLAGS = -shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,10 +140,10 @@
</span> HAVE_GLUT := yes
SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +20,13 @@
</span> + CC = cc
+ AR = ar
+ LD = ld
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RANLIB_CMD = ranlib $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RANLIB = ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (, $(shell which pkg-config))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(warning "No pkg-config found, install it for proper integration of libcrypto")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,8 +155,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span>
-else ifeq ($(OS),Linux)
- HAVE_OBJCOPY := yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +35,7 @@
</span>
ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,12 +125,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -205,12 +205,6 @@
</span> SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
endif
</pre><pre style='margin:0'>
</pre>