mupdf: update to 1.4.
This commit is contained in:
parent
04f1045b50
commit
110e80a538
3 changed files with 41 additions and 27 deletions
|
@ -1,21 +0,0 @@
|
||||||
--- Makerules 2013-08-27 14:35:11.243520354 +0000
|
|
||||||
+++ Makerules 2013-08-27 15:40:22.583629510 +0000
|
|
||||||
@@ -67,6 +67,8 @@
|
|
||||||
SYS_JBIG2DEC_LIBS = -ljbig2dec
|
|
||||||
SYS_JPEG_LIBS = -ljpeg
|
|
||||||
SYS_ZLIB_LIBS = -lz
|
|
||||||
+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
|
|
||||||
+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
--- Makethird 2013-08-27 15:41:18.043354692 +0000
|
|
||||||
+++ Makethird 2013-08-27 15:42:41.332916192 +0000
|
|
||||||
@@ -444,5 +444,6 @@
|
|
||||||
CURL_CFLAGS := -I$(CURL_DIR)/include
|
|
||||||
CURL_LIBS := $(SYS_CURL_DEPS)
|
|
||||||
else
|
|
||||||
-NOCURL := yes
|
|
||||||
+CURL_CFLAGS := $(SYS_CURL_CFLAGS)
|
|
||||||
+CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS)
|
|
||||||
endif
|
|
24
srcpkgs/mupdf/patches/mupdf-1.4-system-libcurl.patch
Normal file
24
srcpkgs/mupdf/patches/mupdf-1.4-system-libcurl.patch
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
--- Makerules 2014-04-11 15:10:41.000000000 +0000
|
||||||
|
+++ Makerules 2014-04-15 05:35:34.430028127 +0000
|
||||||
|
@@ -47,6 +47,8 @@ SYS_OPENJPEG_LIBS = -lopenjpeg
|
||||||
|
SYS_JBIG2DEC_LIBS = -ljbig2dec
|
||||||
|
SYS_JPEG_LIBS = -ljpeg
|
||||||
|
SYS_ZLIB_LIBS = -lz
|
||||||
|
+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) -I/usr/include/curl
|
||||||
|
+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
|
||||||
|
|
||||||
|
CC = xcrun cc
|
||||||
|
AR = xcrun ar
|
||||||
|
--- Makethird 2014-04-11 15:10:41.000000000 +0000
|
||||||
|
+++ Makethird 2014-04-15 05:37:06.712810863 +0000
|
||||||
|
@@ -454,6 +454,10 @@ CURL_CFLAGS := -I$(CURL_DIR)/include
|
||||||
|
CURL_LIBS := $(SYS_CURL_DEPS)
|
||||||
|
|
||||||
|
HAVE_CURL := yes
|
||||||
|
+else
|
||||||
|
+HAVE_CURL := yes
|
||||||
|
+CURL_CFLAGS := $(SYS_CURL_CFLAGS)
|
||||||
|
+CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
# --- X11 ---
|
|
@ -1,24 +1,35 @@
|
||||||
# Template file for 'mupdf'
|
# Template file for 'mupdf'
|
||||||
pkgname=mupdf
|
pkgname=mupdf
|
||||||
version=1.3
|
version=1.4
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc="${pkgname}-${version}-source"
|
wrksrc="${pkgname}-${version}-source"
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel"
|
||||||
makedepends="zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel desktop-file-utils"
|
makedepends="zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel desktop-file-utils"
|
||||||
depends="desktop-file-utils"
|
depends="desktop-file-utils"
|
||||||
short_desc="Lightweight PDF and XPS viewer"
|
short_desc="Lightweight PDF and XPS viewer"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
license="GPL-3"
|
license="GPL-3"
|
||||||
homepage="http://mupdf.com"
|
homepage="http://mupdf.com"
|
||||||
distfiles="https://mupdf.googlecode.com/files/mupdf-${version}-source.tar.gz"
|
distfiles="http://mupdf.com/downloads/mupdf-${version}-source.tar.gz"
|
||||||
checksum=aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478
|
checksum=018bab9520b5e93bb33ab07b0472fdf9f768c5801769f95b9a696941b633ec22
|
||||||
|
|
||||||
pre_build() {
|
pre_configure() {
|
||||||
rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
|
rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
if [ "$CROSS_BUILD" ]; then
|
||||||
|
unset CFLAGS
|
||||||
|
make CC=cc LD=ld AR=ar build=release generate
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
make ${makejobs} build=release
|
if [ "$CROSS_BUILD" ]; then
|
||||||
|
make CROSSCOMPILE=yes CURL_LIBS='-lcurl -lpthread' build=release
|
||||||
|
else
|
||||||
|
make CURL_LIBS='-lcurl -lpthread' build=release
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue