aboutsummaryrefslogtreecommitdiffstats
path: root/testing/mupdf
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-03-24 09:37:25 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-03-24 09:37:25 +0000
commit11758a6ad19a18f43e3150f66fca7cd9dca1375d (patch)
treecab37b708f30777036429110a277d67b11a6a01d /testing/mupdf
parent1102864f25df4572eb4835f14baa473f87f4305a (diff)
downloadaports-11758a6ad19a18f43e3150f66fca7cd9dca1375d.tar.bz2
aports-11758a6ad19a18f43e3150f66fca7cd9dca1375d.tar.xz
testing/mupdf: rebuild against openjpeg-2.1
use system libs by removing thirdparty dirs
Diffstat (limited to 'testing/mupdf')
-rw-r--r--testing/mupdf/APKBUILD20
-rw-r--r--testing/mupdf/mupdf-openjpeg-2.1.patch11
2 files changed, 24 insertions, 7 deletions
diff --git a/testing/mupdf/APKBUILD b/testing/mupdf/APKBUILD
index 2f22e4cc0..8cd9d2053 100644
--- a/testing/mupdf/APKBUILD
+++ b/testing/mupdf/APKBUILD
@@ -1,17 +1,19 @@
# Maintainer: Michael Zhou <zhoumichaely@gmail.com>
pkgname=mupdf
pkgver=1.6
-pkgrel=0
+pkgrel=1
pkgdesc="A lightweight PDF and XPS viewer"
url="http://mupdf.com"
arch="all"
license="GPL3+"
depends=""
-makedepends="pkgconfig freetype-dev jpeg-dev jbig2dec-dev libx11-dev
- libxext-dev openjpeg-dev"
+makedepends="freetype-dev jpeg-dev jbig2dec-dev libx11-dev libxext-dev
+ openjpeg-dev"
install=""
subpackages="$pkgname-doc"
-source="http://mupdf.com/downloads/$pkgname-$pkgver-source.tar.gz"
+source="http://mupdf.com/downloads/$pkgname-$pkgver-source.tar.gz
+ mupdf-openjpeg-2.1.patch
+ "
_builddir="$srcdir/$pkgname-$pkgver-source"
prepare() {
@@ -22,6 +24,7 @@ prepare() {
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
+ rm -r thirdparty
}
build() {
@@ -35,6 +38,9 @@ package() {
rm -f "$pkgdir"/usr/lib/*.la
}
-md5sums="8d69db41ae9e0b6807b76bb6ed70dc2f mupdf-1.6-source.tar.gz"
-sha256sums="9813ee330950a641364181649ebd369c947adbcea9d41ed953ec5365640ea563 mupdf-1.6-source.tar.gz"
-sha512sums="3a47d47b81550f531039153385fc22bb81a24df334706e23b7f118d08d97bb103566eef2a6ea3602ebe242fcb9d53304bb9d8230109572204491415a3a1b0645 mupdf-1.6-source.tar.gz"
+md5sums="8d69db41ae9e0b6807b76bb6ed70dc2f mupdf-1.6-source.tar.gz
+4a8772b09af5152d9bf58e69834b74bf mupdf-openjpeg-2.1.patch"
+sha256sums="9813ee330950a641364181649ebd369c947adbcea9d41ed953ec5365640ea563 mupdf-1.6-source.tar.gz
+7b49af879df5eb2c79884a0983635fa335422edc9854bc4fbc44f653892827f2 mupdf-openjpeg-2.1.patch"
+sha512sums="3a47d47b81550f531039153385fc22bb81a24df334706e23b7f118d08d97bb103566eef2a6ea3602ebe242fcb9d53304bb9d8230109572204491415a3a1b0645 mupdf-1.6-source.tar.gz
+0a07dc0a0312ef0b6a20f6a89da7a2010008cf804a1c9b33667b17f263a69e46047a34dcb24e8015a98a61e28e1e302dc302c0fbb7303a61b00d9490146b7b83 mupdf-openjpeg-2.1.patch"
diff --git a/testing/mupdf/mupdf-openjpeg-2.1.patch b/testing/mupdf/mupdf-openjpeg-2.1.patch
new file mode 100644
index 000000000..70481400e
--- /dev/null
+++ b/testing/mupdf/mupdf-openjpeg-2.1.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.5/source/fitz/load-jpx.c
++++ mupdf-1.5/source/fitz/load-jpx.c
+@@ -116,7 +116,7 @@
+ opj_stream_set_read_function(stream, fz_opj_stream_read);
+ opj_stream_set_skip_function(stream, fz_opj_stream_skip);
+ opj_stream_set_seek_function(stream, fz_opj_stream_seek);
+- opj_stream_set_user_data(stream, &sb);
++ opj_stream_set_user_data(stream, &sb, NULL);
+ /* Set the length to avoid an assert */
+ opj_stream_set_user_data_length(stream, size);
+