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 | 582cb7b508be22ea243d6a6acfedf530bdcf7acb (patch) | |
tree | 58c24936866751a5580203f4fb2917c75e3b3134 /sci-libs/gdal | |
parent | Version bump. (diff) | |
download | historical-582cb7b508be22ea243d6a6acfedf530bdcf7acb.tar.gz historical-582cb7b508be22ea243d6a6acfedf530bdcf7acb.tar.bz2 historical-582cb7b508be22ea243d6a6acfedf530bdcf7acb.zip |
Updated with pdf use flag and png-1.5 support (closes bug 355817).
Package-Manager: portage-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/Manifest | 4 | ||||
-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 |
4 files changed, 293 insertions, 2 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/Manifest b/sci-libs/gdal/Manifest index f07bb1d21177..1e38137a56e8 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -5,11 +5,13 @@ AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593 AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1 AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea +AUX gdal-png-1.5.patch 1422 RMD160 5177f60d44189289fefc98ec8f59645b880b7362 SHA1 63c3290883f6f9f70fe6ec9cd2c3e37becaeee7b SHA256 c7a5c4584b60c653b0f2116d9898e5110fe0e29d175a2fc00d34d36487856418 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67 DIST gdal-1.7.3.tar.gz 7757684 RMD160 ce84a12d48c85a58c56a17381aee1c4f2ba08b57 SHA1 58d4355fe792ad618bb74605dc1a084a0aeb7cb1 SHA256 fbdb89356abad4e27894ebfbc865afb8b89cdb796f3a19d9b0347f9dd6e4cf4a DIST gdal-1.8.0.tar.gz 8837824 RMD160 0e116f41b23ff5b44c692f56459facab332c6201 SHA1 e5a2802933054050c6fb0b0a0e1f46b5dd195b0a SHA256 515f0316cd17281a09a147914b47b28bbc4855cdb86d41d12cb8716d1721e435 EBUILD gdal-1.6.3-r1.ebuild 6945 RMD160 10002036621b9177f36735792c58e3762b0d2f82 SHA1 90581a6e09df2a78279ba8bf10d2ad8b227b21a7 SHA256 3bbadfdd4a4a761a859cbf5f6bc0cd2fbe9242a568d82227b03093446e8db13e EBUILD gdal-1.7.3.ebuild 6338 RMD160 72d01e85e43f008c4085bc473016d56051f62639 SHA1 53d933abd9415147cb3f971d63ede251ad6425e3 SHA256 5def9add2dba72c13766f556be5d9ef9d591740de886d9b6845642721d2ae67e +EBUILD gdal-1.8.0-r1.ebuild 6372 RMD160 2953a8f3fb1435306474e9f47aad7068dde92dc4 SHA1 68d455e30e6baca62d0a1cbb2ec441205f4ce974 SHA256 b497b7e1a42b6a1a1354d93166950b68f380eb55147ead78d8795feecf2c3a75 EBUILD gdal-1.8.0.ebuild 6271 RMD160 c3f1cba19fdc99b0831b8e8fa531658001aa7716 SHA1 3c5cee1c8e39dbe72de87cc437badb5cbc07d91f SHA256 732aac0859eced0daff235dfc0c4d42e90fadc3c1eefe99427f6dc7f476ee4fb -MISC ChangeLog 19800 RMD160 70eb34aa82b9aac6c144d857cf50d0c52ff969ae SHA1 3a3bca1970b3005e9d63a368e95863eab714c967 SHA256 de9e562f09a27c537fcdb19a39a421a686e4f213735c540c7cd53cc74834e106 +MISC ChangeLog 20059 RMD160 8d23a413f45654bcaa36639b2df4c22832fb52ce SHA1 c1be853354f097c3cf520f44add069b5c4215b4b SHA256 3131477da3ea8702937bfe4026a6860b1384e403602890b25f836aed364e50d6 MISC metadata.xml 1177 RMD160 1711328052cf0a70e14142ea08d571d564288c68 SHA1 c791c4e490071c65aad3938cee40e54db4541de4 SHA256 2d9cf1dfaf4d13f428e1dc5b5e4f5dfea3997475d09f994ce858f90768329807 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)." +} |