diff options
Diffstat (limited to 'print/mupdf/patches/patch-ab')
| -rw-r--r-- | print/mupdf/patches/patch-ab | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab index 892d2dddf64..3b5da57d8dc 100644 --- a/print/mupdf/patches/patch-ab +++ b/print/mupdf/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $ +$NetBSD: patch-ab,v 1.19 2019/05/12 12:27:02 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 @@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $ If no lcms2 is available just pass `-DNO_ICC' to disable it via CFLAGS. ---- Makerules.orig 2018-09-25 12:39:17.000000000 +0000 +--- Makerules.orig 2019-05-06 11:53:09.000000000 +0000 +++ Makerules @@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW) OS := $(OS:Windows_NT=MINGW) @@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $ SANITIZE_FLAGS += -fsanitize=address SANITIZE_FLAGS += -fsanitize=leak -@@ -72,77 +61,63 @@ SYS_MUJS_LIBS := -lmujs +@@ -72,52 +61,40 @@ SYS_MUJS_LIBS := -lmujs SYS_OPENJPEG_LIBS := -lopenjp2 SYS_ZLIB_LIBS := -lz @@ -50,11 +50,11 @@ $NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $ - AR = xcrun ar - LD = xcrun ld - RANLIB = xcrun ranlib -+HAVE_OBJCOPY := no - +- -else ifeq ($(OS),Linux) - HAVE_OBJCOPY := yes -- ++HAVE_OBJCOPY := no + - ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) +ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) @@ -74,7 +74,7 @@ $NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $ - endif - ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes) +else -+ CFLAGS += -DNO_ICC ++ CFLAGS += -DFZ_ENABLE_ICC=0 +endif +ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes) SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) @@ -94,34 +94,21 @@ $NetBSD: patch-ab,v 1.18 2018/10/04 19:02:33 leot Exp $ - endif +endif -- HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes) -- ifeq ($(HAVE_CURL),yes) -+HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes) -+ifeq ($(HAVE_CURL),yes) - SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) - SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -- endif -+endif - -- HAVE_GLUT := yes ++ifeq ($(shell pkg-config --exists glut && echo yes),yes) + HAVE_GLUT := yes - ifeq ($(HAVE_GLUT),yes) - SYS_GLUT_CFLAGS := - SYS_GLUT_LIBS := -lglut -lGL - endif -+ifeq "$(shell pkg-config --exists glut && pkg-config --exists gl && echo yes)" "yes" -+HAVE_GLUT ?= yes -+SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut) -+SYS_GLUT_LIBS := $(shell pkg-config --libs glut) ++ SYS_GLUT_CFLAGS := ++ SYS_GLUT_LIBS := -lglut -lGL +endif -- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) -- ifeq ($(HAVE_X11),yes) -+HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) -+ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) + HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) + ifeq ($(HAVE_X11),yes) +@@ -125,18 +102,16 @@ else ifeq ($(OS),Linux) X11_LIBS := $(shell pkg-config --libs x11 xext) -- endif -+endif + endif - HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) - ifeq ($(HAVE_LIBCRYPTO),yes) |