xmw 14/08/25 09:38:00 Modified: mupdf-9999.ebuild mupdf-1.5.ebuild ChangeLog Log: Fix for openjpeg-2.1 (bug 520774). (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.48 app-text/mupdf/mupdf-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.48&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.48&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?r1=1.47&r2=1.48 Index: mupdf-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- mupdf-9999.ebuild 21 Jul 2014 22:00:02 -0000 1.47 +++ mupdf-9999.ebuild 25 Aug 2014 09:38:00 -0000 1.48 @@ -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 @@ "${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 1.3 app-text/mupdf/mupdf-1.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild?r1=1.2&r2=1.3 Index: mupdf-1.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mupdf-1.5.ebuild 25 Aug 2014 09:06:55 -0000 1.2 +++ mupdf-1.5.ebuild 25 Aug 2014 09:38:00 -0000 1.3 @@ -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 @@ 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 @@ "${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 1.108 app-text/mupdf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.108&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.108&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?r1=1.107&r2=1.108 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- ChangeLog 25 Aug 2014 09:06:55 -0000 1.107 +++ ChangeLog 25 Aug 2014 09:38:00 -0000 1.108 @@ -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 <[email protected]> + +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 <[email protected]> mupdf-1.1_p20121127.ebuild, mupdf-1.3_p20140118.ebuild, mupdf-1.4-r1.ebuild, mupdf-1.5.ebuild:
