* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2016-06-17 14:59 Amy Winston
0 siblings, 0 replies; 10+ messages in thread
From: Amy Winston @ 2016-06-17 14:59 UTC (permalink / raw
To: gentoo-commits
commit: cd5789a45d77f688939d4ad3aadf3c11ff21f13d
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 20:43:59 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 14:54:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5789a4
sci-libs/gdal: Remove unused patches
Package-Manager: portage-2.2.28
| 13 -------
sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch | 43 ----------------------
2 files changed, 56 deletions(-)
diff --git a/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch b/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch
deleted file mode 100644
index 04777c8..0000000
--- a/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- port/cpl_minizip_ioapi.h.orig 2011-09-25 13:38:22.000000000 -0700
-+++ port/cpl_minizip_ioapi.h 2011-09-25 13:39:22.000000000 -0700
-@@ -41,6 +41,10 @@
- #endif
- #endif
-
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch b/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch
deleted file mode 100644
index b98f684..0000000
--- a/sci-libs/gdal/files/gdal-1.9.1-ruby-makefile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urN gdal-1.9.1.old//swig/ruby/RubyMakefile.mk gdal-1.9.1/swig/ruby/RubyMakefile.mk
---- gdal-1.9.1.old//swig/ruby/RubyMakefile.mk 2012-05-25 19:54:12.073974979 +0200
-+++ gdal-1.9.1/swig/ruby/RubyMakefile.mk 2012-05-25 19:56:56.014977833 +0200
-@@ -37,13 +37,13 @@
-
- ifeq ("$(shell uname -s)", "Darwin")
- RUBY_MODULES=$(RUBY_MODULES_MAC)
--LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR)
--RUBY_LIB := -l$(RUBY_SO_NAME)
- else
- RUBY_MODULES=$(RUBY_MODULES_LIN)
--LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
--RUBY_LIB := -l$(RUBY_SO_NAME)
- endif
-+LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR)
-+CFLAGS += -fPIC -DPIC
-+CXXFLAGS += -fPIC -DPIC
-+RUBY_LIB := -l$(RUBY_SO_NAME)
-
- build: $(RUBY_MODULES)
-
-@@ -59,7 +59,7 @@
- $(INSTALL_DIR):
- mkdir -p $(DESTDIR)$(INSTALL_DIR)
-
--install: $(INSTALL_DIR)
-+install: $(INSTALL_DIR) $(RUBY_MODULES)
- for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done
-
- $(RUBY_MODULES_MAC): %.bundle: %_wrap.o
-@@ -69,10 +69,10 @@
- $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
-
- %.o: %.cpp
-- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-
- %.o: %.cxx
-- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-
- %.o: %.c
- $(CC) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2019-02-14 23:06 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-02-14 23:06 UTC (permalink / raw
To: gentoo-commits
commit: ff084e0fdcccf59fe87bfbcab397fa735cf7ab72
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 12 16:46:12 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 23:06:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff084e0f
sci-libs/gdal: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11035
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch | 84 ------------------------
1 file changed, 84 deletions(-)
diff --git a/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch b/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch
deleted file mode 100644
index bbee77b51c7..00000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
-===================================================================
---- a/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp (revision 41042)
-+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp (revision 41043)
-@@ -28,4 +28,6 @@
- ****************************************************************************/
-
-+#define JSON_C_VER_013 (13 << 8)
-+
- #include "ogrgeojsonwriter.h"
- #include "ogrgeojsonutils.h"
-@@ -33,5 +35,9 @@
- #include "ogrgeojsonreader.h"
- #include <json.h> // JSON-C
-+
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
- #include <json_object_private.h>
-+#endif
-+
- #include <printbuf.h>
- #include <ogr_api.h>
-@@ -1382,11 +1388,15 @@
- // TODO(schwehr): Explain this casting.
- const int nPrecision =
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
- static_cast<int>(reinterpret_cast<GUIntptr_t>(jso->_userdata));
-+#else
-+ static_cast<int>(reinterpret_cast<GUIntptr_t>(json_object_get_userdata(jso)));
-+#endif
- char szBuffer[75] = {};
-- OGRFormatDouble( szBuffer, sizeof(szBuffer), jso->o.c_double, '.',
-+ OGRFormatDouble( szBuffer, sizeof(szBuffer), json_object_get_double(jso), '.',
- (nPrecision < 0) ? 15 : nPrecision );
- if( szBuffer[0] == 't' /*oobig */ )
- {
-- CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", jso->o.c_double);
-+ CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", json_object_get_double(jso));
- }
- return printbuf_memappend(pb, szBuffer, static_cast<int>(strlen(szBuffer)));
-@@ -1418,9 +1428,9 @@
- char szBuffer[75] = {};
- int nSize = 0;
-- if( CPLIsNan(jso->o.c_double))
-+ if( CPLIsNan(json_object_get_double(jso)))
- nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "NaN");
-- else if( CPLIsInf(jso->o.c_double) )
-- {
-- if( jso->o.c_double > 0 )
-+ else if( CPLIsInf(json_object_get_double(jso)) )
-+ {
-+ if( json_object_get_double(jso) > 0 )
- nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity");
- else
-@@ -1430,5 +1440,9 @@
- {
- char szFormatting[32] = {};
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
- const int nSignificantFigures = (int) (GUIntptr_t) jso->_userdata;
-+#else
-+ const int nSignificantFigures = (int) (GUIntptr_t) json_object_get_userdata(jso);
-+#endif
- const int nInitialSignificantFigures =
- nSignificantFigures >= 0 ? nSignificantFigures : 17;
-@@ -1436,5 +1450,5 @@
- "%%.%dg", nInitialSignificantFigures);
- nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
-- szFormatting, jso->o.c_double);
-+ szFormatting, json_object_get_double(jso));
- const char* pszDot = NULL;
- if( nSize+2 < static_cast<int>(sizeof(szBuffer)) &&
-@@ -1458,5 +1472,5 @@
- "%%.%dg", nInitialSignificantFigures- i);
- nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
-- szFormatting, jso->o.c_double);
-+ szFormatting, json_object_get_double(jso));
- pszDot = strchr(szBuffer, '.');
- if( pszDot != NULL &&
-@@ -1473,5 +1487,5 @@
- "%%.%dg", nInitialSignificantFigures);
- nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
-- szFormatting, jso->o.c_double);
-+ szFormatting, json_object_get_double(jso));
- if( nSize+2 < static_cast<int>(sizeof(szBuffer)) &&
- strchr(szBuffer, '.') == NULL )
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2021-02-21 21:30 Conrad Kostecki
0 siblings, 0 replies; 10+ messages in thread
From: Conrad Kostecki @ 2021-02-21 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 6ded0dea9ff17b1de2e379587b65575722f69e3e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 21 11:05:41 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 21:27:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ded0dea
sci-libs/gdal: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/19573
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
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/files/gdal-3.0.4-poppler-20.08.patch | 42 -----------
3 files changed, 195 deletions(-)
diff --git a/sci-libs/gdal/files/gdal-3.0.2-complete.patch b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
deleted file mode 100644
index 5d6716c7280..00000000000
--- a/sci-libs/gdal/files/gdal-3.0.2-complete.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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
deleted file mode 100644
index 95c525ca1b8..00000000000
--- a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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/files/gdal-3.0.4-poppler-20.08.patch b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
deleted file mode 100644
index 0fd8051c365..00000000000
--- a/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2021-03-09 22:08 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-03-09 22:08 UTC (permalink / raw
To: gentoo-commits
commit: d72b95c42efb6fa261ebe1849f298153c5dfc8a1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 22:06:24 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 22:08:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72b95c4
sci-libs/gdal: add link to upstream PR
Bug: https://bugs.gentoo.org/696106
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
index 89bc87489e9..0a6c99b73f1 100644
--- a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -1,3 +1,5 @@
+https://github.com/OSGeo/gdal/pull/3560
+https://bugs.gentoo.org/696106
--- a/configure.ac
+++ b/configure.ac
@@ -1133,11 +1133,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2021-03-09 22:10 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-03-09 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 871d75f47010b9efc658ea04690c18a837c67e1b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 22:09:59 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 22:09:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871d75f4
sci-libs/gdal: update libdir patch slightly
* Removed more obsolete libproj logic/checks
* Fix json-c too
Bug: https://bugs.gentoo.org/696106
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 166 ++++++++++++++++------------
1 file changed, 95 insertions(+), 71 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
index 0a6c99b73f1..fcf20dd8bed 100644
--- a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -1,8 +1,33 @@
https://github.com/OSGeo/gdal/pull/3560
-https://bugs.gentoo.org/696106
---- a/configure.ac
-+++ b/configure.ac
-@@ -1133,11 +1133,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
+
+From fbb2adf5b67741f561036b41ab196c72b5978517 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 9 Mar 2021 21:57:57 +0000
+Subject: [PATCH] Respect --libdir parameter
+
+When searching for various libraries, we want to use
+the libdir passed in to autotools (--libdir)
+to ensure that we find the library
+for the correct ABI.
+
+It is possible that we pick up the wrong
+copy from e.g. /usr/lib/ where a 32-bit
+copy of e.g. zlib exists
+when we're in the middle of a 64-bit build.
+
+Use ${libdir} to ensure we respect
+any preferences/information given and
+search for libraries in the right place.
+
+No behaviour should change here as
+--libdir defaults to 'lib'.
+
+Bug: https://bugs.gentoo.org/696106
+Signed-off-by: Sam James <sam@gentoo.org>
+
+--- a/gdal/configure.ac
++++ b/gdal/configure.ac
+@@ -1121,11 +1121,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then
@@ -17,7 +42,7 @@ https://bugs.gentoo.org/696106
if test "$LIBZ_SETTING" = "external" ; then
AC_MSG_RESULT([using libz library from $with_libz])
else
-@@ -1178,7 +1178,7 @@ AC_ARG_WITH(libdeflate,
+@@ -1166,7 +1166,7 @@ AC_ARG_WITH(libdeflate,
if test "$with_libdeflate" != "no" ; then
if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
@@ -26,7 +51,7 @@ https://bugs.gentoo.org/696106
else
AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no])
fi
-@@ -1209,7 +1209,7 @@ fi
+@@ -1197,7 +1197,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"
@@ -35,7 +60,7 @@ https://bugs.gentoo.org/696106
else
LIBS="-ldeflate $LIBS"
fi
-@@ -1302,7 +1302,7 @@ else
+@@ -1290,7 +1290,7 @@ else
LIBS="-L$with_libtiff -ltiff $LIBS"
EXTRA_INCLUDES="-I$with_libtiff $EXTRA_INCLUDES"
else
@@ -44,7 +69,7 @@ https://bugs.gentoo.org/696106
EXTRA_INCLUDES="-I$with_libtiff/include $EXTRA_INCLUDES"
fi
-@@ -1426,19 +1426,12 @@ else
+@@ -1414,52 +1414,22 @@ else
fi
else
ORIG_LIBS="$LIBS"
@@ -55,21 +80,36 @@ https://bugs.gentoo.org/696106
AC_LANG_POP([C++])
if test "$PROJ_FOUND" = "no"; then
- 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"
+ 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"
- 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/lib -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
+ AC_CHECK_LIB(proj,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 -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+- unset ac_cv_lib_proj_internal_proj_create_from_wkt
+- AC_LANG_PUSH([C++])
+- AC_CHECK_LIB(proj,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
- LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
- AC_LANG_PUSH([C++])
@@ -82,14 +122,10 @@ https://bugs.gentoo.org/696106
- 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
+ if test "$PROJ_FOUND" = "yes"; then
+ PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
+ fi
+@@ -1523,7 +1493,7 @@ elif test "$with_spatialite" = "dlopen"; then
SPATIALITE_SONAME="spatialite.so"
fi
else
@@ -98,7 +134,7 @@ https://bugs.gentoo.org/696106
if test -f "$with_spatialite/include/spatialite.h" -a \
"$SPATIALITE_INIT_FOUND" = "yes"; then
-@@ -1543,7 +1520,7 @@ else
+@@ -1531,7 +1501,7 @@ else
if test "$HAVE_SQLITE3" = "yes"; then
SPATIALITE_INC="-I$with_spatialite/include"
HAVE_SPATIALITE=yes
@@ -107,7 +143,7 @@ https://bugs.gentoo.org/696106
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
+@@ -1593,10 +1563,10 @@ if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then
fi
elif test "$with_zstd" != "" -a "$with_zstd" != "no"; then
@@ -120,7 +156,7 @@ https://bugs.gentoo.org/696106
EXTRA_INCLUDES="-I$with_zstd/include $EXTRA_INCLUDES"
else
AC_MSG_ERROR([libzstd not found])
-@@ -1931,20 +1908,20 @@ fi
+@@ -1919,20 +1889,20 @@ fi
# TODO: separate libs for rasters and vectors
if test "$with_grass" != "yes" -a "$with_grass" != "no" ; then
@@ -145,7 +181,7 @@ https://bugs.gentoo.org/696106
fi
GRASS_INCLUDE="-I$with_grass/include"
GRASS_GISBASE="$with_grass"
-@@ -1968,10 +1945,10 @@ elif test "$with_libgrass" = "yes" -o "$with_libgrass" = "" ; then
+@@ -1956,10 +1926,10 @@ elif test "$with_libgrass" = "yes" -o "$with_libgrass" = "" ; then
else
@@ -158,7 +194,7 @@ https://bugs.gentoo.org/696106
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
+@@ -2006,7 +1976,7 @@ dnl Fedora has cfitsio headers in /usr/include/cfitsio
else
FITS_SETTING=external
@@ -167,7 +203,7 @@ https://bugs.gentoo.org/696106
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
+@@ -2055,7 +2025,7 @@ elif test "$with_pcraster" = "internal" ; then
else
PCRASTER_SETTING=external
@@ -176,7 +212,7 @@ https://bugs.gentoo.org/696106
EXTRA_INCLUDES="-I$with_pcraster/include $EXTRA_INCLUDES"
echo "using libcsf from $with_pcraster."
-@@ -2118,7 +2095,7 @@ elif test "$with_png" = "internal" ; then
+@@ -2106,7 +2076,7 @@ elif test "$with_png" = "internal" ; then
else
PNG_SETTING=external
@@ -185,7 +221,7 @@ https://bugs.gentoo.org/696106
EXTRA_INCLUDES="-I$with_png -I$with_png/include $EXTRA_INCLUDES"
echo "using libpng from $with_png."
-@@ -2153,7 +2130,7 @@ else
+@@ -2141,7 +2111,7 @@ else
DDS_SETTING=yes
CRUNCHDIR="$with_dds"
@@ -194,7 +230,7 @@ https://bugs.gentoo.org/696106
echo "using libcrunch from $with_dds."
fi
-@@ -2191,7 +2168,7 @@ elif test "$with_gta" = "yes" -o "$with_gta" = "" ; then
+@@ -2179,7 +2149,7 @@ elif test "$with_gta" = "yes" -o "$with_gta" = "" ; then
else
GTA_SETTING=yes
@@ -203,7 +239,7 @@ https://bugs.gentoo.org/696106
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
+@@ -2217,7 +2187,7 @@ elif test "$with_pcidsk" = "" -o "$with_pcidsk" = "yes" -o "$with_pcidsk" = "int
else
PCIDSK_SETTING=external
@@ -212,7 +248,7 @@ https://bugs.gentoo.org/696106
PCIDSK_INCLUDE="-I$with_pcidsk/include -I$with_pcidsk/include/pcidsk"
echo "using libpcidsk from $with_pcidsk."
-@@ -2304,10 +2281,10 @@ else
+@@ -2292,10 +2262,10 @@ else
dnl We now require libgeotiff 1.5.0
dnl first check if $with_geotiff/lib has the library:
@@ -225,7 +261,7 @@ https://bugs.gentoo.org/696106
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
+@@ -2367,7 +2337,7 @@ elif test "$with_jpeg" = "internal" ; then
else
JPEG_SETTING=external
@@ -234,7 +270,7 @@ https://bugs.gentoo.org/696106
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
+@@ -2518,7 +2488,7 @@ elif test "$with_gif" = "internal" ; then
else
GIF_SETTING=external
@@ -243,7 +279,7 @@ https://bugs.gentoo.org/696106
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
+@@ -2584,10 +2554,10 @@ elif test "$with_ogdi" = "yes" -o "$with_ogdi" = "" ; then
else
@@ -256,7 +292,7 @@ https://bugs.gentoo.org/696106
OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
echo "using libogdi from $with_ogdi."
-@@ -2609,10 +2586,10 @@ else
+@@ -2597,10 +2567,10 @@ else
fi
else
dnl For backward compatibility. Retry with ogdi31 as a name
@@ -269,7 +305,7 @@ https://bugs.gentoo.org/696106
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
+@@ -2718,10 +2688,10 @@ elif test "$with_sosi" = "yes" ; then
rm -f testfyba
else
@@ -283,7 +319,7 @@ https://bugs.gentoo.org/696106
SOSI_ENABLED=yes
else
AC_MSG_ERROR([not found.])
-@@ -2794,14 +2771,14 @@ else
+@@ -2782,14 +2752,14 @@ else
AC_ARG_WITH(boost-lib-path,
[ --with-boost-lib-path=ARG Path to boost libraries for mongocxx client],,,)
@@ -303,10 +339,19 @@ https://bugs.gentoo.org/696106
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
+@@ -4770,8 +4740,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
+--- a/gdal/frmts/grass/pkg/configure.in
++++ b/gdal/frmts/grass/pkg/configure.in
@@ -99,7 +99,7 @@ else
if $GDAL_CONFIG --autoload > /dev/null 2>&1 ; then
AUTOLOAD_DIR=`$GDAL_CONFIG --autoload`
@@ -350,10 +395,8 @@ index 25602bd..0765333 100644
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
+--- a/gdal/m4/ax_lib_expat.m4
++++ b/gdal/m4/ax_lib_expat.m4
@@ -119,9 +119,9 @@ AC_DEFUN([AX_LIB_EXPAT],
expat_lib_flags="-lexpat"
fi
@@ -366,10 +409,8 @@ index d1fb22c..32caf45 100644
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
+--- a/gdal/m4/ax_lib_libkml.m4
++++ b/gdal/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"
@@ -379,10 +420,8 @@ index 16af436..f542c2e 100644
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
+--- a/gdal/m4/ax_lib_xerces.m4
++++ b/gdal/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"
@@ -392,18 +431,3 @@ index fdd0e79..6ef7af0 100644
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2021-03-09 22:11 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-03-09 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 111add5983433f78e9854bfbfeaf4605833dbe13
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 22:11:07 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 22:11:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111add59
sci-libs/gdal: remove some patch metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 27 +--------------------------
1 file changed, 1 insertion(+), 26 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
index fcf20dd8bed..3cd65b64784 100644
--- a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -1,30 +1,5 @@
https://github.com/OSGeo/gdal/pull/3560
-
-From fbb2adf5b67741f561036b41ab196c72b5978517 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 9 Mar 2021 21:57:57 +0000
-Subject: [PATCH] Respect --libdir parameter
-
-When searching for various libraries, we want to use
-the libdir passed in to autotools (--libdir)
-to ensure that we find the library
-for the correct ABI.
-
-It is possible that we pick up the wrong
-copy from e.g. /usr/lib/ where a 32-bit
-copy of e.g. zlib exists
-when we're in the middle of a 64-bit build.
-
-Use ${libdir} to ensure we respect
-any preferences/information given and
-search for libraries in the right place.
-
-No behaviour should change here as
---libdir defaults to 'lib'.
-
-Bug: https://bugs.gentoo.org/696106
-Signed-off-by: Sam James <sam@gentoo.org>
-
+https://bugs.gentoo.org/696106
--- a/gdal/configure.ac
+++ b/gdal/configure.ac
@@ -1121,11 +1121,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2021-03-09 22:13 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-03-09 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 8fd581fc7ef300466dae0f9a1cd64ccc1e679240
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 22:12:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 22:12:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd581fc
sci-libs/gdal: adjust paths
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 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
index 3cd65b64784..fb6813d5df8 100644
--- a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -1,7 +1,7 @@
https://github.com/OSGeo/gdal/pull/3560
https://bugs.gentoo.org/696106
---- a/gdal/configure.ac
-+++ b/gdal/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -1121,11 +1121,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then
@@ -325,8 +325,8 @@ https://bugs.gentoo.org/696106
else
AC_MSG_ERROR([libjson-c (internal or external) is required])
fi
---- a/gdal/frmts/grass/pkg/configure.in
-+++ b/gdal/frmts/grass/pkg/configure.in
+--- 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`
@@ -370,8 +370,8 @@ https://bugs.gentoo.org/696106
fi
GRASS_INCLUDE="-I$with_grass/include"
GRASS_GISBASE="$with_grass"
---- a/gdal/m4/ax_lib_expat.m4
-+++ b/gdal/m4/ax_lib_expat.m4
+--- 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
@@ -384,8 +384,8 @@ https://bugs.gentoo.org/696106
fi
fi
fi
---- a/gdal/m4/ax_lib_libkml.m4
-+++ b/gdal/m4/ax_lib_libkml.m4
+--- 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"
@@ -395,8 +395,8 @@ https://bugs.gentoo.org/696106
fi
run_libkml_test="yes"
elif test "$libkml_requested" = "yes"; then
---- a/gdal/m4/ax_lib_xerces.m4
-+++ b/gdal/m4/ax_lib_xerces.m4
+--- 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"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2021-03-09 22:17 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-03-09 22:17 UTC (permalink / raw
To: gentoo-commits
commit: f2e7245cce85205abbbe915a8be8c0e41b331c6e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 22:17:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 22:17:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e7245c
sci-libs/gdal: update older patch metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/files/gdal-2.2.3-soname.patch | 4 ++--
sci-libs/gdal/files/gdal-2.3.0-curl.patch | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
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 4cceee5ec92..1fee41daeaf 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>
---- a/GDALmake.opt.in 2008-02-02 18:25:48.000000000 -0800
-+++ b/GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
@@ -97,6 +97,14 @@
GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT)
GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal
diff --git a/sci-libs/gdal/files/gdal-2.3.0-curl.patch b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
index 1cd33243f42..46bc6de7167 100644
--- a/sci-libs/gdal/files/gdal-2.3.0-curl.patch
+++ b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
@@ -1,6 +1,6 @@
-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
+https://bugs.gentoo.org/659840
+--- a/port/cpl_vsil_curl.cpp
++++ b/port/cpl_vsil_curl.cpp
@@ -8617,8 +8617,10 @@
if( poFSHandler )
poFSHandler->ClearCache();
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2021-03-09 23:30 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-03-09 23:30 UTC (permalink / raw
To: gentoo-commits
commit: e993bd8971df7caa068ac928e44726a8b915d4d7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 23:27:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 23:30:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e993bd89
sci-libs/gdal: update libdir patch (again)
Missed one 'lib'.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
index fb6813d5df8..cc4537bca43 100644
--- a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -287,7 +287,7 @@ https://bugs.gentoo.org/696106
- 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
++ if test -r $with_sosi/${libdir}/libfyba.a -a -r $with_sosi/${libdir}/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"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/
@ 2022-01-19 19:49 Florian Schmaus
0 siblings, 0 replies; 10+ messages in thread
From: Florian Schmaus @ 2022-01-19 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 57c838e34ec8eafeac24b25623de170f8d9e0a8e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Dec 26 08:19:53 2021 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jan 19 19:49:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c838e3
sci-libs/gdal: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/23521
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 408 ---------------------
.../files/gdal-3.3.0-configure-geos-disable.patch | 187 ----------
.../gdal/files/gdal-3.3.2-poppler-21.10.0.patch | 32 --
3 files changed, 627 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
deleted file mode 100644
index cc4537bca434..000000000000
--- a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
+++ /dev/null
@@ -1,408 +0,0 @@
-https://github.com/OSGeo/gdal/pull/3560
-https://bugs.gentoo.org/696106
---- a/configure.ac
-+++ b/configure.ac
-@@ -1121,11 +1121,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
-@@ -1166,7 +1166,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
-@@ -1197,7 +1197,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
-@@ -1290,7 +1290,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
-
-@@ -1414,52 +1414,22 @@ 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"
-+ 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,)
- 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"
-- 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/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,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 -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
-- unset ac_cv_lib_proj_internal_proj_create_from_wkt
-- AC_LANG_PUSH([C++])
-- AC_CHECK_LIB(proj,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
-- 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
-@@ -1523,7 +1493,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
-@@ -1531,7 +1501,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
-@@ -1593,10 +1563,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])
-@@ -1919,20 +1889,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"
-@@ -1956,10 +1926,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!])
-@@ -2006,7 +1976,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."
-@@ -2055,7 +2025,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."
-@@ -2106,7 +2076,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."
-@@ -2141,7 +2111,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
-@@ -2179,7 +2149,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."
-@@ -2217,7 +2187,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."
-@@ -2292,10 +2262,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
-@@ -2367,7 +2337,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."
-@@ -2518,7 +2488,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."
-@@ -2584,10 +2554,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."
-@@ -2597,10 +2567,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."
-@@ -2718,10 +2688,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/${libdir}/libfyba.a -a -r $with_sosi/${libdir}/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.])
-@@ -2782,14 +2752,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
-@@ -4770,8 +4740,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
---- 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"
---- 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
---- 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
---- 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/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch b/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch
deleted file mode 100644
index 1671845707a3..000000000000
--- a/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6.patch
-https://github.com/OSGeo/gdal/issues/3782
-
-From b414b0a0594b3e9c175a001e8455819463039eb6 Mon Sep 17 00:00:00 2001
-From: Thomas Bonfort <thomas.bonfort@airbus.com>
-Date: Tue, 4 May 2021 08:13:45 +0200
-Subject: [PATCH] configure: fix explicit disabling of geos/sfcgal
---- a/configure
-+++ b/configure
-@@ -38323,6 +38323,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: GEOS support disabled" >&5
- $as_echo "GEOS support disabled" >&6; }
- GEOS_CONFIG=no
-+ HAVE_GEOS=no
-
- elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
-
-@@ -38580,15 +38581,13 @@ $as_echo "$as_me: WARNING: GEOS was found on your system, but the library could
-
- else
-
-- if test $ac_geos_config_auto = "no" ; then
-+ if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
- as_fn_error $? "GEOS support explicitly enabled, but geos-config could not be found" "$LINENO" 5
- fi
-
- fi
-
--HAVE_GEOS_RESULT="no"
- if test "${HAVE_GEOS}" = "yes" ; then
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from GEOS $GEOS_VERSION" >&5
- $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
-
-@@ -38602,7 +38601,6 @@ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
-
- GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
- LIBS="${GEOS_LIBS} ${LIBS}"
-- HAVE_GEOS_RESULT="yes"
- fi
-
-
-@@ -38625,6 +38623,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: SFCGAL support disabled" >&5
- $as_echo "SFCGAL support disabled" >&6; }
-+ HAVE_SFCGAL=no
- SFCGAL_CONFIG=no
-
- elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
-@@ -38883,15 +38882,13 @@ $as_echo "$as_me: WARNING: SFCGAL was found on your system, but the library coul
-
- else
-
-- if test $ac_sfcgal_config_auto = "no" ; then
-+ if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
- as_fn_error $? "SFCGAL support explicitly enabled, but sfcgal-config could not be found" "$LINENO" 5
- fi
-
- fi
-
--HAVE_SFCGAL_RESULT="no"
- if test "${HAVE_SFCGAL}" = "yes" ; then
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from SFCGAL $SFCGAL_VERSION" >&5
- $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
-
-@@ -38905,7 +38902,6 @@ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
-
- SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
- LIBS="${SFCGAL_LIBS} ${LIBS}"
-- HAVE_SFCGAL_RESULT="yes"
- fi
-
-
-@@ -44998,7 +44994,7 @@ echo " FreeXL support: ${HAVE_FREEXL}"
- echo " GEORASTER support: ${HAVE_GEORASTER}"
-
-
--echo " GEOS support: ${HAVE_GEOS_RESULT}"
-+echo " GEOS support: ${HAVE_GEOS}"
-
-
- echo " Google libkml support: ${HAVE_LIBKML}"
-@@ -45162,7 +45158,7 @@ echo " RasterLite2 support: ${HAVE_RASTERLITE2}"
- echo " RDB support: ${RDB_SETTING}"
-
-
--echo " SFCGAL support: ${HAVE_SFCGAL_RESULT}"
-+echo " SFCGAL support: ${HAVE_SFCGAL}"
-
-
- echo " SOSI support: ${SOSI_ENABLED}"
-diff --git a/configure.ac b/configure.ac
-index ffc71b7faf76..1f88370c4045 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4541,14 +4541,11 @@ dnl Check if geos library is available.
- dnl ---------------------------------------------------------------------------
-
- GEOS_INIT(3.1.0)
--HAVE_GEOS_RESULT="no"
- if test "${HAVE_GEOS}" = "yes" ; then
--
- AC_MSG_NOTICE([Using C API from GEOS $GEOS_VERSION])
- STRIP_SYSTEM_LIBRARY_PATHS("${GEOS_LIBS}")
- GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
- LIBS="${GEOS_LIBS} ${LIBS}"
-- HAVE_GEOS_RESULT="yes"
- fi
-
- dnl ---------------------------------------------------------------------------
-@@ -4556,14 +4553,11 @@ dnl Check if SFCGAL library is available.
- dnl ---------------------------------------------------------------------------
-
- SFCGAL_INIT(1.2.2)
--HAVE_SFCGAL_RESULT="no"
- if test "${HAVE_SFCGAL}" = "yes" ; then
--
- AC_MSG_NOTICE([Using C API from SFCGAL $SFCGAL_VERSION])
- STRIP_SYSTEM_LIBRARY_PATHS("${SFCGAL_LIBS}")
- SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
- LIBS="${SFCGAL_LIBS} ${LIBS}"
-- HAVE_SFCGAL_RESULT="yes"
- fi
-
- dnl ---------------------------------------------------------------------------
-@@ -6077,7 +6071,7 @@ LOC_MSG([ EXR support: ${HAVE_EXR}])
- LOC_MSG([ FGDB support: ${FGDB_ENABLED}])
- LOC_MSG([ FreeXL support: ${HAVE_FREEXL}])
- LOC_MSG([ GEORASTER support: ${HAVE_GEORASTER}])
--LOC_MSG([ GEOS support: ${HAVE_GEOS_RESULT}])
-+LOC_MSG([ GEOS support: ${HAVE_GEOS}])
- LOC_MSG([ Google libkml support: ${HAVE_LIBKML}])
- LOC_MSG([ GRASS support: ${GRASS_SETTING}])
- LOC_MSG([ GTA support: ${GTA_SETTING}])
-@@ -6135,7 +6129,7 @@ LOC_MSG([ QHull support: ${QHULL_SETTING}])
- LOC_MSG([ Rasdaman support: ${RASDAMAN_ENABLED}])
- LOC_MSG([ RasterLite2 support: ${HAVE_RASTERLITE2}])
- LOC_MSG([ RDB support: ${RDB_SETTING}])
--LOC_MSG([ SFCGAL support: ${HAVE_SFCGAL_RESULT}])
-+LOC_MSG([ SFCGAL support: ${HAVE_SFCGAL}])
- LOC_MSG([ SOSI support: ${SOSI_ENABLED}])
- LOC_MSG([ SpatiaLite support: ${HAVE_SPATIALITE}])
- if test "x$SPATIALITE_SONAME" != "x"; then
-diff --git a/m4/geos.m4 b/m4/geos.m4
-index 1c685039740e..608466c67c69 100644
---- a/m4/geos.m4
-+++ b/m4/geos.m4
-@@ -55,6 +55,7 @@ AC_DEFUN([GEOS_INIT],[
-
- AC_MSG_RESULT([GEOS support disabled])
- GEOS_CONFIG=no
-+ HAVE_GEOS=no
-
- elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
-
-@@ -160,7 +161,7 @@ AC_DEFUN([GEOS_INIT],[
-
- else
-
-- if test $ac_geos_config_auto = "no" ; then
-+ if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
- AC_MSG_ERROR([GEOS support explicitly enabled, but geos-config could not be found])
- fi
-
-diff --git a/m4/sfcgal.m4 b/m4/sfcgal.m4
-index 2384f0f0dc5d..1a8d26460ce7 100644
---- a/m4/sfcgal.m4
-+++ b/m4/sfcgal.m4
-@@ -53,6 +53,7 @@ AC_DEFUN([SFCGAL_INIT],[
- if test x"$with_sfcgal" = x"no" ; then
-
- AC_MSG_RESULT([SFCGAL support disabled])
-+ HAVE_SFCGAL=no
- SFCGAL_CONFIG=no
-
- elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
-@@ -159,7 +160,7 @@ AC_DEFUN([SFCGAL_INIT],[
-
- else
-
-- if test $ac_sfcgal_config_auto = "no" ; then
-+ if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
- AC_MSG_ERROR([SFCGAL support explicitly enabled, but sfcgal-config could not be found])
- fi
-
diff --git a/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
deleted file mode 100644
index a727d21dab64..000000000000
--- a/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 26 Sep 2021 22:49:52 +0200
-Subject: [PATCH] Fix build against Poppler master
-
----
- frmts/pdf/pdfdataset.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 9c4c28a6572..50a8154c756 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
- #ifdef HAVE_POPPLER
- if (bUseLib.test(PDFLIB_POPPLER))
- {
-- GooString* poMetadata = poCatalogPoppler->readMetadata();
-+ auto poMetadata = poCatalogPoppler->readMetadata();
- if (poMetadata)
- {
- #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
-@@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
- const char * const apszMDList[2] = { pszContent, nullptr };
- poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
- }
-+#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9))
- delete poMetadata;
-+#endif
- }
-
- /* Read Info object */
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-01-19 19:49 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-09 22:08 [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-01-19 19:49 Florian Schmaus
2021-03-09 23:30 Sam James
2021-03-09 22:17 Sam James
2021-03-09 22:13 Sam James
2021-03-09 22:11 Sam James
2021-03-09 22:10 Sam James
2021-02-21 21:30 Conrad Kostecki
2019-02-14 23:06 Andreas Sturmlechner
2016-06-17 14:59 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox