Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gdal/pre_3.5.0: bump deps, use version range for zlib & openssl #20734

Closed
wants to merge 19 commits into from
Closed

gdal/pre_3.5.0: bump deps, use version range for zlib & openssl #20734

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2978e89
gdal/pre_3.5.0: bump deps, use version range for zlib & openssl
mayeut Oct 22, 2023
cc31c04
bump proj
mayeut Oct 22, 2023
b798bec
Merge branch 'master' into gdal-bump
AbrilRBS Nov 20, 2023
ec7904d
Bump sqlite3
AbrilRBS Nov 20, 2023
31448bd
Merge branch 'master' into gdal-bump
AbrilRBS Nov 21, 2023
103a60e
Merge branch 'master' into gdal-bump
mayeut Nov 25, 2023
1627297
Merge remote-tracking branch 'upstream/master' into gdal-bump
mayeut Dec 3, 2023
e4663f7
bump deps
mayeut Dec 3, 2023
336b0e0
use version range for libcurl
mayeut Dec 3, 2023
2ef2d53
Merge branch 'master' into gdal-bump
mayeut Dec 4, 2023
ca5a053
Merge branch 'master' into gdal-bump
mayeut Dec 5, 2023
b7922d0
Merge branch 'master' into gdal-bump
mayeut Dec 12, 2023
8f83deb
Merge branch 'master' into gdal-bump
uilianries Dec 12, 2023
13eb92d
Merge branch 'master' into gdal-bump
mayeut Dec 19, 2023
c5bfad0
Merge branch 'master' into gdal-bump
mayeut Dec 22, 2023
b89a0e4
Merge branch 'master' into gdal-bump
mayeut Dec 31, 2023
98fd958
bump deps
mayeut Jan 1, 2024
2033584
Workaround for a NMakeDeps define quoting issue
mayeut Jan 1, 2024
fcc70dd
Merge branch 'master' into gdal-bump
mayeut Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 30 additions & 24 deletions recipes/gdal/pre_3.5.0/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,28 +249,28 @@
self.requires("json-c/0.17")
self.requires("libgeotiff/1.7.1")
# self.requires("libopencad/0.0.2") # TODO: use conan recipe when available instead of internal one
self.requires("libtiff/4.5.1")
self.requires("proj/9.2.1")
self.requires("libtiff/4.6.0")
self.requires("proj/9.3.1")
if Version(self.version) >= "3.1.0":
self.requires("flatbuffers/2.0.5")
if self.options.get_safe("with_zlib", True):
self.requires("zlib/1.2.13")
self.requires("zlib/[>=1.2.11 <2]")
if self.options.get_safe("with_libdeflate"):
self.requires("libdeflate/1.18")
self.requires("libdeflate/1.19")
if self.options.with_libiconv:
self.requires("libiconv/1.17")
if self.options.get_safe("with_zstd"):
self.requires("zstd/1.5.5")
if self.options.get_safe("with_blosc"):
self.requires("c-blosc/1.21.3")
self.requires("c-blosc/1.21.5")
if self.options.get_safe("with_lz4"):
self.requires("lz4/1.9.4")
if self.options.with_pg:
self.requires("libpq/14.5")
self.requires("libpq/15.4")
# if self.options.with_libgrass:
# self.requires("libgrass/x.x.x")
if self.options.with_cfitsio:
self.requires("cfitsio/4.1.0")
self.requires("cfitsio/4.2.0")
# if self.options.with_pcraster:
# self.requires("pcraster-rasterformat/1.3.2")
if self.options.get_safe("with_png", True):
Expand All @@ -284,11 +284,11 @@
if self.options.with_jpeg == "libjpeg":
self.requires("libjpeg/9e")
elif self.options.with_jpeg == "libjpeg-turbo":
self.requires("libjpeg-turbo/3.0.0")
self.requires("libjpeg-turbo/3.0.1")
elif self.options.with_jpeg == "mozjpeg":
self.requires("mozjpeg/4.1.1")
self.requires("mozjpeg/4.1.3")
if self.options.with_charls:
self.requires("charls/2.4.1")
self.requires("charls/2.4.2")
if self.options.with_gif:
self.requires("giflib/5.2.1")
# if self.options.with_ogdi:
Expand All @@ -300,7 +300,7 @@
if self.options.with_hdf4:
self.requires("hdf4/4.2.15")
if self.options.with_hdf5:
self.requires("hdf5/1.14.0")
self.requires("hdf5/1.14.1")
if self.options.with_kea:
self.requires("kealib/1.4.14")
if self.options.with_netcdf:
Expand All @@ -312,9 +312,9 @@
# if self.options.with_fgdb:
# self.requires("file-geodatabase-api/x.x.x")
if self.options.with_mysql == "libmysqlclient":
self.requires("libmysqlclient/8.0.31")
self.requires("libmysqlclient/8.1.0")
elif self.options.with_mysql == "mariadb-connector-c":
self.requires("mariadb-connector-c/3.1.12")
self.requires("mariadb-connector-c/3.3.3")
if self.options.with_xerces:
self.requires("xerces-c/3.2.4")
if self.options.with_expat:
Expand All @@ -326,30 +326,30 @@
# if self.options.with_dods_root:
# self.requires("libdap/3.20.6")
if self.options.with_curl:
self.requires("libcurl/8.2.1")
self.requires("libcurl/[>=7.78.0 <9]")
if self.options.with_xml2:
self.requires("libxml2/2.10.3")
self.requires("libxml2/2.11.6")
# if self.options.with_spatialite:
# self.requires("libspatialite/4.3.0a")
if self.options.get_safe("with_sqlite3"):
self.requires("sqlite3/3.42.0")
self.requires("sqlite3/3.44.2")
# if self.options.with_rasterlite2:
# self.requires("rasterlite2/x.x.x")
if self.options.get_safe("with_pcre"):
self.requires("pcre/8.45")
if self.options.get_safe("with_pcre2"):
self.requires("pcre2/10.42")
if self.options.with_webp:
self.requires("libwebp/1.3.1")
self.requires("libwebp/1.3.2")
if self.options.with_geos:
self.requires("geos/3.11.1")
self.requires("geos/3.12.0")
# if self.options.with_sfcgal:
# self.requires("sfcgal/1.3.7")
if self.options.with_qhull:
self.requires("qhull/8.0.1")
if self.options.with_opencl:
self.requires("opencl-headers/2022.09.30")
self.requires("opencl-icd-loader/2022.09.30")
self.requires("opencl-headers/2023.04.17")
self.requires("opencl-icd-loader/2023.04.17")
if self.options.with_freexl:
self.requires("freexl/1.0.6")
if self.options.with_poppler:
Expand All @@ -365,15 +365,15 @@
# if self.options.with_armadillo:
# self.requires("armadillo/9.880.1")
if self.options.with_cryptopp:
self.requires("cryptopp/8.7.0")
self.requires("cryptopp/8.8.0")
if self.options.with_crypto:
self.requires("openssl/1.1.1u")
self.requires("openssl/[>=1.1 <4]")
# if not self.options.without_lerc:
# self.requires("lerc/2.1") # TODO: use conan recipe (not possible yet because lerc API is broken for GDAL)
if self.options.get_safe("with_exr"):
self.requires("openexr/3.1.9")
if self.options.get_safe("with_heif"):
self.requires("libheif/1.13.0")
self.requires("libheif/1.16.2")

def validate(self):
if self.settings.compiler.get_safe("cppstd"):
Expand Down Expand Up @@ -412,7 +412,7 @@
if not is_msvc(self):
self.tool_requires("libtool/2.4.7")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/1.9.3")
self.tool_requires("pkgconf/2.1.0")
if self._settings_build.os == "Windows":
self.win_bash = True
if not self.conf.get("tools.microsoft.bash:path", check_type=str):
Expand Down Expand Up @@ -457,7 +457,7 @@
replace_in_file(self, configure_ac, "AC_CHECK_LIB(z,", f"AC_CHECK_LIB({zlib_name},")
replace_in_file(self, configure_ac, "-lz ", f"-l{zlib_name} ")
# Workaround for autoconf 2.71
with open(os.path.join(self.source_folder, "config.rpath"), "w"):

Check warning on line 460 in recipes/gdal/pre_3.5.0/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Using open without explicitly specifying an encoding
pass

# Disable tools
Expand Down Expand Up @@ -523,6 +523,12 @@
replace_in_file(self, os.path.join(self.source_folder, "alg", "makefile.vc"),
"$(GEOS_CFLAGS)", "$(GEOS_CFLAGS) /DHAVE_OPENCL")

# Workaround for a NMakeDeps define quoting issue:
# https://github.com/conan-io/conan/issues/13603
replace_in_file(self, os.path.join(self.generators_folder, "conannmakedeps.bat"),
r'/DSQLITE_API#\"__declspec(dllimport)\"',
"/DSQLITE_API#__declspec(dllimport)", strict=False)

with chdir(self, self.source_folder):
self.run(f"nmake -f makefile.vc {' '.join(self._nmake_args)}")

Expand Down
Loading