snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

mupdf: fix build.

This commit is contained in:
Matthias von Faber 2017-08-28 08:47:41 +02:00 committed by Leаh Neukirchen
parent a2fc7b4ceb
commit a7a1c40d98
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch
View File

@ -1,6 +1,6 @@
--- source/fitz/load-jpx.c.orig --- source/fitz/load-jpx.c.orig
+++ source/fitz/load-jpx.c +++ source/fitz/load-jpx.c
@@ -444,14 +444,19 @@ @@ -444,12 +444,17 @@
#else /* HAVE_LURATECH */ #else /* HAVE_LURATECH */
@ -16,11 +16,8 @@
#define USE_JPIP #define USE_JPIP
+#endif +#endif
-#include <openjpeg.h> #include <openjpeg.h>
+#include <openjpeg-2.1/openjpeg.h>
struct fz_jpxd_s
{
@@ -919,6 +924,9 @@ @@ -919,6 +924,9 @@
*yresp = state.yres; *yresp = state.yres;
} }

3
srcpkgs/mupdf/template
View File

@ -1,7 +1,7 @@
# Template file for 'mupdf' # Template file for 'mupdf'
pkgname=mupdf pkgname=mupdf
version=1.11 version=1.11
revision=2 revision=3
wrksrc="${pkgname}-${version}-source" wrksrc="${pkgname}-${version}-source"
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel
@ -28,6 +28,7 @@ do_configure() {
} }
do_build() { do_build() {
CFLAGS+=" -fPIC" CFLAGS+=" -fPIC"
CFLAGS+=" $(pkg-config --cflags libopenjp2)"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
make CROSSCOMPILE=yes CURL_LIBS='-lcurl -lpthread' build=release make CROSSCOMPILE=yes CURL_LIBS='-lcurl -lpthread' build=release
make CROSSCOMPILE=yes CFLAGS="$CFLAGS" build=release -C thirdparty/mujs make CROSSCOMPILE=yes CFLAGS="$CFLAGS" build=release -C thirdparty/mujs