diff options
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/mupdf/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch | 11 | ||||
| -rw-r--r-- | app-text/mupdf/mupdf-1.5.ebuild | 9 | ||||
| -rw-r--r-- | app-text/mupdf/mupdf-9999.ebuild | 7 |
4 files changed, 29 insertions, 4 deletions
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog index ed1f884ea68f..1d72cb8e572f 100644 --- a/app-text/mupdf/ChangeLog +++ b/app-text/mupdf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/mupdf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.107 2014/08/25 09:06:55 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.108 2014/08/25 09:38:00 xmw Exp $ + + 25 Aug 2014; Michael Weber <xmw@gentoo.org> + +files/mupdf-1.5-openjpeg-2.1.patch, mupdf-1.5.ebuild, mupdf-9999.ebuild: + Fix for openjpeg-2.1 (bug 520774). 25 Aug 2014; Michael Weber <xmw@gentoo.org> mupdf-1.1_p20121127.ebuild, mupdf-1.3_p20140118.ebuild, mupdf-1.4-r1.ebuild, mupdf-1.5.ebuild: diff --git a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch new file mode 100644 index 000000000000..70481400edde --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.5-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); + diff --git a/app-text/mupdf/mupdf-1.5.ebuild b/app-text/mupdf/mupdf-1.5.ebuild index 23058f81a3ab..f87ae7c5dc9d 100644 --- a/app-text/mupdf/mupdf-1.5.ebuild +++ b/app-text/mupdf/mupdf-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v 1.2 2014/08/25 09:06:55 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v 1.3 2014/08/25 09:38:00 xmw Exp $ EAPI=5 @@ -18,7 +18,7 @@ IUSE="X vanilla +curl +openssl static static-libs" LIB_DEPEND="dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] - <media-libs/openjpeg-2.1:2[static-libs?] + media-libs/openjpeg:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] @@ -42,6 +42,11 @@ src_prepare() { "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch + if has_version ">=media-libs/openjpeg-2.1:2" ; then + epatch \ + "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch + fi + sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ -i platform/debian/${PN}.pc || die diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild index 7e847f1b472b..e6b485b54185 100644 --- a/app-text/mupdf/mupdf-9999.ebuild +++ b/app-text/mupdf/mupdf-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.47 2014/07/21 22:00:02 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.48 2014/08/25 09:38:00 xmw Exp $ EAPI=5 @@ -43,6 +43,11 @@ src_prepare() { "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch + if has_version ">=media-libs/openjpeg-2.1:2" ; then + epatch \ + "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch + fi + sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ -i platform/debian/${PN}.pc || die |