Stuart, ports@,
I'd like to update mupdf to last release.
I have used it since first -RC and a bit before that, and it quite stable.
Ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/mupdf/Makefile,v
diff -u -p -r1.148 Makefile
--- Makefile 14 Apr 2025 18:56:39 -0000 1.148
+++ Makefile 12 May 2025 22:53:47 -0000
@@ -2,7 +2,7 @@ COMMENT = graphic library, pdf parser, v
SHARED_LIBS += mupdf 12.1
-V = 1.25.6
+V = 1.26.0
DISTNAME = mupdf-$V-source
PKGNAME = mupdf-${V:S/-rc/rc/}
@@ -21,7 +21,7 @@ PERMIT_PACKAGE = Yes
# uses pledge(2)
WANTLIB += X11 Xext c curl freetype gumbo harfbuzz jbig2dec jpeg
-WANTLIB += m openjp2 pthread z crypto
+WANTLIB += m openjp2 pthread z crypto brotlienc brotlidec
FLAVORS = js
FLAVOR ?=
@@ -35,7 +35,8 @@ COMPILER = base-clang ports-gcc
BUILD_DEPENDS = shells/bash
RUN_DEPENDS = devel/desktop-file-utils \
devel/xdg-utils
-LIB_DEPENDS = devel/harfbuzz \
+LIB_DEPENDS = archivers/brotli \
+ devel/harfbuzz \
graphics/jbig2dec \
graphics/jpeg \
graphics/openjp2>=2.0.1 \
@@ -75,15 +76,12 @@ pre-configure:
cd ${WRKSRC}; sed -i 's,/usr/X11R6/include,${X11BASE}/include,g'
Makerules Makethird
# keeping internal copy of lcms2 which is a fork with API changes
#
http://git.ghostscript.com/?p=thirdparty-lcms2.git;a=blob_plain;f=doc/WhyThisFork.txt;hb=lcms2mt
- rm -r
${WRKSRC}/thirdparty/{curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
# use from ports
+ rm -r
${WRKSRC}/thirdparty/{curl,brotli,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
# use from ports
+
.if !${FLAVOR:Mjs}
- rm -r ${WRKSRC}/thirdparty/mujs # not building with javascript support
-CFLAGS += -DFZ_ENABLE_JS=0
-# disable mupdf-gl; it uses some parts of mujs internally so
-# js support can't be knocked out completely
MAKE_FLAGS += HAVE_GLUT=No
.else
-MAKE_FLAGS += ENABLE_MUJS=yes
+MAKE_FLAGS += mujs=yes
WANTLIB += GL glut
LIB_DEPENDS += graphics/freeglut
.endif
@@ -92,6 +90,10 @@ LIB_DEPENDS += graphics/freeglut
.if ${MACHINE_ARCH:Mmips64*}
MAKE_FLAGS += HAVE_OBJCOPY=no
.endif
+
+# 1.26.0 moved muraster and mupdf-x11-curl into separate build targets
+ALL_TARGET = all extra-apps
+INSTALL_TARGET = install install-extra-apps
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{applications,pixmaps}
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/mupdf/distinfo,v
diff -u -p -r1.67 distinfo
--- distinfo 14 Apr 2025 18:56:39 -0000 1.67
+++ distinfo 12 May 2025 22:53:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (mupdf-1.25.6-source.tar.gz) =
WlHYvV7WkNPIv4Kzx8Pxz1+d3kCIejbjtap4p+PM0bs=
-SIZE (mupdf-1.25.6-source.tar.gz) = 54637444
+SHA256 (mupdf-1.26.0-source.tar.gz) =
2Jb4nqv8Wqqrzd3DD0WS9t8zB1ZAdZKS3TONjmnlnGM=
+SIZE (mupdf-1.26.0-source.tar.gz) = 64626385
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-Makefile,v
diff -u -p -r1.24 patch-Makefile
--- patches/patch-Makefile 17 Jun 2024 11:57:15 -0000 1.24
+++ patches/patch-Makefile 12 May 2025 22:53:47 -0000
@@ -1,12 +1,12 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -81,7 +81,7 @@ endif
- LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+@@ -83,7 +83,7 @@ ifdef RANLIB
+ endif
+ LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(EXE_LDFLAGS) $(LDFLAGS) -o $@
$^ $(LIBS)
TAGS_CMD = $(QUIET_TAGS) ctags
- WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
-OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z
noexecstack -o $@ $<
+OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) $(LLD_EMUL) -r -b binary
-z noexecstack -o $@ $<
- GENDEF_CMD = $(QUIET_GENDEF) gendef - $< > $@
- DLLTOOL_CMD = $(QUIET_DLLTOOL) dlltool -d $< -D $(notdir $(^:%.def=%.dll)) -l
$@
+ SYMLINK_CMD = $(QUIET_SYMLINK) $(MKTGTDIR) ; ln -sf
+ ifeq ($(shared),yes)
Index: patches/patch-Makerules
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-Makerules,v
diff -u -p -r1.31 patch-Makerules
--- patches/patch-Makerules 25 Jul 2024 15:13:07 -0000 1.31
+++ patches/patch-Makerules 12 May 2025 22:53:47 -0000
@@ -1,7 +1,7 @@
Index: Makerules
--- Makerules.orig
+++ Makerules
-@@ -114,7 +114,7 @@ ifeq ($(build),debug)
+@@ -131,7 +131,7 @@ ifeq ($(build),debug)
CFLAGS += -pipe -g
LDFLAGS += -g
else ifeq ($(build),release)
Index: patches/patch-Makethird
===================================================================
RCS file: patches/patch-Makethird
diff -N patches/patch-Makethird
--- patches/patch-Makethird 22 Mar 2024 13:14:37 -0000 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-Index: Makethird
---- Makethird.orig
-+++ Makethird
-@@ -145,6 +145,7 @@ endif
-
- # --- MuJS ---
-
-+ifeq ($(ENABLE_MUJS),yes)
- ifeq ($(USE_SYSTEM_MUJS),yes)
- THIRD_CFLAGS += $(SYS_MUJS_CFLAGS)
- THIRD_LIBS += $(SYS_MUJS_LIBS)
-@@ -154,6 +155,7 @@ else
- THIRD_SRC += $(MUJS_SRC)
- $(OUT)/thirdparty/mujs/%.o: thirdparty/mujs/%.c
- $(CC_CMD) $(LIB_CFLAGS) $(MUJS_CFLAGS) $(MUJS_BUILD_CFLAGS)
-+endif
- endif
-
- # --- ZLIB ---
Index: patches/patch-docs_man_mupdf_1
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-docs_man_mupdf_1,v
diff -u -p -r1.6 patch-docs_man_mupdf_1
--- patches/patch-docs_man_mupdf_1 7 Mar 2022 21:36:57 -0000 1.6
+++ patches/patch-docs_man_mupdf_1 12 May 2025 22:53:47 -0000
@@ -3,7 +3,7 @@ espie@ added feature
Index: docs/man/mupdf.1
--- docs/man/mupdf.1.orig
+++ docs/man/mupdf.1
-@@ -94,6 +94,9 @@ Pan page left or right.
+@@ -119,6 +119,9 @@ Pan page left or right.
.TP
.B Control + Scroll wheel
Zoom in or out.
Index: patches/patch-platform_x11_pdfapp_c
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-platform_x11_pdfapp_c,v
diff -u -p -r1.24 patch-platform_x11_pdfapp_c
--- patches/patch-platform_x11_pdfapp_c 26 Jan 2025 12:24:53 -0000 1.24
+++ patches/patch-platform_x11_pdfapp_c 12 May 2025 22:53:47 -0000
@@ -28,7 +28,7 @@ Index: platform/x11/pdfapp.c
static int zoom_in(int oldres)
{
int i;
-@@ -1679,6 +1689,7 @@ key_rewritten:
+@@ -1684,6 +1694,7 @@ key_rewritten:
app->pageno++;
break;
@@ -36,7 +36,7 @@ Index: platform/x11/pdfapp.c
case 'b':
{
int number = 1;
-@@ -1725,7 +1736,7 @@ key_rewritten:
+@@ -1730,7 +1741,7 @@ key_rewritten:
{
if (app->imgw + app->panx <= app->winw
+ app->imgw/20)
{
@@ -45,7 +45,7 @@ Index: platform/x11/pdfapp.c
{
app->panx = 0;
app->pany = 0;
-@@ -1837,9 +1848,9 @@ static void handlescroll(pdfapp_t *app, int modifiers,
+@@ -1842,9 +1853,9 @@ static void handlescroll(pdfapp_t *app, int modifiers,
{
/* zoom in/out if ctrl is pressed */
if (dir > 0)
Index: patches/patch-platform_x11_x11_main_c
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-platform_x11_x11_main_c,v
diff -u -p -r1.12 patch-platform_x11_x11_main_c
--- patches/patch-platform_x11_x11_main_c 2 Dec 2024 11:04:37 -0000
1.12
+++ patches/patch-platform_x11_x11_main_c 12 May 2025 22:53:47 -0000
@@ -14,7 +14,7 @@ Index: platform/x11/x11_main.c
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-@@ -756,7 +757,6 @@ static void onselreq(Window requestor, Atom selection,
+@@ -771,7 +772,6 @@ static void onselreq(Window requestor, Atom selection,
void winreloadpage(pdfapp_t *app)
{
XEvent xev;
@@ -22,7 +22,7 @@ Index: platform/x11/x11_main.c
xev.xclient.type = ClientMessage;
xev.xclient.serial = 0;
-@@ -767,8 +767,7 @@ void winreloadpage(pdfapp_t *app)
+@@ -782,8 +782,7 @@ void winreloadpage(pdfapp_t *app)
xev.xclient.data.l[0] = 0;
xev.xclient.data.l[1] = 0;
xev.xclient.data.l[2] = 0;
@@ -32,7 +32,7 @@ Index: platform/x11/x11_main.c
}
void winopenuri(pdfapp_t *app, char *buf)
-@@ -962,6 +961,16 @@ int main(int argc, char **argv)
+@@ -977,6 +976,16 @@ int main(int argc, char **argv)
tmo_at.tv_sec = 0;
tmo_at.tv_usec = 0;
timeout = NULL;
Index: patches/patch-source_tools_mudraw_c
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-source_tools_mudraw_c,v
diff -u -p -r1.20 patch-source_tools_mudraw_c
--- patches/patch-source_tools_mudraw_c 2 Dec 2024 11:04:37 -0000 1.20
+++ patches/patch-source_tools_mudraw_c 12 May 2025 22:53:47 -0000
@@ -12,7 +12,7 @@ Index: source/tools/mudraw.c
#include <string.h>
#include <limits.h>
#include <stdlib.h>
-@@ -2165,6 +2167,12 @@ int mudraw_main(int argc, char **argv)
+@@ -2166,6 +2168,12 @@ int mudraw_main(int argc, char **argv)
if (fz_optind == argc)
return usage();
Index: patches/patch-source_tools_pdfclean_c
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-source_tools_pdfclean_c,v
diff -u -p -r1.11 patch-source_tools_pdfclean_c
--- patches/patch-source_tools_pdfclean_c 23 Jan 2025 09:41:31 -0000
1.11
+++ patches/patch-source_tools_pdfclean_c 12 May 2025 22:53:47 -0000
@@ -12,7 +12,7 @@ Index: source/tools/pdfclean.c
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-@@ -257,6 +259,12 @@ int pdfclean_main(int argc, char **argv)
+@@ -266,6 +268,12 @@ int pdfclean_main(int argc, char **argv)
(strstr(argv[fz_optind], ".pdf") || strstr(argv[fz_optind],
".PDF")))
{
outfile = argv[fz_optind++];
Index: patches/patch-source_tools_pdfposter_c
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-source_tools_pdfposter_c,v
diff -u -p -r1.8 patch-source_tools_pdfposter_c
--- patches/patch-source_tools_pdfposter_c 22 Mar 2024 13:14:37 -0000
1.8
+++ patches/patch-source_tools_pdfposter_c 12 May 2025 22:53:47 -0000
@@ -12,7 +12,7 @@ Index: source/tools/pdfposter.c
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-@@ -240,6 +242,12 @@ int pdfposter_main(int argc, char **argv)
+@@ -248,6 +250,12 @@ int pdfposter_main(int argc, char **argv)
(strstr(argv[fz_optind], ".pdf") || strstr(argv[fz_optind],
".PDF")))
{
outfile = argv[fz_optind++];
Index: patches/patch-source_tools_pdfshow_c
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-source_tools_pdfshow_c,v
diff -u -p -r1.11 patch-source_tools_pdfshow_c
--- patches/patch-source_tools_pdfshow_c 21 Apr 2022 09:47:28 -0000
1.11
+++ patches/patch-source_tools_pdfshow_c 12 May 2025 22:53:47 -0000
@@ -15,7 +15,7 @@ Index: source/tools/pdfshow.c
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-@@ -627,10 +630,23 @@ int pdfshow_main(int argc, char **argv)
+@@ -641,11 +644,24 @@ int pdfshow_main(int argc, char **argv)
else
out = fz_stdout(ctx);
@@ -26,6 +26,7 @@ Index: source/tools/pdfshow.c
+ }
+
fz_var(doc);
+ fz_var(labels);
fz_try(ctx)
{
doc = pdf_open_document(ctx, filename);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/mupdf/pkg/PLIST,v
diff -u -p -r1.34 PLIST
--- pkg/PLIST 2 Dec 2024 11:04:37 -0000 1.34
+++ pkg/PLIST 12 May 2025 22:53:47 -0000
@@ -9,6 +9,7 @@ include/mupdf/fitz/
include/mupdf/fitz.h
include/mupdf/fitz/archive.h
include/mupdf/fitz/band-writer.h
+include/mupdf/fitz/barcode.h
include/mupdf/fitz/bidi.h
include/mupdf/fitz/bitmap.h
include/mupdf/fitz/buffer.h
@@ -33,6 +34,7 @@ include/mupdf/fitz/hash.h
include/mupdf/fitz/heap-imp.h
include/mupdf/fitz/heap.h
include/mupdf/fitz/image.h
+include/mupdf/fitz/json.h
include/mupdf/fitz/link.h
include/mupdf/fitz/log.h
include/mupdf/fitz/outline.h
--
wbr, Kirill
