* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2015-10-24 17:23 Justin Lecher
0 siblings, 0 replies; 18+ messages in thread
From: Justin Lecher @ 2015-10-24 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 26928529bd50baa3f6a6ef0a77eb4012c82a0fd1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 17:22:40 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 17:23:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26928529
sci-libs/gdal: Backport patch for glibc-2.22
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563608
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch | 14 ++++++++++++++
sci-libs/gdal/gdal-2.0.0-r1.ebuild | 2 ++
2 files changed, 16 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
new file mode 100644
index 0000000..f23ff76
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
@@ -0,0 +1,14 @@
+Index: /branches/2.0/gdal/apps/gdalserver.c
+===================================================================
+--- /branches/2.0/gdal/apps/gdalserver.c (revision 29667)
++++ /branches/2.0/gdal/apps/gdalserver.c (revision 29668)
+@@ -28,7 +28,6 @@
+ ****************************************************************************/
+
+-#if defined(__STDC_VERSION__)
+-#define _XOPEN_SOURCE
+-#endif
++// So that __USE_XOPEN2K is defined to have getaddrinfo
++#define _XOPEN_SOURCE 600
+
+ #include "cpl_port.h"
diff --git a/sci-libs/gdal/gdal-2.0.0-r1.ebuild b/sci-libs/gdal/gdal-2.0.0-r1.ebuild
index 8f44889..6a34452 100644
--- a/sci-libs/gdal/gdal-2.0.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.0.0-r1.ebuild
@@ -80,6 +80,8 @@ pkg_setup() {
src_prepare() {
java-pkg-opt-2_src_prepare
+ epatch "${FILESDIR}"/${P}-glibc-2.22-backport.patch
+
# fix datadir and docdir placement
sed -i \
-e "s:@datadir@:@datadir@/gdal:" \
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2016-11-07 13:56 Amy Winston
0 siblings, 0 replies; 18+ messages in thread
From: Amy Winston @ 2016-11-07 13:56 UTC (permalink / raw
To: gentoo-commits
commit: 33c636fd5f8adad1a38696dcc01252b29a77c616
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 7 13:43:44 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 13:55:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c636fd
sci-libs/gdal: fix jasper bug #598597
Package-Manager: portage-2.3.0
sci-libs/gdal/files/gdal-2.0.2-jasper.patch | 13 ++
sci-libs/gdal/gdal-2.0.2-r2.ebuild | 317 ++++++++++++++++++++++++++++
2 files changed, 330 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch b/sci-libs/gdal/files/gdal-2.0.2-jasper.patch
new file mode 100644
index 00000000..00cf5c1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.0.2-jasper.patch
@@ -0,0 +1,13 @@
+diff -urpN gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h
+--- gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h 2016-01-26 07:21:48.000000000 -0800
++++ gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h 2016-10-31 23:45:28.939407322 -0700
+@@ -29,7 +29,8 @@
+
+ #ifndef JPEG2000_VSIL_IO_H
+ #define JPEG2000_VSIL_IO_H
+-
++
++#include <sys/types.h>
+ #include <jasper/jasper.h>
+
+ jas_stream_t *JPEG2000_VSIL_fopen(const char *filename, const char *mode);
diff --git a/sci-libs/gdal/gdal-2.0.2-r2.ebuild b/sci-libs/gdal/gdal-2.0.2-r2.ebuild
new file mode 100644
index 00000000..ff4d810
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.0.2-r2.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOCONF="2.5"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_4 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls"
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/json-c
+ dev-libs/libpcre
+ dev-libs/libxml2
+ media-libs/tiff:0=
+ sci-libs/libgeotiff
+ sys-libs/zlib[minizip(+)]
+ armadillo? ( sci-libs/armadillo[lapack] )
+ curl? ( net-misc/curl )
+ 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] )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0= )
+ jpeg2k? ( media-libs/jasper:= )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( sci-libs/ogdi )
+ opencl? ( virtual/opencl )
+ pdf? ( >=app-text/poppler-0.24.3:= )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ sqlite? ( dev-db/sqlite:3 )
+ spatialite? ( dev-db/spatialite )
+ xls? ( dev-libs/freexl )
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ java? ( >=virtual/jdk-1.6 )
+ perl? ( dev-lang/swig:0 )
+ python? ( dev-lang/swig:0 )"
+
+AT_M4DIR="${S}/m4"
+
+REQUIRED_USE="
+ spatialite? ( sqlite )
+ mdb? ( java )
+"
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_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" \
+ "${S}"/GDALmake.opt.in || die
+
+ # the second sed expression should fix bug 371075
+ sed -i \
+ -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+ -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+ "${S}"/swig/python/GNUmakefile || die
+
+ if use jpeg2k; then
+ epatch "${FILESDIR}"/${P}-jasper.patch
+ fi
+
+ # -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
+
+ # Fix spatialite/sqlite include issue
+ sed -i \
+ -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+ ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+ # Fix freexl configure check
+ sed -i \
+ -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+ configure.in || die
+
+ sed \
+ -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+ -i configure.in || die
+
+ sed \
+ -e 's:^ar:$(AR):g' \
+ -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+ tc-export AR RANLIB
+
+ eautoreconf
+
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die
+ find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die
+# mkdir -p "${BUILD_DIR}"/swig/python || die
+# mkdir -p "${BUILD_DIR}"/apps || die
+# cp -dpR --target="${BUILD_DIR}"/swig/ \
+# "${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
+# ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
+# ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
+# ln -s "${S}"/port "${BUILD_DIR}"/ || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
+}
+
+gdal_src_configure() {
+ local myopts=""
+
+ if use java; then
+ myopts+="
+ --with-java=$(java-config --jdk-home 2>/dev/null)
+ $(use_with mdb)"
+ else
+ myopts+=" --without-java --without-mdb"
+ use mdb && ewarn "mdb requires java use enabled. disabling"
+ fi
+
+ if use sqlite; then
+ myopts+=" LIBS=-lsqlite3"
+ 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
+ # podofo - we use poppler instead they are exclusive for each other
+ # tiff is a hard dep
+ ECONF_SOURCE="${S}" econf \
+ --includedir="${EPREFIX}/usr/include/${PN}" \
+ --disable-static \
+ --enable-shared \
+ --with-expat \
+ --with-geotiff \
+ --with-grib \
+ --with-libtiff \
+ --with-libz="${EPREFIX}/usr/" \
+ --with-ogr \
+ --without-bsb \
+ --without-dods-root \
+ --without-dwgdirect \
+ --without-epsilon \
+ --without-fme \
+ --without-grass \
+ --without-hdf4 \
+ --without-idb \
+ --without-ingres \
+ --without-jp2mrsid \
+ --without-kakadu \
+ --without-libtool \
+ --without-mrsid \
+ --without-msg \
+ --without-oci \
+ --without-pcraster \
+ --without-podofo \
+ --without-sde \
+ $(use_enable debug) \
+ $(use_with armadillo) \
+ $(use_with aux_xml pam) \
+ $(use_with curl) \
+ --without-ecw \
+ $(use_with fits cfitsio) \
+ $(use_with geos) \
+ $(use_with gif) \
+ $(use_with gml xerces) \
+ $(use_with hdf5) \
+ $(use_with jpeg pcidsk) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k jasper) \
+ $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+ $(use_with netcdf) \
+ $(use_with odbc) \
+ $(use_with ogdi ogdi "${EPREFIX}"/usr) \
+ $(use_with opencl) \
+ $(use_with pdf poppler) \
+ $(use_with perl) \
+ $(use_with png) \
+ $(use_with postgres pg) \
+ $(use_with python) \
+ $(use_with spatialite) \
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+ $(use_with threads) \
+ $(use_with xls freexl) \
+ ${myopts}
+
+ # 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
+
+ if [[ -n $use_python ]]; then
+ # updated for newer swig (must specify the path to input files)
+ 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_configure() {
+ local use_python=""
+
+ gdal_src_configure
+
+ if use python; then
+ use_python="yes"
+ python_foreach_impl run_in_build_dir gdal_src_configure
+ fi
+}
+
+src_compile() {
+ if use perl; then
+ rm "${S}"/swig/perl/*_wrap.cpp || die
+ emake -C "${S}"/swig/perl generate
+ fi
+
+ default
+
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null
+ perl-module_src_configure
+ perl-module_src_compile
+ popd > /dev/null
+ fi
+
+ use doc && emake docs
+
+ compile_python() {
+ rm -f swig/python/*_wrap.cpp || die
+ emake -C swig/python generate
+ emake -C swig/python build
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
+}
+
+src_install() {
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null
+ perl-module_src_install
+ popd > /dev/null
+ sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
+ -i GDALmake.opt || die
+ fi
+
+ default
+
+ use perl && perl_delete_localpod
+
+ dodoc Doxyfile HOWTO-RELEASE NEWS
+
+ use doc && dohtml html/*
+
+ install_python() {
+ emake -C swig/python DESTDIR="${D}" install
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ newdoc swig/python/README.txt README-python.txt
+ insinto /usr/share/${PN}/samples
+ doins swig/python/samples/*
+ python_replicate_script "${ED}"/usr/bin/*py
+ fi
+
+ pushd man/man1 > /dev/null
+ for i in * ; do
+ newman ${i} ${i}
+ done
+ popd > /dev/null
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2018-01-16 21:06 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2018-01-16 21:06 UTC (permalink / raw
To: gentoo-commits
commit: bbe66af667f540c766d7cf77b19f24497488c823
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 20:57:53 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 21:06:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe66af6
sci-libs/gdal: Drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-libs/gdal/Manifest | 1 -
sci-libs/gdal/files/gdal-1.5.0-install_name.patch | 45 ----
sci-libs/gdal/files/gdal-1.5.0-soname.patch | 13 -
sci-libs/gdal/files/gdal-2.0.2-jasper.patch | 13 -
sci-libs/gdal/files/gdal-2.0.2-jasper2.patch | 62 -----
sci-libs/gdal/gdal-2.0.2-r3.ebuild | 286 ---------------------
sci-libs/gdal/gdal-2.2.3.ebuild | 289 ----------------------
7 files changed, 709 deletions(-)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 0570d7e9127..b105313f67a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,2 @@
-DIST gdal-2.0.2.tar.gz 11643726 BLAKE2B aac80990d800acb8b0881caf84229a3c73b57aad1acbd05adb911c9c2ca56fff145eae5a77dcaa934003a22188178883381db5a4c10e7fc082b8f4d98aa146c6 SHA512 b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266
DIST gdal-2.0.3.tar.gz 11589011 BLAKE2B 2b9d319be24e377aff751c7ae4d6c89812c47fe2a0b9476936b2f3423e4f5593034a6303346e05709c9a7cffd71703ae80f72c689218ae0337794d35afcb3a1d SHA512 3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
diff --git a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch b/sci-libs/gdal/files/gdal-1.5.0-install_name.patch
deleted file mode 100644
index e17575267d6..00000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800
-+++ GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal
-
-+# for building without libtool
-+GDAL_SLIB_SO_VER = $(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME = -install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
-
---- GNUmakefile.orig 2010-03-09 14:03:08 +0100
-+++ GNUmakefile 2010-03-09 14:05:29 +0100
-@@ -218,7 +218,7 @@
-
- ifeq ($(HAVE_LD_SHARED),yes)
-
--GDAL_SLIB_B = $(notdir $(GDAL_SLIB))
-+GDAL_SLIB_B = libgdal
-
- install-lib:
-
-@@ -226,14 +226,14 @@
- ifeq ($(MACOSX_FRAMEWORK),yes)
- $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL
- else
-- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
-- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
-- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-- $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).dylib
-+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib
-+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
-+ $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
- (cd $(DESTDIR)$(INST_LIB) ; \
-- ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
-+ ln -s $(GDAL_SLIB_B).$(GDAL_VER).dylib $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib)
- (cd $(DESTDIR)$(INST_LIB) ; \
-- ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
-+ ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib $(GDAL_SLIB_B).dylib)
- endif
-
- else
diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname.patch b/sci-libs/gdal/files/gdal-1.5.0-soname.patch
deleted file mode 100644
index f784536316c..00000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800
-+++ GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal
-
-+# for building without libtool
-+GDAL_SLIB_SO_VER = $(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME = -Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
-
diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch b/sci-libs/gdal/files/gdal-2.0.2-jasper.patch
deleted file mode 100644
index 00cf5c16fa4..00000000000
--- a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urpN gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h
---- gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h 2016-01-26 07:21:48.000000000 -0800
-+++ gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h 2016-10-31 23:45:28.939407322 -0700
-@@ -29,7 +29,8 @@
-
- #ifndef JPEG2000_VSIL_IO_H
- #define JPEG2000_VSIL_IO_H
--
-+
-+#include <sys/types.h>
- #include <jasper/jasper.h>
-
- jas_stream_t *JPEG2000_VSIL_fopen(const char *filename, const char *mode);
diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch b/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch
deleted file mode 100644
index a418e4159c0..00000000000
--- a/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urN orig/frmts/jpeg2000/jpeg2000_vsil_io.cpp dwok/frmts/jpeg2000/jpeg2000_vsil_io.cpp
---- orig/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2016-01-26 16:21:48.000000000 +0100
-+++ dwok/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2016-11-16 21:53:15.280302723 +0100
-@@ -179,40 +179,25 @@
- * Buffer initialization code.
- \******************************************************************************/
-
--static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
-- int bufsize)
-+static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode)
- {
- /* If this function is being called, the buffer should not have been
- initialized yet. */
- assert(!stream->bufbase_);
-
- if (bufmode != JAS_STREAM_UNBUF) {
-- /* The full- or line-buffered mode is being employed. */
-- if (!buf) {
-- /* The caller has not specified a buffer to employ, so allocate
-- one. */
-- if ((stream->bufbase_ = (unsigned char*)jas_malloc(JAS_STREAM_BUFSIZE +
-- JAS_STREAM_MAXPUTBACK))) {
-- stream->bufmode_ |= JAS_STREAM_FREEBUF;
-- stream->bufsize_ = JAS_STREAM_BUFSIZE;
-- } else {
-- /* The buffer allocation has failed. Resort to unbuffered
-- operation. */
-- stream->bufbase_ = stream->tinybuf_;
-- stream->bufsize_ = 1;
-- }
-+ if ((stream->bufbase_ = (unsigned char*)jas_malloc(JAS_STREAM_BUFSIZE +
-+ JAS_STREAM_MAXPUTBACK))) {
-+ stream->bufmode_ |= JAS_STREAM_FREEBUF;
-+ stream->bufsize_ = JAS_STREAM_BUFSIZE;
- } else {
-- /* The caller has specified a buffer to employ. */
-- /* The buffer must be large enough to accommodate maximum
-- putback. */
-- assert(bufsize > JAS_STREAM_MAXPUTBACK);
-- stream->bufbase_ = JAS_CAST(uchar *, buf);
-- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
-+ /* The buffer allocation has failed. Resort to unbuffered
-+ operation. */
-+ stream->bufbase_ = stream->tinybuf_;
-+ stream->bufsize_ = 1;
- }
- } else {
- /* The unbuffered mode is being employed. */
-- /* A buffer should not have been supplied by the caller. */
-- assert(!buf);
- /* Use a trivial one-character buffer. */
- stream->bufbase_ = stream->tinybuf_;
- stream->bufsize_ = 1;
-@@ -282,7 +267,7 @@
- }
-
- /* By default, use full buffering for this type of stream. */
-- JPEG2000_VSIL_jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
-+ JPEG2000_VSIL_jas_stream_initbuf(stream, JAS_STREAM_FULLBUF);
-
- return stream;
- }
diff --git a/sci-libs/gdal/gdal-2.0.2-r3.ebuild b/sci-libs/gdal/gdal-2.0.2-r3.ebuild
deleted file mode 100644
index 836f98c0938..00000000000
--- a/sci-libs/gdal/gdal-2.0.2-r3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_4 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools eutils libtool perl-module distutils-r1 flag-o-matic toolchain-funcs java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/json-c
- dev-libs/libpcre
- dev-libs/libxml2
- media-libs/tiff:0=
- sci-libs/libgeotiff
- sys-libs/zlib[minizip(+)]
- armadillo? ( sci-libs/armadillo[lapack] )
- curl? ( net-misc/curl )
- 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] )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( media-libs/jasper:= )
- mysql? ( virtual/mysql )
- netcdf? ( sci-libs/netcdf )
- odbc? ( dev-db/unixODBC )
- ogdi? ( sci-libs/ogdi )
- opencl? ( virtual/opencl )
- pdf? ( >=app-text/poppler-0.24.3:= )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postgres? ( >=dev-db/postgresql-8.4:= )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- sqlite? ( dev-db/sqlite:3 )
- spatialite? ( dev-db/spatialite )
- xls? ( dev-libs/freexl )
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.6 )
- perl? ( dev-lang/swig:0 )
- python? ( dev-lang/swig:0 )"
-
-AT_M4DIR="${S}/m4"
-
-REQUIRED_USE="
- spatialite? ( sqlite )
- python? ( ${PYTHON_REQUIRED_USE} )
- mdb? ( java )
-"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_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" \
- "${S}"/GDALmake.opt.in || die
-
- if use jpeg2k; then
- epatch "${FILESDIR}"/${P}-jasper.patch
- epatch "${FILESDIR}"/${P}-jasper2.patch #bug 599626
- fi
-
- # -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
-
- # Fix spatialite/sqlite include issue
- sed -i \
- -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
- ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
- # Fix freexl configure check
- sed -i \
- -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
- configure.in || die
-
- sed \
- -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
- -i configure.in || die
-
- sed \
- -e 's:^ar:$(AR):g' \
- -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
- # updated for newer swig (must specify the path to input files)
- 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"
-
- # bug 626844, poppler headers require C++11
- use pdf && append-cxxflags -std=c++11
-
- tc-export AR RANLIB
-
- eautoreconf
-}
-
-src_configure() {
- local myopts=""
-
- if use java; then
- myopts+="
- --with-java=$(java-config --jdk-home 2>/dev/null)
- $(use_with mdb)"
- else
- myopts+=" --without-java --without-mdb"
- use mdb && ewarn "mdb requires java use enabled. disabling"
- fi
-
- if use sqlite; then
- myopts+=" LIBS=-lsqlite3"
- 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
- # podofo - we use poppler instead they are exclusive for each other
- # tiff is a hard dep
- ECONF_SOURCE="${S}" econf \
- --includedir="${EPREFIX}/usr/include/${PN}" \
- --disable-static \
- --enable-shared \
- --with-expat \
- --with-geotiff \
- --with-grib \
- --with-libtiff \
- --with-libz="${EPREFIX}/usr/" \
- --with-ogr \
- --without-bsb \
- --without-dods-root \
- --without-dwgdirect \
- --without-epsilon \
- --without-fme \
- --without-grass \
- --without-hdf4 \
- --without-idb \
- --without-ingres \
- --without-jp2mrsid \
- --without-kakadu \
- --without-libtool \
- --without-mrsid \
- --without-msg \
- --without-oci \
- --without-pcraster \
- --without-podofo \
- --without-python \
- --without-sde \
- $(use_enable debug) \
- $(use_with armadillo) \
- $(use_with aux_xml pam) \
- $(use_with curl) \
- --without-ecw \
- $(use_with fits cfitsio) \
- $(use_with geos) \
- $(use_with gif) \
- $(use_with gml xerces) \
- $(use_with hdf5) \
- $(use_with jpeg pcidsk) \
- $(use_with jpeg) \
- $(use_with jpeg2k jasper) \
- $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
- $(use_with netcdf) \
- $(use_with odbc) \
- $(use_with ogdi ogdi "${EPREFIX}"/usr) \
- $(use_with opencl) \
- $(use_with pdf poppler) \
- $(use_with perl) \
- $(use_with png) \
- $(use_with postgres pg) \
- $(use_with spatialite) \
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
- $(use_with threads) \
- $(use_with xls freexl) \
- ${myopts}
-
- # 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
-}
-
-src_compile() {
- if use perl; then
- rm "${S}"/swig/perl/*_wrap.cpp || die
- emake -C "${S}"/swig/perl generate
- fi
-
- # gdal-config needed before generating Python bindings
- default
-
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null || die
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null || die
- fi
-
- if use python; then
- rm -f "${S}"swig/python/*_wrap.cpp || die
- emake -C "${S}"/swig/python generate
- pushd "${S}"/swig/python > /dev/null || die
- distutils-r1_src_compile
- popd > /dev/null || die
- fi
-
- use doc && emake docs
-}
-
-src_install() {
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null || die
- perl-module_src_install
- popd > /dev/null || die
- sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
- -i GDALmake.opt || die
- fi
-
- default
-
- use perl && perl_delete_localpod
-
- dodoc Doxyfile HOWTO-RELEASE NEWS
-
- use doc && dohtml html/*
-
- python_install() {
- distutils-r1_python_install
- python_doscript scripts/*.py
- }
- if use python; then
- pushd "${S}"/swig/python > /dev/null || die
- distutils-r1_src_install
- popd > /dev/null || die
- newdoc swig/python/README.txt README-python.txt
- insinto /usr/share/${PN}/samples
- doins swig/python/samples/*
- fi
-
- pushd man/man1 > /dev/null || die
- for i in * ; do
- newman ${i} ${i}
- done
- popd > /dev/null || die
-}
-
-pkg_postinst() {
- elog "Check available image and data formats after building with"
- elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-2.2.3.ebuild b/sci-libs/gdal/gdal-2.2.3.ebuild
deleted file mode 100644
index d9baddecf2b..00000000000
--- a/sci-libs/gdal/gdal-2.2.3.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2.2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
-
-COMMON_DEPEND="dev-libs/expat
- dev-libs/json-c:=
- dev-libs/libpcre
- dev-libs/libxml2:=
- media-libs/tiff:0=
- sci-libs/libgeotiff
- sys-libs/zlib:=[minizip(+)]
- armadillo? ( sci-libs/armadillo:=[lapack] )
- curl? ( net-misc/curl )
- fits? ( sci-libs/cfitsio:= )
- geos? ( >=sci-libs/geos-2.2.1 )
- gif? ( media-libs/giflib:= )
- gml? ( >=dev-libs/xerces-c-3.1 )
- hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:2= )
- mdb? ( dev-java/jackcess:1 )
- mysql? ( virtual/mysql )
- netcdf? ( sci-libs/netcdf:= )
- odbc? ( dev-db/unixODBC )
- ogdi? ( sci-libs/ogdi )
- opencl? ( virtual/opencl )
- oracle? ( dev-db/oracle-instantclient:= )
- pdf? ( >=app-text/poppler-0.24.3:= )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postgres? ( >=dev-db/postgresql-8.4:= )
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- sqlite? ( dev-db/sqlite:3 )
- spatialite? ( dev-db/spatialite )
- webp? ( media-libs/libwebp:= )
- xls? ( dev-libs/freexl )"
-
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
- python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
- doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.7:* )
- perl? ( dev-lang/swig:0 )
- python? ( dev-lang/swig:0 )"
-
-REQUIRED_USE="mdb? ( java )
- python? ( ${PYTHON_REQUIRED_USE} )
- spatialite? ( sqlite )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.3-soname.patch"
- "${FILESDIR}/${PN}-2.2.3-json-c-0.13.patch" # bug 641658
-)
-
-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" \
- "${S}"/GDALmake.opt.in || die
-
- # the second sed expression should fix bug 371075
- sed -i \
- -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
- -e "s:--prefix=\$(DESTDIR):--prefix=:" \
- "${S}"/swig/python/GNUmakefile || die
-
- # Fix spatialite/sqlite include issue
- sed -i \
- -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
- ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
- # Fix freexl configure check
- sed -i \
- -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
- configure.ac || die
-
- sed \
- -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
- -i configure.ac || die
-
- sed \
- -e 's:^ar:$(AR):g' \
- -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
- # updated for newer swig (must specify the path to input files)
- 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"
-
- default
- eautoreconf
-}
-
-src_configure() {
-
- tc-export AR RANLIB
- local myopts=()
-
- if use java; then
- myopts+=(
- --with-java=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-lib=dlopen
- $(use_with mdb))
- else
- myopts+=( --without-java --without-mdb )
- fi
-
- if use sqlite; then
- append-libs -lsqlite3
- 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
- # ingres - same story as oracle oci
- # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
- # podofo - we use poppler instead they are exclusive for each other
- # tiff is a hard dep
- ECONF_SOURCE="${S}" econf \
- --includedir="${EPREFIX}/usr/include/${PN}" \
- --disable-pdf-plugin \
- --disable-static \
- --enable-shared \
- --with-expat \
- --with-geotiff \
- --with-grib \
- --with-hide-internal-symbols \
- --with-libtiff \
- --with-libtool \
- --with-libz="${EPREFIX}/usr/" \
- --with-gnm \
- --with-cryptopp=no \
- --without-bsb \
- --without-dods-root \
- --without-ecw \
- --without-epsilon \
- --without-fme \
- --without-grass \
- --without-hdf4 \
- --without-idb \
- --without-ingres \
- --without-jasper \
- --without-jp2mrsid \
- --without-kakadu \
- --without-mrsid \
- --without-msg \
- --without-mrf \
- --without-pcraster \
- --without-pdfium \
- --without-sde \
- --without-sosi \
- --without-mongocxx \
- --without-podofo \
- --disable-lto \
- $(use_enable debug) \
- $(use_with armadillo) \
- $(use_with aux_xml pam) \
- $(use_with curl) \
- $(use_with fits cfitsio) \
- $(use_with geos) \
- $(use_with gif) \
- $(use_with gml xerces) \
- $(use_with hdf5) \
- $(use_with jpeg pcidsk) \
- $(use_with jpeg) \
- $(use_with jpeg2k openjpeg) \
- $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
- $(use_with netcdf) \
- $(use_with oracle oci) \
- $(use_with odbc) \
- $(use_with ogdi ogdi "${EPREFIX}"/usr) \
- $(use_with opencl) \
- $(use_with perl) \
- $(use_with png) \
- $(use_with pdf poppler) \
- $(use_with postgres pg) \
- $(use_with python) \
- $(use_with spatialite) \
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
- $(use_with threads) \
- $(use_with webp) \
- $(use_with xls freexl) \
- ${myopts}
-
- # 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
-}
-
-src_compile() {
- if use perl; then
- rm "${S}"/swig/perl/*_wrap.cpp || die
- emake -C "${S}"/swig/perl generate
- fi
-
- # gdal-config needed before generating Python bindings
- default
-
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null || die
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null || die
- fi
-
- if use python; then
- rm -f "${S}"/swig/python/*_wrap.cpp || die
- emake -C "${S}"/swig/python generate
- pushd "${S}"/swig/python > /dev/null || die
- distutils-r1_src_compile
- popd > /dev/null || die
- fi
-
- use doc && emake docs
-}
-
-src_install() {
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null || die
- perl-module_src_install
- popd > /dev/null || die
- sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
- -i GDALmake.opt || die
- fi
-
- use perl && perl_delete_localpod
-
- local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
- use doc && HTML_DOCS=( html/. )
-
- default
-
- python_install() {
- distutils-r1_python_install
- python_doscript scripts/*.py
- }
-
- if use python; then
- # Don't clash with gdal's docs
- unset DOCS HTML_DOCS
-
- pushd "${S}"/swig/python > /dev/null || die
- distutils-r1_src_install
- popd > /dev/null || die
-
- newdoc swig/python/README.txt README-python.txt
-
- insinto /usr/share/${PN}/samples
- doins -r swig/python/samples/
- fi
-
- doman "${S}"/man/man*/*
-}
-
-pkg_postinst() {
- elog "Check available image and data formats after building with"
- elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2018-02-04 10:18 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2018-02-04 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 1b2289888f129d28cc0238e38f41fffdf5b55353
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 4 00:43:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 4 10:15:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b228988
sci-libs/gdal: Drop old
Closes: https://bugs.gentoo.org/643996
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-libs/gdal/Manifest | 1 -
sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch | 13 -
.../gdal-2.0.3-add-dlopen-support-for-jvm.patch | 232 ----------------
sci-libs/gdal/files/gdal-2.0.3-install_name.patch | 49 ----
sci-libs/gdal/gdal-2.0.3.ebuild | 291 ---------------------
5 files changed, 586 deletions(-)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index b105313f67a..17fbd88fc85 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1 @@
-DIST gdal-2.0.3.tar.gz 11589011 BLAKE2B 2b9d319be24e377aff751c7ae4d6c89812c47fe2a0b9476936b2f3423e4f5593034a6303346e05709c9a7cffd71703ae80f72c689218ae0337794d35afcb3a1d SHA512 3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch b/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch
deleted file mode 100644
index ec35018868d..00000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-soname-r1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- old/GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800
-+++ new/GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal
-
-+# for building without libtool
-+GDAL_SLIB_SO_VER = $(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME = -Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
-
diff --git a/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch b/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch
deleted file mode 100644
index 7c35d1cb124..00000000000
--- a/sci-libs/gdal/files/gdal-2.0.3-add-dlopen-support-for-jvm.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From baba2c213770972e79be6be4902716278f351fb4 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 24 Aug 2016 23:32:13 +0100
-Subject: [PATCH 1/2] Allow libjvm.so to be dlopen'd with --with-jvm-lib=dlopen
-
-Having to set LD_LIBRARY_PATH is a pain and relying on the rpath can
-be problematic when libjvm.so lives in a versioned directory. Some
-distributions even allow per-user JVM selection so checking the value
-of JAVA_HOME at runtime allows this choice to be respected.
-
-libjvm.so's location is hard to predict (amd64 vs i386, jre or not?)
-so ${JAVA_HOME}/bin/java -XshowSettings is executed to find its
-location. If JAVA_HOME is not set then java is executed from the PATH
-instead.
----
- gdal/configure | 11 +++++-
- gdal/configure.in | 7 +++-
- gdal/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp | 57 +++++++++++++++++++++++++++--
- gdal/port/cpl_config.h.in | 3 ++
- 4 files changed, 71 insertions(+), 7 deletions(-)
-
-diff --git a/configure b/configure
-index 75e4e279de..acdfa439de 100755
---- a/configure
-+++ b/configure
-@@ -1753,7 +1753,7 @@ Optional Packages:
- --with-python=ARG Enable python bindings (ARG=yes, no, or path to python binary)
- --with-java Include Java support (ARG=yes, no or JDK home path) [default=no]
- --with-mdb Include MDB driver
-- --with-jvm-lib=ARG ARG points to Java libjvm path
-+ --with-jvm-lib=ARG ARG is dlopen or points to Java libjvm path
- --with-jvm-lib-add-rpath Add the libjvm path to the RPATH (no by default)
- --with-rasdaman=DIR Include rasdaman support (DIR is rasdaman's install dir).
- --with-armadillo=ARG Include Armadillo support for faster TPS transform computation (ARG=yes/no/path to armadillo install root) [default=no]
-@@ -29491,7 +29491,14 @@ if test "${with_jvm_lib_add_rpath+set}" = set; then :
- fi
-
-
-- if test "x$with_jvm_lib" != "x"; then
-+ if test "x$with_jvm_lib" = "xdlopen"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define JVM_LIB_DLOPEN 1
-+_ACEOF
-+
-+ JVM_LIB="-ldl"
-+ elif test "x$with_jvm_lib" != "x"; then
- if test -d "$with_jvm_lib"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$with_jvm_lib"
-diff --git a/configure.in b/configure.in
-index 91efa5a32a..546ff04049 100644
---- a/configure.in
-+++ b/configure.in
-@@ -4213,11 +4213,14 @@ if test "$with_mdb" = "yes" ; then
- AC_MSG_ERROR("--with-java must be specified.")
- fi
-
-- AC_ARG_WITH(jvm-lib, [ --with-jvm-lib=[ARG] ARG points to Java libjvm path],,)
-+ AC_ARG_WITH(jvm-lib, [ --with-jvm-lib=[ARG] ARG is dlopen or points to Java libjvm path],,)
-
- AC_ARG_WITH(jvm-lib-add-rpath,[ --with-jvm-lib-add-rpath Add the libjvm path to the RPATH (no by default)],,)
-
-- if test "x$with_jvm_lib" != "x"; then
-+ if test "x$with_jvm_lib" = "xdlopen"; then
-+ AC_DEFINE_UNQUOTED(JVM_LIB_DLOPEN, 1, [Define to 1 if libjvm.so should be dlopen'd])
-+ JVM_LIB="-ldl"
-+ elif test "x$with_jvm_lib" != "x"; then
- if test -d "$with_jvm_lib"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$with_jvm_lib"
-diff --git a/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-index b068adf777..bc54a115df 100644
---- a/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-+++ b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-@@ -29,6 +29,11 @@
-
- #include "ogr_mdb.h"
-
-+#if JVM_LIB_DLOPEN
-+#include <limits.h>
-+#include <stdio.h>
-+#endif
-+
- CPL_CVSID("$Id: ogrmdbjackcess.cpp 27044 2014-03-16 23:41:27Z rouault $");
-
- static JavaVM *jvm_static = NULL;
-@@ -161,9 +166,41 @@ int OGRMDBJavaEnv::Init()
- {
- JavaVM* vmBuf[1];
- jsize nVMs;
-+ int ret = 0;
-+
-+#if JVM_LIB_DLOPEN
-+ const char *jvmLibPtr = "libjvm.so";
-+ char jvmLib[PATH_MAX];
-+
-+ FILE *javaCmd = popen("\"${JAVA_HOME}${JAVA_HOME:+/bin/}java\" -XshowSettings 2>&1 | sed -n '/\\bsun\\.boot\\.library\\.path =/s:.* = \\(.*\\):\\1/server/libjvm.so:p'", "r");
-+
-+ if (javaCmd != NULL)
-+ {
-+ size_t javaCmdRead = fread(jvmLib, 1, PATH_MAX, javaCmd);
-+ ret = pclose(javaCmd);
-+
-+ if (ret == 0 && javaCmdRead >= 2)
-+ {
-+ /* Chomp the new line */
-+ jvmLib[javaCmdRead - 1] = '\0';
-+ jvmLibPtr = jvmLib;
-+ }
-+ }
-+
-+ jint (*pfnJNI_GetCreatedJavaVMs)(JavaVM **, jsize, jsize *);
-+ pfnJNI_GetCreatedJavaVMs = (jint (*)(JavaVM **, jsize, jsize *))
-+ CPLGetSymbol(jvmLibPtr, "JNI_GetCreatedJavaVMs");
-+
-+ if (pfnJNI_GetCreatedJavaVMs == NULL)
-+ return FALSE;
-+ else
-+ ret = pfnJNI_GetCreatedJavaVMs(vmBuf, 1, &nVMs);
-+#else
-+ ret = JNI_GetCreatedJavaVMs(vmBuf, 1, &nVMs);
-+#endif
-
- /* Are we already called from Java ? */
-- if (JNI_GetCreatedJavaVMs(vmBuf, 1, &nVMs) == JNI_OK && nVMs == 1)
-+ if (ret == JNI_OK && nVMs == 1)
- {
- jvm = vmBuf[0];
- if (jvm->GetEnv((void **)&env, JNI_VERSION_1_2) == JNI_OK)
-@@ -194,8 +231,22 @@ int OGRMDBJavaEnv::Init()
- args.nOptions = 0;
- args.ignoreUnrecognized = JNI_FALSE;
-
-- int ret = JNI_CreateJavaVM(&jvm, (void **)&env, &args);
-- if (ret != 0 || jvm == NULL || env == NULL)
-+#if JVM_LIB_DLOPEN
-+ jint (*pfnJNI_CreateJavaVM)(JavaVM **, void **, void *);
-+ pfnJNI_CreateJavaVM = (jint (*)(JavaVM **, void **, void *))
-+ CPLGetSymbol(jvmLibPtr, "JNI_CreateJavaVM");
-+
-+ if (pfnJNI_CreateJavaVM == NULL)
-+ return FALSE;
-+ else
-+ ret = pfnJNI_CreateJavaVM(&jvm, (void **)&env, &args);
-+#else
-+ ret = JNI_CreateJavaVM(&jvm, (void **)&env, &args);
-+#endif
-+
-+ CPLFree(pszClassPathOption);
-+
-+ if (ret != JNI_OK || jvm == NULL || env == NULL)
- {
- CPLError(CE_Failure, CPLE_AppDefined, "JNI_CreateJavaVM failed (%d)", ret);
- return FALSE;
-diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in
-index 313729fd3e..e8fa21140a 100644
---- a/port/cpl_config.h.in
-+++ b/port/cpl_config.h.in
-@@ -161,6 +161,9 @@
- /* For .cpp files, define as const if the declaration of iconv() needs const. */
- #undef ICONV_CPP_CONST
-
-+/* Define to 1 if libjvm.so should be dlopen'd */
-+#undef JVM_LIB_DLOPEN
-+
- /* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
- #undef LT_OBJDIR
---
-2.11.0
-
-
-From cd6bbb60ced62b6176482e86c54ab618e2592ac8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 25 Aug 2016 21:26:20 +0100
-Subject: [PATCH 2/2] Fetch jackcess classpath using java-config instead of
- using CLASSPATH
-
----
- gdal/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-index bc54a115df..5b0972677e 100644
---- a/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-+++ b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp
-@@ -218,19 +218,37 @@ int OGRMDBJavaEnv::Init()
- JavaVMInitArgs args;
- JavaVMOption options[1];
- args.version = JNI_VERSION_1_2;
-- const char* pszClassPath = CPLGetConfigOption("CLASSPATH", NULL);
-- CPLString osClassPathOption;
-+
-+ FILE *javaCmd = popen("java-config --with-dependencies --classpath=jackcess-1", "r");
-+
-+ const char* pszClassPath = NULL;
-+ if (javaCmd != NULL)
-+ {
-+ pszClassPath = CPLReadLine(javaCmd);
-+ ret = pclose(javaCmd);
-+
-+ if (ret != 0)
-+ pszClassPath = NULL;
-+ }
-+
-+ if (pszClassPath == NULL)
-+ pszClassPath = CPLGetConfigOption("CLASSPATH", NULL);
-+
-+ char* pszClassPathOption = NULL;
- if (pszClassPath)
- {
- args.nOptions = 1;
-- osClassPathOption.Printf("-Djava.class.path=%s", pszClassPath);
-- options[0].optionString = (char*) osClassPathOption.c_str();
-+ pszClassPathOption = CPLStrdup(CPLSPrintf("-Djava.class.path=%s", pszClassPath));
-+ options[0].optionString = pszClassPathOption;
- args.options = options;
- }
- else
- args.nOptions = 0;
- args.ignoreUnrecognized = JNI_FALSE;
-
-+ if (javaCmd != NULL)
-+ CPLReadLine(NULL);
-+
- #if JVM_LIB_DLOPEN
- jint (*pfnJNI_CreateJavaVM)(JavaVM **, void **, void *);
- pfnJNI_CreateJavaVM = (jint (*)(JavaVM **, void **, void *))
---
-2.11.0
-
diff --git a/sci-libs/gdal/files/gdal-2.0.3-install_name.patch b/sci-libs/gdal/files/gdal-2.0.3-install_name.patch
deleted file mode 100644
index 1e83d55ecf7..00000000000
--- a/sci-libs/gdal/files/gdal-2.0.3-install_name.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Unbreak compilation on Darwin
-
-Author: Fabian Groffen <grobian@gentoo.org>
-
---- gdal-2.0.3.old/GDALmake.opt.in
-+++ gdal-2.0.3/GDALmake.opt.in
-@@ -104,6 +104,10 @@ GDAL_LIB = $(GDAL_ROOT)/libgdal.a
- GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal
-
-+# for building without libtool
-+GDAL_SLIB_SO_VER = $(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME = -install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
-
---- gdal-2.0.3.old/GNUmakefile
-+++ gdal-2.0.3/GNUmakefile
-@@ -208,7 +208,7 @@ else
-
- ifeq ($(HAVE_LD_SHARED),yes)
-
--GDAL_SLIB_B = $(notdir $(GDAL_SLIB))
-+GDAL_SLIB_B = libgdal
-
- install-lib:
-
-@@ -216,14 +216,14 @@ install-lib:
- ifeq ($(MACOSX_FRAMEWORK),yes)
- $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL
- else
-- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
-- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
-- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-- $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).dylib
-+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib
-+ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
-+ $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
- (cd $(DESTDIR)$(INST_LIB) ; \
-- ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
-+ ln -s $(GDAL_SLIB_B).$(GDAL_VER).dylib $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib)
- (cd $(DESTDIR)$(INST_LIB) ; \
-- ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
-+ ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib $(GDAL_SLIB_B).dylib)
- $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/gdalplugins
- endif
-
diff --git a/sci-libs/gdal/gdal-2.0.3.ebuild b/sci-libs/gdal/gdal-2.0.3.ebuild
deleted file mode 100644
index ee3dfedc4d8..00000000000
--- a/sci-libs/gdal/gdal-2.0.3.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads xls"
-
-COMMON_DEPEND="dev-libs/expat
- dev-libs/json-c:=
- dev-libs/libpcre
- dev-libs/libxml2:=
- media-libs/tiff:0=
- sci-libs/libgeotiff
- sys-libs/zlib[minizip(+)]
- armadillo? ( sci-libs/armadillo:=[lapack] )
- curl? ( net-misc/curl )
- 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:0= )
- jpeg2k? ( media-libs/openjpeg:2= )
- mdb? ( dev-java/jackcess:1 )
- mysql? ( virtual/mysql )
- netcdf? ( sci-libs/netcdf:= )
- odbc? ( dev-db/unixODBC )
- ogdi? ( sci-libs/ogdi )
- opencl? ( virtual/opencl )
- oracle? ( dev-db/oracle-instantclient:= )
- pdf? ( >=app-text/poppler-0.24.3:= )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postgres? ( >=dev-db/postgresql-8.4:= )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- sqlite? ( dev-db/sqlite:3 )
- spatialite? ( dev-db/spatialite )
- xls? ( dev-libs/freexl )"
-
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
- doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.7:* )
- perl? ( dev-lang/swig:0 )
- python? ( dev-lang/swig:0 )"
-
-REQUIRED_USE="mdb? ( java )
- python? ( ${PYTHON_REQUIRED_USE} )
- spatialite? ( sqlite )
-"
-
-src_prepare() {
- local PATCHES=()
- local PATCHES=( "${FILESDIR}"/gdal-2.0.3-add-dlopen-support-for-jvm.patch )
-
- # -soname is only accepted by GNU ld/ELF
- if [[ ${CHOST} == *-darwin* ]]; then
- PATCHES+=( "${FILESDIR}"/${PN}-2.0.3-install_name.patch )
- else
- PATCHES+=( "${FILESDIR}"/${PN}-1.5.0-soname-r1.patch )
- fi
-
- # fix datadir and docdir placement
- sed -i \
- -e "s:@datadir@:@datadir@/gdal:" \
- -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
- "${S}"/GDALmake.opt.in || die
-
- # the second sed expression should fix bug 371075
- sed -i \
- -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
- -e "s:--prefix=\$(DESTDIR):--prefix=:" \
- "${S}"/swig/python/GNUmakefile || die
-
- # Fix spatialite/sqlite include issue
- sed -i \
- -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
- ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
- # Fix freexl configure check
- sed -i \
- -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
- configure.in || die
-
- sed \
- -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
- -i configure.in || die
-
- sed \
- -e 's:^ar:$(AR):g' \
- -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
- # updated for newer swig (must specify the path to input files)
- 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"
-
- default
-
- # bug 626844, poppler headers require C++11
- use pdf && append-cxxflags -std=c++11
-
- tc-export AR RANLIB
-
- mv configure.{in,ac} || die
-
- eautoreconf
-}
-
-src_configure() {
- local myopts=""
-
- if use java; then
- myopts+="
- --with-java=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-lib=dlopen
- $(use_with mdb)"
- else
- myopts+=" --without-java --without-mdb"
- fi
-
- if use sqlite; then
- myopts+=" LIBS=-lsqlite3"
- 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
- # ingres - same story as oracle oci
- # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
- # podofo - we use poppler instead they are exclusive for each other
- # tiff is a hard dep
- ECONF_SOURCE="${S}" econf \
- --includedir="${EPREFIX}/usr/include/${PN}" \
- --disable-static \
- --enable-shared \
- --with-expat \
- --with-geotiff \
- --with-grib \
- --with-libtiff \
- --with-libz="${EPREFIX}/usr/" \
- --with-ogr \
- --without-bsb \
- --without-dods-root \
- --without-dwgdirect \
- --without-epsilon \
- --without-fme \
- --without-grass \
- --without-hdf4 \
- --without-idb \
- --without-ingres \
- --without-jasper \
- --without-jp2mrsid \
- --without-kakadu \
- --without-libtool \
- --without-mrsid \
- --without-msg \
- --without-pcraster \
- --without-podofo \
- --without-sde \
- $(use_enable debug) \
- $(use_with armadillo) \
- $(use_with aux_xml pam) \
- $(use_with curl) \
- --without-ecw \
- $(use_with fits cfitsio) \
- $(use_with geos) \
- $(use_with gif) \
- $(use_with gml xerces) \
- $(use_with hdf5) \
- $(use_with jpeg pcidsk) \
- $(use_with jpeg) \
- $(use_with jpeg2k openjpeg) \
- $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
- $(use_with netcdf) \
- $(use_with oracle oci) \
- $(use_with odbc) \
- $(use_with ogdi ogdi "${EPREFIX}"/usr) \
- $(use_with opencl) \
- $(use_with pdf poppler) \
- $(use_with perl) \
- $(use_with png) \
- $(use_with postgres pg) \
- $(use_with python) \
- $(use_with spatialite) \
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
- $(use_with threads) \
- $(use_with xls freexl) \
- ${myopts}
-
- # 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
-}
-
-src_compile() {
- if use perl; then
- rm "${S}"/swig/perl/*_wrap.cpp || die
- emake -C "${S}"/swig/perl generate
- fi
-
- # gdal-config needed before generating Python bindings
- default
-
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null || die
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null || die
- fi
-
- if use python; then
- rm -f "${S}"swig/python/*_wrap.cpp || die
- emake -C "${S}"/swig/python generate
- pushd "${S}"/swig/python > /dev/null || die
- distutils-r1_src_compile
- popd > /dev/null || die
- fi
-
- use doc && emake docs
-}
-
-src_install() {
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null || die
- perl-module_src_install
- popd > /dev/null || die
- sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
- -i GDALmake.opt || die
- fi
-
- use perl && perl_delete_localpod
-
- local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
- use doc && HTML_DOCS=( html/. )
-
- default
-
- python_install() {
- distutils-r1_python_install
- python_doscript scripts/*.py
- }
-
- if use python; then
- # Don't clash with gdal's docs
- unset DOCS HTML_DOCS
-
- pushd "${S}"/swig/python > /dev/null || die
- distutils-r1_src_install
- popd > /dev/null || die
-
- newdoc swig/python/README.txt README-python.txt
-
- insinto /usr/share/${PN}/samples
- doins swig/python/samples/*
- fi
-
- doman "${S}"/man/man*/*
-}
-
-pkg_postinst() {
- elog "Check available image and data formats after building with"
- elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2018-06-19 9:09 Amy Liffey
0 siblings, 0 replies; 18+ messages in thread
From: Amy Liffey @ 2018-06-19 9:09 UTC (permalink / raw
To: gentoo-commits
commit: d2fd2e5c98f0a2f84a519ff1b9f659991a704a82
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Mon Jun 18 22:05:37 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 09:08:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2fd2e5c
sci-libs/gdal: fix compilation with >=app-text/poppler-0.64.0
Closes: https://bugs.gentoo.org/656252
Closes: https://github.com/gentoo/gentoo/pull/8895
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-libs/gdal/files/gdal-2.2.3-goocast.patch | 11 +
sci-libs/gdal/gdal-2.2.3-r2.ebuild | 291 +++++++++++++++++++++++++++
2 files changed, 302 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
new file mode 100644
index 00000000000..a25a524c253
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
@@ -0,0 +1,11 @@
+--- a/frmts/pdf/pdfobject.cpp 2018-05-29 11:23:00.980957371 +0300
++++ b/frmts/pdf/pdfobject.cpp 2018-05-29 11:23:44.378955265 +0300
+@@ -1055,7 +1055,7 @@
+ {
+ if (GetType() == PDFObjectType_String)
+ {
+- GooString* gooString = m_po->getString();
++ GooString* gooString =(GooString*) m_po->getString();
+ return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
+ static_cast<int>(gooString->getLength())));
+ }
diff --git a/sci-libs/gdal/gdal-2.2.3-r2.ebuild b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
new file mode 100644
index 00000000000..9db81229486
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/2.2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ dev-libs/json-c:=
+ dev-libs/libpcre
+ dev-libs/libxml2:=
+ media-libs/tiff:0=
+ sci-libs/libgeotiff
+ sys-libs/zlib:=[minizip(+)]
+ armadillo? ( sci-libs/armadillo:=[lapack] )
+ curl? ( net-misc/curl )
+ fits? ( sci-libs/cfitsio:= )
+ geos? ( >=sci-libs/geos-2.2.1 )
+ gif? ( media-libs/giflib:= )
+ gml? ( >=dev-libs/xerces-c-3.1 )
+ hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ mdb? ( dev-java/jackcess:1 )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf:= )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( sci-libs/ogdi )
+ opencl? ( virtual/opencl )
+ oracle? ( dev-db/oracle-instantclient:= )
+ pdf? ( >=app-text/poppler-0.24.3:= )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ spatialite? ( dev-db/spatialite )
+ sqlite? ( dev-db/sqlite:3 )
+ webp? ( media-libs/libwebp:= )
+ xls? ( dev-libs/freexl )"
+
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.7:* )"
+
+DEPEND="${COMMON_DEPEND}
+ app-shells/bash-completion
+ doc? ( app-doc/doxygen )
+ java? ( >=virtual/jdk-1.7:* )
+ perl? ( dev-lang/swig:0 )
+ python? (
+ dev-lang/swig:0
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )"
+
+REQUIRED_USE="
+ mdb? ( java )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ spatialite? ( sqlite )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-soname.patch"
+ "${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658
+ "${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866
+ "${FILESDIR}/${P}-goocast.patch" # bug 656252
+)
+
+src_prepare() {
+ # fix datadir and docdir placement
+ sed -e "s:@datadir@:@datadir@/gdal:" \
+ -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+ -i "${S}"/GDALmake.opt.in || die
+
+ # the second sed expression should fix bug 371075
+ sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+ -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+ -i "${S}"/swig/python/GNUmakefile || die
+
+ # Fix spatialite/sqlite include issue
+ sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+ -i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+ # Fix freexl configure check
+ sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+ -i configure.ac || die
+
+ sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+ -i configure.ac || die
+
+ sed -e 's:^ar:$(AR):g' \
+ -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+ # updated for newer swig (must specify the path to input files)
+ sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+ -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+ -i swig/python/GNUmakefile || die "sed python makefile failed"
+ sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+ -i swig/python/setup.cfg || die "sed python setup.cfg failed"
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # bug 619148
+ append-cxxflags -std=c++14
+
+ tc-export AR RANLIB
+ local myopts=()
+
+ if use java; then
+ myopts+=(
+ --with-java=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-lib=dlopen
+ $(use_with mdb)
+ )
+ else
+ myopts+=( --without-java --without-mdb )
+ fi
+
+ if use sqlite; then
+ append-libs -lsqlite3
+ 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
+ # ingres - same story as oracle oci
+ # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+ # podofo - we use poppler instead they are exclusive for each other
+ # tiff is a hard dep
+ ECONF_SOURCE="${S}" econf \
+ --includedir="${EPREFIX}/usr/include/${PN}" \
+ --disable-pdf-plugin \
+ --disable-static \
+ --enable-shared \
+ --with-expat \
+ --with-geotiff \
+ --with-grib \
+ --with-hide-internal-symbols \
+ --with-libjson-c="${EPREFIX}/usr/" \
+ --with-libtiff \
+ --with-libtool \
+ --with-libz="${EPREFIX}/usr/" \
+ --with-gnm \
+ --with-cryptopp=no \
+ --without-bsb \
+ --without-dods-root \
+ --without-ecw \
+ --without-epsilon \
+ --without-fme \
+ --without-grass \
+ --without-hdf4 \
+ --without-idb \
+ --without-ingres \
+ --without-jasper \
+ --without-jp2mrsid \
+ --without-kakadu \
+ --without-mrsid \
+ --without-msg \
+ --without-mrf \
+ --without-pcraster \
+ --without-pdfium \
+ --without-sde \
+ --without-sosi \
+ --without-mongocxx \
+ --without-podofo \
+ --disable-lto \
+ $(use_enable debug) \
+ $(use_with armadillo) \
+ $(use_with aux_xml pam) \
+ $(use_with curl) \
+ $(use_with fits cfitsio) \
+ $(use_with geos) \
+ $(use_with gif) \
+ $(use_with gml xerces) \
+ $(use_with hdf5) \
+ $(use_with jpeg pcidsk) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k openjpeg) \
+ $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+ $(use_with netcdf) \
+ $(use_with oracle oci) \
+ $(use_with odbc) \
+ $(use_with ogdi ogdi "${EPREFIX}"/usr) \
+ $(use_with opencl) \
+ $(use_with perl) \
+ $(use_with png) \
+ $(use_with pdf poppler) \
+ $(use_with postgres pg) \
+ $(use_with python) \
+ $(use_with spatialite) \
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+ $(use_with threads) \
+ $(use_with webp) \
+ $(use_with xls freexl) \
+ ${myopts}
+
+ # mysql-config puts this in (and boy is it a PITA to get it out)
+ if use mysql; then
+ sed -e "s: -rdynamic : :" \
+ -i GDALmake.opt || die "sed LIBS failed"
+ fi
+}
+
+src_compile() {
+ if use perl; then
+ rm "${S}"/swig/perl/*_wrap.cpp || die
+ emake -C "${S}"/swig/perl generate
+ fi
+
+ # gdal-config needed before generating Python bindings
+ default
+
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null || die
+ perl-module_src_configure
+ perl-module_src_compile
+ popd > /dev/null || die
+ fi
+
+ if use python; then
+ rm -f "${S}"/swig/python/*_wrap.cpp || die
+ emake -C "${S}"/swig/python generate
+ pushd "${S}"/swig/python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+
+ use doc && emake docs
+}
+
+src_install() {
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null || die
+ perl-module_src_install
+ popd > /dev/null || die
+ sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
+ -i GDALmake.opt || die
+ fi
+
+ use perl && perl_delete_localpod
+
+ local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
+ use doc && HTML_DOCS=( html/. )
+
+ default
+
+ python_install() {
+ distutils-r1_python_install
+ python_doscript scripts/*.py
+ }
+
+ if use python; then
+ # Don't clash with gdal's docs
+ unset DOCS HTML_DOCS
+
+ pushd "${S}"/swig/python > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
+
+ newdoc swig/python/README.txt README-python.txt
+
+ insinto /usr/share/${PN}/samples
+ doins -r swig/python/samples/
+ fi
+
+ doman "${S}"/man/man*/*
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2018-08-04 12:04 Amy Liffey
0 siblings, 0 replies; 18+ messages in thread
From: Amy Liffey @ 2018-08-04 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 24b142ee7181dd03692bd636d3ffc2e787dc5202
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 4 12:03:05 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Aug 4 12:03:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b142ee
sci-libs/gdal: fix curl undefined reference
Submitted-by: Michael Uleysky <uleysky <AT> gmail.com>
Closes: https://bugs.gentoo.org/659840
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-libs/gdal/files/gdal-2.3.0-curl.patch | 15 +++++++++++++++
sci-libs/gdal/gdal-2.3.0-r1.ebuild | 1 +
2 files changed, 16 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-2.3.0-curl.patch b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
new file mode 100644
index 00000000000..1cd33243f42
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
@@ -0,0 +1,15 @@
+diff -urNd gdal-2.3.1/port/cpl_vsil_curl.cpp gdal-2.3.1-curl/port/cpl_vsil_curl.cpp
+--- gdal-2.3.1/port/cpl_vsil_curl.cpp 2018-06-24 01:10:23.000000000 +1000
++++ gdal-2.3.1-curl/port/cpl_vsil_curl.cpp 2018-07-13 01:29:31.326347717 +1000
+@@ -8617,8 +8617,10 @@
+ if( poFSHandler )
+ poFSHandler->ClearCache();
+ }
+-
++#if !defined(HAVE_CURL) || defined(CPL_MULTIPROC_STUB)
++#else
+ VSICurlStreamingClearCache();
++#endif
+ }
+
+ #endif /* HAVE_CURL */
diff --git a/sci-libs/gdal/gdal-2.3.0-r1.ebuild b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
index 8aacbcb83c7..2ddaa49d414 100644
--- a/sci-libs/gdal/gdal-2.3.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-soname.patch"
"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
"${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
+ "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
)
src_prepare() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2018-08-12 19:17 Amy Liffey
0 siblings, 0 replies; 18+ messages in thread
From: Amy Liffey @ 2018-08-12 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 89993d3fc3cba6e559905b758f691b157b589fcf
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 12 18:33:12 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 19:15:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89993d3f
sci-libs/gdal: add security patches
Bug: https://bugs.gentoo.org/621712
Bug: https://bugs.gentoo.org/621720
Bug: https://bugs.gentoo.org/623028
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../gdal/files/gdal-2.3.0-changeset_38658.patch | 80 ++++++++++++++++++++++
.../gdal/files/gdal-2.3.0-frmts-nitf38234.patch | 12 ++++
sci-libs/gdal/files/gdal-2.3.0-libtiff.patch | 12 ++++
.../{gdal-2.3.0-r1.ebuild => gdal-2.3.0-r2.ebuild} | 5 ++
4 files changed, 109 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
new file mode 100644
index 00000000000..3f681836989
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
@@ -0,0 +1,80 @@
+Index: /trunk/gdal/frmts/nitf/nitfrasterband.cpp
+===================================================================
+--- a/frmts/nitf/nitfrasterband.cpp (revision 38657)
++++ b/frmts/nitf/nitfrasterband.cpp (revision 38658)
+@@ -824,4 +826,20 @@
+ pUnpackData[i+7] = ((pDataSrc[k+2]) & 0x7);
+ }
++ if( i < n )
++ {
++ pUnpackData[i+0] = ((pDataSrc[k+0] >> 5));
++ if( i + 1 < n )
++ pUnpackData[i+1] = ((pDataSrc[k+0] >> 2) & 0x07);
++ if( i + 2 < n )
++ pUnpackData[i+2] = ((pDataSrc[k+0] << 1) & 0x07) | (pDataSrc[k+1] >> 7);
++ if( i + 3 < n )
++ pUnpackData[i+3] = ((pDataSrc[k+1] >> 4) & 0x07);
++ if( i + 4 < n )
++ pUnpackData[i+4] = ((pDataSrc[k+1] >> 1) & 0x07);
++ if( i + 5 < n )
++ pUnpackData[i+5] = ((pDataSrc[k+1] << 2) & 0x07) | (pDataSrc[k+2] >> 6);
++ if( i + 6 < n )
++ pUnpackData[i+6] = ((pDataSrc[k+2] >> 3) & 0x07);
++ }
+
+ memcpy(pData, pUnpackData, n);
+@@ -842,4 +862,20 @@
+ pUnpackData[i+7] = ((pDataSrc[k+4]) & 0x1f);
+ }
++ if( i < n )
++ {
++ pUnpackData[i+0] = ((pDataSrc[k+0] >> 3));
++ if( i + 1 < n )
++ pUnpackData[i+1] = ((pDataSrc[k+0] << 2) & 0x1f) | (pDataSrc[k+1] >> 6);
++ if( i + 2 < n )
++ pUnpackData[i+2] = ((pDataSrc[k+1] >> 1) & 0x1f);
++ if( i + 3 < n )
++ pUnpackData[i+3] = ((pDataSrc[k+1] << 4) & 0x1f) | (pDataSrc[k+2] >> 4);
++ if( i + 4 < n )
++ pUnpackData[i+4] = ((pDataSrc[k+2] << 1) & 0x1f) | (pDataSrc[k+3] >> 7);
++ if( i + 5 < n )
++ pUnpackData[i+5] = ((pDataSrc[k+3] >> 2) & 0x1f);
++ if( i + 6 < n )
++ pUnpackData[i+6] = ((pDataSrc[k+3] << 3) & 0x1f) | (pDataSrc[k+4] >> 5);
++ }
+
+ memcpy(pData, pUnpackData, n);
+@@ -856,4 +894,12 @@
+ pUnpackData[i+3] = ((pDataSrc[k+2]) & 0x3f);
+ }
++ if( i < n )
++ {
++ pUnpackData[i+0] = ((pDataSrc[k+0] >> 2));
++ if( i + 1 < n )
++ pUnpackData[i+1] = ((pDataSrc[k+0] << 4) & 0x3f) | (pDataSrc[k+1] >> 4);
++ if( i + 2 < n )
++ pUnpackData[i+2] = ((pDataSrc[k+1] << 2) & 0x3f) | (pDataSrc[k+2] >> 6);
++ }
+
+ memcpy(pData, pUnpackData, n);
+@@ -873,4 +921,20 @@
+ pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
+ pUnpackData[i+7] = ((pDataSrc[k+6]) & 0x7f);
++ }
++ if( i < n )
++ {
++ pUnpackData[i+0] = ((pDataSrc[k+0] >> 1));
++ if( i + 1 < n )
++ pUnpackData[i+1] = ((pDataSrc[k+0] << 6) & 0x7f) | (pDataSrc[k+1] >> 2);
++ if( i + 2 < n )
++ pUnpackData[i+2] = ((pDataSrc[k+1] << 5) & 0x7f) | (pDataSrc[k+2] >> 3) ;
++ if( i + 3 < n )
++ pUnpackData[i+3] = ((pDataSrc[k+2] << 4) & 0x7f) | (pDataSrc[k+3] >> 4);
++ if( i + 4 < n )
++ pUnpackData[i+4] = ((pDataSrc[k+3] << 3) & 0x7f) | (pDataSrc[k+4] >> 5);
++ if( i + 5 < n )
++ pUnpackData[i+5] = ((pDataSrc[k+4] << 2) & 0x7f) | (pDataSrc[k+5] >> 6);
++ if( i + 6 < n )
++ pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
+ }
+
diff --git a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
new file mode 100644
index 00000000000..783752e0efa
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
@@ -0,0 +1,12 @@
+Index: trunk/gdal/frmts/nitf/nitffile.c
+===================================================================
+--- a/frmts/nitf/nitffile.c (revision 38085)
++++ b/frmts/nitf/nitffile.c (revision 38234)
+@@ -350,5 +350,6 @@
+ if (nOffset != -1)
+ nOffset = NITFCollectSegmentInfo( psFile, nHeaderLen, nOffset, "RE", 4, 7, &nNextData);
+- else
++
++ if( nOffset < 0 )
+ {
+ NITFClose(psFile);
diff --git a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
new file mode 100644
index 00000000000..5964165e3e6
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
@@ -0,0 +1,12 @@
+--- ./frmts/gtiff/libtiff/tif_read.c.old 2018-08-11 09:12:42.378891934 +0100
++++ ./frmts/gtiff/libtiff/tif_read.c 2018-08-11 09:15:37.330882891 +0100
+@@ -296,7 +296,8 @@
+ }
+ else
+ {
+- return 1;
++ tif->tif_rawcc = tif->tif_rawdataloaded;
++ return 1;
+ }
+ }
+
diff --git a/sci-libs/gdal/gdal-2.3.0-r1.ebuild b/sci-libs/gdal/gdal-2.3.0-r2.ebuild
similarity index 97%
rename from sci-libs/gdal/gdal-2.3.0-r1.ebuild
rename to sci-libs/gdal/gdal-2.3.0-r2.ebuild
index 436c68a468d..3762e5d262c 100644
--- a/sci-libs/gdal/gdal-2.3.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.0-r2.ebuild
@@ -82,6 +82,10 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
"${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+ # Security bugs
+ "${FILESDIR}/${P}-libtiff.patch" # bug 621712
+ "${FILESDIR}/${P}-frmts-nitf38234.patch" # bug 621720
+ "${FILESDIR}/${P}-changeset_38658.patch" # bug 623028
)
src_prepare() {
@@ -305,6 +309,7 @@ src_install() {
fi
doman "${S}"/man/man*/*
+ find "${ED}" -name '*.la' -delete || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2018-11-03 22:51 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2018-11-03 22:51 UTC (permalink / raw
To: gentoo-commits
commit: e9aced03ab6c5b8c5697f02a4f69b6bc68188a60
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 3 22:50:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 3 22:51:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9aced03
sci-libs/gdal: Fix build with app-text/poppler-0.69.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../gdal/files/gdal-2.3.1-poppler-0.69.0.patch | 301 +++++++++++++++++++++
sci-libs/gdal/gdal-2.3.1.ebuild | 1 +
2 files changed, 302 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch
new file mode 100644
index 00000000000..a89970074b0
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch
@@ -0,0 +1,301 @@
+From 0c0b9ea5a5d6bbef938de8a77c5b00cb228b902d Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Fri, 12 Oct 2018 19:02:40 +0200
+Subject: [PATCH] Add support for Poppler 0.69 (fixes #1004)
+
+---
+ GDALmake.opt.in | 1 +
+ configure | 61 ++++++++++++++++++++++++++---------
+ configure.ac | 56 +++++++++++++++++++++++---------
+ frmts/pdf/GNUmakefile | 4 +++
+ frmts/pdf/makefile.vc | 6 +++-
+ frmts/pdf/pdfdataset.cpp | 12 +++++++
+ nmake.opt | 2 ++
+ 7 files changed, 111 insertions(+), 31 deletions(-)
+
+diff --git a/GDALmake.opt.in b/GDALmake.opt.in
+index 30749ae982a..f9ab41fd124 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -481,6 +481,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@
+ POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
+ POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@
+ POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@
++POPPLER_0_69_OR_LATER = @POPPLER_0_69_OR_LATER@
+ POPPLER_INC = @POPPLER_INC@
+ POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@
+
+diff --git a/configure b/configure
+index 050bc79ac97..a8472ba8c2d 100755
+--- a/configure
++++ b/configure
+@@ -669,6 +669,7 @@ PODOFO_INC
+ HAVE_PODOFO
+ POPPLER_PLUGIN_LIB
+ POPPLER_INC
++POPPLER_0_69_OR_LATER
+ POPPLER_0_58_OR_LATER
+ POPPLER_0_23_OR_LATER
+ POPPLER_0_20_OR_LATER
+@@ -34798,6 +34799,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
+ POPPLER_0_20_OR_LATER=no
+ POPPLER_0_23_OR_LATER=no
+ POPPLER_0_58_OR_LATER=no
++POPPLER_0_69_OR_LATER=no
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
+ $as_echo_n "checking for poppler... " >&6; }
+@@ -34840,24 +34842,51 @@ $as_echo "yes" >&6; }
+
+ CHECK_OTHER_POPPLER_VERSION=yes
+
+- # And now we check if we have Poppler >= 0.58.0
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OptionalContent has API >= 0.69.0" >&5
++$as_echo_n "checking if OptionalContent has API >= 0.69.0... " >&6; }
++ rm -f testpoppler.*
++ echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
++ echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
++ echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
++ echo 'ocg.getOCGs().size();' >> testpoppler.cpp
++ echo 'return 0; }' >> testpoppler.cpp
++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
++ POPPLER_0_69_OR_LATER=yes
++ POPPLER_0_58_OR_LATER=yes
++ POPPLER_0_23_OR_LATER=yes
++ POPPLER_0_20_OR_LATER=yes
++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
++ POPPLER_HAS_OPTCONTENT=yes
++ CHECK_OTHER_POPPLER_VERSION=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ fi
++ fi
++
++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
++ # And now we check if we have Poppler >= 0.58.0
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
+ $as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; }
+- rm -f testpoppler.*
+- echo '#include <poppler/Object.h>' > testpoppler.cpp
+- echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
+- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
+- POPPLER_0_58_OR_LATER=yes
+- POPPLER_0_23_OR_LATER=yes
+- POPPLER_0_20_OR_LATER=yes
+- POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
+- POPPLER_HAS_OPTCONTENT=yes
+- CHECK_OTHER_POPPLER_VERSION=no
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++ rm -f testpoppler.*
++ echo '#include <poppler/Object.h>' > testpoppler.cpp
++ echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
++ POPPLER_0_58_OR_LATER=yes
++ POPPLER_0_23_OR_LATER=yes
++ POPPLER_0_20_OR_LATER=yes
++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
++ POPPLER_HAS_OPTCONTENT=yes
++ CHECK_OTHER_POPPLER_VERSION=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
++ fi
+ fi
+
+ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
+@@ -34962,6 +34991,8 @@ POPPLER_0_23_OR_LATER=$POPPLER_0_23_OR_LATER
+
+ POPPLER_0_58_OR_LATER=$POPPLER_0_58_OR_LATER
+
++POPPLER_0_69_OR_LATER=$POPPLER_0_69_OR_LATER
++
+ POPPLER_INC=$POPPLER_INC
+
+ POPPLER_PLUGIN_LIB=$POPPLER_PLUGIN_LIB
+diff --git a/configure.ac b/configure.ac
+index 4b8ab911cec..0c588e04f03 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4496,6 +4496,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
+ POPPLER_0_20_OR_LATER=no
+ POPPLER_0_23_OR_LATER=no
+ POPPLER_0_58_OR_LATER=no
++POPPLER_0_69_OR_LATER=no
+
+ AC_MSG_CHECKING([for poppler])
+
+@@ -4536,21 +4537,45 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
+
+ CHECK_OTHER_POPPLER_VERSION=yes
+
+- # And now we check if we have Poppler >= 0.58.0
+- AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
+- rm -f testpoppler.*
+- echo '#include <poppler/Object.h>' > testpoppler.cpp
+- echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
+- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
+- POPPLER_0_58_OR_LATER=yes
+- POPPLER_0_23_OR_LATER=yes
+- POPPLER_0_20_OR_LATER=yes
+- POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
+- POPPLER_HAS_OPTCONTENT=yes
+- CHECK_OTHER_POPPLER_VERSION=no
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_RESULT([no])
++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
++ AC_MSG_CHECKING([if OptionalContent has API >= 0.69.0])
++ rm -f testpoppler.*
++ echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
++ echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
++ echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
++ echo 'ocg.getOCGs().size();' >> testpoppler.cpp
++ echo 'return 0; }' >> testpoppler.cpp
++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
++ POPPLER_0_69_OR_LATER=yes
++ POPPLER_0_58_OR_LATER=yes
++ POPPLER_0_23_OR_LATER=yes
++ POPPLER_0_20_OR_LATER=yes
++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
++ POPPLER_HAS_OPTCONTENT=yes
++ CHECK_OTHER_POPPLER_VERSION=no
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ fi
++ fi
++
++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
++ # And now we check if we have Poppler >= 0.58.0
++ AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
++ rm -f testpoppler.*
++ echo '#include <poppler/Object.h>' > testpoppler.cpp
++ echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
++ POPPLER_0_58_OR_LATER=yes
++ POPPLER_0_23_OR_LATER=yes
++ POPPLER_0_20_OR_LATER=yes
++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
++ POPPLER_HAS_OPTCONTENT=yes
++ CHECK_OTHER_POPPLER_VERSION=no
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ fi
+ fi
+
+ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
+@@ -4635,6 +4660,7 @@ AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS)
+ AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)
+ AC_SUBST(POPPLER_0_23_OR_LATER, $POPPLER_0_23_OR_LATER)
+ AC_SUBST(POPPLER_0_58_OR_LATER, $POPPLER_0_58_OR_LATER)
++AC_SUBST(POPPLER_0_69_OR_LATER, $POPPLER_0_69_OR_LATER)
+ AC_SUBST(POPPLER_INC, $POPPLER_INC)
+ AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_PLUGIN_LIB)
+
+diff --git a/frmts/pdf/GNUmakefile b/frmts/pdf/GNUmakefile
+index 2c332d2798f..6a267f529b2 100644
+--- a/frmts/pdf/GNUmakefile
++++ b/frmts/pdf/GNUmakefile
+@@ -34,6 +34,10 @@ ifeq ($(POPPLER_0_58_OR_LATER),yes)
+ CPPFLAGS += -DPOPPLER_0_58_OR_LATER
+ endif
+
++ifeq ($(POPPLER_0_69_OR_LATER),yes)
++CPPFLAGS += -DPOPPLER_0_69_OR_LATER
++endif
++
+ ifeq ($(HAVE_PODOFO),yes)
+ CPPFLAGS += -DHAVE_PODOFO
+ endif
+diff --git a/frmts/pdf/makefile.vc b/frmts/pdf/makefile.vc
+index b4fa14d0a18..ad76d3de70c 100644
+--- a/frmts/pdf/makefile.vc
++++ b/frmts/pdf/makefile.vc
+@@ -14,7 +14,7 @@ OBJ = $(OBJ) ..\..\ogr\ogrsf_frmts\mem\ogrmemdatasource.obj ..\..\ogr\ogrsf_frmt
+ EXTRAFLAGS = -I..\vrt -I..\mem -I..\..\ogr\ogrsf_frmts\mem $(POPPLER_EXTRAFLAGS) $(PODOFO_EXTRAFLAGS) $(PDFIUM_EXTRAFLAGS)
+
+ !IFDEF POPPLER_ENABLED
+-POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) -DHAVE_POPPLER
++POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) $(POPPLER_0_69_OR_LATER_FLAGS) -DHAVE_POPPLER
+
+ !IFDEF POPPLER_HAS_OPTCONTENT
+ POPPLER_HAS_OPTCONTENT_FLAGS = -DPOPPLER_HAS_OPTCONTENT
+@@ -36,6 +36,10 @@ POPPLER_0_23_OR_LATER_FLAGS = -DPOPPLER_0_23_OR_LATER
+ POPPLER_0_58_OR_LATER_FLAGS = -DPOPPLER_0_58_OR_LATER
+ !ENDIF
+
++!IFDEF POPPLER_0_69_OR_LATER
++POPPLER_0_69_OR_LATER_FLAGS = -DPOPPLER_0_69_OR_LATER
++!ENDIF
++
+ !ENDIF
+
+ !IFDEF PODOFO_ENABLED
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index ee89fd07564..1a56f57ee06 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -3440,10 +3440,16 @@ void PDFDataset::FindLayersPoppler()
+ }
+ else
+ {
++#ifdef POPPLER_0_69_OR_LATER
++ for( const auto& refOCGPair: optContentConfig->getOCGs() )
++ {
++ auto ocg = refOCGPair.second.get();
++#else
+ GooList* ocgList = optContentConfig->getOCGs();
+ for(int i=0;i<ocgList->getLength();i++)
+ {
+ OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
++#endif
+ if( ocg != nullptr && ocg->getName() != nullptr )
+ {
+ const char* pszLayerName = (const char*)ocg->getName()->getCString();
+@@ -3472,10 +3478,16 @@ void PDFDataset::TurnLayersOnOffPoppler()
+ {
+ int i;
+ int bAll = EQUAL(pszLayers, "ALL");
++#ifdef POPPLER_0_69_OR_LATER
++ for( const auto& refOCGPair: optContentConfig->getOCGs() )
++ {
++ auto ocg = refOCGPair.second.get();
++#else
+ GooList* ocgList = optContentConfig->getOCGs();
+ for(i=0;i<ocgList->getLength();i++)
+ {
+ OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
++#endif
+ ocg->setState( (bAll) ? OptionalContentGroup::On : OptionalContentGroup::Off );
+ }
+
+diff --git a/nmake.opt b/nmake.opt
+index 682d766d93e..1eb049038c8 100644
+--- a/nmake.opt
++++ b/nmake.opt
+@@ -639,6 +639,7 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include
+ # Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0
+ # Uncomment POPPLER_0_23_OR_LATER = YES for Poppler >= 0.23.0
+ # Uncomment POPPLER_0_58_OR_LATER = YES for Poppler >= 0.58.0
++# Uncomment POPPLER_0_69_OR_LATER = YES for Poppler >= 0.69.0
+ #POPPLER_ENABLED = YES
+ #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler
+ #POPPLER_HAS_OPTCONTENT = YES
+@@ -646,6 +647,7 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include
+ #POPPLER_0_20_OR_LATER = YES
+ #POPPLER_0_23_OR_LATER = YES
+ #POPPLER_0_58_OR_LATER = YES
++#POPPLER_0_69_OR_LATER = YES
+ #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib
+
+ # Uncomment for PDF support
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 65af4595613..317b386da9e 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -82,6 +82,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-soname.patch"
"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+ "${FILESDIR}/${PN}-2.3.1-poppler-0.69.0.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2019-01-12 20:07 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2019-01-12 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 864b528b1db3f4e946a21c7badac1448f13feaea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 12 16:27:11 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 12 20:07:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864b528b
sci-libs/gdal: Fix build with poppler-0.71 and poppler-0.72
Bug: https://bugs.gentoo.org/674556
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../gdal/files/gdal-2.3.1-poppler-0.71.0.patch | 82 ++++++++++++++++++++++
.../gdal/files/gdal-2.3.1-poppler-0.72.0.patch | 58 +++++++++++++++
sci-libs/gdal/gdal-2.3.1.ebuild | 7 +-
3 files changed, 146 insertions(+), 1 deletion(-)
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch
new file mode 100644
index 00000000000..90ee94d0621
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch
@@ -0,0 +1,82 @@
+Description: Add support for Poppler 0.71.0.
+Author: Even Rouault <even.rouault@spatialys.com>
+Origin: https://github.com/OSGeo/gdal/commit/4cc0215b8f2cef3582265cdfaf16589390697706
+Bug: https://github.com/OSGeo/gdal/issues/1121
+Bug-Debian: https://bugs.debian.org/915722
+
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -2593,18 +2593,25 @@ static void PDFDatasetErrorFunctionCommo
+ }
+
+ #ifdef POPPLER_0_20_OR_LATER
+-static void PDFDatasetErrorFunction(CPL_UNUSED void* userData, CPL_UNUSED ErrorCategory eErrCategory,
++
++static void PDFDatasetErrorFunction(void* /* userData*/,
++ ErrorCategory /* eErrCategory */,
+ #ifdef POPPLER_0_23_OR_LATER
+ Goffset nPos,
+ #else
+ int nPos,
+ #endif
+- char *pszMsg)
++#ifdef POPPLER_0_71_OR_LATER
++ const char *pszMsg
++#else
++ char *pszMsg
++#endif
++ )
+ {
+ CPLString osError;
+
+ if (nPos >= 0)
+- osError.Printf("Pos = %d, ", (int)nPos);
++ osError.Printf("Pos = " CPL_FRMT_GUIB ", ", static_cast<GUIntBig>(nPos));
+ osError += pszMsg;
+ PDFDatasetErrorFunctionCommon(osError);
+ }
+@@ -4442,7 +4449,7 @@ GDALDataset *PDFDataset::Open( GDALOpenI
+ #ifdef HAVE_POPPLER
+ if (bUseLib.test(PDFLIB_POPPLER))
+ {
+- PDFRectangle* psMediaBox = poPagePoppler->getMediaBox();
++ const auto* psMediaBox = poPagePoppler->getMediaBox();
+ dfX1 = psMediaBox->x1;
+ dfY1 = psMediaBox->y1;
+ dfX2 = psMediaBox->x2;
+@@ -4780,14 +4787,12 @@ GDALDataset *PDFDataset::Open( GDALOpenI
+ GooString* poMetadata = poCatalogPoppler->readMetadata();
+ if (poMetadata)
+ {
+- char* pszContent = poMetadata->getCString();
++ const char* pszContent = poMetadata->getCString();
+ if (pszContent != nullptr &&
+ STARTS_WITH(pszContent, "<?xpacket begin="))
+ {
+- char *apszMDList[2];
+- apszMDList[0] = pszContent;
+- apszMDList[1] = nullptr;
+- poDS->SetMetadata(apszMDList, "xml:XMP");
++ const char * const apszMDList[2] = { pszContent, nullptr };
++ poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
+ }
+ delete poMetadata;
+ }
+--- a/frmts/pdf/pdfio.h
++++ b/frmts/pdf/pdfio.h
+@@ -58,6 +58,15 @@
+ #define makeSubStream_object_type Object*
+ #endif
+
++// Detect Poppler 0.71 that no longer defines GBool
++#ifdef POPPLER_0_69_OR_LATER
++#ifndef initObj
++#define POPPLER_0_71_OR_LATER
++#define GBool bool
++#define gFalse false
++#endif
++#endif
++
+ class VSIPDFFileStream: public BaseStream
+ {
+ public:
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
new file mode 100644
index 00000000000..3302df9100d
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
@@ -0,0 +1,58 @@
+From b471814ef406582f2b1bc0aabbe430c0026608c7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 12 Jan 2019 17:21:54 +0100
+Subject: [PATCH] Fix build with poppler-0.72.0
+
+Non-upstreamable patch that breaks backward compatibility.
+---
+ frmts/pdf/pdfdataset.cpp | 4 ++--
+ frmts/pdf/pdfobject.cpp | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 84fe1fe..38b8c30 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -3459,7 +3459,7 @@ void PDFDataset::FindLayersPoppler()
+ #endif
+ if( ocg != nullptr && ocg->getName() != nullptr )
+ {
+- const char* pszLayerName = (const char*)ocg->getName()->getCString();
++ const char* pszLayerName = (const char*)ocg->getName()->c_str();
+ AddLayer(pszLayerName);
+ oLayerOCGMapPoppler[pszLayerName] = ocg;
+ }
+@@ -4787,7 +4787,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ GooString* poMetadata = poCatalogPoppler->readMetadata();
+ if (poMetadata)
+ {
+- const char* pszContent = poMetadata->getCString();
++ const char* pszContent = poMetadata->c_str();
+ if (pszContent != nullptr &&
+ STARTS_WITH(pszContent, "<?xpacket begin="))
+ {
+diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
+index 0a5f907..9bed6c1 100644
+--- a/frmts/pdf/pdfobject.cpp
++++ b/frmts/pdf/pdfobject.cpp
+@@ -1061,7 +1061,7 @@ const CPLString& GDALPDFObjectPoppler::GetString()
+ #else
+ GooString* gooString = m_po->getString();
+ #endif
+- return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
++ return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
+ static_cast<int>(gooString->getLength())));
+ }
+ else
+@@ -1422,7 +1422,7 @@ char* GDALPDFStreamPoppler::GetBytes()
+ char* pszContent = (char*) VSIMalloc(m_nLength + 1);
+ if (pszContent)
+ {
+- memcpy(pszContent, gstr->getCString(), m_nLength);
++ memcpy(pszContent, gstr->c_str(), m_nLength);
+ pszContent[m_nLength] = '\0';
+ }
+ delete gstr;
+--
+2.20.1
+
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 317b386da9e..7af0dee0851 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -83,6 +83,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
"${FILESDIR}/${PN}-2.3.1-poppler-0.69.0.patch"
+ "${FILESDIR}/${PN}-2.3.1-poppler-0.71.0.patch" # bug 674556
)
src_prepare() {
@@ -119,6 +120,9 @@ src_prepare() {
default
+ # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12:
+ has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
+
eautoreconf
}
@@ -311,6 +315,7 @@ src_install() {
fi
doman "${S}"/man/man*/*
+ find "${ED}" -name '*.la' -delete || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2019-03-02 20:29 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2019-03-02 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 936fdfe7d0cbbc1fa31f612cc3dbf21156f4bd83
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 20:24:38 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 20:24:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936fdfe7
sci-libs/gdal: Drop 2.3.0-r2
Does not build against poppler versions in tree.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/gdal/Manifest | 1 -
sci-libs/gdal/files/gdal-2.2.3-goocast.patch | 11 -
.../gdal/files/gdal-2.3.0-changeset_38658.patch | 80 ------
.../gdal/files/gdal-2.3.0-frmts-nitf38234.patch | 12 -
sci-libs/gdal/files/gdal-2.3.0-libtiff.patch | 12 -
sci-libs/gdal/gdal-2.3.0-r2.ebuild | 318 ---------------------
6 files changed, 434 deletions(-)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 3d0114321d5..3e3fe719104 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1 @@
-DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
diff --git a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
deleted file mode 100644
index a25a524c253..00000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/frmts/pdf/pdfobject.cpp 2018-05-29 11:23:00.980957371 +0300
-+++ b/frmts/pdf/pdfobject.cpp 2018-05-29 11:23:44.378955265 +0300
-@@ -1055,7 +1055,7 @@
- {
- if (GetType() == PDFObjectType_String)
- {
-- GooString* gooString = m_po->getString();
-+ GooString* gooString =(GooString*) m_po->getString();
- return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
- static_cast<int>(gooString->getLength())));
- }
diff --git a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
deleted file mode 100644
index 3f681836989..00000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: /trunk/gdal/frmts/nitf/nitfrasterband.cpp
-===================================================================
---- a/frmts/nitf/nitfrasterband.cpp (revision 38657)
-+++ b/frmts/nitf/nitfrasterband.cpp (revision 38658)
-@@ -824,4 +826,20 @@
- pUnpackData[i+7] = ((pDataSrc[k+2]) & 0x7);
- }
-+ if( i < n )
-+ {
-+ pUnpackData[i+0] = ((pDataSrc[k+0] >> 5));
-+ if( i + 1 < n )
-+ pUnpackData[i+1] = ((pDataSrc[k+0] >> 2) & 0x07);
-+ if( i + 2 < n )
-+ pUnpackData[i+2] = ((pDataSrc[k+0] << 1) & 0x07) | (pDataSrc[k+1] >> 7);
-+ if( i + 3 < n )
-+ pUnpackData[i+3] = ((pDataSrc[k+1] >> 4) & 0x07);
-+ if( i + 4 < n )
-+ pUnpackData[i+4] = ((pDataSrc[k+1] >> 1) & 0x07);
-+ if( i + 5 < n )
-+ pUnpackData[i+5] = ((pDataSrc[k+1] << 2) & 0x07) | (pDataSrc[k+2] >> 6);
-+ if( i + 6 < n )
-+ pUnpackData[i+6] = ((pDataSrc[k+2] >> 3) & 0x07);
-+ }
-
- memcpy(pData, pUnpackData, n);
-@@ -842,4 +862,20 @@
- pUnpackData[i+7] = ((pDataSrc[k+4]) & 0x1f);
- }
-+ if( i < n )
-+ {
-+ pUnpackData[i+0] = ((pDataSrc[k+0] >> 3));
-+ if( i + 1 < n )
-+ pUnpackData[i+1] = ((pDataSrc[k+0] << 2) & 0x1f) | (pDataSrc[k+1] >> 6);
-+ if( i + 2 < n )
-+ pUnpackData[i+2] = ((pDataSrc[k+1] >> 1) & 0x1f);
-+ if( i + 3 < n )
-+ pUnpackData[i+3] = ((pDataSrc[k+1] << 4) & 0x1f) | (pDataSrc[k+2] >> 4);
-+ if( i + 4 < n )
-+ pUnpackData[i+4] = ((pDataSrc[k+2] << 1) & 0x1f) | (pDataSrc[k+3] >> 7);
-+ if( i + 5 < n )
-+ pUnpackData[i+5] = ((pDataSrc[k+3] >> 2) & 0x1f);
-+ if( i + 6 < n )
-+ pUnpackData[i+6] = ((pDataSrc[k+3] << 3) & 0x1f) | (pDataSrc[k+4] >> 5);
-+ }
-
- memcpy(pData, pUnpackData, n);
-@@ -856,4 +894,12 @@
- pUnpackData[i+3] = ((pDataSrc[k+2]) & 0x3f);
- }
-+ if( i < n )
-+ {
-+ pUnpackData[i+0] = ((pDataSrc[k+0] >> 2));
-+ if( i + 1 < n )
-+ pUnpackData[i+1] = ((pDataSrc[k+0] << 4) & 0x3f) | (pDataSrc[k+1] >> 4);
-+ if( i + 2 < n )
-+ pUnpackData[i+2] = ((pDataSrc[k+1] << 2) & 0x3f) | (pDataSrc[k+2] >> 6);
-+ }
-
- memcpy(pData, pUnpackData, n);
-@@ -873,4 +921,20 @@
- pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
- pUnpackData[i+7] = ((pDataSrc[k+6]) & 0x7f);
-+ }
-+ if( i < n )
-+ {
-+ pUnpackData[i+0] = ((pDataSrc[k+0] >> 1));
-+ if( i + 1 < n )
-+ pUnpackData[i+1] = ((pDataSrc[k+0] << 6) & 0x7f) | (pDataSrc[k+1] >> 2);
-+ if( i + 2 < n )
-+ pUnpackData[i+2] = ((pDataSrc[k+1] << 5) & 0x7f) | (pDataSrc[k+2] >> 3) ;
-+ if( i + 3 < n )
-+ pUnpackData[i+3] = ((pDataSrc[k+2] << 4) & 0x7f) | (pDataSrc[k+3] >> 4);
-+ if( i + 4 < n )
-+ pUnpackData[i+4] = ((pDataSrc[k+3] << 3) & 0x7f) | (pDataSrc[k+4] >> 5);
-+ if( i + 5 < n )
-+ pUnpackData[i+5] = ((pDataSrc[k+4] << 2) & 0x7f) | (pDataSrc[k+5] >> 6);
-+ if( i + 6 < n )
-+ pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
- }
-
diff --git a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
deleted file mode 100644
index 783752e0efa..00000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: trunk/gdal/frmts/nitf/nitffile.c
-===================================================================
---- a/frmts/nitf/nitffile.c (revision 38085)
-+++ b/frmts/nitf/nitffile.c (revision 38234)
-@@ -350,5 +350,6 @@
- if (nOffset != -1)
- nOffset = NITFCollectSegmentInfo( psFile, nHeaderLen, nOffset, "RE", 4, 7, &nNextData);
-- else
-+
-+ if( nOffset < 0 )
- {
- NITFClose(psFile);
diff --git a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
deleted file mode 100644
index 5964165e3e6..00000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./frmts/gtiff/libtiff/tif_read.c.old 2018-08-11 09:12:42.378891934 +0100
-+++ ./frmts/gtiff/libtiff/tif_read.c 2018-08-11 09:15:37.330882891 +0100
-@@ -296,7 +296,8 @@
- }
- else
- {
-- return 1;
-+ tif->tif_rawcc = tif->tif_rawdataloaded;
-+ return 1;
- }
- }
-
diff --git a/sci-libs/gdal/gdal-2.3.0-r2.ebuild b/sci-libs/gdal/gdal-2.3.0-r2.ebuild
deleted file mode 100644
index fe8e746f8d1..00000000000
--- a/sci-libs/gdal/gdal-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://www.gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2.3"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
-
-COMMON_DEPEND="
- dev-libs/expat
- dev-libs/json-c:=
- dev-libs/libpcre
- dev-libs/libxml2:=
- media-libs/tiff:0=
- sci-libs/libgeotiff
- sys-libs/zlib:=[minizip(+)]
- armadillo? ( sci-libs/armadillo:=[lapack] )
- curl? ( net-misc/curl )
- fits? ( sci-libs/cfitsio:= )
- geos? ( >=sci-libs/geos-2.2.1 )
- gif? ( media-libs/giflib:= )
- gml? ( >=dev-libs/xerces-c-3.1 )
- hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
- jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( media-libs/openjpeg:2= )
- lzma? ( || (
- app-arch/xz-utils
- app-arch/lzma
- ) )
- mdb? ( dev-java/jackcess:1 )
- mysql? ( virtual/mysql )
- netcdf? ( sci-libs/netcdf:= )
- odbc? ( dev-db/unixODBC )
- ogdi? ( sci-libs/ogdi )
- opencl? ( virtual/opencl )
- oracle? ( dev-db/oracle-instantclient:= )
- pdf? ( >=app-text/poppler-0.24.3:= )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postgres? ( >=dev-db/postgresql-8.4:= )
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- spatialite? ( dev-db/spatialite )
- sqlite? ( dev-db/sqlite:3 )
- webp? ( media-libs/libwebp:= )
- xls? ( dev-libs/freexl )"
-
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
- doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.7:* )
- perl? ( dev-lang/swig:0 )
- python? (
- dev-lang/swig:0
- dev-python/setuptools[${PYTHON_USEDEP}]
- )"
-
-REQUIRED_USE="
- mdb? ( java )
- python? ( ${PYTHON_REQUIRED_USE} )
- spatialite? ( sqlite )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.3-soname.patch"
- "${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
- "${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
- "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
- # Security bugs
- "${FILESDIR}/${P}-libtiff.patch" # bug 621712
- "${FILESDIR}/${P}-frmts-nitf38234.patch" # bug 621720
- "${FILESDIR}/${P}-changeset_38658.patch" # bug 623028
-)
-
-src_prepare() {
- # fix datadir and docdir placement
- sed -e "s:@datadir@:@datadir@/gdal:" \
- -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
- -i "${S}"/GDALmake.opt.in || die
-
- # the second sed expression should fix bug 371075
- sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
- -e "s:--prefix=\$(DESTDIR):--prefix=:" \
- -i "${S}"/swig/python/GNUmakefile || die
-
- # Fix spatialite/sqlite include issue
- sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
- -i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
- # Fix freexl configure check
- sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
- -i configure.ac || die
-
- sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
- -i configure.ac || die
-
- sed -e 's:^ar:$(AR):g' \
- -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
- # updated for newer swig (must specify the path to input files)
- sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
- -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
- -i swig/python/GNUmakefile || die "sed python makefile failed"
- sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
- -i swig/python/setup.cfg || die "sed python setup.cfg failed"
-
- default
-
- eautoreconf
-}
-
-src_configure() {
- # bug 619148
- append-cxxflags -std=c++14
-
- local myconf=(
- # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
- # bsb - legal issues
- # ingres - same story as oracle oci
- # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
- # podofo - we use poppler instead they are exclusive for each other
- # tiff is a hard dep
- --includedir="${EPREFIX}/usr/include/${PN}"
- --disable-pdf-plugin
- --disable-static
- --enable-shared
- --with-expat
- --with-cryptopp=no
- --with-geotiff
- --with-grib
- --with-hide-internal-symbols
- --with-libjson-c="${EPREFIX}/usr/"
- --with-libtiff
- --with-libtool
- --with-libz="${EPREFIX}/usr/"
- --with-gnm
- --without-bsb
- --without-dods-root
- --without-ecw
- --without-epsilon
- --without-fgdb
- --without-fme
- --without-gta
- --without-grass
- --without-hdf4
- --without-idb
- --without-ingres
- --without-jasper
- --without-jp2lura
- --without-jp2mrsid
- --without-kakadu
- --without-kea
- --without-libkml
- --without-mongocxx
- --without-mrsid
- --without-mrsid_lidar
- --without-msg
- --without-mrf
- --without-rasdaman
- --without-rasterlite2
- --without-pcraster
- --without-pdfium
- --without-php
- --without-podofo
- --without-qhull
- --without-sde
- --without-sfcgal
- --without-sosi
- --without-teigha
- --disable-lto
- $(use_enable debug)
- $(use_with armadillo)
- $(use_with aux_xml pam)
- $(use_with curl)
- $(use_with fits cfitsio)
- $(use_with geos)
- $(use_with gif)
- $(use_with gml xerces)
- $(use_with hdf5)
- $(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal
- $(use_with jpeg)
- $(use_with jpeg2k openjpeg)
- $(use_with lzma liblzma)
- $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
- $(use_with netcdf)
- $(use_with oracle oci)
- $(use_with odbc)
- $(use_with ogdi ogdi "${EPREFIX}"/usr)
- $(use_with opencl)
- $(use_with pdf poppler)
- $(use_with perl)
- $(use_with png)
- $(use_with postgres pg)
- $(use_with python)
- $(use_with spatialite)
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
- $(use_with threads)
- $(use_with webp)
- $(use_with xls freexl) )
-
- tc-export AR RANLIB
-
- if use java; then
- myconf+=(
- --with-java=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-lib=dlopen
- $(use_with mdb)
- )
- else
- myconf+=( --without-java --without-mdb )
- fi
-
- if use sqlite; then
- append-libs -lsqlite3
- fi
-
- # bug #632660
- if use ogdi; then
- tc-export PKG_CONFIG
- append-cflags $(${PKG_CONFIG} --cflags libtirpc)
- append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
- fi
-
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
- # mysql-config puts this in (and boy is it a PITA to get it out)
- if use mysql; then
- sed -e "s: -rdynamic : :" \
- -i GDALmake.opt || die "sed LIBS failed"
- fi
-}
-
-src_compile() {
- if use perl; then
- rm "${S}"/swig/perl/*_wrap.cpp || die
- emake -C "${S}"/swig/perl generate
- fi
-
- # gdal-config needed before generating Python bindings
- default
-
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null || die
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null || die
- fi
-
- if use python; then
- rm -f "${S}"/swig/python/*_wrap.cpp || die
- emake -C "${S}"/swig/python generate
- pushd "${S}"/swig/python > /dev/null || die
- distutils-r1_src_compile
- popd > /dev/null || die
- fi
-
- use doc && emake docs
-}
-
-src_install() {
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null || die
- perl-module_src_install
- popd > /dev/null || die
- sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
- -i GDALmake.opt || die
- fi
-
- use perl && perl_delete_localpod
-
- local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
- use doc && HTML_DOCS=( html/. )
-
- default
-
- python_install() {
- distutils-r1_python_install
- python_doscript scripts/*.py
- }
-
- if use python; then
- # Don't clash with gdal's docs
- unset DOCS HTML_DOCS
-
- pushd "${S}"/swig/python > /dev/null || die
- distutils-r1_src_install
- popd > /dev/null || die
-
- newdoc swig/python/README.txt README-python.txt
-
- insinto /usr/share/${PN}/samples
- doins -r swig/python/samples/
- fi
-
- doman "${S}"/man/man*/*
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Check available image and data formats after building with"
- elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2020-01-01 15:19 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2020-01-01 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 015c2605dae2b7e8dc0b700d49d7ed5b5e0be983
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 18:14:40 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 15:19:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=015c2605
sci-libs/gdal: 2.4.3 version bump
- Drop python2_7 and python3_5
- Drop poppler-0.75.patch and poppler-0.76.patch, supported upstream
- Drop 2.3.0-curl.patch, --with-curl --without-threads was fixed, see also:
https://github.com/OSGeo/gdal/issues/1386
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/gdal/Manifest | 1 +
sci-libs/gdal/files/gdal-2.2.3-soname.patch | 8 +-
sci-libs/gdal/gdal-2.4.3.ebuild | 319 ++++++++++++++++++++++++++++
3 files changed, 324 insertions(+), 4 deletions(-)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a20b22bcb90..a3f4832ec81 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1 +1,2 @@
DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
+DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
index f2746bdf5e3..4cceee5ec92 100644
--- a/sci-libs/gdal/files/gdal-2.2.3-soname.patch
+++ b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
@@ -3,8 +3,8 @@ Set SONAME and unbreak compilation on Darwin
Author: Fabian Groffen <grobian@gentoo.org>
Author: Dennis Schridde <devurandom@gmx.net>
---- old/GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800
-+++ new/GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800
+--- a/GDALmake.opt.in 2008-02-02 18:25:48.000000000 -0800
++++ b/GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800
@@ -97,6 +97,14 @@
GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT)
GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal
@@ -20,8 +20,8 @@ Author: Dennis Schridde <devurandom@gmx.net>
# Mac OS X Framework definition
MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
---- gdal-2.0.3.old/GNUmakefile
-+++ gdal-2.0.3/GNUmakefile
+--- a/GNUmakefile
++++ b/GNUmakefile
@@ -208,7 +208,7 @@ else
ifeq ($(HAVE_LD_SHARED),yes)
diff --git a/sci-libs/gdal/gdal-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
new file mode 100644
index 00000000000..0f880af5e68
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.4.3.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+inherit autotools perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/2.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+ mdb? ( java )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ spatialite? ( sqlite )
+"
+
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ java? ( >=virtual/jdk-1.7:* )
+ perl? ( dev-lang/swig:0 )
+ python? (
+ dev-lang/swig:0
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )"
+
+DEPEND="
+ dev-libs/expat
+ dev-libs/json-c:=
+ dev-libs/libpcre
+ dev-libs/libxml2:=
+ media-libs/tiff:0=
+ sci-libs/libgeotiff:=
+ sys-libs/zlib[minizip(+)]
+ armadillo? ( sci-libs/armadillo:=[lapack] )
+ curl? ( net-misc/curl )
+ fits? ( sci-libs/cfitsio:= )
+ geos? ( >=sci-libs/geos-2.2.1 )
+ gif? ( media-libs/giflib:= )
+ gml? ( >=dev-libs/xerces-c-3.1 )
+ hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+ jpeg? ( virtual/jpeg:0= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ lzma? ( || (
+ app-arch/xz-utils
+ app-arch/lzma
+ ) )
+ mdb? ( dev-java/jackcess:1 )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf:= )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( sci-libs/ogdi )
+ opencl? ( virtual/opencl )
+ oracle? ( dev-db/oracle-instantclient:= )
+ pdf? ( app-text/poppler:= )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ spatialite? ( dev-db/spatialite )
+ sqlite? ( dev-db/sqlite:3 )
+ webp? ( media-libs/libwebp:= )
+ xls? ( dev-libs/freexl )
+ zstd? ( app-arch/zstd:= )"
+
+RDEPEND="${DEPEND}
+ java? ( >=virtual/jre-1.7:* )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.3-soname.patch
+ "${FILESDIR}"/${PN}-2.2.3-bashcomp-path.patch # bug 641866
+ "${FILESDIR}"/${PN}-2.4.1-swig-4.patch # bug 689110
+ "${FILESDIR}"/${PN}-2.4.1-poppler-0.82.patch
+ "${FILESDIR}"/${PN}-2.4.1-poppler-0.83-{1,2}.patch # bug 703790
+)
+
+src_prepare() {
+ # fix datadir and docdir placement
+ sed -e "s:@datadir@:@datadir@/gdal:" \
+ -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+ -i GDALmake.opt.in || die
+
+ # the second sed expression should fix bug 371075
+ sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+ -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+ -i swig/python/GNUmakefile || die
+
+ # Fix spatialite/sqlite include issue
+ sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+ -i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+ # Fix freexl configure check
+ sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+ -i configure.ac || die
+
+ sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+ -i configure.ac || die
+
+ sed -e 's:^ar:$(AR):g' \
+ -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+ # updated for newer swig (must specify the path to input files)
+ sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+ -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+ -i swig/python/GNUmakefile || die "sed python makefile failed"
+ sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+ -i swig/python/setup.cfg || die "sed python setup.cfg failed"
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # bug 619148
+ append-cxxflags -std=c++14
+
+ local myconf=(
+ # charls - not packaged in Gentoo ebuild repository
+ # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+ # bsb - legal issues
+ # ingres - same story as oracle oci
+ # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+ # podofo - we use poppler instead they are exclusive for each other
+ # tiff is a hard dep
+ --includedir="${EPREFIX}"/usr/include/${PN}
+ --disable-pdf-plugin
+ --disable-static
+ --enable-shared
+ --with-expat
+ --with-cryptopp=no
+ --with-geotiff
+ --with-grib
+ --with-hide-internal-symbols
+ --with-libjson-c="${EPREFIX}"/usr/
+ --with-libtiff
+ --with-libtool
+ --with-libz="${EPREFIX}"/usr/
+ --with-gnm
+ --without-bsb
+ --without-charls
+ --without-dods-root
+ --without-ecw
+ --without-epsilon
+ --without-fgdb
+ --without-fme
+ --without-gta
+ --without-grass
+ --without-hdf4
+ --without-idb
+ --without-ingres
+ --without-jasper
+ --without-jp2lura
+ --without-jp2mrsid
+ --without-kakadu
+ --without-kea
+ --without-libkml
+ --without-mongocxx
+ --without-mrsid
+ --without-mrsid_lidar
+ --without-msg
+ --without-mrf
+ --without-rasdaman
+ --without-rasterlite2
+ --without-pcraster
+ --without-pdfium
+ --without-podofo
+ --without-qhull
+ --without-sde
+ --without-sfcgal
+ --without-sosi
+ --without-teigha
+ --disable-lto
+ $(use_enable debug)
+ $(use_with armadillo)
+ $(use_with aux-xml pam)
+ $(use_with curl)
+ $(use_with fits cfitsio)
+ $(use_with geos)
+ $(use_with gif)
+ $(use_with gml xerces)
+ $(use_with hdf5)
+ $(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal
+ $(use_with jpeg)
+ $(use_with jpeg2k openjpeg)
+ $(use_with lzma liblzma)
+ $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+ $(use_with netcdf)
+ $(use_with oracle oci)
+ $(use_with odbc)
+ $(use_with ogdi ogdi "${EPREFIX}"/usr)
+ $(use_with opencl)
+ $(use_with pdf poppler)
+ $(use_with perl)
+ $(use_with png)
+ $(use_with postgres pg)
+ $(use_with python)
+ $(use_with spatialite)
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+ $(use_with threads)
+ $(use_with webp)
+ $(use_with xls freexl)
+ $(use_with zstd)
+ )
+
+ tc-export AR RANLIB
+
+ if use java; then
+ myconf+=(
+ --with-java=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-lib=dlopen
+ $(use_with mdb)
+ )
+ else
+ myconf+=( --without-java --without-mdb )
+ fi
+
+ if use sqlite; then
+ append-libs -lsqlite3
+ fi
+
+ # bug #632660
+ if use ogdi; then
+ tc-export PKG_CONFIG
+ append-cflags $(${PKG_CONFIG} --cflags libtirpc)
+ append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+ # mysql-config puts this in (and boy is it a PITA to get it out)
+ if use mysql; then
+ sed -e "s: -rdynamic : :" \
+ -i GDALmake.opt || die "sed LIBS failed"
+ fi
+}
+
+src_compile() {
+ if use perl; then
+ rm "${S}"/swig/perl/*_wrap.cpp || die
+ emake -C "${S}"/swig/perl generate
+ fi
+
+ # gdal-config needed before generating Python bindings
+ default
+
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null || die
+ perl-module_src_configure
+ perl-module_src_compile
+ popd > /dev/null || die
+ fi
+
+ if use python; then
+ rm -f "${S}"/swig/python/*_wrap.cpp || die
+ emake -C "${S}"/swig/python generate
+ pushd "${S}"/swig/python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+
+ use doc && emake docs
+}
+
+src_install() {
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null || die
+ myinst=( DESTDIR="${D}" )
+ perl-module_src_install
+ popd > /dev/null || die
+ sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
+ -i GDALmake.opt || die
+ fi
+
+ use perl && perl_delete_localpod
+
+ local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
+ use doc && HTML_DOCS=( html/. )
+
+ default
+
+ python_install() {
+ distutils-r1_python_install
+ python_doscript scripts/*.py
+ }
+
+ if use python; then
+ # Don't clash with gdal's docs
+ unset DOCS HTML_DOCS
+
+ pushd "${S}"/swig/python > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
+
+ newdoc swig/python/README.rst README-python.rst
+
+ insinto /usr/share/${PN}/samples
+ doins -r swig/python/samples/
+ fi
+
+ doman "${S}"/man/man*/*
+ find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2020-01-29 21:32 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2020-01-29 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 1ae8b7c7c3790f0a866e57eb44b06a8c014c3c51
Author: Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Fri Jan 10 19:38:40 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 21:32:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae8b7c7
sci-libs/gdal: version bump 3.0.2
Bug: https://bugs.gentoo.org/686732
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14061
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/gdal/Manifest | 1 +
sci-libs/gdal/files/gdal-3.0.2-complete.patch | 84 +++++++
sci-libs/gdal/files/gdal-3.0.2-datadir.patch | 69 ++++++
sci-libs/gdal/gdal-3.0.2.ebuild | 305 ++++++++++++++++++++++++++
4 files changed, 459 insertions(+)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a3f4832ec81..06a7010fbf8 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1,3 @@
DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
+DIST gdal-3.0.2.tar.gz 14348856 BLAKE2B a52b3c5f1177b85ca991fd5dd27e4238a6ff066fa28842ffbddea8617a3f897d9525035a1cf9237365dbc4657037b3eb0a740cd0e65fe4c83b0c76ffe23c0e56 SHA512 eb35e28106f2f422fd5021261ef44864574f6a6be23e679cc5ae44be910f978769fc24fa15367ad4058fb3170cdd2985a6c4caedc3510dde8a6d163091cf3ab0
diff --git a/sci-libs/gdal/files/gdal-3.0.2-complete.patch b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
new file mode 100644
index 00000000000..5d6716c7280
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
@@ -0,0 +1,84 @@
+diff --git a/GDALmake.opt.in b/GDALmake.opt.in
+index fd8e8f374d..655c004c56 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -63,6 +63,7 @@ INST_INCLUDE = @includedir@
+ INST_DATA = @datadir@
+ INST_LIB = @libdir@
+ INST_BIN = @bindir@
++INST_BASH_COMPLETION = @bashcompdir@
+ INST_PYMOD = @pymoddir@
+ INST_DOCS = @exec_prefix@/doc
+ INST_MAN = @mandir@
+diff --git a/GNUmakefile b/GNUmakefile
+index 92467d6cf6..6d5e7d9fc0 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -229,7 +229,9 @@ endif
+ ifneq ($(BINDINGS),)
+ (cd swig; $(MAKE) install)
+ endif
++ifdef INST_BASH_COMPLETION
+ (cd scripts; $(MAKE) install)
++endif
+ for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
+ $(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
+diff --git a/configure.ac b/configure.ac
+index 93ddca84d9..5d0e7ab8be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1187,6 +1187,24 @@ if test "$am_func_iconv" = "yes"; then
+ AC_DEFINE_UNQUOTED(ICONV_CPP_CONST,$ICONV_CPP_CONST, [For.cpp files, define as const if the declaration of iconv() needs const.])
+ fi
+
++dnl ---------------------------------------------------------------------------
++dnl Bash completions
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH([bash-completion],
++ AS_HELP_STRING([--with-bash-completion[=ARG]],
++ [Install Bash completions (ARG=yes or path)]),,)
++
++if test "x$with_bash_completion" = "xno" -o "x$with_bash_completion" = "x"; then
++ AC_MSG_NOTICE([Bash completions not requested])
++elif test "x$with_bash_completion" = "xyes"; then
++ PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
++ bashcompdir="${sysconfdir}/bash_completion.d")
++ AC_SUBST(bashcompdir)
++else
++ AC_SUBST(bashcompdir, $with_bash_completion)
++fi
++
+ dnl ---------------------------------------------------------------------------
+ dnl PROJ.6 related stuff
+ dnl ---------------------------------------------------------------------------
+diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
+index 8f039e469a..511fbb499c 100644
+--- a/scripts/GNUmakefile
++++ b/scripts/GNUmakefile
+@@ -1,10 +1,20 @@
+ include ../GDALmake.opt
+
++PROGRAMS := gdal2tiles.py gdal2xyz.py gdaladdo gdalbuildvrt gdal_calc.py \
++ gdalchksum.py gdalcompare.py gdal-config gdal_contour gdaldem \
++ gdal_edit.py gdalenhance gdal_fillnodata.py gdal_grid \
++ gdalident.py gdalimport.py gdallocationinfo gdalmanage \
++ gdal_merge.py gdalmove.py gdal_polygonize.py gdal_proximity.py \
++ gdal_rasterize gdal_retile.py gdalserver gdal_sieve.py \
++ gdalsrsinfo gdaltindex gdaltransform gdal_translate gdalwarp \
++ ogr2ogr ogrinfo ogrlineref ogrmerge.py ogrtindex
++
+ completion:
+ PATH=$(GDAL_ROOT)/swig/python/scripts:$(GDAL_ROOT)/apps:$(PATH) python completionFinder.py gdal-bash-completion.sh
+
+ install:
+- if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
+- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
+- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
+- fi
++ $(INSTALL_DIR) $(DESTDIR)$(INST_BASH_COMPLETION) ; \
++ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; \
++ for p in $(PROGRAMS); do \
++ ln -rs $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
++ done
diff --git a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
new file mode 100644
index 00000000000..95c525ca1b8
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
@@ -0,0 +1,69 @@
+diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
+index 655c004c56..7d8f3708d6 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -56,18 +56,23 @@ GNM_ENABLED = @GNM_ENABLED@
+ OSX_FRAMEWORK_PREFIX = /Library/Frameworks/GDAL.framework
+ OSX_VERSION_FRAMEWORK_PREFIX = ${OSX_FRAMEWORK_PREFIX}/Versions/@GDAL_VERSION_MAJOR@.@GDAL_VERSION_MINOR@
+
++PACKAGE = @PACKAGE@
++
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++datarootdir = @datarootdir@
++docdir = @docdir@
++htmldir = @htmldir@
+ INST_PREFIX = @exec_prefix@
+ INST_INCLUDE = @includedir@
+-INST_DATA = @datadir@
++INST_DATA = @datadir@/gdal
+ INST_LIB = @libdir@
+ INST_BIN = @bindir@
+ INST_BASH_COMPLETION = @bashcompdir@
+ INST_PYMOD = @pymoddir@
+-INST_DOCS = @exec_prefix@/doc
++INST_DOCS = @htmldir@
+ INST_MAN = @mandir@
+-INST_HTML = $(HOME)/www/gdal
++INST_WEB = $(HOME)/www/gdal
+
+ CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
+ CFLAGS = @CFLAGS@ @C_WFLAGS@ $(USER_DEFS)
+diff --git a/gdal/configure.ac b/gdal/configure.ac
+index 5d0e7ab8be..afef88fdbd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,7 @@ define([AC_CACHE_SAVE], )
+
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(GDALmake.opt.in)
++AC_SUBST(PACKAGE, gdal)
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([port/cpl_config.h:port/cpl_config.h.in])
+ AH_BOTTOM([#include "cpl_config_extras.h"])
+@@ -5167,25 +5168,6 @@ export BINTRUE
+
+ AC_SUBST(BINTRUE,$BINTRUE)
+
+-dnl ---------------------------------------------------------------------------
+-dnl If datadir is set to @prefix@/share, the modify it to be
+-dnl @prefix@/share/gdal. I wish we could default this.
+-dnl ---------------------------------------------------------------------------
+-if test "$datadir" = '${prefix}/share' ; then
+- datadir='${prefix}/share/gdal'
+-fi
+-
+-if test "$datadir" = '${datarootdir}' \
+- -a "$datarootdir" = '${prefix}/share' ; then
+- datarootdir='${prefix}/share/gdal'
+-fi
+-
+-dnl ---------------------------------------------------------------------------
+-dnl By default mandir is $datarootdir/man which would be
+-dnl /usr/local/share/gdal/man but we want man pages in /usr/local/man.
+-dnl ---------------------------------------------------------------------------
+-mandir='${prefix}/man'
+-
+ dnl ---------------------------------------------------------------------------
+ dnl Capture GDAL_PREFIX for the cpl_config.h include file.
+ dnl ---------------------------------------------------------------------------
diff --git a/sci-libs/gdal/gdal-3.0.2.ebuild b/sci-libs/gdal/gdal-3.0.2.ebuild
new file mode 100644
index 00000000000..bfeb01ef6ac
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.0.2.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/2.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+ mdb? ( java )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ spatialite? ( sqlite )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ java? (
+ dev-java/ant-core
+ dev-lang/swig:0
+ >=virtual/jdk-1.7:*
+ )
+ perl? ( dev-lang/swig:0 )
+ python? (
+ dev-lang/swig:0
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )"
+
+DEPEND="
+ dev-libs/expat
+ dev-libs/json-c:=
+ dev-libs/libpcre
+ dev-libs/libxml2:=
+ media-libs/tiff:0=
+ >=sci-libs/libgeotiff-1.5.1-r1:=
+ >=sci-libs/proj-6.0.0
+ sys-libs/zlib:=[minizip(+)]
+ armadillo? ( sci-libs/armadillo:=[lapack] )
+ curl? ( net-misc/curl )
+ fits? ( sci-libs/cfitsio:= )
+ geos? ( >=sci-libs/geos-3.8.0 )
+ gif? ( media-libs/giflib:= )
+ gml? ( >=dev-libs/xerces-c-3.1 )
+ hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+ jpeg? ( virtual/jpeg:0= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ lzma? ( || (
+ app-arch/xz-utils
+ app-arch/lzma
+ ) )
+ mdb? ( dev-java/jackcess:1 )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf:= )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( sci-libs/ogdi )
+ opencl? ( virtual/opencl )
+ oracle? ( dev-db/oracle-instantclient:= )
+ pdf? ( app-text/poppler:= )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ spatialite? ( dev-db/spatialite )
+ sqlite? ( dev-db/sqlite:3 )
+ webp? ( media-libs/libwebp:= )
+ xls? ( dev-libs/freexl )
+ zstd? ( app-arch/zstd:= )"
+
+RDEPEND="${DEPEND}
+ java? ( >=virtual/jre-1.7:* )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.3-soname.patch"
+ "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+ "${FILESDIR}"/${PN}-2.4.1-poppler-0.83-{1,2}.patch # bug 703790
+ "${FILESDIR}/${PN}-3.0.2-complete.patch"
+ "${FILESDIR}/${PN}-3.0.2-datadir.patch"
+)
+
+src_prepare() {
+ default
+
+ sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+ -i configure.ac || die
+
+ sed -e 's:^ar:$(AR):g' \
+ -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+ # SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+ sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+ -i swig/python/GNUmakefile || die "sed python makefile failed"
+
+ eautoreconf
+}
+
+src_configure() {
+ # bug 619148
+ append-cxxflags -std=c++14
+
+ local myconf=(
+ # charls - not packaged in Gentoo ebuild repository
+ # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+ # bsb - legal issues
+ # ingres - same story as oracle oci
+ # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+ # podofo - we use poppler instead they are exclusive for each other
+ # tiff is a hard dep
+ --includedir="${EPREFIX}"/usr/include/${PN}
+ --disable-lto
+ --disable-static
+ --disable-driver-bsb
+ --disable-driver-mrf
+ --disable-pdf-plugin
+ --enable-shared
+ --enable-driver-grib
+ --with-bash-completion="$(get_bashcompdir)"
+ --with-cryptopp=no
+ --with-expat
+ --with-geotiff
+ --with-gnm
+ --with-hide-internal-symbols
+ --with-libjson-c="${EPREFIX}"/usr/
+ --with-libtiff
+ --with-libtool
+ --with-libz="${EPREFIX}"/usr/
+ --without-charls
+ --without-dods-root
+ --without-ecw
+ --without-epsilon
+ --without-fgdb
+ --without-fme
+ --without-gta
+ --without-grass
+ --without-hdf4
+ --without-idb
+ --without-ingres
+ --without-jasper
+ --without-jp2lura
+ --without-jp2mrsid
+ --without-kakadu
+ --without-kea
+ --without-libkml
+ --without-mongocxx
+ --without-mrsid
+ --without-mrsid_lidar
+ --without-msg
+ --without-rasdaman
+ --without-rasterlite2
+ --without-pcraster
+ --without-pdfium
+ --without-perl
+ --without-podofo
+ --without-python
+ --without-qhull
+ --without-sde
+ --without-sfcgal
+ --without-sosi
+ --without-teigha
+ $(use_enable debug)
+ $(use_with armadillo)
+ $(use_with aux-xml pam)
+ $(use_with curl)
+ $(use_with fits cfitsio)
+ $(use_with geos)
+ $(use_with gif)
+ $(use_with gml xerces)
+ $(use_with hdf5)
+ $(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+ $(use_with jpeg)
+ $(use_with jpeg2k openjpeg)
+ $(use_with lzma liblzma)
+ $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+ $(use_with netcdf)
+ $(use_with oracle oci)
+ $(use_with odbc)
+ $(use_with ogdi ogdi "${EPREFIX}"/usr)
+ $(use_with opencl)
+ $(use_with pdf poppler)
+ $(use_with png)
+ $(use_with postgres pg)
+ $(use_with spatialite)
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+ $(use_with threads)
+ $(use_with webp)
+ $(use_with xls freexl)
+ $(use_with zstd)
+ )
+
+ tc-export AR RANLIB
+
+ if use java; then
+ myconf+=(
+ --with-java=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-lib=dlopen
+ $(use_with mdb)
+ )
+ else
+ myconf+=( --without-java --without-mdb )
+ fi
+
+ if use sqlite; then
+ append-libs -lsqlite3
+ fi
+
+ # bug #632660
+ if use ogdi; then
+ tc-export PKG_CONFIG
+ append-cflags $(${PKG_CONFIG} --cflags libtirpc)
+ append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+ # mysql-config puts this in (and boy is it a PITA to get it out)
+ if use mysql; then
+ sed -e "s: -rdynamic : :" \
+ -i GDALmake.opt || die "sed LIBS failed"
+ fi
+}
+
+src_compile() {
+ if use perl; then
+ rm "${S}"/swig/perl/*_wrap.cpp || die
+ emake -C "${S}"/swig/perl generate
+ fi
+
+ # gdal-config needed before generating Python bindings
+ default
+
+ if use java; then
+ pushd "${S}"/swig/java > /dev/null || die
+ emake
+ popd > /dev/null || die
+ fi
+
+ if use perl; then
+ pushd "${S}"/swig/perl > /dev/null || die
+ perl-module_src_configure
+ perl-module_src_compile
+ popd > /dev/null || die
+ fi
+
+ if use python; then
+ rm -f "${S}"/swig/python/*_wrap.cpp || die
+ emake -C "${S}"/swig/python generate
+ pushd "${S}"/swig/python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+
+ use doc && emake docs
+}
+
+src_install() {
+ local DOCS=( NEWS )
+ use doc && HTML_DOCS=( html/. )
+
+ default
+
+ use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+ if use perl; then
+ pushd "${S}"/swig/perl > /dev/null || die
+ myinst=( DESTDIR="${D}" )
+ perl-module_src_install
+ popd > /dev/null || die
+ perl_delete_localpod
+ fi
+
+ if use python; then
+ # Don't clash with gdal's docs
+ unset DOCS HTML_DOCS
+
+ pushd "${S}"/swig/python > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
+
+ newdoc swig/python/README.rst README-python.rst
+
+ insinto /usr/share/${PN}/samples
+ doins -r swig/python/samples/.
+ fi
+
+ doman "${S}"/man/man*/*
+ find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2020-08-05 8:26 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2020-08-05 8:26 UTC (permalink / raw
To: gentoo-commits
commit: fca144ebd963f6e5a6144c499c419ecadfaae3f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 4 19:46:08 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 08:26:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca144eb
sci-libs/gdal: Fix build against poppler-20.08
Thanks-to: PhobosK <phobosk <AT> fastmail.fm>
Closes: https://bugs.gentoo.org/735828
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch | 42 ++++++++++++++++++++++
sci-libs/gdal/gdal-3.0.4-r1.ebuild | 1 +
2 files changed, 43 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
new file mode 100644
index 00000000000..0fd8051c365
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
@@ -0,0 +1,42 @@
+From 2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 3 Aug 2020 14:52:25 +0200
+Subject: [PATCH] Unix build: fix detection of minor version number of Poppler
+ with the new YY.MM.X numbering scheme (fixes #2823) (#2825)
+
+Authored-by: @chris2553
+---
+ a/configure | 4 ++--
+ b/configure.ac | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 4d618db8149..69d46182a26 100755
+--- a/configure
++++ b/configure
+@@ -40824,8 +40824,8 @@ $as_echo "yes" >&6; }
+ fi
+ if test "$POPPLER_VERSION" != ""; then
+ HAVE_POPPLER=yes
+- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'`
+- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'`
++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
+ POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
+ fi
+ else
+diff --git a/configure.ac b/configure.ac
+index 0f4124e6431..7f337e77c1d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4966,8 +4966,8 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
+ [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=])
+ if test "$POPPLER_VERSION" != ""; then
+ HAVE_POPPLER=yes
+- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'`
+- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
+ POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
+ fi
+ else
diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
index b8e390e8e00..c7591678764 100644
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
@@ -89,6 +89,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
"${FILESDIR}/${PN}-3.0.2-complete.patch"
"${FILESDIR}/${PN}-3.0.2-datadir.patch"
+ "${FILESDIR}/${P}-poppler-20.08.patch" # bug 735828
)
src_prepare() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2021-03-09 20:43 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-03-09 20:43 UTC (permalink / raw
To: gentoo-commits
commit: a2df5bcead58163828cde20535e4b4f4204f4ecf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 20:38:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 20:43:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2df5bce
sci-libs/gdal: respect libdir
To be upstreamed.
Unfortunately, we can't do *everything* required in Gentoo
in the patch, as there's a --with-local argument which I'd
prefer to get rid of, but is a bit too invasive of a change
for me to want to push upstream for now.
So, we settle on a single sed in the ebuild, which is an
improvement!
Closes: https://bugs.gentoo.org/696106
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 407 ++++++++++++++++++++++++++++
sci-libs/gdal/gdal-3.2.1-r1.ebuild | 11 +-
2 files changed, 416 insertions(+), 2 deletions(-)
diff --git a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
new file mode 100644
index 00000000000..89bc87489e9
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -0,0 +1,407 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1133,11 +1133,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
+
+ elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then
+
+- LIBS="-L$with_libz -L$with_libz/lib $LIBS"
++ LIBS="-L$with_libz -L$with_libz/${libdir} $LIBS"
+
+- AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz)
++ AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz)
+ if test "$LIBZ_SETTING" = "external" ; then
+- AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz)
++ AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz)
+ if test "$LIBZ_SETTING" = "external" ; then
+ AC_MSG_RESULT([using libz library from $with_libz])
+ else
+@@ -1178,7 +1178,7 @@ AC_ARG_WITH(libdeflate,
+ if test "$with_libdeflate" != "no" ; then
+
+ if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
+- AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/lib)
++ AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/${libdir})
+ else
+ AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no])
+ fi
+@@ -1209,7 +1209,7 @@ fi
+ if test "$LIBDEFLATE_SETTING" = "yes" ; then
+ if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
+ EXTRA_INCLUDES="-I$with_libdeflate/include $EXTRA_INCLUDES"
+- LIBS="-L$with_libdeflate/lib -ldeflate $LIBS"
++ LIBS="-L$with_libdeflate/${libdir} -ldeflate $LIBS"
+ else
+ LIBS="-ldeflate $LIBS"
+ fi
+@@ -1302,7 +1302,7 @@ else
+ LIBS="-L$with_libtiff -ltiff $LIBS"
+ EXTRA_INCLUDES="-I$with_libtiff $EXTRA_INCLUDES"
+ else
+- LIBS="-L$with_libtiff/lib -ltiff $LIBS"
++ LIBS="-L$with_libtiff/${libdir} -ltiff $LIBS"
+ EXTRA_INCLUDES="-I$with_libtiff/include $EXTRA_INCLUDES"
+ fi
+
+@@ -1426,19 +1426,12 @@ else
+ fi
+ else
+ ORIG_LIBS="$LIBS"
+- LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++ LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+ AC_LANG_PUSH([C++])
+ AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+ AC_LANG_POP([C++])
+ if test "$PROJ_FOUND" = "no"; then
+- LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+- unset ac_cv_lib_proj_proj_create_from_wkt
+- AC_LANG_PUSH([C++])
+- AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+- AC_LANG_POP([C++])
+- fi
+- if test "$PROJ_FOUND" = "no"; then
+- LIBS="-L$with_proj/lib64 -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++ LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+ unset ac_cv_lib_proj_proj_create_from_wkt
+ AC_LANG_PUSH([C++])
+ AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+@@ -1460,22 +1453,6 @@ else
+ PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
+ fi
+ fi
+- if test "$PROJ_FOUND" = "no"; then
+- LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+- AC_LANG_PUSH([C++])
+- AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+- AC_LANG_POP([C++])
+- if test "$PROJ_FOUND" = "no"; then
+- LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+- unset ac_cv_lib_internal_proj_internal_proj_create_from_wkt
+- AC_LANG_PUSH([C++])
+- AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+- AC_LANG_POP([C++])
+- fi
+- if test "$PROJ_FOUND" = "yes"; then
+- PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
+- fi
+- fi
+ if test "$PROJ_FOUND" = "no"; then
+ AC_MSG_ERROR([PROJ 6 symbols not found])
+ fi
+@@ -1535,7 +1512,7 @@ elif test "$with_spatialite" = "dlopen"; then
+ SPATIALITE_SONAME="spatialite.so"
+ fi
+ else
+- AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/lib -lspatialite)
++ AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/${libdir} -lspatialite)
+
+ if test -f "$with_spatialite/include/spatialite.h" -a \
+ "$SPATIALITE_INIT_FOUND" = "yes"; then
+@@ -1543,7 +1520,7 @@ else
+ if test "$HAVE_SQLITE3" = "yes"; then
+ SPATIALITE_INC="-I$with_spatialite/include"
+ HAVE_SPATIALITE=yes
+- SPATIALITE_LIBS="-L$with_spatialite/lib -lspatialite"
++ SPATIALITE_LIBS="-L$with_spatialite/${libdir} -lspatialite"
+ LIBS="$SQLITE3_LDFLAGS $LIBS $SPATIALITE_LIBS"
+ AC_MSG_RESULT(spatialite enabled)
+ else
+@@ -1605,10 +1582,10 @@ if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then
+ fi
+ elif test "$with_zstd" != "" -a "$with_zstd" != "no"; then
+
+- AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/lib)
++ AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/${libdir})
+
+ if test "$ZSTD_SETTING" = "yes" -a -f "$with_zstd/include/zstd.h" ; then
+- LIBS="-L$with_zstd/lib -lzstd $LIBS"
++ LIBS="-L$with_zstd/${libdir} -lzstd $LIBS"
+ EXTRA_INCLUDES="-I$with_zstd/include $EXTRA_INCLUDES"
+ else
+ AC_MSG_ERROR([libzstd not found])
+@@ -1931,20 +1908,20 @@ fi
+ # TODO: separate libs for rasters and vectors
+ if test "$with_grass" != "yes" -a "$with_grass" != "no" ; then
+
+- AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++ AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+ if test "$GRASS_SETTING" = "no" ; then
+- AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++ AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+ fi
+
+ if test "$GRASS_SETTING" != "no" ; then
+ if test "$GRASS_SETTING" = "grass70+" ; then
+ G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+ G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+ else
+ G_RASTLIBS="-lgrass_I"
+ G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+ fi
+ GRASS_INCLUDE="-I$with_grass/include"
+ GRASS_GISBASE="$with_grass"
+@@ -1968,10 +1945,10 @@ elif test "$with_libgrass" = "yes" -o "$with_libgrass" = "" ; then
+
+ else
+
+- AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/lib)
++ AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/${libdir})
+
+ if test "$GRASS_SETTING" = "libgrass" ; then
+- LIBS="-L$with_libgrass -L$with_libgrass/lib -lgrass5 $LIBS"
++ LIBS="-L$with_libgrass -L$with_libgrass/${libdir} -lgrass5 $LIBS"
+ GRASS_INCLUDE="-I$with_libgrass -I$with_libgrass/include $EXTRA_INCLUDES"
+ else
+ AC_MSG_ERROR([--with-libgrass=$with_grass requested, but libgrass5 not found!])
+@@ -2018,7 +1995,7 @@ dnl Fedora has cfitsio headers in ""/usr/include/cfitsio
+ else
+
+ FITS_SETTING=external
+- LIBS="-L$with_cfitsio -L$with_cfitsio/lib -lcfitsio $LIBS"
++ LIBS="-L$with_cfitsio -L$with_cfitsio/${libdir} -lcfitsio $LIBS"
+ EXTRA_INCLUDES="-I$with_cfitsio -I$with_cfitsio/include $EXTRA_INCLUDES"
+
+ echo "using libcfitsio from $with_cfitsio."
+@@ -2067,7 +2044,7 @@ elif test "$with_pcraster" = "internal" ; then
+ else
+
+ PCRASTER_SETTING=external
+- LIBS="-L$with_pcraster/lib -lcsf $LIBS"
++ LIBS="-L$with_pcraster/${libdir} -lcsf $LIBS"
+ EXTRA_INCLUDES="-I$with_pcraster/include $EXTRA_INCLUDES"
+
+ echo "using libcsf from $with_pcraster."
+@@ -2118,7 +2095,7 @@ elif test "$with_png" = "internal" ; then
+ else
+
+ PNG_SETTING=external
+- LIBS="-L$with_png -L$with_png/lib -lpng $LIBS"
++ LIBS="-L$with_png -L$with_png/${libdir} -lpng $LIBS"
+ EXTRA_INCLUDES="-I$with_png -I$with_png/include $EXTRA_INCLUDES"
+
+ echo "using libpng from $with_png."
+@@ -2153,7 +2130,7 @@ else
+
+ DDS_SETTING=yes
+ CRUNCHDIR="$with_dds"
+- LIBS="-L$with_dds/lib/ -lcrunch $LIBS"
++ LIBS="-L$with_dds/${libdir}/ -lcrunch $LIBS"
+ echo "using libcrunch from $with_dds."
+
+ fi
+@@ -2191,7 +2168,7 @@ elif test "$with_gta" = "yes" -o "$with_gta" = "" ; then
+ else
+
+ GTA_SETTING=yes
+- LIBS="-L$with_gta -L$with_gta/lib -lgta $LIBS"
++ LIBS="-L$with_gta -L$with_gta/${libdir} -lgta $LIBS"
+ EXTRA_INCLUDES="-I$with_gta -I$with_gta/include $EXTRA_INCLUDES"
+
+ echo "using libgta from $with_gta."
+@@ -2229,7 +2206,7 @@ elif test "$with_pcidsk" = "" -o "$with_pcidsk" = "yes" -o "$with_pcidsk" = "int
+ else
+
+ PCIDSK_SETTING=external
+- PCIDSK_LIB="-L$with_pcidsk/lib -lpcidsk"
++ PCIDSK_LIB="-L$with_pcidsk/${libdir} -lpcidsk"
+ PCIDSK_INCLUDE="-I$with_pcidsk/include -I$with_pcidsk/include/pcidsk"
+
+ echo "using libpcidsk from $with_pcidsk."
+@@ -2304,10 +2281,10 @@ else
+
+ dnl We now require libgeotiff 1.5.0
+ dnl first check if $with_geotiff/lib has the library:
+- AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/lib)
++ AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/${libdir})
+
+ if test $GEOTIFF_SETTING = "external" ; then
+- LIBS="-L$with_geotiff/lib -lgeotiff $LIBS"
++ LIBS="-L$with_geotiff/${libdir} -lgeotiff $LIBS"
+ if test -d $with_geotiff/include ; then
+ EXTRA_INCLUDES="-I$with_geotiff/include $EXTRA_INCLUDES"
+ fi
+@@ -2379,7 +2356,7 @@ elif test "$with_jpeg" = "internal" ; then
+ else
+
+ JPEG_SETTING=external
+- LIBS="-L$with_jpeg -L$with_jpeg/lib -ljpeg $LIBS"
++ LIBS="-L$with_jpeg -L$with_jpeg/${libdir} -ljpeg $LIBS"
+ EXTRA_INCLUDES="-I$with_jpeg -I$with_jpeg/include $EXTRA_INCLUDES"
+
+ echo "using libjpeg from $with_jpeg."
+@@ -2530,7 +2507,7 @@ elif test "$with_gif" = "internal" ; then
+ else
+
+ GIF_SETTING=external
+- LIBS="-L$with_gif -L$with_gif/lib -lgif $LIBS"
++ LIBS="-L$with_gif -L$with_gif/${libdir} -lgif $LIBS"
+ EXTRA_INCLUDES="-I$with_gif -I$with_gif/include $EXTRA_INCLUDES"
+
+ echo "using libgif from $with_gif."
+@@ -2596,10 +2573,10 @@ elif test "$with_ogdi" = "yes" -o "$with_ogdi" = "" ; then
+
+ else
+
+- AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi)
++ AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi)
+ if test "$HAVE_OGDI" = "yes" ; then
+ if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then
+- LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi $LIBS"
++ LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi $LIBS"
+ OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
+
+ echo "using libogdi from $with_ogdi."
+@@ -2609,10 +2586,10 @@ else
+ fi
+ else
+ dnl For backward compatibility. Retry with ogdi31 as a name
+- AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi31)
++ AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi31)
+ if test "$HAVE_OGDI" = "yes" ; then
+ if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then
+- LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS"
++ LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi31 $LIBS"
+ OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
+
+ echo "using libogdi31 from $with_ogdi."
+@@ -2730,10 +2707,10 @@ elif test "$with_sosi" = "yes" ; then
+ rm -f testfyba
+ else
+
+- AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/lib])
+- if test -r $with_sosi/lib/libfyba.a -a -r $with_sosi/lib/libfygm.a -a -r $with_sosi/lib/libfyut.a ; then
++ AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/${libdir}])
++ if test -r $with_sosi/lib/libfyba.a -a -r $with_sosi/lib/libfygm.a -a -r $with_sosi/${libdir}/libfyut.a ; then
+ AC_MSG_RESULT([found.])
+- SOSI_LIB="$with_sosi/lib/libfyba.a $with_sosi/lib/libfygm.a $with_sosi/lib/libfyut.a"
++ SOSI_LIB="$with_sosi/${libdir}/libfyba.a $with_sosi/${libdir}/libfygm.a $with_sosi/${libdir}/libfyut.a"
+ SOSI_ENABLED=yes
+ else
+ AC_MSG_ERROR([not found.])
+@@ -2794,14 +2771,14 @@ else
+ AC_ARG_WITH(boost-lib-path,
+ [ --with-boost-lib-path=ARG Path to boost libraries for mongocxx client],,,)
+
+- AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/lib])
++ AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/${libdir}])
+ MONGODB_ENABLED=yes
+- if test -r $with_mongocxx/lib/libmongoclient.so; then
++ if test -r $with_mongocxx/${libdir}/libmongoclient.so; then
+ AC_MSG_RESULT([found.])
+- MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient"
+- elif test -r $with_mongocxx/lib/libmongoclient.dylib; then
++ MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient"
++ elif test -r $with_mongocxx/${libdir}/libmongoclient.dylib; then
+ AC_MSG_RESULT([found.])
+- MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient"
++ MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient"
+ else
+ AC_MSG_ERROR([not found.])
+ fi
+diff --git a/frmts/grass/pkg/configure.in b/frmts/grass/pkg/configure.in
+index 25602bd..0765333 100644
+--- a/frmts/grass/pkg/configure.in
++++ b/frmts/grass/pkg/configure.in
+@@ -99,7 +99,7 @@ else
+ if $GDAL_CONFIG --autoload > /dev/null 2>&1 ; then
+ AUTOLOAD_DIR=`$GDAL_CONFIG --autoload`
+ else
+- AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/lib/gdalplugins
++ AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/${libdir}/gdalplugins
+ fi
+ fi
+
+@@ -123,11 +123,11 @@ fi
+
+ if test "$with_grass" != "yes" ; then
+
+- AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++ AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+ if test "$GRASS_SETTING" = "no" ; then
+- AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++ AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+ if test "$GRASS_SETTING" = "no" ; then
+- AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++ AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+ fi
+ fi
+
+@@ -135,15 +135,15 @@ if test "$with_grass" != "yes" ; then
+ if test "$GRASS_SETTING" = "grass72+" ; then
+ G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+ G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
+ elif test "$GRASS_SETTING" = "grass70+" ; then
+ G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+ G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+ else
+ G_RASTLIBS="-lgrass_I"
+ G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+- LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++ LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+ fi
+ GRASS_INCLUDE="-I$with_grass/include"
+ GRASS_GISBASE="$with_grass"
+diff --git a/m4/ax_lib_expat.m4 b/m4/ax_lib_expat.m4
+index d1fb22c..32caf45 100644
+--- a/m4/ax_lib_expat.m4
++++ b/m4/ax_lib_expat.m4
+@@ -119,9 +119,9 @@ AC_DEFUN([AX_LIB_EXPAT],
+ expat_lib_flags="-lexpat"
+ fi
+ else
+- AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/lib)
++ AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/${libdir})
+ if test "$run_expat_test" = "yes"; then
+- expat_lib_flags="-L$expat_prefix/lib -lexpat"
++ expat_lib_flags="-L$expat_prefix/${libdir} -lexpat"
+ fi
+ fi
+ fi
+diff --git a/m4/ax_lib_libkml.m4 b/m4/ax_lib_libkml.m4
+index 16af436..f542c2e 100644
+--- a/m4/ax_lib_libkml.m4
++++ b/m4/ax_lib_libkml.m4
+@@ -172,7 +172,7 @@ kmldom::KmlFactory* factory = kmldom::KmlFactory::GetFactory();
+ if test "$libkml_prefix" = "/usr"; then
+ libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+ else
+- libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
++ libkml_lib_flags="-L$libkml_prefix/${libdir} -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+ fi
+ run_libkml_test="yes"
+ elif test "$libkml_requested" = "yes"; then
+diff --git a/m4/ax_lib_xerces.m4 b/m4/ax_lib_xerces.m4
+index fdd0e79..6ef7af0 100644
+--- a/m4/ax_lib_xerces.m4
++++ b/m4/ax_lib_xerces.m4
+@@ -100,7 +100,7 @@ AC_DEFUN([AX_LIB_XERCES],
+ if test "$xerces_prefix" = "/usr"; then
+ xerces_lib_flags="-lxerces-c -lpthread"
+ else
+- xerces_lib_flags="-L$xerces_prefix/lib -lxerces-c -lpthread"
++ xerces_lib_flags="-L$xerces_prefix/${libdir} -lxerces-c -lpthread"
+ fi
+ run_xerces_test="yes"
+ elif test "$xerces_requested" = "yes"; then
+diff --git a/configure.ac b/configure.ac
+index 020b249..ffad6ba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4794,8 +4794,8 @@ if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjs
+ elif test "$with_libjson_c" = "internal" ; then
+ LIBJSONC_SETTING=internal
+ elif test "$with_libjson_c" != "no"; then
+- LIBS="-L$with_libjson_c/lib $LIBS"
+- AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/lib)
++ LIBS="-L$with_libjson_c/${libdir} $LIBS"
++ AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/${libdir})
+ else
+ AC_MSG_ERROR([libjson-c (internal or external) is required])
+ fi
diff --git a/sci-libs/gdal/gdal-3.2.1-r1.ebuild b/sci-libs/gdal/gdal-3.2.1-r1.ebuild
index 5eb32d7fbfb..ebac034babc 100644
--- a/sci-libs/gdal/gdal-3.2.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.2.1-r1.ebuild
@@ -88,11 +88,18 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.2.3-soname.patch"
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+ "${FILESDIR}/${PN}-3.2.1-libdir.patch"
)
src_prepare() {
default
+ # Drop a --prefix hack in the upstream build system
+ # We don't want the line at all, so let's just drop it rather than
+ # trying to put in the right libdir value.
+ sed -e '/\$ADD_PREFIX\/lib/d' \
+ -i configure.ac || die
+
sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-i configure.ac || die
@@ -131,10 +138,10 @@ src_configure() {
--with-geotiff
--with-gnm
--with-hide-internal-symbols
- --with-libjson-c="${EPREFIX}"/usr/
+ --with-libjson-c="${EPREFIX}"/usr
--with-libtiff
--with-libtool
- --with-libz="${EPREFIX}"/usr/
+ --with-libz="${EPREFIX}"/usr
--without-charls
--without-dods-root
--without-ecw
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2023-04-23 6:06 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-04-23 6:06 UTC (permalink / raw
To: gentoo-commits
commit: a196821e2f3783c1e40e318505c5c92d336237a7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 06:03:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 06:03:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a196821e
sci-libs/gdal: add 3.6.4
Closes: https://bugs.gentoo.org/900106
Closes: https://bugs.gentoo.org/904534
Thanks-to: Michael Uleysky <uleysky <AT> gmail.com> (abseil patch)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/Manifest | 2 +
.../gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch | 12 +
sci-libs/gdal/gdal-3.6.4.ebuild | 249 +++++++++++++++++++++
3 files changed, 263 insertions(+)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index f39eae1fba87..47738d3855d4 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,7 +2,9 @@ DIST gdal-3.5.3.tar.xz 9504740 BLAKE2B 7054df4c7ea6d8d3e6e9cf2544fc5c7a9149dea94
DIST gdal-3.6.1.tar.xz 8685072 BLAKE2B 84f707085e77317f2e6577afe594eb01aae777d2863454bfc873ba170f1254094946f02301079d9cce66f8e64848b2b97f03651b114b283c7910d46da1507430 SHA512 07138bdd66a0259cffed3a1587904760b734fffa546f5cdf7ca9ee472c77676e5694f6c92d57f03f9cdb94cc3992a0404688f248b79e263eb0c1e3ab6025f6bb
DIST gdal-3.6.2.tar.xz 8635724 BLAKE2B c90606b642c632dd5ec224d63aa80c158c9ee04c6ca0341815f7449b319bf9442d65c2f9b981aedd242713ef6909a30f620b448ba26baf6cd8a31e2a9ae0dd8a SHA512 d404335d37ef4916b6098fa8dc7a5e1579ecdd958b37ce73bb08855fa226d3a7b488eee52db17364ef1c0697d59805d495a734f21dad2ad2f0b27e7b1f253e50
DIST gdal-3.6.3.tar.xz 8645148 BLAKE2B c9d6817e74d0ec377979a060db231ec989e676f9aa0c1c04a8bcd6913c271eaccbb43a59b8bd52f0e297844759a3925039b83c73c4e0773943eeec8af656bb8a SHA512 296901ea667b7d419638fafd9a3ef3cb8bfb1753223048660c463b18e510cb840ae99fdcdb860495782003376c9fb8c24ca3be3699dc31497bd324a09e2abec9
+DIST gdal-3.6.4.tar.xz 8648032 BLAKE2B d6abdbcc87029bf230dae5586f06cbd329e5e43be37d8f5e9a72c67c93a6769458cc9c693b498e3f697b1ee1b68c9f9dbf7545ff9819fceb8fdde81b8d4ac882 SHA512 a8f69158d44ea456c44cfcb8937892697a28d2e4a43333c28db8fb9e81c51436a6edcb7a392b8c7ef63cd7453be6350a938bc4ba910720d9d5d9a1f32c57c558
DIST gdalautotest-3.5.3.tar.gz 12374523 BLAKE2B 3f8e2ba8b49d7bb870a49bde4ec95f807ff79cf23d36504cf7beeccff104364d8fc8e287184a0239cd2c4bf5e26c900cfb29bda3beb615504e588519385a322c SHA512 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e
DIST gdalautotest-3.6.1.tar.gz 12577286 BLAKE2B 5215db1c39ee1b6d923da9503a2220d8862cf262d3f92605902e6a8e7272fbae156c306a8172f7ef75ad110fc6a82a06873c8420d5d1f2a3a8d4600430932a79 SHA512 a91ba311840b98d16df1918752bb5a629bdbe68b98e3ca9f00e2a8ee49f9f68021081700eb39cce7cf5b09fc3fafed987ea067c8135ab2469b91c34338ba7ef2
DIST gdalautotest-3.6.2.tar.gz 12586870 BLAKE2B 28b6ae04d68964705dfe370bf189343c76fa63e358ce1c7362604743c92130c8e93ec826170a7adfd95aad8a05a5ae7a006b35cf487a81eb0c6695353ab7ef20 SHA512 63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859
DIST gdalautotest-3.6.3.tar.gz 12613287 BLAKE2B a4548ccf7bd4a8de9fd093514afbd3d6de453ca6a1bb0c4b6e50f6f37ac5ec321f7b80943f32fcf4164442d2d63b09458c1d0ebad76ee76a53b681e2b07ee388 SHA512 2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4
+DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
diff --git a/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch b/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch
new file mode 100644
index 000000000000..2ddc39db8b36
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/904534
+--- a/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt
++++ b/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt
+@@ -8,6 +8,7 @@
+ ogrflatgeobufeditablelayer.cpp
+ PLUGIN_CAPABLE
+ NO_DEPS)
++set_property(TARGET ogr_FlatGeobuf PROPERTY CXX_STANDARD 17)
+ gdal_standard_includes(ogr_FlatGeobuf)
+ target_include_directories(ogr_FlatGeobuf PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
+
diff --git a/sci-libs/gdal/gdal-3.6.4.ebuild b/sci-libs/gdal/gdal-3.6.4.ebuild
new file mode 100644
index 000000000000..bce013c8d745
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.6.4.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
+SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz )"
+
+LICENSE="BSD Info-ZIP MIT"
+SLOT="0/32" # subslot is libgdal.so.<SONAME>
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ spatialite? ( sqlite )
+"
+
+BDEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ java? (
+ dev-java/ant-core
+ dev-lang/swig:0
+ >=virtual/jdk-1.8:*
+ )
+ python? (
+ dev-lang/swig:0
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )"
+DEPEND="dev-libs/expat
+ dev-libs/json-c:=
+ dev-libs/libpcre2
+ dev-libs/libxml2:2
+ dev-libs/openssl:=
+ media-libs/tiff
+ >=sci-libs/libgeotiff-1.5.1-r1:=
+ >=sci-libs/proj-6.0.0:=
+ sys-libs/zlib[minizip(+)]
+ armadillo? ( sci-libs/armadillo:=[lapack] )
+ curl? ( net-misc/curl )
+ fits? ( sci-libs/cfitsio:= )
+ geos? ( >=sci-libs/geos-3.8.0 )
+ gif? ( media-libs/giflib:= )
+ gml? ( >=dev-libs/xerces-c-3.1 )
+ heif? ( media-libs/libheif:= )
+ hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ lzma? ( || (
+ app-arch/xz-utils
+ app-arch/lzma
+ ) )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf:= )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( >=sci-libs/ogdi-4.1.0-r1 )
+ opencl? ( virtual/opencl )
+ oracle? ( dev-db/oracle-instantclient:= )
+ pdf? ( app-text/poppler:= )
+ png? ( media-libs/libpng:= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ')
+ )
+ spatialite? ( dev-db/spatialite )
+ sqlite? ( dev-db/sqlite:3 )
+ webp? ( media-libs/libwebp:= )
+ xls? ( dev-libs/freexl )
+ zstd? ( app-arch/zstd:= )"
+RDEPEND="${DEPEND}
+ java? ( >=virtual/jre-1.8:* )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ _wstat64 # Windows LFS
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use test ; then
+ mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_IPO=OFF
+ -DGDAL_USE_EXTERNAL_LIBS=ON
+ -DGDAL_USE_INTERNAL_LIBS=OFF
+
+ # bug #844874 and bug #845150
+ -DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
+
+ # Options here are generally off because of one of:
+ # - Not yet packaged dependencies
+ #
+ # - Off for autotools build and didn't want more churn by
+ # enabling during port to CMake. Feel free to request them
+ # being turned on if useful for you.
+ -DGDAL_USE_ARMADILLO=$(usex armadillo)
+ -DGDAL_USE_ARROW=OFF
+ -DGDAL_USE_BLOSC=OFF
+ -DGDAL_USE_BRUNSLI=OFF
+ -DGDAL_USE_CRNLIB=OFF
+ -DGDAL_USE_CFITSIO=$(usex fits)
+ -DGDAL_USE_CURL=$(usex curl)
+ -DGDAL_USE_CRYPTOPP=OFF
+ -DGDAL_USE_DEFLATE=OFF
+ -DGDAL_USE_ECW=OFF
+ -DGDAL_USE_EXPAT=ON
+ -DGDAL_USE_FILEGDB=OFF
+ -DGDAL_USE_FREEXL=$(usex xls)
+ -DGDAL_USE_FYBA=OFF
+ -DGDAL_USE_GEOTIFF=ON
+ -DGDAL_USE_GEOS=$(usex geos)
+ -DGDAL_USE_GIF=$(usex gif)
+ -DGDAL_USE_GTA=OFF
+ -DGDAL_USE_HEIF=$(usex heif)
+ -DGDAL_USE_HDF4=OFF
+ -DGDAL_USE_HDF5=$(usex hdf5)
+ -DGDAL_USE_HDFS=OFF
+ -DGDAL_USE_ICONV=ON # TODO dep
+ -DGDAL_USE_IDB=OFF
+ -DGDAL_USE_JPEG=$(usex jpeg)
+
+ # https://gdal.org/build_hints.html#jpeg12
+ # Independent of whether using system libjpeg
+ -DGDAL_USE_JPEG12_INTERNAL=ON
+
+ -DGDAL_USE_JSONC=ON
+ -DGDAL_USE_JXL=OFF
+ -DGDAL_USE_KDU=OFF
+ -DGDAL_USE_KEA=OFF
+ -DGDAL_USE_LERC=OFF
+ -DGDAL_USE_LIBKML=OFF
+ -DGDAL_USE_LIBLZMA=$(usex lzma)
+ -DGDAL_USE_LIBXML2=ON
+ -DGDAL_USE_LURATECH=OFF
+ -DGDAL_USE_LZ4=OFF
+ -DGDAL_USE_MONGOCXX=OFF
+ -DGDAL_USE_MRSID=OFF
+ -DGDAL_USE_MSSQL_NCLI=OFF
+ -DGDAL_USE_MSSQL_ODBC=OFF
+ -DGDAL_USE_MYSQL=$(usex mysql)
+ -DGDAL_USE_NETCDF=$(usex netcdf)
+ -DGDAL_USE_ODBC=$(usex odbc)
+ -DGDAL_USE_ODBCCPP=OFF
+ -DGDAL_USE_OGDI=$(usex ogdi)
+ -DGDAL_USE_OPENCAD=OFF
+ -DGDAL_USE_OPENCL=$(usex opencl)
+ -DGDAL_USE_OPENEXR=OFF
+ -DGDAL_USE_OPENJPEG=$(usex jpeg2k)
+ -DGDAL_USE_OPENSSL=ON
+ -DGDAL_USE_ORACLE=$(usex oracle)
+ -DGDAL_USE_PARQUET=OFF
+ -DGDAL_USE_PCRE2=ON
+ -DGDAL_USE_PDFIUM=OFF
+ -DGDAL_USE_PNG=$(usex png)
+ -DGDAL_USE_PODOFO=OFF
+ -DGDAL_USE_POPPLER=$(usex pdf)
+ -DGDAL_USE_POSTGRESQL=$(usex postgres)
+ -DGDAL_USE_QHULL=OFF
+ -DGDAL_USE_RASTERLITE2=OFF
+ -DGDAL_USE_RDB=OFF
+ -DGDAL_USE_SPATIALITE=$(usex spatialite)
+ -DGDAL_USE_SQLITE3=$(usex sqlite)
+ -DGDAL_USE_SFCGAL=OFF
+ -DGDAL_USE_TEIGHA=OFF
+ -DGDAL_USE_TIFF=ON
+ -DGDAL_USE_TILEDB=OFF
+ -DGDAL_USE_WEBP=$(usex webp)
+ -DGDAL_USE_XERCESC=$(usex gml)
+ -DGDAL_USE_ZLIB=ON
+ -DGDAL_USE_ZSTD=$(usex zstd)
+
+ # Bindings
+ -DBUILD_PYTHON_BINDINGS=$(usex python)
+ -DBUILD_JAVA_BINDINGS=$(usex java)
+ # bug #845369
+ -DBUILD_CSHARP_BINDINGS=OFF
+
+ # Check work/gdal-3.5.0_build/CMakeCache.txt after configure
+ # and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
+ # Commented out: not (yet?) implemented upstream.
+ # Also, arm64 stuff is a TODO upstream, but not there (yet?)
+ -Dtest_avx=$(usex cpu_flags_x86_avx)
+ -Dtest_avx2=$(usex cpu_flags_x86_avx2)
+ -Dtest_sse=$(usex cpu_flags_x86_sse)
+ -Dtest_sse2=$(usex cpu_flags_x86_sse2)
+ #-Dtest_sse3=$(usex cpu_flags_x86_sse3)
+ -Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
+ #-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
+ #-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
+ -Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
+ #-Dtest_fma4=$(usex cpu_flags_x86_fma4)
+ #-Dtest_xop=$(usex cpu_flags_x86_xop)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ use doc && cmake_src_compile doc
+}
+
+src_test() {
+ export GDAL_RUN_SLOW_TESTS=0
+ export GDAL_DOWNLOAD_TEST_DATA=0
+
+ # Two test suites:
+ # 1. autotests (much larger, uses pytest)
+ # 2. Small set of fuzzing tests (no download needed)
+
+ # Missing file for test-unit?
+ cmake_src_test -E "(test-unit)"
+}
+
+src_install() {
+ cmake_src_install
+ use python && python_optimize
+ # TODO: install docs?
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2023-05-10 19:27 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-05-10 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 9010ab474517d315954b99b5fc604a37ee55ec21
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 19:27:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 10 19:27:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9010ab47
sci-libs/gdal: add 3.7.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/Manifest | 2 +
sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch | 51 +++++
sci-libs/gdal/gdal-3.7.0.ebuild | 266 +++++++++++++++++++++++++++
3 files changed, 319 insertions(+)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 085551233d50..cff14a75a5d7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,8 @@
DIST gdal-3.5.3.tar.xz 9504740 BLAKE2B 7054df4c7ea6d8d3e6e9cf2544fc5c7a9149dea94ed882723ec82c61268100c2f5330f28a8d9d44e1296511eb2a204c64dfe41f135fadb44db380aa331d9c731 SHA512 b7bac9dd568e9db49d1fa5be8cd48df37f37196b0cacce44f738a981f0c43a77b5750312cd0c3385fdd881a6b525a5ceac56bcd08284d76071bd508d01781f49
DIST gdal-3.6.2.tar.xz 8635724 BLAKE2B c90606b642c632dd5ec224d63aa80c158c9ee04c6ca0341815f7449b319bf9442d65c2f9b981aedd242713ef6909a30f620b448ba26baf6cd8a31e2a9ae0dd8a SHA512 d404335d37ef4916b6098fa8dc7a5e1579ecdd958b37ce73bb08855fa226d3a7b488eee52db17364ef1c0697d59805d495a734f21dad2ad2f0b27e7b1f253e50
DIST gdal-3.6.4.tar.xz 8648032 BLAKE2B d6abdbcc87029bf230dae5586f06cbd329e5e43be37d8f5e9a72c67c93a6769458cc9c693b498e3f697b1ee1b68c9f9dbf7545ff9819fceb8fdde81b8d4ac882 SHA512 a8f69158d44ea456c44cfcb8937892697a28d2e4a43333c28db8fb9e81c51436a6edcb7a392b8c7ef63cd7453be6350a938bc4ba910720d9d5d9a1f32c57c558
+DIST gdal-3.7.0.tar.xz 8604724 BLAKE2B 400cc17fc636c637f7c40e93aed8e2db7bfbbe73741da4135cfeec8dbcda24ce0c8035214edf038afc29a916012da86a78d789729540f870231dfa6aa27e424a SHA512 4a3262d75ffbb58ec0821cd266843e28ca64c34383fb2bfaf30c984bf01c6d012381892a31a2ebc7c27a58b058fb44389cd45b05b619579b6178feb192f37bc6
DIST gdalautotest-3.5.3.tar.gz 12374523 BLAKE2B 3f8e2ba8b49d7bb870a49bde4ec95f807ff79cf23d36504cf7beeccff104364d8fc8e287184a0239cd2c4bf5e26c900cfb29bda3beb615504e588519385a322c SHA512 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e
DIST gdalautotest-3.6.2.tar.gz 12586870 BLAKE2B 28b6ae04d68964705dfe370bf189343c76fa63e358ce1c7362604743c92130c8e93ec826170a7adfd95aad8a05a5ae7a006b35cf487a81eb0c6695353ab7ef20 SHA512 63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859
DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
+DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B cac18436ad2acb558e27e8ba3f1f2c22aa6c7ba258abe25118acf65fb2cb8a3d5f132ccb8315912a54d07f035b5ff331cf6a66bdf51a54c8275c5203e844eb82 SHA512 81e80c799a8a910a861182480e8306c8583cdffe7cb62f47fbaddf031e1c4d1d3fb341edf0daddbb8c934e5f2d547b380feb2f5a9f22cd50db14e43c2b02737b
diff --git a/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch
new file mode 100644
index 000000000000..5f6dafeab525
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch
@@ -0,0 +1,51 @@
+--- a/frmts/zlib/contrib/infback9/minified_zutil.c
++++ b/frmts/zlib/contrib/infback9/minified_zutil.c
+@@ -8,9 +8,9 @@
+ #include "minified_zutil.h"
+
+ #ifndef STDC
+-extern voidp malloc OF((uInt size));
+-extern voidp calloc OF((uInt items, uInt size));
+-extern void free OF((voidpf ptr));
++extern voidp malloc (uInt size);
++extern voidp calloc (uInt items, uInt size);
++extern void free (voidpf ptr);
+ #endif
+
+ voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
+--- a/frmts/zlib/contrib/infback9/minified_zutil.h
++++ b/frmts/zlib/contrib/infback9/minified_zutil.h
+@@ -191,9 +191,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ /* provide prototypes for these when building zlib without LFS */
+ #if !defined(_WIN32) && \
+ (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+- ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
++ ZEXTERN uLong ZEXPORT adler32_combine64 (uLong, uLong, z_off_t);
++ ZEXTERN uLong ZEXPORT crc32_combine64 (uLong, uLong, z_off_t);
++ ZEXTERN uLong ZEXPORT crc32_combine_gen64 (z_off_t);
+ #endif
+
+ /* common defaults */
+@@ -232,16 +232,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ # define zmemzero(dest, len) memset(dest, 0, len)
+ # endif
+ #else
+- void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+- int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+- void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
++ void ZLIB_INTERNAL zmemcpy (Bytef* dest, const Bytef* source, uInt len);
++ int ZLIB_INTERNAL zmemcmp (const Bytef* s1, const Bytef* s2, uInt len);
++ void ZLIB_INTERNAL zmemzero (Bytef* dest, uInt len);
+ #endif
+
+ /* Diagnostic functions */
+ #ifdef ZLIB_DEBUG
+ # include <stdio.h>
+ extern int ZLIB_INTERNAL z_verbose;
+- extern void ZLIB_INTERNAL z_error OF((char *m));
++ extern void ZLIB_INTERNAL z_error (char *m);
+ # define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+ # define Trace(x) {if (z_verbose>=0) fprintf x ;}
+ # define Tracev(x) {if (z_verbose>0) fprintf x ;}
diff --git a/sci-libs/gdal/gdal-3.7.0.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild
new file mode 100644
index 000000000000..ef7fc667de4d
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.7.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit cmake java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
+SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz )"
+
+LICENSE="BSD Info-ZIP MIT"
+SLOT="0/33" # subslot is libgdal.so.<SONAME>
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ spatialite? ( sqlite )
+ test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ java? (
+ dev-java/ant-core
+ dev-lang/swig
+ >=virtual/jdk-1.8:*
+ )
+ python? (
+ dev-lang/swig
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ )
+ test? (
+ ${PYTHON_DEPS}
+ dev-cpp/gtest
+ )
+"
+DEPEND="
+ dev-libs/expat
+ dev-libs/json-c:=
+ dev-libs/libpcre2
+ dev-libs/libxml2:2
+ dev-libs/openssl:=
+ media-libs/tiff
+ >=sci-libs/libgeotiff-1.5.1-r1:=
+ >=sci-libs/proj-6.0.0:=
+ sys-libs/zlib[minizip(+)]
+ armadillo? ( sci-libs/armadillo:=[lapack] )
+ curl? ( net-misc/curl )
+ fits? ( sci-libs/cfitsio:= )
+ geos? ( >=sci-libs/geos-3.8.0 )
+ gif? ( media-libs/giflib:= )
+ gml? ( >=dev-libs/xerces-c-3.1 )
+ heif? ( media-libs/libheif:= )
+ hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ lzma? ( || (
+ app-arch/xz-utils
+ app-arch/lzma
+ ) )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf:= )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( >=sci-libs/ogdi-4.1.0-r1 )
+ opencl? ( virtual/opencl )
+ oracle? ( dev-db/oracle-instantclient:= )
+ pdf? ( app-text/poppler:= )
+ png? ( media-libs/libpng:= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ')
+ )
+ spatialite? ( dev-db/spatialite )
+ sqlite? ( dev-db/sqlite:3 )
+ webp? ( media-libs/libwebp:= )
+ xls? ( dev-libs/freexl )
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+ ${DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ _wstat64 # Windows LFS
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
+ "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch
+)
+
+pkg_setup() {
+ if use python || use test ; then
+ python-single-r1_pkg_setup
+ fi
+
+ use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use test ; then
+ mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_IPO=OFF
+ -DGDAL_USE_EXTERNAL_LIBS=ON
+ -DGDAL_USE_INTERNAL_LIBS=OFF
+ -DUSE_EXTERNAL_GTEST=ON
+ -DBUILD_TESTING=$(usex test)
+
+ # bug #844874 and bug #845150
+ -DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
+
+ # Options here are generally off because of one of:
+ # - Not yet packaged dependencies
+ #
+ # - Off for autotools build and didn't want more churn by
+ # enabling during port to CMake. Feel free to request them
+ # being turned on if useful for you.
+ -DGDAL_USE_ARMADILLO=$(usex armadillo)
+ -DGDAL_USE_ARROW=OFF
+ -DGDAL_USE_BLOSC=OFF
+ -DGDAL_USE_BRUNSLI=OFF
+ -DGDAL_USE_CRNLIB=OFF
+ -DGDAL_USE_CFITSIO=$(usex fits)
+ -DGDAL_USE_CURL=$(usex curl)
+ -DGDAL_USE_CRYPTOPP=OFF
+ -DGDAL_USE_DEFLATE=OFF
+ -DGDAL_USE_ECW=OFF
+ -DGDAL_USE_EXPAT=ON
+ -DGDAL_USE_FILEGDB=OFF
+ -DGDAL_USE_FREEXL=$(usex xls)
+ -DGDAL_USE_FYBA=OFF
+ -DGDAL_USE_GEOTIFF=ON
+ -DGDAL_USE_GEOS=$(usex geos)
+ -DGDAL_USE_GIF=$(usex gif)
+ -DGDAL_USE_GTA=OFF
+ -DGDAL_USE_HEIF=$(usex heif)
+ -DGDAL_USE_HDF4=OFF
+ -DGDAL_USE_HDF5=$(usex hdf5)
+ -DGDAL_USE_HDFS=OFF
+ -DGDAL_USE_ICONV=ON # TODO dep
+ -DGDAL_USE_IDB=OFF
+ -DGDAL_USE_JPEG=$(usex jpeg)
+
+ # https://gdal.org/build_hints.html#jpeg12
+ # Independent of whether using system libjpeg
+ -DGDAL_USE_JPEG12_INTERNAL=ON
+
+ -DGDAL_USE_JSONC=ON
+ -DGDAL_USE_JXL=OFF
+ -DGDAL_USE_KDU=OFF
+ -DGDAL_USE_KEA=OFF
+ -DGDAL_USE_LERC=OFF
+ -DGDAL_USE_LIBKML=OFF
+ -DGDAL_USE_LIBLZMA=$(usex lzma)
+ -DGDAL_USE_LIBXML2=ON
+ -DGDAL_USE_LURATECH=OFF
+ -DGDAL_USE_LZ4=OFF
+ -DGDAL_USE_MONGOCXX=OFF
+ -DGDAL_USE_MRSID=OFF
+ -DGDAL_USE_MSSQL_NCLI=OFF
+ -DGDAL_USE_MSSQL_ODBC=OFF
+ -DGDAL_USE_MYSQL=$(usex mysql)
+ -DGDAL_USE_NETCDF=$(usex netcdf)
+ -DGDAL_USE_ODBC=$(usex odbc)
+ -DGDAL_USE_ODBCCPP=OFF
+ -DGDAL_USE_OGDI=$(usex ogdi)
+ -DGDAL_USE_OPENCAD=OFF
+ -DGDAL_USE_OPENCL=$(usex opencl)
+ -DGDAL_USE_OPENEXR=OFF
+ -DGDAL_USE_OPENJPEG=$(usex jpeg2k)
+ -DGDAL_USE_OPENSSL=ON
+ -DGDAL_USE_ORACLE=$(usex oracle)
+ -DGDAL_USE_PARQUET=OFF
+ -DGDAL_USE_PCRE2=ON
+ -DGDAL_USE_PDFIUM=OFF
+ -DGDAL_USE_PNG=$(usex png)
+ -DGDAL_USE_PODOFO=OFF
+ -DGDAL_USE_POPPLER=$(usex pdf)
+ -DGDAL_USE_POSTGRESQL=$(usex postgres)
+ -DGDAL_USE_QHULL=OFF
+ -DGDAL_USE_RASTERLITE2=OFF
+ -DGDAL_USE_RDB=OFF
+ -DGDAL_USE_SPATIALITE=$(usex spatialite)
+ -DGDAL_USE_SQLITE3=$(usex sqlite)
+ -DGDAL_USE_SFCGAL=OFF
+ -DGDAL_USE_TEIGHA=OFF
+ -DGDAL_USE_TIFF=ON
+ -DGDAL_USE_TILEDB=OFF
+ -DGDAL_USE_WEBP=$(usex webp)
+ -DGDAL_USE_XERCESC=$(usex gml)
+ -DGDAL_USE_ZLIB=ON
+ -DGDAL_USE_ZSTD=$(usex zstd)
+
+ # Bindings
+ -DBUILD_PYTHON_BINDINGS=$(usex python)
+ -DBUILD_JAVA_BINDINGS=$(usex java)
+ # bug #845369
+ -DBUILD_CSHARP_BINDINGS=OFF
+
+ # Check work/gdal-3.5.0_build/CMakeCache.txt after configure
+ # and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
+ # Commented out: not (yet?) implemented upstream.
+ # Also, arm64 stuff is a TODO upstream, but not there (yet?)
+ -Dtest_avx=$(usex cpu_flags_x86_avx)
+ -Dtest_avx2=$(usex cpu_flags_x86_avx2)
+ -Dtest_sse=$(usex cpu_flags_x86_sse)
+ -Dtest_sse2=$(usex cpu_flags_x86_sse2)
+ #-Dtest_sse3=$(usex cpu_flags_x86_sse3)
+ -Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
+ #-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
+ #-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
+ -Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
+ #-Dtest_fma4=$(usex cpu_flags_x86_fma4)
+ #-Dtest_xop=$(usex cpu_flags_x86_xop)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ use doc && cmake_src_compile doc
+}
+
+src_test() {
+ export GDAL_RUN_SLOW_TESTS=0
+ export GDAL_DOWNLOAD_TEST_DATA=0
+
+ # Two test suites:
+ # 1. autotests (much larger, uses pytest)
+ # 2. Small set of fuzzing tests (no download needed)
+
+ # Missing file for test-unit?
+ cmake_src_test -E "(test-unit)"
+}
+
+src_install() {
+ cmake_src_install
+ use python && python_optimize
+ # TODO: install docs?
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2024-04-11 10:02 Andrew Ammerlaan
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Ammerlaan @ 2024-04-11 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 36d365c38a240d902e66c944296e730ab20c21e4
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Feb 3 08:25:07 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 10:01:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d365c3
sci-libs/gdal: gdal-3.8.0-java21.patch
also no longer depends on deprecated dev-java/ant-core
Bug: https://bugs.gentoo.org/916787
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.8.0-java21.patch | 20 ++++++++++++++++++++
.../gdal/{gdal-3.8.0.ebuild => gdal-3.8.0-r1.ebuild} | 3 ++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/sci-libs/gdal/files/gdal-3.8.0-java21.patch b/sci-libs/gdal/files/gdal-3.8.0-java21.patch
new file mode 100644
index 000000000000..3e924c5206c1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.0-java21.patch
@@ -0,0 +1,20 @@
+--- a/swig/java/build.xml
++++ b/swig/java/build.xml
+@@ -21,7 +21,7 @@
+ <target name="compile" depends="init" description="Compile the source files.">
+ <mkdir dir="${build_dir}/build/classes"/>
+ <javac srcdir="${build_dir}/org" destdir="${build_dir}/build/classes"
+- debug="on" source="7" target="7"
++ debug="on" source="8" target="8"
+ includeantruntime="false" deprecation="true">
+ </javac>
+ <echo>compilation complete</echo>
+@@ -38,7 +38,7 @@
+ <target name="compile_tests" depends="archive" description="Compile the tests files.">
+ <mkdir dir="${build_dir}/build/apps"/>
+ <javac srcdir="${source_apps}" destdir="${build_dir}/build/apps"
+- debug="on" source="7" target="7"
++ debug="on" source="8" target="8"
+ includeantruntime="false" deprecation="true" classpath="${build_dir}/gdal.jar">
+ </javac>
+ <echo>compilation of tests complete</echo>
diff --git a/sci-libs/gdal/gdal-3.8.0.ebuild b/sci-libs/gdal/gdal-3.8.0-r1.ebuild
similarity index 99%
rename from sci-libs/gdal/gdal-3.8.0.ebuild
rename to sci-libs/gdal/gdal-3.8.0-r1.ebuild
index 5a47aad92bfa..1a8dd8a1059a 100644
--- a/sci-libs/gdal/gdal-3.8.0.ebuild
+++ b/sci-libs/gdal/gdal-3.8.0-r1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-text/doxygen )
java? (
- dev-java/ant-core
+ >=dev-java/ant-1.10.14-r3:0
dev-lang/swig
)
python? (
@@ -99,6 +99,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
)
PATCHES=(
+ "${FILESDIR}/gdal-3.8.0-java21.patch"
"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
"${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch
"${FILESDIR}"/${P}-libxml2-2.12-{1,2}.patch # bug 917564
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/
@ 2024-05-13 23:14 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2024-05-13 23:14 UTC (permalink / raw
To: gentoo-commits
commit: 6db9200aefab8f1d62f87d4a0ef20adc20bc4c12
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 22:04:29 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 23:14:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db9200a
sci-libs/gdal: Fix build with Poppler 24.05
Upstream commit 60dcddbf5fab917338caf433b3e7dca283cf9720
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../gdal/files/gdal-3.8.5-poppler-24.05.0.patch | 23 ++++++++++++++++++++++
sci-libs/gdal/gdal-3.8.5.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch
new file mode 100644
index 000000000000..837a50f6b825
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch
@@ -0,0 +1,23 @@
+From 60dcddbf5fab917338caf433b3e7dca283cf9720 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Thu, 4 Apr 2024 17:48:33 +0200
+Subject: [PATCH] Fix build with Poppler 24.05 (unreleased yet)
+
+---
+ frmts/pdf/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt
+index 9b9a1898a730..bcb19c3aa24c 100644
+--- a/frmts/pdf/CMakeLists.txt
++++ b/frmts/pdf/CMakeLists.txt
+@@ -54,6 +54,9 @@ if (GDAL_USE_POPPLER)
+ if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+")
+ string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR ${Poppler_VERSION_MINOR})
+ endif ()
++ if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05")
++ target_compile_features(gdal_PDF PRIVATE cxx_std_20)
++ endif ()
+ target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR}
+ -DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR})
+ endif ()
diff --git a/sci-libs/gdal/gdal-3.8.5.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild
index bb1c2e0bde5e..3b40e02bfefc 100644
--- a/sci-libs/gdal/gdal-3.8.5.ebuild
+++ b/sci-libs/gdal/gdal-3.8.5.ebuild
@@ -101,6 +101,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
PATCHES=(
"${FILESDIR}"/${PN}-3.8.0-java21.patch
"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
+ "${FILESDIR}"/${P}-poppler-24.05.0.patch # in 3.9.0
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-05-13 23:15 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-03 22:51 [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-05-13 23:14 Andreas Sturmlechner
2024-04-11 10:02 Andrew Ammerlaan
2023-05-10 19:27 Sam James
2023-04-23 6:06 Sam James
2021-03-09 20:43 Sam James
2020-08-05 8:26 Andreas Sturmlechner
2020-01-29 21:32 Andreas Sturmlechner
2020-01-01 15:19 Andreas Sturmlechner
2019-03-02 20:29 Andreas Sturmlechner
2019-01-12 20:07 Andreas Sturmlechner
2018-08-12 19:17 Amy Liffey
2018-08-04 12:04 Amy Liffey
2018-06-19 9:09 Amy Liffey
2018-02-04 10:18 Andreas Sturmlechner
2018-01-16 21:06 Andreas Sturmlechner
2016-11-07 13:56 Amy Winston
2015-10-24 17:23 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox