diff options
author | leot <leot@pkgsrc.org> | 2016-02-04 11:50:24 +0000 |
---|---|---|
committer | leot <leot@pkgsrc.org> | 2016-02-04 11:50:24 +0000 |
commit | a033ceb6cdd8f0754ea4b66ee352bdfb7d047a5a (patch) | |
tree | 5da84a63401c04fa29ffa62cf40a5e2ec835b3ea /print | |
parent | deb474a95d849c5a93cfdf1e588bd84f424032c0 (diff) | |
download | pkgsrc-a033ceb6cdd8f0754ea4b66ee352bdfb7d047a5a.tar.gz |
Add glfw option to mupdf (disabled by default).
Bump PKGREVISION++.
Diffstat (limited to 'print')
-rw-r--r-- | print/mupdf/Makefile | 4 | ||||
-rw-r--r-- | print/mupdf/PLIST | 3 | ||||
-rw-r--r-- | print/mupdf/buildlink3.mk | 7 | ||||
-rw-r--r-- | print/mupdf/distinfo | 12 | ||||
-rw-r--r-- | print/mupdf/options.mk | 15 | ||||
-rw-r--r-- | print/mupdf/patches/patch-Makethird | 6 | ||||
-rw-r--r-- | print/mupdf/patches/patch-ab | 25 | ||||
-rw-r--r-- | print/mupdf/patches/patch-ac | 29 | ||||
-rw-r--r-- | print/mupdf/patches/patch-ae | 4 | ||||
-rw-r--r-- | print/mupdf/patches/patch-source_fitz_load-jpx.c | 4 |
10 files changed, 77 insertions, 32 deletions
diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile index e8d4aadda85..d8cf651d5bf 100644 --- a/print/mupdf/Makefile +++ b/print/mupdf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2015/11/12 21:11:31 leot Exp $ +# $NetBSD: Makefile,v 1.34 2016/02/04 11:50:24 leot Exp $ DISTNAME= mupdf-1.8-source PKGNAME= ${DISTNAME:S/-source//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= http://mupdf.com/downloads/ diff --git a/print/mupdf/PLIST b/print/mupdf/PLIST index 13ab82ffa33..f4f9f0a27f9 100644 --- a/print/mupdf/PLIST +++ b/print/mupdf/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.10 2015/11/11 17:08:25 leot Exp $ +@comment $NetBSD: PLIST,v 1.11 2016/02/04 11:50:24 leot Exp $ bin/mujstest bin/mupdf +${PLIST.glfw}bin/mupdf-gl bin/mutool include/mupdf/fitz.h include/mupdf/fitz/annotation.h diff --git a/print/mupdf/buildlink3.mk b/print/mupdf/buildlink3.mk index 84a51c7db4a..588fc9e7387 100644 --- a/print/mupdf/buildlink3.mk +++ b/print/mupdf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/11/11 17:08:25 leot Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2016/02/04 11:50:24 leot Exp $ BUILDLINK_TREE+= mupdf @@ -16,6 +16,11 @@ pkgbase := mupdf .include "../../mk/pthread.buildlink3.mk" .endif +.if !empty(PKG_BUILD_OPTIONS.mupdf:Mglfw) +.include "../../graphics/glut/buildlink3.mk" +.include "../../graphics/glfw/buildlink3.mk" +.endif + .include "../../graphics/jbig2dec/buildlink3.mk" .include "../../graphics/openjpeg/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo index b2196878c95..13ea721e960 100644 --- a/print/mupdf/distinfo +++ b/print/mupdf/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.22 2015/11/12 21:11:31 leot Exp $ +$NetBSD: distinfo,v 1.23 2016/02/04 11:50:24 leot Exp $ SHA1 (mupdf-1.8-source.tar.gz) = 9fbc9e06f0b74fe904745c363324eaca3517bfce RMD160 (mupdf-1.8-source.tar.gz) = 2708f5650f23101a66cef92b7903aafb716f9c02 SHA512 (mupdf-1.8-source.tar.gz) = 938fbed4afc0dd0aa621911cd70b9289c6a4f13d026f9390b11fc86d5b37845a76943c9fa42f218f67fe298295f15d6664a18be7bf73b5d952724122510f9deb Size (mupdf-1.8-source.tar.gz) = 14169777 bytes -SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299 -SHA1 (patch-ab) = 8f8f167d9207734891c68e358c802107f5600da2 -SHA1 (patch-ac) = 51cfd962d498c70308053507b159df2634b2fbd6 -SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19 -SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33 +SHA1 (patch-Makethird) = a44207c6c33fabec7e35c5f94bf30ab4172a93bc +SHA1 (patch-ab) = a8ea41737aee65ad36ff52089d772844fb96d464 +SHA1 (patch-ac) = 75447e4a2ab2ba9f9691a860499897e15d2498fa +SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede +SHA1 (patch-source_fitz_load-jpx.c) = 661b6a7f1d4da4f0cf5de3762db2f77d91239a6b diff --git a/print/mupdf/options.mk b/print/mupdf/options.mk index 2a1ec5f3e85..a8a22fb9e11 100644 --- a/print/mupdf/options.mk +++ b/print/mupdf/options.mk @@ -1,10 +1,12 @@ -# $NetBSD: options.mk,v 1.3 2014/06/15 19:15:51 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2016/02/04 11:50:24 leot Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mupdf -PKG_SUPPORTED_OPTIONS= curl +PKG_SUPPORTED_OPTIONS= curl glfw .include "../../mk/bsd.options.mk" +PLIST_VARS+= glfw + # # curl support # @@ -12,3 +14,12 @@ PKG_SUPPORTED_OPTIONS= curl .include "../../www/curl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif + +# +# glfw support +# +.if !empty(PKG_OPTIONS:Mglfw) +PLIST.glfw= yes +.include "../../graphics/glut/buildlink3.mk" +.include "../../graphics/glfw/buildlink3.mk" +.endif diff --git a/print/mupdf/patches/patch-Makethird b/print/mupdf/patches/patch-Makethird index 800d2e70b54..8a54d5ebfa4 100644 --- a/print/mupdf/patches/patch-Makethird +++ b/print/mupdf/patches/patch-Makethird @@ -1,10 +1,10 @@ -$NetBSD: patch-Makethird,v 1.4 2014/06/15 19:15:51 wiz Exp $ +$NetBSD: patch-Makethird,v 1.5 2016/02/04 11:50:24 leot Exp $ o mujs building support with libtool ---- Makethird.orig 2014-06-10 15:09:28.000000000 +0000 +--- Makethird.orig 2015-11-10 16:19:51.000000000 +0000 +++ Makethird -@@ -50,14 +50,14 @@ endif +@@ -51,14 +51,14 @@ endif ifneq "$(wildcard $(MUJS_DIR)/README)" "" diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab index 6785630d5a7..319bdff40b5 100644 --- a/print/mupdf/patches/patch-ab +++ b/print/mupdf/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.10 2015/11/11 17:08:25 leot Exp $ +$NetBSD: patch-ab,v 1.11 2016/02/04 11:50:24 leot Exp $ o Handle the various operating systems in the same way avoiding hardcoding o Build and link with openjpeg-2.1 ---- Makerules.orig 2015-10-21 14:45:11.000000000 +0000 +--- Makerules.orig 2015-11-10 16:19:51.000000000 +0000 +++ Makerules @@ -29,46 +29,6 @@ ifeq "$(largefile)" "yes" CFLAGS += -DFZ_LARGEFILE @@ -52,7 +52,26 @@ o Build and link with openjpeg-2.1 HAVE_X11 ?= yes HAVE_GLUT ?= yes -@@ -98,8 +58,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec +@@ -87,8 +47,16 @@ SYS_CURL_DEPS = -lpthread -lrt + SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext) + SYS_X11_LIBS = $(shell pkg-config --libs x11 xext) + +-SYS_GLUT_CFLAGS = +-SYS_GLUT_LIBS = -lglut -lGL ++ifeq "$(shell pkg-config --exists glut && echo yes)" "yes" ++SYS_GLUT_CFLAGS = $(shell pkg-config --cflags glut) ++SYS_GLUT_LIBS = $(shell pkg-config --libs glut) ++endif ++ ++ifeq "$(shell pkg-config --exists glfw3 && echo yes)" "yes" ++HAVE_GLFW = yes ++SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3) ++SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3) ++endif + + SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) + SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) +@@ -98,8 +66,6 @@ SYS_JBIG2DEC_LIBS = -ljbig2dec SYS_JPEG_LIBS = -ljpeg SYS_ZLIB_LIBS = -lz diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac index 496832a0730..dc1468ceae8 100644 --- a/print/mupdf/patches/patch-ac +++ b/print/mupdf/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.12 2015/11/12 21:11:31 leot Exp $ +$NetBSD: patch-ac,v 1.13 2016/02/04 11:50:24 leot Exp $ o libtool support o Install target cleanup @@ -171,7 +171,7 @@ o libmujs support: install like a non-thirdparty mupdf's library $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS) $(MUTOOL) : $(MUTOOL_OBJ) -@@ -251,19 +244,19 @@ $(MUTOOL) : $(MUTOOL_OBJ) +@@ -251,27 +244,27 @@ $(MUTOOL) : $(MUTOOL_OBJ) MJSGEN := $(OUT)/mjsgen $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS) @@ -195,11 +195,12 @@ o libmujs support: install like a non-thirdparty mupdf's library $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS) $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) -@@ -271,7 +264,7 @@ $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) + $(LINK_CMD) $(X11_LIBS) ifeq "$(HAVE_GLFW)" "yes" - MUVIEW_GLFW := $(OUT)/mupdf-gl +-MUVIEW_GLFW := $(OUT)/mupdf-gl -MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o) ++MUVIEW_GLFW := $(OUT)/platform/gl/mupdf-gl +MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.lo gl-input.lo gl-main.lo) $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h $(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIBS) $(GLFW_LIB) @@ -215,7 +216,7 @@ o libmujs support: install like a non-thirdparty mupdf's library $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB) $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) -@@ -290,7 +283,7 @@ endif +@@ -290,17 +283,27 @@ endif ifeq "$(HAVE_WIN32)" "yes" MUVIEW_WIN32 := $(OUT)/mupdf @@ -224,11 +225,14 @@ o libmujs support: install like a non-thirdparty mupdf's library $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS) $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) -@@ -300,7 +293,12 @@ endif - MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW) - MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL) + $(LINK_CMD) $(WIN32_LIBS) + endif --INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL) +-MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW) ++MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) + MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL) ++MUVIEW_GLFW := $(MUVIEW_GLFW) ++ +INSTALL_APPS := $(MUTOOL) $(MUJSTEST) +ifeq "$(HAVE_CURL)" "yes" +INSTALL_APPS += $(MUVIEW_CURL) @@ -236,9 +240,14 @@ o libmujs support: install like a non-thirdparty mupdf's library +INSTALL_APPS += $(MUVIEW) +endif +-INSTALL_APPS := $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL) ++ifeq "$(HAVE_GLFW)" "yes" ++INSTALL_APPS += $(MUVIEW_GLFW) ++endif + # --- Examples --- -@@ -343,24 +341,26 @@ libs: $(INSTALL_LIBS) +@@ -343,24 +346,26 @@ libs: $(INSTALL_LIBS) apps: $(INSTALL_APPS) install: libs apps diff --git a/print/mupdf/patches/patch-ae b/print/mupdf/patches/patch-ae index 4ce63959c46..41a0419c490 100644 --- a/print/mupdf/patches/patch-ae +++ b/print/mupdf/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.4 2014/04/21 16:14:40 wiz Exp $ +$NetBSD: patch-ae,v 1.5 2016/02/04 11:50:24 leot Exp $ Avoid namespace conflicts with bswap(3). ---- source/fitz/crypt-sha2.c.orig 2014-04-11 15:10:41.000000000 +0000 +--- source/fitz/crypt-sha2.c.orig 2015-11-10 16:19:51.000000000 +0000 +++ source/fitz/crypt-sha2.c @@ -17,7 +17,7 @@ static inline int isbigendian(void) return *(char*)&one == 0; diff --git a/print/mupdf/patches/patch-source_fitz_load-jpx.c b/print/mupdf/patches/patch-source_fitz_load-jpx.c index 4f563bcbbd2..7a3b0c592c9 100644 --- a/print/mupdf/patches/patch-source_fitz_load-jpx.c +++ b/print/mupdf/patches/patch-source_fitz_load-jpx.c @@ -1,9 +1,9 @@ -$NetBSD: patch-source_fitz_load-jpx.c,v 1.1 2014/05/18 08:12:22 wiz Exp $ +$NetBSD: patch-source_fitz_load-jpx.c,v 1.2 2016/02/04 11:50:24 leot Exp $ Fix build with openjpeg-2.1. I have misgivings about the code though. ---- source/fitz/load-jpx.c.orig 2014-04-11 15:10:41.000000000 +0000 +--- source/fitz/load-jpx.c.orig 2015-11-10 16:19:51.000000000 +0000 +++ source/fitz/load-jpx.c @@ -117,7 +117,8 @@ fz_load_jpx(fz_context *ctx, unsigned ch opj_stream_set_read_function(stream, fz_opj_stream_read); |