CVS commit: pkgsrc/print/mupdf

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Aug  2 14:32:46 UTC 2023

Modified Files:
        pkgsrc/print/mupdf: Makefile distinfo
        pkgsrc/print/mupdf/patches: patch-Makelists patch-ab
Removed Files:
        pkgsrc/print/mupdf/patches: patch-Makethird

Log Message:
mupdf: Enable color management

* The external lcms2 from graphics/lcms2 is not compatible with
  current mupdf. Remove some changes that disable internel lcms2.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/mupdf/patches/patch-Makelists
cvs rdiff -u -r1.15 -r0 pkgsrc/print/mupdf/patches/patch-Makethird
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/mupdf/patches/patch-ab

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.105 pkgsrc/print/mupdf/Makefile:1.106
--- pkgsrc/print/mupdf/Makefile:1.105   Wed Jun 28 08:37:16 2023
+++ pkgsrc/print/mupdf/Makefile Wed Aug  2 14:32:46 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2023/06/28 08:37:16 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2023/08/02 14:32:46 ryoon Exp $
 
 DISTNAME=      mupdf-1.22.2-source
 PKGNAME=       ${DISTNAME:S/-source//}
+PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES=  https://mupdf.com/downloads/archive/
 
@@ -28,7 +29,7 @@ CFLAGS.SunOS+=        -D_XOPEN_SOURCE=600
 .include "options.mk"
 
 # Remove thirdparty directory in order to use the libraries provided by pkgsrc
-post-extract:
+ppost-extract:
        ${RM} -fr \
            ${WRKSRC}/thirdparty/curl \
            ${WRKSRC}/thirdparty/freeglut \
@@ -37,7 +38,6 @@ post-extract:
            ${WRKSRC}/thirdparty/harfbuzz \
            ${WRKSRC}/thirdparty/jbig2dec \
            ${WRKSRC}/thirdparty/leptonica \
-           ${WRKSRC}/thirdparty/lcms2 \
            ${WRKSRC}/thirdparty/libjpeg \
            ${WRKSRC}/thirdparty/mujs \
            ${WRKSRC}/thirdparty/openjpeg \

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.66 pkgsrc/print/mupdf/distinfo:1.67
--- pkgsrc/print/mupdf/distinfo:1.66    Wed Jun 28 08:37:16 2023
+++ pkgsrc/print/mupdf/distinfo Wed Aug  2 14:32:46 2023
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.66 2023/06/28 08:37:16 wiz Exp $
+$NetBSD: distinfo,v 1.67 2023/08/02 14:32:46 ryoon Exp $
 
 BLAKE2s (mupdf-1.22.2-source.tar.gz) = 08b3154c05b4d7f2add872278f1f53b2fdafbf4b1546c21e04c50f4a47b713b9
 SHA512 (mupdf-1.22.2-source.tar.gz) = 1f2e1c8caab49fcc1fe9d3f2bc994d36c77166a8f424311fb8dd8cfdc18b279d85f2cec52966cdce84a0488465b50eadf9f26f22dda06cb9de6127096458b3b9
 Size (mupdf-1.22.2-source.tar.gz) = 57541621 bytes
-SHA1 (patch-Makelists) = 474ad296aa550272b9d734e2b001af1371ae06ad
-SHA1 (patch-Makethird) = 6c0359df0809e658c3c6568d85a98b02158f2e3e
-SHA1 (patch-ab) = acbb4e8a34ccad701323a521600f361175668b9e
+SHA1 (patch-Makelists) = 3e7ed072386ce30b59f7c0ca16d9abdd4defee67
+SHA1 (patch-ab) = 38d7ce5f7302ef376af7b185186e8dae57d6a884
 SHA1 (patch-ac) = b66ee5026bebec1fc428b847de6672e8d90b7e16
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 1e915249010acd3ff1343f0607e785d06577fe78

Index: pkgsrc/print/mupdf/patches/patch-Makelists
diff -u pkgsrc/print/mupdf/patches/patch-Makelists:1.1 pkgsrc/print/mupdf/patches/patch-Makelists:1.2
--- pkgsrc/print/mupdf/patches/patch-Makelists:1.1      Sat Oct 23 15:22:07 2021
+++ pkgsrc/print/mupdf/patches/patch-Makelists  Wed Aug  2 14:32:46 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makelists,v 1.1 2021/10/23 15:22:07 leot Exp $
+$NetBSD: patch-Makelists,v 1.2 2023/08/02 14:32:46 ryoon Exp $
 
 Avoid to unconditionally pass -DHAVE_* flags: this breaks lcms2 that
 gets recognized as lcms2mt.
@@ -14,12 +14,3 @@ gets recognized as lcms2mt.
  
  JPEGXR_BUILD_CFLAGS += -Wno-tautological-compare
  
-@@ -186,7 +186,7 @@ LIBJPEG_SRC += thirdparty/libjpeg/jutils
- # --- LCMS2 (multi-threaded fork) ---
- 
- LCMS2_CFLAGS += -Ithirdparty/lcms2/include
--LCMS2_CFLAGS += -DHAVE_LCMS2MT
-+#LCMS2_CFLAGS += -DHAVE_LCMS2MT
- 
- LCMS2_SRC += thirdparty/lcms2/src/cmsalpha.c
- LCMS2_SRC += thirdparty/lcms2/src/cmscam02.c

Index: pkgsrc/print/mupdf/patches/patch-ab
diff -u pkgsrc/print/mupdf/patches/patch-ab:1.25 pkgsrc/print/mupdf/patches/patch-ab:1.26
--- pkgsrc/print/mupdf/patches/patch-ab:1.25    Sat Jul 23 15:09:43 2022
+++ pkgsrc/print/mupdf/patches/patch-ab Wed Aug  2 14:32:46 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.25 2022/07/23 15:09:43 leot Exp $
+$NetBSD: patch-ab,v 1.26 2023/08/02 14:32:46 ryoon Exp $
 
 - Handle the various operating systems in the same way avoiding hardcoding
 - Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
@@ -9,10 +9,10 @@ $NetBSD: patch-ab,v 1.25 2022/07/23 15:0
   (also for other fonts)).  This needs to be investigated further.
 - Avoid internal version of freeglut and try to pick it up via pkg-config and
   set SYS_GLUT_{CFLAGS,LIBS} accordingly.
-- Avoid internal version of lcms2 and try to pick it up via pkg-config and
-  set SYS_LCMS2_{CFLAGS,LIBS} accordingly.
-  If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
-  CFLAGS.
+#- Avoid internal version of lcms2 and try to pick it up via pkg-config and
+#  set SYS_LCMS2_{CFLAGS,LIBS} accordingly.
+#  If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
+#  CFLAGS.
 
 --- Makerules.orig     2022-06-14 12:19:22.000000000 +0000
 +++ Makerules
@@ -103,7 +103,7 @@ $NetBSD: patch-ab,v 1.25 2022/07/23 15:0
 -  endif
 -  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
 +else
-+      CFLAGS += -DFZ_ENABLE_ICC=0
++      #CFLAGS += -DFZ_ENABLE_ICC=0
 +endif
 +ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
        SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)