From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- sci-libs/gdal/Manifest | 9 +- sci-libs/gdal/files/gdal-2.2.3-soname.patch | 4 +- sci-libs/gdal/files/gdal-2.3.0-curl.patch | 6 +- sci-libs/gdal/files/gdal-3.2.1-libdir.patch | 408 ++++++++++++++++++++++++++++ sci-libs/gdal/gdal-3.2.1-r1.ebuild | 12 +- sci-libs/gdal/gdal-3.2.2.ebuild | 316 +++++++++++++++++++++ 6 files changed, 745 insertions(+), 10 deletions(-) create mode 100644 sci-libs/gdal/files/gdal-3.2.1-libdir.patch create mode 100644 sci-libs/gdal/gdal-3.2.2.ebuild (limited to 'sci-libs/gdal') diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 205f5ac88bb2..fb20e649a013 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -1,5 +1,8 @@ -AUX gdal-2.2.3-soname.patch 2031 BLAKE2B adc05d4e426083af16c153011d1bccb2a6d7334eac2911faffdc373765cd21a69505928b14cf9896b7f7b23acefc574abd5c85d20b6376aee6a7bb87d775d30b SHA512 8d4cf1f7a69002c7d2789a5abb3c4d10a0d687566e8acd2ea208e994870eff2cb03975812c435eaa0dc13e1e2f42e2151dcb23ea0470242b1e79aa6892a13cdd -AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6 +AUX gdal-2.2.3-soname.patch 1959 BLAKE2B f6cdba1af819b3416e18be1e584384b3df6858133773d2606dce96a78c239d23c204b55df62b09b16e5a0ddfee4c9469e7e6aa527088d53710884aa93287d41c SHA512 c7986792549557683125b331e0c1417cfe49ecffd067f5330ffaeb039ec0ec329d5967697210292edad6ccdcc912397cc2f4781808a87cec8de70e78d99f0a26 +AUX gdal-2.3.0-curl.patch 323 BLAKE2B 19a89ac9ffed5716fe2c26234233045022a3bc262d2ec386fdb5bc7a15cafc6472d1264020358223d2505992124177a0ae106cad26b8da671bbd1ece83762ee1 SHA512 5bd2df7712c6487e5968fbef84b4154f20d13ffe88f22886325be3c03fc882e2699e258e11c54eec750225fde1b2001d4dd35ace751a5f3c8ae59a9572241373 +AUX gdal-3.2.1-libdir.patch 20206 BLAKE2B 1b8c737246b25e8ea56855ec8cd41dc8bcc3ee575b02a6f13bd18dc062037e8f63848763fcb9a065c83d26ed510e341ee5ac9315d9b4c78ca3bb3a76f0098539 SHA512 da49eb9b42cd298b870afce6312e46ea81a41ffea7598b4cae579c846301b0179a7236ee6677fa7a2ff3c2da28eeb519d634667de973cf001f3ea8a08d4cebad DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6 SHA512 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688 -EBUILD gdal-3.2.1-r1.ebuild 7221 BLAKE2B 5d0322c1869f37dbdd0e39884acc0c17c939f442fa3dd1a0ad98cd735cb02b034fa6c33bcffb7f204c5e6081f5b785578757e800d46c9c3225008e4380a7a9a0 SHA512 855ccb9d188a6c5c91a2da2074f78425c908615cc488dcedb631aa4784f69b8a144f77369b01401f59d5cd83a7bae96237c45b12f3075091d56e9a7ef9a66525 +DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 001347ee12c72fe4d9cfa27adb427624f80e5b16eeca01510166e3d74c36eb00da72c27d8582ccda124151143561c29b8e59dc3dd800c474b77991417b33acd1 SHA512 d7ff8773d3f1cb894fce89f56a3d4355769f1113eefb1367a3a543ced750e2c42618a4a1deef3a338ddd4d33b7332ae962b2d793f8c0b97e31ed4b84cb2df2d5 +EBUILD gdal-3.2.1-r1.ebuild 7498 BLAKE2B 9b79a2d74a5bfec4c52c655ab1dc1778add39a315855b6507f3d11ae43056c5530735cc56dc23b65f24fd591291f446f56ad78932691356637832194013b8204 SHA512 aa7ec568bd7c061cfc0e37030912b5ac2e4121ecb331953f03bd58c135d10dcc7bf24ecaa0a77c4597a1813e1feb0ed589657eab22363d04ca15bd0009921612 +EBUILD gdal-3.2.2.ebuild 7728 BLAKE2B d5580737064518bbac3ff601069a7e8def19f17d3adbb65975e5fe82cddcaa27038b035555e26bf856b4498c40b15717f9f90f89561582918c1d2f611ce590a6 SHA512 2708bfc0cea227df3ad43af2084fc82042792c3a74e6bf3035c81f9fe4fcc43eef9c2dae89f61c8cd9375b90cd6faa3a0c72152e36600a3a0edbe74804c72cea MISC metadata.xml 1495 BLAKE2B 3d9f0cc3e5169eab7ff2c59b61d9fa5b4f8edf683f6e1447c40b1b0e8d81834e2d9fc13c68979c51a710f5aca5c9cd9a1f45a13c4e4ad0ded7a0fcdc1751d54b SHA512 cd0820bd5df06ccfb6315ab4586e49f72396115d08f318038dc3af2380a1896128ccf0ba46de0cc370546f7313907844907d6d75cc705a74bf4c78d0121afc3d 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 4cceee5ec928..1fee41daeafc 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 Author: Dennis Schridde ---- 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 1cd33243f42b..46bc6de71672 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(); 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 000000000000..cc4537bca434 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch @@ -0,0 +1,408 @@ +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/gdal-3.2.1-r1.ebuild b/sci-libs/gdal/gdal-3.2.1-r1.ebuild index 5eb32d7fbfb8..7bed137263c6 100644 --- a/sci-libs/gdal/gdal-3.2.1-r1.ebuild +++ b/sci-libs/gdal/gdal-3.2.1-r1.ebuild @@ -88,11 +88,19 @@ 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. + # bug #696106 + sed -e '/\$ADD_PREFIX\/lib/d' \ + -i configure.ac || die + sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \ -i configure.ac || die @@ -131,10 +139,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 diff --git a/sci-libs/gdal/gdal-3.2.2.ebuild b/sci-libs/gdal/gdal-3.2.2.ebuild new file mode 100644 index 000000000000..b0bb442841b2 --- /dev/null +++ b/sci-libs/gdal/gdal-3.2.2.ebuild @@ -0,0 +1,316 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GENTOO_DEPEND_ON_PERL="no" +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_OPTIONAL=1 +inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module 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/3.2" +LICENSE="BSD Info-ZIP MIT" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 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: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 ) + 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}-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. + # bug #696106 + sed -e '/\$ADD_PREFIX\/lib/d' \ + -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 + + # 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" + + # autoconf 2.70+ + # bug #775209 + config_rpath_update . + + eautoreconf +} + +src_configure() { + 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-cpp14 + --with-crypto + --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-sfcgal + --without-sosi + --without-teigha + $(use_enable debug) + $(use_with armadillo) + $(use_with aux-xml pam) + $(use_with curl) + $(use_with cpu_flags_x86_avx avx) + $(use_with cpu_flags_x86_sse sse) + $(use_with cpu_flags_x86_ssse3 ssse3) + $(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 + append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc) + append-cxxflags $($(tc-getPKG_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 && local 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 "${ED}" -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)." +} -- cgit v1.2.3