diff options
author | Steve Arnold <nerdboy@gentoo.org> | 2011-03-03 07:21:12 +0000 |
---|---|---|
committer | Steve Arnold <nerdboy@gentoo.org> | 2011-03-03 07:21:12 +0000 |
commit | 1e4aa14faa032287f10799aa2255bb2a6cace8f8 (patch) | |
tree | 9b90f123f65e52b11c306eb984bfeb690ed6cfcf /sci-libs/gdal | |
parent | Version bump. (diff) | |
download | gentoo-2-1e4aa14faa032287f10799aa2255bb2a6cace8f8.tar.gz gentoo-2-1e4aa14faa032287f10799aa2255bb2a6cace8f8.tar.bz2 gentoo-2-1e4aa14faa032287f10799aa2255bb2a6cace8f8.zip |
Updated with pdf use flag and png-1.5 support (closes bug 355817).
(Portage version: 2.1.9.41/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/gdal')
-rw-r--r-- | sci-libs/gdal/ChangeLog | 9 | ||||
-rw-r--r-- | sci-libs/gdal/files/gdal-png-1.5.patch | 38 | ||||
-rw-r--r-- | sci-libs/gdal/gdal-1.8.0-r1.ebuild | 244 |
3 files changed, 290 insertions, 1 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index 6b89a172799b..4ec075b15b89 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.107 2011/02/26 22:19:38 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.108 2011/03/03 07:21:12 nerdboy Exp $ + +*gdal-1.8.0-r1 (03 Mar 2011) + + 03 Mar 2011; Steve Arnold <nerdboy@gentoo.org> +files/gdal-png-1.5.patch, + +gdal-1.8.0-r1.ebuild: + Updated with pdf use flag and png-1.5 support, closes bug 355817 (thanks + to Jean-Claude Repetto for submitting the patch). 26 Feb 2011; Kevin McCarthy <signals@gentoo.org> gdal-1.7.3.ebuild, gdal-1.8.0.ebuild: diff --git a/sci-libs/gdal/files/gdal-png-1.5.patch b/sci-libs/gdal/files/gdal-png-1.5.patch new file mode 100644 index 000000000000..f7a3f159826c --- /dev/null +++ b/sci-libs/gdal/files/gdal-png-1.5.patch @@ -0,0 +1,38 @@ +--- frmts/png/pngdataset.cpp 2011-01-14 06:19:04.000000000 +0100 ++++ frmts/png/pngdataset.cpp 2011-03-01 11:41:28.762999973 +0100 +@@ -1315,7 +1315,7 @@ + * instead of an int, which is what fread() actually returns. + */ + check = (png_size_t)VSIFReadL(data, (png_size_t)1, length, +- (VSILFILE*)png_ptr->io_ptr); ++ (VSILFILE*)png_get_io_ptr(png_ptr)); + + if (check != length) + png_error(png_ptr, "Read Error"); +@@ -1330,7 +1330,7 @@ + { + png_uint_32 check; + +- check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr)); ++ check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr)); + + if (check != length) + png_error(png_ptr, "Write Error"); +@@ -1341,7 +1341,7 @@ + /************************************************************************/ + static void png_vsi_flush(png_structp png_ptr) + { +- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) ); ++ VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) ); + } + + /************************************************************************/ +@@ -1357,7 +1357,7 @@ + // libpng is generally not built as C++ and so won't honour unwind + // semantics. Ugg. + +- jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr; ++ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr); + if (psSetJmpContext) + { + longjmp( *psSetJmpContext, 1 ); diff --git a/sci-libs/gdal/gdal-1.8.0-r1.ebuild b/sci-libs/gdal/gdal-1.8.0-r1.ebuild new file mode 100644 index 000000000000..d61b74e10fb3 --- /dev/null +++ b/sci-libs/gdal/gdal-1.8.0-r1.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.1 2011/03/03 07:21:12 nerdboy Exp $ + +EAPI="2" + +WANT_AUTOCONF="2.5" +RUBY_OPTIONAL="yes" +USE_RUBY="ruby18" +PYTHON_DEPEND="python? *:2.6" + +inherit autotools eutils perl-module python ruby-ng toolchain-funcs + +DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)" +HOMEPAGE="http://www.gdal.org/" +SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" + +IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads" + +RDEPEND=" + dev-libs/expat + >=media-libs/tiff-4.0.0_beta6 + sci-libs/libgeotiff + sys-libs/zlib + curl? ( net-misc/curl ) + ecwj2k? ( sci-libs/libecwj2 ) + fits? ( sci-libs/cfitsio ) + geos? ( >=sci-libs/geos-2.2.1 ) + gif? ( media-libs/giflib ) + gml? ( >=dev-libs/xerces-c-3 ) + hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) + jpeg? ( virtual/jpeg ) + jpeg2k? ( media-libs/jasper ) + mysql? ( virtual/mysql ) + netcdf? ( sci-libs/netcdf ) + odbc? ( dev-db/unixODBC ) + ogdi? ( sci-libs/ogdi ) + pdf? ( app-text/poppler ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng ) + postgres? ( + || ( + >=dev-db/postgresql-base-8.4 + >=dev-db/postgresql-server-8.4 + ) + ) + python? ( dev-python/numpy ) + ruby? ( $(ruby_implementation_depend ruby18) ) + sqlite? ( >=dev-db/sqlite-3 )" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + perl? ( >=dev-lang/swig-1.3.32 ) + python? ( >=dev-lang/swig-1.3.32 ) + ruby? ( >=dev-lang/swig-1.3.32 )" + +AT_M4DIR="${S}/m4" +MAKEOPTS+=" -j1" + +src_unpack() { + # prevent ruby-ng.eclass from messing with the src path + default +} + +src_prepare() { + # fix datadir and docdir placement + sed -i \ + -e "s:@datadir@:@datadir@/gdal:" \ + -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \ + GDALmake.opt.in || die + + sed -i \ + -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \ + swig/python/GNUmakefile || die + + epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch + epatch "${FILESDIR}"/gdal-png-1.5.patch + + # -soname is only accepted by GNU ld/ELF + [[ ${CHOST} == *-darwin* ]] \ + && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ + || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch + + eautoreconf +} + +src_configure() { + if use ruby; then + RUBY_MOD_DIR="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')" + echo "Ruby module dir is: $RUBY_MOD_DIR" + fi + + # pcidsk is internal, because there is no such library yet released + # also that thing is developed by the gdal people + # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore + # bsb - legal issues + # oracle - disabled, i dont have and can't test + # ingres - same story as oracle oci + # tiff is a hard dep + econf \ + --enable-shared \ + --disable-static \ + --with-expat \ + --without-grass \ + --without-hdf4 \ + --without-fme \ + --without-pcraster \ + --without-kakadu \ + --without-mrsid \ + --without-jp2mrsid \ + --without-msg \ + --without-bsb \ + --without-dods-root \ + --without-oci \ + --without-ingres \ + --without-spatialite \ + --without-dwgdirect \ + --without-epsilon \ + --without-idb \ + --without-sde \ + --without-libtool \ + --with-libz="${EPREFIX}/usr/" \ + --with-ogr \ + --with-grib \ + --with-vfk \ + --with-libtiff \ + --with-geotiff \ + $(use_enable debug) \ + $(use_with postgres pg) \ + $(use_with fits cfitsio) \ + $(use_with netcdf) \ + $(use_with png) \ + $(use_with jpeg) \ + $(use_with jpeg pcidsk) \ + $(use_with gif) \ + $(use_with ogdi ogdi "${EPREFIX}"/usr) \ + $(use_with hdf5) \ + $(use_with jpeg2k jasper) \ + $(use_with ecwj2k ecw) \ + $(use_with gml xerces) \ + $(use_with odbc) \ + $(use_with curl) \ + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \ + $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \ + $(use_with geos) \ + $(use_with aux_xml pam) \ + $(use_with pdf poppler) \ + $(use_with perl) \ + $(use_with ruby) \ + $(use_with python) \ + $(use_with threads) \ + --with-pymoddir="${EPREFIX}"/$(python_get_sitedir) + + # mysql-config puts this in (and boy is it a PITA to get it out) + if use mysql; then + sed -i \ + -e "s: -rdynamic : :" \ + GDALmake.opt || die "sed LIBS failed" + fi + + # updated for newer swig (must specify the path to input files) + if use python; then + sed -i \ + -e "s: gdal_array.i: ../include/gdal_array.i:" \ + -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \ + swig/python/GNUmakefile || die "sed python makefile failed" + sed -i \ + -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \ + swig/python/setup.cfg || die "sed python setup.cfg failed" + fi +} + +src_compile() { + local i + for i in perl ruby python; do + if use $i; then + rm "${S}"/swig/$i/*_wrap.cpp + emake -C "${S}"/swig/$i generate || \ + die "make generate failed for swig/$i" + fi + done + + # parallel makes fail + emake || die "emake failed" + + if use perl ; then + cd "${S}"/swig/perl + perl-module_src_prep + perl-module_src_compile + cd "${S}" + fi + + if use doc ; then + make docs || die "make docs failed" + fi +} + +src_install() { + if use perl ; then + pushd "${S}"/swig/perl > /dev/null + perl-module_src_install + popd > /dev/null + sed -i \ + -e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \ + GDALmake.opt || die + fi + + emake DESTDIR="${D}" install || die "make install failed" + + if use ruby ; then + # weird reinstall collision; needs manual intervention... + pushd "${S}"/swig/ruby > /dev/null + rm -rf "${D}"${RUBY_MOD_DIR}/gdal + exeinto ${RUBY_MOD_DIR}/gdal + doexe *.so || die "doins ruby modules failed" + popd > /dev/null + fi + + use perl && fixlocalpod + + dodoc Doxyfile HOWTO-RELEASE NEWS || die + + if use doc ; then + dohtml html/* || die "install html failed" + docinto ogr + dohtml ogr/html/* || die "install ogr html failed" + fi + + if use python; then + newdoc swig/python/README.txt README-python.txt || die + insinto /usr/share/${PN}/samples + doins swig/python/samples/* || die + fi +} + +pkg_postinst() { + echo + elog "Check available image and data formats after building with" + elog "gdalinfo and ogrinfo (using the --formats switch)." +} |