From a7a1c40d981b85b074af0c06fd0fb7ef19f853b4 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Mon, 28 Aug 2017 08:47:41 +0200
Subject: [PATCH] mupdf: fix build.
---
srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch | 7 ++-----
srcpkgs/mupdf/template | 3 ++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch b/srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch
index 177080c75c8..fa1054782fc 100644
--- a/srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch
+++ b/srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch
@@ -1,6 +1,6 @@
--- source/fitz/load-jpx.c.orig
+++ source/fitz/load-jpx.c
-@@ -444,14 +444,19 @@
+@@ -444,12 +444,17 @@
#else /* HAVE_LURATECH */
@@ -16,11 +16,8 @@
#define USE_JPIP
+#endif
--#include <openjpeg.h>
-+#include <openjpeg-2.1/openjpeg.h>
+ #include <openjpeg.h>
- struct fz_jpxd_s
- {
@@ -919,6 +924,9 @@
*yresp = state.yres;
}
diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 763ad258150..9a1cfa590c7 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
# Template file for 'mupdf'
pkgname=mupdf
version=1.11
-revision=2
+revision=3
wrksrc="${pkgname}-${version}-source"
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel
@@ -28,6 +28,7 @@ do_configure() {
}
do_build() {
CFLAGS+=" -fPIC"
+ CFLAGS+=" $(pkg-config --cflags libopenjp2)"
if [ "$CROSS_BUILD" ]; then
make CROSSCOMPILE=yes CURL_LIBS='-lcurl -lpthread' build=release
make CROSSCOMPILE=yes CFLAGS="$CFLAGS" build=release -C thirdparty/mujs