| 1 |
bicatali 11/12/20 23:16:07 |
| 2 |
|
| 3 |
Modified: ChangeLog grib_api-1.9.9.ebuild |
| 4 |
Log: |
| 5 |
Fixed automagic and jpeg2k support, bug #391797 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.41/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 sci-libs/grib_api/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/ChangeLog?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/ChangeLog?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/ChangeLog?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- ChangeLog 20 Nov 2011 20:34:45 -0000 1.6 |
| 23 |
+++ ChangeLog 20 Dec 2011 23:16:07 -0000 1.7 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for sci-libs/grib_api |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.6 2011/11/20 20:34:45 bicatali Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.7 2011/12/20 23:16:07 bicatali Exp $ |
| 29 |
+ |
| 30 |
+ 20 Dec 2011; Sébastien Fabbro <bicatali@g.o> grib_api-1.9.9.ebuild: |
| 31 |
+ Fixed automagic and jpeg2k support, bug #391797 |
| 32 |
|
| 33 |
*grib_api-1.9.9 (20 Nov 2011) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 sci-libs/grib_api/grib_api-1.9.9.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: grib_api-1.9.9.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- grib_api-1.9.9.ebuild 20 Nov 2011 20:34:45 -0000 1.1 |
| 51 |
+++ grib_api-1.9.9.ebuild 20 Dec 2011 23:16:07 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2011 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild,v 1.1 2011/11/20 20:34:45 bicatali Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild,v 1.2 2011/12/20 23:16:07 bicatali Exp $ |
| 57 |
|
| 58 |
EAPI=3 |
| 59 |
inherit eutils autotools |
| 60 |
@@ -33,19 +33,29 @@ |
| 61 |
} |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
+ local myconf |
| 65 |
+ if use jpeg2k; then |
| 66 |
+ myconf="--enable-jpeg" |
| 67 |
+ if hasv media-libs/jasper; then |
| 68 |
+ myconf="${myconf} --with-jasper=system --without-openjpeg" |
| 69 |
+ elif hasv media-libs/openjpeg; then |
| 70 |
+ myconf="${myconf} --without-jasper --with-openjpeg=system" |
| 71 |
+ fi |
| 72 |
+ else |
| 73 |
+ myconf="--disable-jpeg --without-jasper --without-openjpeg" |
| 74 |
+ fi |
| 75 |
econf \ |
| 76 |
--enable-install-system-perl \ |
| 77 |
- --with-perl-options=INSTALLDIRS=vendor \ |
| 78 |
+ --with-perl-options="INSTALLDIRS=vendor" \ |
| 79 |
$(use_enable fortran) \ |
| 80 |
- $(use_enable jpeg2k jpeg) \ |
| 81 |
$(use_enable openmp omp-packing) \ |
| 82 |
$(use_enable python) \ |
| 83 |
$(use_enable python numpy) \ |
| 84 |
$(use_enable static-libs static) \ |
| 85 |
- $(use_with netcdf netcdf "${EPRFIX}"/usr) \ |
| 86 |
+ $(use_with netcdf netcdf "${EPREFIX}"/usr) \ |
| 87 |
$(use_with perl) \ |
| 88 |
- $(use_with png png-support) |
| 89 |
- |
| 90 |
+ $(use_with png png-support) \ |
| 91 |
+ ${myconf} |
| 92 |
} |
| 93 |
|
| 94 |
src_install() { |
Archives