Update MuPDF

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 07b5ca0016fa7979283fa74aaf1fefca54f2b2eaf6a1e4b09fc82a904a016f3a..b51b9de00b56f7e3e8fc81c5a59009728be535d2efa1d61274414c72e40ee917 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -183,7 +183,7 @@
 /mpv-v0.40.0-445-g7815181b19.tar.zst
 /mpv.git/
 /mu-1.10.8.tar.xz
-/mupdf-1.24.0-170-g05063f228.tar.zst
+/mupdf-1.27.2.tar.zst
 /mupdf/
 /mutt-2.3.0.tar.gz
 /nasm-2.16.01.tar.xz

diff --git a/build/distfiles/mupdf-1.24.0-170-g05063f228.tar.zst.do b/build/distfiles/mupdf-1.27.2.tar.zst.do
similarity index 90%
rename from build/distfiles/mupdf-1.24.0-170-g05063f228.tar.zst.do
rename to build/distfiles/mupdf-1.27.2.tar.zst.do
index 4bc3d8610907ed9f75ef13cc8187bee10db1bd580ee1f5759c1121b3c0672505..53c7d60e2a4428c1859f15e6380b90d146715fffaa3f058f1fab9fc864834032 100644 (file)
--- a/build/distfiles/mupdf-1.24.0-170-g05063f228.tar.zst.do
+++ b/build/distfiles/mupdf-1.27.2.tar.zst.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 [ -d mupdf ] || git clone --depth 1 https://github.com/ArtifexSoftware/mupdf.git >&2
 cd mupdf
-commit=05063f228c6a8809f01a7ac21b4c077924054e67
+commit=73d3100d46d8a9ad634f6ef035bbe78f0f947886
 git fetch origin $commit >&2
 git checkout $commit >&2
 git submodule update --init --recursive >&2

diff --git a/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do b/build/skel/graphics/mupdf-1.27.2.do
similarity index 54%
rename from build/skel/graphics/mupdf-1.24.0-170-g05063f228.do
rename to build/skel/graphics/mupdf-1.27.2.do
index a53ce7000dfb0b3548ff6f56bf0a568f55bd91188568ca1b9968befb9eec6053..cd4bf745ab1c380636ca9eb3ca8720277d7ef0df6f3dea69acee2a7cbfa3c7ca 100644 (file)
--- a/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do
+++ b/build/skel/graphics/mupdf-1.27.2.do
@@ -10,8 +10,10 @@ devel/gmake-4.4.1
 devel/pkgconf-2.1.1
 shells/bash-5.2.21
 "
-rdeps=graphics/libjpeg-turbo-3.0.3
-[ -n "$MUPDF_NO_GL" ] || rdeps="$rdeps graphics/freetype-2.13.3"
+rdeps="
+graphics/freetype-2.13.3
+graphics/libjpeg-turbo-3.0.3
+"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
@@ -21,17 +23,16 @@ $TAR xf "$DISTFILES"/$NAME.tar.zst --options read_concatenated_archives
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
-# Ability to install only shared libraries:
-# patch <"$BASS_ROOT"/build/skel/graphics/mupdf-libmupdf-third-install.patch >&2
-if [ -n "$MUPDF_NO_GL" ] ; then
-    flags="HAVE_X11=no HAVE_GLUT=no"
-else
-    flags="HAVE_GLUT=yes USE_SYSTEM_FREETYPE=yes USE_SYSTEM_GLUT=yes "
-    perl -i -npe "s/-lfreetype2/-lfreetype/" Makerules
-    export XLDFLAGS="-lglut -lGL"
-fi
-XCFLAGS=-fPIC gmake -j$MAKE_JOBS $flags USE_SYSTEM_LIBJPEG=yes build=release \
-    prefix="$SKELBINS"/$ARCH/$NAME-$hsh install >&2
+perl -i -npe "s/-lfreetype2/-lfreetype/" Makerules
+XCFLAGS=-fPIC gmake -j$MAKE_JOBS \
+    HAVE_GLUT=no \
+    HAVE_CURL=no \
+    USE_SYSTEM_FREETYPE=yes \
+    USE_SYSTEM_HARFBUZZ=yes \
+    build=release \
+    mujs=no \
+    prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
+    install >&2
 
 cd "$SKELBINS"/$ARCH
 "$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps

diff --git a/build/skel/graphics/mupdf-libmupdf-third-install.patch b/build/skel/graphics/mupdf-libmupdf-third-install.patch
deleted file mode 100644 (file)
index f316059..0000000
--- a/build/skel/graphics/mupdf-libmupdf-third-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig      2024-06-12 20:55:27.000000000 +0300
-+++ Makefile   2024-06-14 12:14:18.213060000 +0300
-@@ -126,7 +126,7 @@
-       $(CC_CMD) $(LIB_CFLAGS) $(WARNING_CFLAGS) $(THIRD_CFLAGS) $(THREADING_CFLAGS)
- 
- $(OUT)/generated/%.o : generated/%.c
--      $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) -O0
-+      $(CC_CMD) $(WARNING_CFLAGS) $(LIB_CFLAGS) -O2
- 
- $(OUT)/platform/x11/%.o : platform/x11/%.c
-       $(CC_CMD) $(WARNING_CFLAGS) $(X11_CFLAGS)
-@@ -300,6 +300,7 @@
- 
- ifeq ($(shared),yes)
- MUPDF_LIB = $(OUT)/libmupdf.$(SO)$(SO_VERSION)
-+THIRD_LIB = $(OUT)/libmupdf-third.$(SO)$(SO_VERSION)
- ifeq ($(SO),dll)
- MUPDF_LIB_IMPORT = $(OUT)/libmupdf_$(SO).a
- LIBS_TO_INSTALL_IN_BIN = $(MUPDF_LIB)
-@@ -335,7 +336,10 @@
- endif
- 
- $(MUPDF_LIB) : $(MUPDF_OBJ)
-+      $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.$(SO)$(SO_VERSION)
- $(THIRD_LIB) : $(THIRD_OBJ)
-+      $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.$(SO)$(SO_VERSION)
-+LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- 

diff --git a/build/skel/graphics/zathura-0.5.11.do b/build/skel/graphics/zathura-0.5.11.do
index aa16981f72cf4d6075f0de7c630ce24609531f2f70f1ed8d6665ae807196ee75..a7a09c80607db10e4f9feb65c49fda3fd2bcbb1f07de5b32d4a007ed3bc329f1 100644 (file)
--- a/build/skel/graphics/zathura-0.5.11.do
+++ b/build/skel/graphics/zathura-0.5.11.do
@@ -14,7 +14,7 @@ rdeps="
 databases/sqlite-3450100
 devel/json-glib-1.10.6
 graphics/djvulibre-3.5.28
-graphics/mupdf-1.24.0-170-g05063f228
+graphics/mupdf-1.27.2
 "
 meson=meson-1.7.2
 pdfmupdf=zathura-pdf-mupdf-0.4.4