diff --git a/abs.yaml b/abs.yaml index b4634381..fdc4a2a5 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,5 +1,3 @@ # the conda-build parameters to use for disabling --skip-existing build_parameters: - "--suppress-variables" - -aggregate_branch: 3.12 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 15af3001..e0561c81 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,10 +1,8 @@ +# Use MacOSX SDK v10.14 because v10.10 fails with an error: +# #file not found: /usr/lib/system/libsystem_coretls.dylib for architecture x86_64" MACOSX_SDK_VERSION: # [osx and x86_64] - "10.14" # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - "10.14" # [osx and x86_64] CONDA_BUILD_SYSROOT: # [osx and x86_64] - /opt/MacOSX10.10.sdk # [osx and x86_64] -c_compiler: # [win] - - vs2019 # [win] -cxx_compiler: # [win] - - vs2019 # [win] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b5c53308..9e50efe4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,8 +9,13 @@ source: sha256: 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 patches: - patches/0001-FindSPATIALITE.patch + # Fix build error with libxml2 2.12. Fixed in gdal v3.9.0, + # see https://github.com/OSGeo/gdal/issues/8746 + - patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch + - patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch + build: - number: 4 + number: 5 # never be built on s390x skip: True # [linux and s390x] skip: True # [py<36] @@ -31,44 +36,44 @@ requirements: host: - blosc - cfitsio - - expat + - expat {{ expat }} - freexl - - geos + - geos {{ geos }} - geotiff - - giflib # [not win] - - hdf4 - - hdf5 1.12.1 - - jpeg + - giflib {{ giflib }} # [not win] + - hdf4 {{ hdf4 }} + - hdf5 {{ hdf5 }} + - jpeg {{ jpeg }} - json-c # [not win] - kealib - lerc - - libcurl 8.1.1 + - libcurl {{ libcurl }} - libdeflate 1.17 - libiconv - libkml - - libnetcdf 4.8.1 - - libpng + - libnetcdf {{ libnetcdf }} + - libpng {{ libpng }} - libpq 12.15 - libspatialite - - libtiff + - libtiff {{ libtiff }} - libuuid # [linux] - libwebp-base - libxml2 {{ libxml2 }} - lz4-c - - openjpeg + - openjpeg {{ openjpeg }} - openssl {{ openssl }} - pcre2 - - poppler - - proj + - poppler 22.12.0 + - proj {{ proj }} # qhull disabled because of https://github.com/conda-forge/qgis-feedstock/issues/284#issuecomment-1356490896 # - qhull - - sqlite + - sqlite {{ sqlite }} - swig - tiledb 2.3.3 - xerces-c - - xz - - zlib - - zstd + - xz {{ xz }} + - zlib {{ zlib }} + - zstd {{ zstd }} outputs: - name: libgdal @@ -95,43 +100,43 @@ outputs: host: - blosc - cfitsio - - expat + - expat {{ expat }} - freexl - - geos + - geos {{ geos }} - geotiff - - giflib # [not win] - - hdf4 - - hdf5 1.12.1 - - jpeg + - giflib {{ giflib }} # [not win] + - hdf4 {{ hdf4 }} + - hdf5 {{ hdf5 }} + - jpeg {{ jpeg }} - json-c # [not win] - kealib - lerc - - libcurl 8.1.1 + - libcurl {{ libcurl }} - libdeflate 1.17 - libiconv - libkml - - libnetcdf 4.8.1 - - libpng + - libnetcdf {{ libnetcdf }} + - libpng {{ libpng }} - libpq 12.15 - libspatialite - - libtiff + - libtiff {{ libtiff }} - libuuid # [linux] - libwebp-base - libxml2 {{ libxml2 }} - lz4-c - - openjpeg + - openjpeg {{ openjpeg }} - openssl {{ openssl }} - pcre2 - - poppler - - proj + - poppler 22.12.0 + - proj {{ proj }} # qhull disabled because of https://github.com/conda-forge/qgis-feedstock/issues/284#issuecomment-1356490896 # - qhull - - sqlite + - sqlite {{ sqlite }} - tiledb 2.3.3 - xerces-c - - xz - - zlib - - zstd + - xz {{ xz }} + - zlib {{ zlib }} + - zstd {{ zstd }} run: - cfitsio @@ -191,39 +196,39 @@ outputs: - blosc - cfitsio - curl - - expat + - expat {{ expat }} - freexl - - geos + - geos {{ geos }} - geotiff - - giflib # [not win] - - hdf4 - - hdf5 1.12.1 - - jpeg + - giflib {{ giflib }} # [not win] + - hdf4 {{ hdf4 }} + - hdf5 {{ hdf5 }} + - jpeg {{ jpeg }} - json-c # [not win] - kealib - arrow-cpp - libkml - - libnetcdf - - libpng + - libnetcdf {{ libnetcdf }} + - libpng {{ libpng }} - libpq - libspatialite - - libtiff + - libtiff {{ libtiff }} - libuuid # [linux] - libwebp-base - libxml2 {{ libxml2 }} - - openjpeg + - openjpeg {{ openjpeg }} - openssl {{ openssl }} - pcre2 - poppler - postgresql - - proj + - proj {{ proj }} - qhull - - sqlite + - sqlite {{ sqlite }} - tiledb - xerces-c - - xz - - zlib - - zstd + - xz {{ xz }} + - zlib {{ zlib }} + - zstd {{ zstd }} run: - {{ pin_subpackage('libgdal', max_pin='x.x.x', exact=True) }} @@ -285,7 +290,7 @@ outputs: - openssl {{openssl }} # Only required to produce all openssl variants. - {{ pin_subpackage('libgdal', max_pin='x.x.x', exact=True) }} # Without this, the solver is having a hard time resolving the correct dependencies... - - openjpeg + - openjpeg {{ openjpeg }} run: - python - {{ pin_compatible('numpy') }} diff --git a/recipe/patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch b/recipe/patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch new file mode 100644 index 00000000..606dc3e0 --- /dev/null +++ b/recipe/patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch @@ -0,0 +1,22 @@ +From cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 18 Nov 2023 15:38:46 +0100 +Subject: [PATCH] Fix build error with libxml2 2.12 + +--- + port/cpl_xml_validate.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp +index 7eb49ff40c90..29070d957b65 100644 +--- a/port/cpl_xml_validate.cpp ++++ b/port/cpl_xml_validate.cpp +@@ -914,7 +914,7 @@ static void CPLLibXMLWarningErrorCallback(void *ctx, const char *msg, ...) + + if (strstr(pszStr, "since this namespace was already imported") == nullptr) + { +- xmlErrorPtr pErrorPtr = xmlGetLastError(); ++ const xmlError *pErrorPtr = xmlGetLastError(); + const char *pszFilename = static_cast(ctx); + char *pszStrDup = CPLStrdup(pszStr); + int nLen = static_cast(strlen(pszStrDup)); diff --git a/recipe/patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch b/recipe/patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch new file mode 100644 index 00000000..410b79e2 --- /dev/null +++ b/recipe/patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch @@ -0,0 +1,27 @@ +From ec33f6d6dfe944f59dc5454d01b4d000d9479c02 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 18 Nov 2023 16:33:25 +0100 +Subject: [PATCH] Fix build error with libxml2 2.12 (cont'd) + +--- + gcore/gdaljp2metadatagenerator.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gcore/gdaljp2metadatagenerator.cpp b/gcore/gdaljp2metadatagenerator.cpp +index b6caa2db9def..751fa3d5e9dd 100644 +--- a/gcore/gdaljp2metadatagenerator.cpp ++++ b/gcore/gdaljp2metadatagenerator.cpp +@@ -357,7 +357,12 @@ static CPLString GDALGMLJP2EvalExpr(const CPLString &osTemplate, + /************************************************************************/ + + static void GDALGMLJP2XPathErrorHandler(void * /* userData */, +- xmlErrorPtr error) ++#if LIBXML_VERSION >= 21200 ++ const xmlError *error ++#else ++ xmlErrorPtr error ++#endif ++) + { + if (error->domain == XML_FROM_XPATH && error->str1 != nullptr && + error->int1 < static_cast(strlen(error->str1)))