| 1 |
xmw 14/08/25 09:38:00 |
| 2 |
|
| 3 |
Modified: mupdf-9999.ebuild mupdf-1.5.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix for openjpeg-2.1 (bug 520774). |
| 6 |
|
| 7 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.48 app-text/mupdf/mupdf-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.48&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.48&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?r1=1.47&r2=1.48 |
| 15 |
|
| 16 |
Index: mupdf-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v |
| 19 |
retrieving revision 1.47 |
| 20 |
retrieving revision 1.48 |
| 21 |
diff -u -r1.47 -r1.48 |
| 22 |
--- mupdf-9999.ebuild 21 Jul 2014 22:00:02 -0000 1.47 |
| 23 |
+++ mupdf-9999.ebuild 25 Aug 2014 09:38:00 -0000 1.48 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.47 2014/07/21 22:00:02 xmw Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.48 2014/08/25 09:38:00 xmw Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -43,6 +43,11 @@ |
| 33 |
"${FILESDIR}"/${PN}-1.3-pkg-config.patch \ |
| 34 |
"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch |
| 35 |
|
| 36 |
+ if has_version ">=media-libs/openjpeg-2.1:2" ; then |
| 37 |
+ epatch \ |
| 38 |
+ "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ |
| 42 |
-e "/^prefix=/s:=.*:=${EROOT}/usr:" \ |
| 43 |
-i platform/debian/${PN}.pc || die |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.3 app-text/mupdf/mupdf-1.5.ebuild |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild?rev=1.3&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild?rev=1.3&content-type=text/plain |
| 51 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild?r1=1.2&r2=1.3 |
| 52 |
|
| 53 |
Index: mupdf-1.5.ebuild |
| 54 |
=================================================================== |
| 55 |
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v |
| 56 |
retrieving revision 1.2 |
| 57 |
retrieving revision 1.3 |
| 58 |
diff -u -r1.2 -r1.3 |
| 59 |
--- mupdf-1.5.ebuild 25 Aug 2014 09:06:55 -0000 1.2 |
| 60 |
+++ mupdf-1.5.ebuild 25 Aug 2014 09:38:00 -0000 1.3 |
| 61 |
@@ -1,6 +1,6 @@ |
| 62 |
# Copyright 1999-2014 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v 1.2 2014/08/25 09:06:55 xmw Exp $ |
| 65 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v 1.3 2014/08/25 09:38:00 xmw Exp $ |
| 66 |
|
| 67 |
EAPI=5 |
| 68 |
|
| 69 |
@@ -18,7 +18,7 @@ |
| 70 |
LIB_DEPEND="dev-libs/openssl[static-libs?] |
| 71 |
media-libs/freetype:2[static-libs?] |
| 72 |
media-libs/jbig2dec[static-libs?] |
| 73 |
- <media-libs/openjpeg-2.1:2[static-libs?] |
| 74 |
+ media-libs/openjpeg:2[static-libs?] |
| 75 |
net-misc/curl[static-libs?] |
| 76 |
virtual/jpeg[static-libs?] |
| 77 |
X? ( x11-libs/libX11[static-libs?] |
| 78 |
@@ -42,6 +42,11 @@ |
| 79 |
"${FILESDIR}"/${PN}-1.3-pkg-config.patch \ |
| 80 |
"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch |
| 81 |
|
| 82 |
+ if has_version ">=media-libs/openjpeg-2.1:2" ; then |
| 83 |
+ epatch \ |
| 84 |
+ "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch |
| 85 |
+ fi |
| 86 |
+ |
| 87 |
sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ |
| 88 |
-e "/^prefix=/s:=.*:=${EROOT}/usr:" \ |
| 89 |
-i platform/debian/${PN}.pc || die |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.108 app-text/mupdf/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.108&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.108&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?r1=1.107&r2=1.108 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v |
| 102 |
retrieving revision 1.107 |
| 103 |
retrieving revision 1.108 |
| 104 |
diff -u -r1.107 -r1.108 |
| 105 |
--- ChangeLog 25 Aug 2014 09:06:55 -0000 1.107 |
| 106 |
+++ ChangeLog 25 Aug 2014 09:38:00 -0000 1.108 |
| 107 |
@@ -1,6 +1,10 @@ |
| 108 |
# ChangeLog for app-text/mupdf |
| 109 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.107 2014/08/25 09:06:55 xmw Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.108 2014/08/25 09:38:00 xmw Exp $ |
| 112 |
+ |
| 113 |
+ 25 Aug 2014; Michael Weber <xmw@g.o> |
| 114 |
+ +files/mupdf-1.5-openjpeg-2.1.patch, mupdf-1.5.ebuild, mupdf-9999.ebuild: |
| 115 |
+ Fix for openjpeg-2.1 (bug 520774). |
| 116 |
|
| 117 |
25 Aug 2014; Michael Weber <xmw@g.o> mupdf-1.1_p20121127.ebuild, |
| 118 |
mupdf-1.3_p20140118.ebuild, mupdf-1.4-r1.ebuild, mupdf-1.5.ebuild: |
Archives