[pkgsrc/trunk]: pkgsrc/print/mupdf mupdf: Use mujs from pkgsrc. Delete no-lon...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/mupdf mupdf: Use mujs from pkgsrc. Delete no-lon...
From: nia <nia%pkgsrc.org@localhost>
Date: Thu, 01 Sep 2022 15:34:24 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a5d070502dd6
branches:  trunk
changeset: 384537:a5d070502dd6
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Sep 01 13:56:53 2022 +0000

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

diffstat:

 print/mupdf/Makefile                               |  13 ++-
 print/mupdf/distinfo                               |   8 +-
 print/mupdf/patches/patch-Makethird                |  13 +---
 print/mupdf/patches/patch-platform_gl_gl-app.h     |   5 +-
 print/mupdf/patches/patch-platform_gl_gl-main.c    |  15 ----
 print/mupdf/patches/patch-thirdparty_mujs_Makefile |  73 ----------------------
 6 files changed, 14 insertions(+), 113 deletions(-)

diffs (213 lines):

diff -r 5f90505fb38b -r a5d070502dd6 print/mupdf/Makefile
--- a/print/mupdf/Makefile      Thu Sep 01 13:51:55 2022 +0000
+++ b/print/mupdf/Makefile      Thu Sep 01 13:56:53 2022 +0000
@@ -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 @@
 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 @@
            ${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 @@
 #.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"
diff -r 5f90505fb38b -r a5d070502dd6 print/mupdf/distinfo
--- a/print/mupdf/distinfo      Thu Sep 01 13:51:55 2022 +0000
+++ b/print/mupdf/distinfo      Thu Sep 01 13:56:53 2022 +0000
@@ -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
diff -r 5f90505fb38b -r a5d070502dd6 print/mupdf/patches/patch-Makethird
--- a/print/mupdf/patches/patch-Makethird       Thu Sep 01 13:51:55 2022 +0000
+++ b/print/mupdf/patches/patch-Makethird       Thu Sep 01 13:56:53 2022 +0000
@@ -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 @@
  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)
diff -r 5f90505fb38b -r a5d070502dd6 print/mupdf/patches/patch-platform_gl_gl-app.h
--- a/print/mupdf/patches/patch-platform_gl_gl-app.h    Thu Sep 01 13:51:55 2022 +0000
+++ b/print/mupdf/patches/patch-platform_gl_gl-app.h    Thu Sep 01 13:56:53 2022 +0000
@@ -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
diff -r 5f90505fb38b -r a5d070502dd6 print/mupdf/patches/patch-platform_gl_gl-main.c
--- a/print/mupdf/patches/patch-platform_gl_gl-main.c   Thu Sep 01 13:51:55 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-platform_gl_gl-main.c,v 1.3 2020/05/07 20:42:57 leot Exp $
-
-glutLeaveMainLoop() is present only on freeglut, define it otherwise.
-
---- platform/gl/gl-main.c.orig 2020-05-05 11:29:09.000000000 +0000
-+++ platform/gl/gl-main.c
-@@ -26,7 +26,7 @@
- #include <direct.h> /* for getcwd */
- #endif
- 
--#ifdef __APPLE__
-+#ifndef FREEGLUT
- static void cleanup(void);
- void glutLeaveMainLoop(void)
- {
diff -r 5f90505fb38b -r a5d070502dd6 print/mupdf/patches/patch-thirdparty_mujs_Makefile
--- a/print/mupdf/patches/patch-thirdparty_mujs_Makefile        Thu Sep 01 13:51:55 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-$NetBSD: patch-thirdparty_mujs_Makefile,v 1.9 2022/07/23 15:09:43 leot Exp $
-
-- Add libtool support to mujs.
-- Avoid to set (unused) VERSION variable.
-
---- thirdparty/mujs/Makefile.orig      2021-12-08 11:56:12.000000000 +0000
-+++ thirdparty/mujs/Makefile
-@@ -9,12 +9,6 @@ bindir ?= $(prefix)/bin
- incdir ?= $(prefix)/include
- libdir ?= $(prefix)/lib
- 
--ifeq "$(wildcard .git)" ".git"
--  VERSION := $(shell git describe --tags --always)
--else
--  VERSION := $(shell basename $$PWD | sed -e s,^mujs-,,)
--endif
--
- ifeq ($(shell uname),Darwin)
-       SO_EXT := dylib
- else
-@@ -60,7 +54,7 @@ HDRS := $(wildcard js*.h mujs.h utf.h re
- 
- default: shell
- shell: $(OUT)/mujs $(OUT)/mujs-pp
--static: $(OUT)/libmujs.a
-+static: $(OUT)/libmujs.la
- shared: $(OUT)/libmujs.$(SO_EXT)
- 
- astnames.h: jsparse.h
-@@ -74,15 +68,15 @@ one.c: $(SRCS)
- 
- jsdump.c: astnames.h opnames.h
- 
--$(OUT)/%.o: %.c $(HDRS)
-+$(OUT)/%.lo: %.c $(HDRS)
-       @ mkdir -p $(dir $@)
-       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- 
--$(OUT)/libmujs.o: one.c $(HDRS)
-+$(OUT)/libmujs.lo: one.c $(HDRS)
-       @ mkdir -p $(dir $@)
-       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- 
--$(OUT)/libmujs.a: $(OUT)/libmujs.o
-+$(OUT)/libmujs.la: $(OUT)/libmujs.lo
-       @ mkdir -p $(dir $@)
-       $(AR) cr $@ $^
- 
-@@ -90,11 +84,11 @@ $(OUT)/libmujs.$(SO_EXT): one.c $(HDRS)
-       @ mkdir -p $(dir $@)
-       $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
- 
--$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
-+$(OUT)/mujs: $(OUT)/libmujs.lo $(OUT)/main.lo
-       @ mkdir -p $(dir $@)
-       $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
- 
--$(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o
-+$(OUT)/mujs-pp: $(OUT)/libmujs.lo $(OUT)/pp.lo
-       @ mkdir -p $(dir $@)
-       $(CC) $(LDFLAGS) -o $@ $^ -lm
- 
-@@ -120,8 +114,8 @@ install-common: $(OUT)/mujs $(OUT)/mujs.
-       install -m 644 $(OUT)/mujs.pc $(DESTDIR)$(libdir)/pkgconfig
-       install -m 755 $(OUT)/mujs $(DESTDIR)$(bindir)
- 
--install-static: install-common $(OUT)/libmujs.a
--      install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir)
-+install-static: install-common $(OUT)/libmujs.la
-+      ${LIBTOOL} --mode=install $(OUT)/libmujs.la $(DESTDIR)$(libdir)
- 
- install-shared: install-common $(OUT)/libmujs.$(SO_EXT)
-       install -m 755 $(OUT)/libmujs.$(SO_EXT) $(DESTDIR)$(libdir)
Prev by Date: [pkgsrc/trunk]: pkgsrc/www/ruby-mustermann www/ruby-mustermann: update to 2.0.2
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated www/ruby-rack-test to 2.0.2
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/ruby-mustermann www/ruby-mustermann: update to 2.0.2
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated www/ruby-rack-test to 2.0.2
Indexes:
Home | Main Index | Thread Index | Old Index