CVS commit: pkgsrc/print/mupdf

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep  1 13:56:53 UTC 2022

Modified Files:
        pkgsrc/print/mupdf: Makefile distinfo
        pkgsrc/print/mupdf/patches: patch-Makethird patch-platform_gl_gl-app.h
Removed Files:
        pkgsrc/print/mupdf/patches: patch-platform_gl_gl-main.c
            patch-thirdparty_mujs_Makefile

Log Message:
mupdf: Use mujs from pkgsrc. Delete no-longer-needed patches.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/mupdf/patches/patch-Makethird
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h
cvs rdiff -u -r1.3 -r0 pkgsrc/print/mupdf/patches/patch-platform_gl_gl-main.c
cvs rdiff -u -r1.9 -r0 \
    pkgsrc/print/mupdf/patches/patch-thirdparty_mujs_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.93 pkgsrc/print/mupdf/Makefile:1.94
--- pkgsrc/print/mupdf/Makefile:1.93    Thu Aug 11 05:09:12 2022
+++ pkgsrc/print/mupdf/Makefile Thu Sep  1 13:56:53 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.93 2022/08/11 05:09:12 gutteridge Exp $
+# $NetBSD: Makefile,v 1.94 2022/09/01 13:56:53 nia Exp $
 
 DISTNAME=      mupdf-1.20.0-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
-MASTER_SITES=  https://mupdf.com/downloads/archive/
+#MASTER_SITES= https://mupdf.com/downloads/archive/
 
 MAINTAINER=    leot%NetBSD.org@localhost
 HOMEPAGE=      https://mupdf.com/
@@ -22,15 +22,14 @@ LDFLAGS+=           ${COMPILER_RPATH_FLAG}${X11BA
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=           build=release
-MAKE_ENV+=             USE_SYSTEM_LIBS=yes
+MAKE_FLAGS+=           USE_SYSTEM_LIBS=yes
+MAKE_FLAGS+=           USE_SYSTEM_MUJS=yes
 
 CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
 
 .include "options.mk"
 
 # Remove thirdparty directory in order to use the libraries provided by pkgsrc
-# mujs directory is an exception and should not be removed (MuJS is the
-# default Javascript interpreter for mupdf).
 post-extract:
        ${RM} -fr \
            ${WRKSRC}/thirdparty/curl \
@@ -42,6 +41,7 @@ post-extract:
            ${WRKSRC}/thirdparty/leptonica \
            ${WRKSRC}/thirdparty/lcms2 \
            ${WRKSRC}/thirdparty/libjpeg \
+           ${WRKSRC}/thirdparty/mujs \
            ${WRKSRC}/thirdparty/openjpeg \
            ${WRKSRC}/thirdparty/tesseract \
            ${WRKSRC}/thirdparty/zlib
@@ -65,6 +65,7 @@ BUILDLINK_API_DEPENDS.zlib+=  zlib>=1.2.7
 #.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../lang/mujs/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../www/gumbo-parser/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.59 pkgsrc/print/mupdf/distinfo:1.60
--- pkgsrc/print/mupdf/distinfo:1.59    Sun Jul 24 10:13:38 2022
+++ pkgsrc/print/mupdf/distinfo Thu Sep  1 13:56:53 2022
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.59 2022/07/24 10:13:38 leot Exp $
+$NetBSD: distinfo,v 1.60 2022/09/01 13:56:53 nia Exp $
 
 BLAKE2s (mupdf-1.20.0-source.tar.gz) = 64fd8e785c6795a23894c6905b9590f1188d8956752c1b5ced032bb9911a28ed
 SHA512 (mupdf-1.20.0-source.tar.gz) = 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
 Size (mupdf-1.20.0-source.tar.gz) = 88455853 bytes
 SHA1 (patch-Makelists) = 474ad296aa550272b9d734e2b001af1371ae06ad
-SHA1 (patch-Makethird) = 415a3fe6e0e58a948565b9098c8325e85d19d561
+SHA1 (patch-Makethird) = fdddf41a3c44a1fda04c7ce1b51284dd918e3c54
 SHA1 (patch-ab) = acbb4e8a34ccad701323a521600f361175668b9e
 SHA1 (patch-ac) = d3d70857bdffa9e4264444c2047f1ad909f141ce
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-platform_gl_gl-app.h) = 48f48f13c9a6376231de25aa63411560ea9d91ca
-SHA1 (patch-platform_gl_gl-main.c) = c760d16f0ac4a9b09800869d22b7324724bc007b
+SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78
 SHA1 (patch-scripts_hexdump.sh) = 1f1299e24ffa5e6bf040f73b75dc49dd6f5272c4
 SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb
-SHA1 (patch-thirdparty_mujs_Makefile) = dda76ff0d35abca49a828cd85e29a28b700518a1

Index: pkgsrc/print/mupdf/patches/patch-Makethird
diff -u pkgsrc/print/mupdf/patches/patch-Makethird:1.13 pkgsrc/print/mupdf/patches/patch-Makethird:1.14
--- pkgsrc/print/mupdf/patches/patch-Makethird:1.13     Sat Oct 23 15:22:07 2021
+++ pkgsrc/print/mupdf/patches/patch-Makethird  Thu Sep  1 13:56:53 2022
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makethird,v 1.13 2021/10/23 15:22:07 leot Exp $
+$NetBSD: patch-Makethird,v 1.14 2022/09/01 13:56:53 nia Exp $
 
 - Avoid to need third party lcms2
 - Add mujs building support with libtool
 
---- Makethird.orig     2021-10-05 10:44:43.000000000 +0000
+--- Makethird.orig     2022-06-14 12:19:22.000000000 +0000
 +++ Makethird
 @@ -120,12 +120,6 @@ endif
  ifeq ($(USE_SYSTEM_LCMS2),yes)
@@ -18,15 +18,6 @@ $NetBSD: patch-Makethird,v 1.13 2021/10/
  endif
  
  # --- MuJS ---
-@@ -137,7 +131,7 @@ else
-   THIRD_CFLAGS += $(MUJS_CFLAGS)
-   THIRD_LIBS += $(MUJS_LIBS)
-   THIRD_SRC += $(MUJS_SRC)
--$(OUT)/thirdparty/mujs/%.o: thirdparty/mujs/%.c
-+$(OUT)/thirdparty/mujs/%.lo: thirdparty/mujs/%.c
-       $(CC_CMD) $(LIB_CFLAGS) $(MUJS_CFLAGS) $(MUJS_BUILD_CFLAGS)
- endif
- 
 @@ -241,7 +235,7 @@ endif
  THIRD_CFLAGS += $(EXTRACT_CFLAGS)
  THIRD_LIBS += $(EXTRACT_LIBS)

Index: pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h
diff -u pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h:1.4 pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h:1.5
--- pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h:1.4   Thu May  7 20:42:57 2020
+++ pkgsrc/print/mupdf/patches/patch-platform_gl_gl-app.h       Thu Sep  1 13:56:53 2022
@@ -1,7 +1,6 @@
-$NetBSD: patch-platform_gl_gl-app.h,v 1.4 2020/05/07 20:42:57 leot Exp $
+$NetBSD: patch-platform_gl_gl-app.h,v 1.5 2022/09/01 13:56:53 nia Exp $
 
-- Do not force freeglut GLUT implementation to every non-APPLE platforms.
-- Adjust the glut.h include.
+- Use freeglut everywhere.
 
 --- platform/gl/gl-app.h.orig  2020-05-05 11:29:09.000000000 +0000
 +++ platform/gl/gl-app.h