diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-06-06 13:39:51 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-06-06 13:39:51 +0000 |
| commit | dfa31347451bf313ed34c56f9d36194326391cad (patch) | |
| tree | bd1fe83d18e0b1ac5f8a951f4c7df722f67a7ff8 /app-text/mupdf | |
| parent | Drop unnecessary coot mask (diff) | |
| download | gentoo-2-dfa31347451bf313ed34c56f9d36194326391cad.tar.gz gentoo-2-dfa31347451bf313ed34c56f9d36194326391cad.tar.bz2 gentoo-2-dfa31347451bf313ed34c56f9d36194326391cad.zip | |
update to openjpeg-2
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'app-text/mupdf')
| -rw-r--r-- | app-text/mupdf/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/mupdf/files/mupdf-9999-openjpeg2.patch | 13 | ||||
| -rw-r--r-- | app-text/mupdf/mupdf-9999.ebuild | 8 |
3 files changed, 23 insertions, 4 deletions
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog index cb7d72b38d7c..da007bac1661 100644 --- a/app-text/mupdf/ChangeLog +++ b/app-text/mupdf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/mupdf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.65 2013/05/04 14:14:52 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.66 2013/06/06 13:39:50 xmw Exp $ + + 06 Jun 2013; Michael Weber <xmw@gentoo.org> +files/mupdf-9999-openjpeg2.patch, + mupdf-9999.ebuild: + update to openjpeg-2 04 May 2013; Michael Weber <xmw@gentoo.org> mupdf-9999.ebuild: Fix LICENSE to AGPL-3 diff --git a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch new file mode 100644 index 000000000000..00f5e391ff5a --- /dev/null +++ b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch @@ -0,0 +1,13 @@ +--- mupdf-9999/Makerules ++++ mupdf-9999/Makerules +@@ -52,8 +52,8 @@ + + SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) + SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) +-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1) +-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1) ++SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2) ++SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2) + SYS_JBIG2DEC_LIBS = -ljbig2dec + SYS_JPEG_LIBS = -ljpeg + SYS_ZLIB_LIBS = -lz diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild index fbbd8ef8213e..4d38466e3898 100644 --- a/app-text/mupdf/mupdf-9999.ebuild +++ b/app-text/mupdf/mupdf-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.26 2013/05/04 14:14:52 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.27 2013/06/06 13:39:50 xmw Exp $ EAPI=4 @@ -17,7 +17,7 @@ IUSE="X vanilla" RDEPEND="media-libs/freetype:2 media-libs/jbig2dec - >=media-libs/openjpeg-1.5 + media-libs/openjpeg:2 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )" @@ -25,7 +25,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${PN}-9999-buildsystem.patch + epatch \ + "${FILESDIR}"/${PN}-9999-buildsystem.patch \ + "${FILESDIR}"/${PN}-9999-openjpeg2.patch if ! use vanilla ; then epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch |