mupdf: use system libopenjpeg2.

This commit is contained in:
Christian Neukirchen 2015-12-02 13:31:35 +01:00
parent 154e5b6451
commit bc0ddbaa60
2 changed files with 15 additions and 4 deletions

View file

@ -0,0 +1,11 @@
--- source/fitz/load-jpx.c
+++ 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);

View file

@ -1,11 +1,11 @@
# Template file for 'mupdf' # Template file for 'mupdf'
pkgname=mupdf pkgname=mupdf
version=1.8 version=1.8
revision=1 revision=2
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
libXrandr-devel libXinerama-devel MesaLib-devel" libXrandr-devel libXinerama-devel MesaLib-devel libopenjpeg2-devel"
makedepends="${hostmakedepends}" makedepends="${hostmakedepends}"
depends="desktop-file-utils" depends="desktop-file-utils"
short_desc="Lightweight PDF and XPS viewer" short_desc="Lightweight PDF and XPS viewer"
@ -16,7 +16,7 @@ distfiles="http://mupdf.com/downloads/mupdf-${version}-source.tar.gz"
checksum=a2a3c64d8b24920f87cf4ea9339a25abf7388496440f13b37482d1403c33c206 checksum=a2a3c64d8b24920f87cf4ea9339a25abf7388496440f13b37482d1403c33c206
pre_configure() { pre_configure() {
rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec} rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec,openjpeg}
} }
do_configure() { do_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
@ -47,7 +47,7 @@ do_install() {
mupdf-devel_package() { mupdf-devel_package() {
short_desc+=" - development files" short_desc+=" - development files"
depends="libjpeg-turbo-devel jbig2dec-devel" depends="libjpeg-turbo-devel jbig2dec-devel libopenjpeg2-devel"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib vmove usr/lib