diff options
author | Michael Weber <xmw@gentoo.org> | 2017-04-28 11:33:04 +0200 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2017-04-28 11:33:23 +0200 |
commit | 7e51c0aae90d1611ff7674963a0e3989e6124e5d (patch) | |
tree | db06cc8c54f6cc629f00091a4953a7344f4fd42e /app-text/mupdf/files | |
parent | x11-wm/stumpwm: Updates clx version (diff) | |
download | gentoo-7e51c0aae90d1611ff7674963a0e3989e6124e5d.tar.gz gentoo-7e51c0aae90d1611ff7674963a0e3989e6124e5d.tar.bz2 gentoo-7e51c0aae90d1611ff7674963a0e3989e6124e5d.zip |
app-text/mupdf: Version bump (bug 616652), make mupdf-gl default if available (bug 616654), thanks Massimo Burcheri.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'app-text/mupdf/files')
-rw-r--r-- | app-text/mupdf/files/mupdf-1.11-CFLAGS.patch | 10 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch | 37 | ||||
-rw-r--r-- | app-text/mupdf/files/mupdf-1.11-system-glfw.patch | 11 |
3 files changed, 58 insertions, 0 deletions
diff --git a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch new file mode 100644 index 000000000000..2ffd326e5e46 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch @@ -0,0 +1,10 @@ +--- mupdf-1.11-source/Makerules ++++ mupdf-1.11-source/Makerules +@@ -23,7 +23,6 @@ + endif + + ifeq "$(build)" "debug" +-CFLAGS += -pipe -g + LDFLAGS += -g + else ifeq "$(build)" "release" + CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch new file mode 100644 index 000000000000..91fd9f6485dc --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch @@ -0,0 +1,37 @@ +--- mupdf-1.11-source/Makerules ++++ mupdf-1.11-source/Makerules +@@ -116,12 +116,17 @@ + SYS_PTHREAD_CFLAGS := + SYS_PTHREAD_LIBS := -lpthread + ++WANT_OPENSSL ?= yes ++ifeq "$(WANT_OPENSSL)" "yes" + ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes" + HAVE_LIBCRYPTO := yes + SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) + SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) + endif ++endif + ++WANT_CURL ?= yes ++ifeq "$(WANT_CURL)" "yes" + ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" + HAVE_CURL := yes + SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) +@@ -133,12 +138,16 @@ + endif + endif + SYS_CURL_DEPS += -lpthread -lrt ++endif + ++WANT_X!! ?= yes ++ifeq "$(WANT_X11)" "yes" + ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" + HAVE_X11 := yes + SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext) + SYS_X11_LIBS := $(shell pkg-config --libs x11 xext) + endif ++endif + + ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes" + SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) diff --git a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch new file mode 100644 index 000000000000..90189f9400b0 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch @@ -0,0 +1,11 @@ +--- mupdf-1.11-source/Makerules ++++ mupdf-1.11-source/Makerules +@@ -158,6 +158,8 @@ + SYS_JBIG2DEC_LIBS := -ljbig2dec + SYS_LIBJPEG_LIBS := -ljpeg + SYS_ZLIB_LIBS := -lz ++SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl) ++SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl) + + endif + |