Merge branch 'conan-io:master' into master

Author: bthomee

recipes/7zip/all/conandata.yml

@@ -5,23 +5,3 @@ sources:
       - https://github.com/ip7z/7zip/releases/download/25.01/7z2501-src.tar.xz
       - https://sourceforge.net/projects/sevenzip/files/7-Zip/25.01/7z2501-src.tar.xz
     sha256: "ed087f83ee789c1ea5f39c464c55a5c9d4008deb0efe900814f2df262b82c36e"
-  "24.09":
-    url:
-      - https://www.7-zip.org/a/7z2409-src.tar.xz
-      - https://sourceforge.net/projects/sevenzip/files/7-Zip/24.09/7z2409-src.tar.xz
-    sha256: "49c05169f49572c1128453579af1632a952409ced028259381dac30726b6133a"
-  "23.01":
-    url:
-      - https://www.7-zip.org/a/7z2301-src.tar.xz
-      - https://sourceforge.net/projects/sevenzip/files/7-Zip/23.01/7z2301-src.tar.xz
-    sha256: "356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74"
-  "22.01":
-    url:
-      - https://www.7-zip.org/a/7z2201-src.tar.xz
-      - https://sourceforge.net/projects/sevenzip/files/7-Zip/22.01/7z2201-src.tar.xz
-    sha256: "393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5"
-  "19.00":
-    url:
-      - https://www.7-zip.org/a/7z1900-src.7z
-      - https://sourceforge.net/projects/sevenzip/files/7-Zip/19.00/7z1900-src.7z
-    sha256: "9ba70a5e8485cf9061b30a2a84fe741de5aeb8dd271aab8889da0e9b3bf1868e"

recipes/7zip/all/conanfile.py

@@ -1,14 +1,14 @@
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
-from conan.tools.files import copy, chdir, download, get, replace_in_file
+from conan.tools.files import copy, chdir, get, replace_in_file
 from conan.tools.gnu import Autotools, AutotoolsDeps, AutotoolsToolchain
 from conan.tools.layout import basic_layout
 from conan.tools.microsoft import is_msvc, NMakeToolchain
 from conan.tools.scm import Version
 
 import os
 
-required_conan_version = ">=1.55.0"
+required_conan_version = ">=2"
 
 
 class SevenZipConan(ConanFile):
@@ -21,10 +21,6 @@ class SevenZipConan(ConanFile):
     package_type = "application"
     settings = "os", "arch", "compiler", "build_type"
 
-    @property
-    def _settings_build(self):
-        return getattr(self, "settings_build", self.settings)
-
     def validate(self):
         if self.settings.os != "Windows":
             raise ConanInvalidConfiguration("Only Windows supported")
@@ -35,26 +31,15 @@ def layout(self):
         basic_layout(self, src_folder="src")
 
     def build_requirements(self):
-        if Version(self.version) < "22":
-            self.build_requires("lzma_sdk/9.20")
-
-        if not is_msvc(self) and self._settings_build.os == "Windows" and "make" not in os.environ.get("CONAN_MAKE_PROGRAM", ""):
+        if not is_msvc(self) and self.settings_build.os == "Windows" and "make" not in os.environ.get("CONAN_MAKE_PROGRAM", ""):
             self.build_requires("make/4.3")
 
     def package_id(self):
         del self.info.settings.build_type
         del self.info.settings.compiler
 
     def source(self):
-        if Version(self.version) < "22":
-            item = self.conan_data["sources"][self.version]
-            filename = "7z-source.7z"
-            download(self, **item, filename=filename)
-            sevenzip = os.path.join(self.dependencies.build["lzma_sdk"].package_folder, "bin", "7zr.exe")
-            self.run(f"{sevenzip} x {filename}")
-            os.unlink(filename)
-        else:
-            get(self, **self.conan_data["sources"][self.version])
+        get(self, **self.conan_data["sources"][self.version])
 
     def generate(self):
         if is_msvc(self):
@@ -115,9 +100,5 @@ def package(self):
         # TODO: Package the libraries: binaries and headers (add the rest of settings)
 
     def package_info(self):
-        bin_path = os.path.join(self.package_folder, "bin")
-        self.output.info(f"Appending PATH environment variable: {bin_path}")
-        self.env_info.path.append(bin_path)
-
         self.cpp_info.includedirs = []
         self.cpp_info.libdirs = []

recipes/7zip/config.yml

@@ -1,11 +1,3 @@
 versions:
   "25.01":
     folder: "all"
-  "24.09":
-    folder: "all"
-  "23.01":
-    folder: "all"
-  "22.01":
-    folder: "all"
-  "19.00":
-    folder: "all"

recipes/alembic/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.8.8":
+    url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.8.tar.gz"
+    sha256: "ba1f34544608ef7d3f68cafea946ec9cc84792ddf9cda3e8d5590821df71f6c6"
   "1.8.6":
     url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.6.tar.gz"
     sha256: "c572ebdea3a5f0ce13774dd1fceb5b5815265cd1b29d142cf8c144b03c131c8c"
@@ -12,6 +15,10 @@ sources:
     url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.2.tar.gz"
     sha256: "3f1c466ee1600578689b32b1f2587066d3259704ec7ed1fcf80c324d01274f48"
 patches:
+  "1.8.8":
+    - patch_file: "patches/1.8.8-0001-fix-cmake.patch"
+      patch_description: "CMake: let conan specify fPIC, don't change rpath"
+      patch_type: "conan"
   "1.8.6":
     - patch_file: "patches/1.8.5-0001-fix-cmake.patch"
       patch_description: "CMake: fix install layout, don't link directly to zlib if hdf5, relocatable shared lib for macOS"

recipes/alembic/all/conanfile.py

@@ -44,7 +44,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("imath/3.1.9", transitive_headers=True)
+        self.requires("imath/[>=3.1.9 <4]", transitive_headers=True)
         if self.options.with_hdf5:
             self.requires("hdf5/1.14.3")
 
@@ -70,7 +70,6 @@ def generate(self):
         tc.variables["ALEMBIC_SHARED_LIBS"] = self.options.shared
         tc.variables["ALEMBIC_USING_IMATH_3"] = False
         tc.variables["ALEMBIC_ILMBASE_FOUND"] = 1
-        tc.variables["ALEMBIC_ILMBASE_LIBS"] = "OpenEXR::OpenEXR"
         if Version(self.version) >= "1.8.4":
             tc.variables["ALEMBIC_DEBUG_WARNINGS_AS_ERRORS"] = False
         tc.generate()

recipes/alembic/all/patches/1.8.8-0001-fix-cmake.patch

@@ -0,0 +1,64 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -175,22 +175,6 @@ IF (BUILD_TESTING)
+     MARK_AS_ADVANCED(BUILDNAME)
+ ENDIF(BUILD_TESTING)
+ 
+-IF (UNIX AND NOT WINDOWS)
+-    FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
+-    IF (CMAKE_UNAME)
+-        EXECUTE_PROCESS(COMMAND uname -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
+-        SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL
+-"processor type (i386 and x86_64)")
+-        IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+-            ADD_DEFINITIONS(-fPIC)
+-        ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+-    ENDIF(CMAKE_UNAME)
+-ENDIF(UNIX AND NOT WINDOWS)
+-
+-IF (DARWIN)
+-    ADD_DEFINITIONS(-fPIC)
+-ENDIF()
+-
+ #-******************************************************************************
+ # DEPENDENCIES
+ #-******************************************************************************
+@@ -206,7 +190,6 @@ INCLUDE("./cmake/AlembicIlmBase.cmake")
+ 
+ # HDF5
+ IF (USE_HDF5)
+-    FIND_PACKAGE(ZLIB REQUIRED)
+     SET(ALEMBIC_WITH_HDF5 "1")
+     INCLUDE("./cmake/AlembicHDF5.cmake")
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DH5_USE_18_API")
+--- a/lib/Alembic/CMakeLists.txt
++++ b/lib/Alembic/CMakeLists.txt
+@@ -65,23 +65,16 @@ IF (ALEMBIC_SHARED_LIBS)
+   SET_TARGET_PROPERTIES(Alembic PROPERTIES DEFINE_SYMBOL ALEMBIC_EXPORTS
+     SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+     VERSION ${PROJECT_VERSION})
+-
+-  if (ALEMBIC_USING_IMATH_3)
+-    if (APPLE OR UNIX)
+-      set_target_properties(Alembic PROPERTIES INSTALL_RPATH "$<TARGET_FILE_DIR:${ALEMBIC_ILMBASE_LIBS}>")
+-    endif ()
+-  endif ()
+ ENDIF()
+ 
+ 
+ TARGET_LINK_LIBRARIES(Alembic
+-    LINK_PUBLIC
++    PUBLIC
+     ${ALEMBIC_ILMBASE_LIBS}
+     ${CMAKE_THREAD_LIBS_INIT}
+     ${EXTERNAL_MATH_LIBS}
+-    LINK_PRIVATE
++    PRIVATE
+     ${HDF5_LIBRARIES}
+-    ${ZLIB_LIBRARY}
+   )
+ 
+ INSTALL(TARGETS Alembic
+-- 
+2.45.2
+

recipes/alembic/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.8.8":
+    folder: all
   "1.8.6":
     folder: all
   "1.8.5":

recipes/arrow/all/conanfile.py

@@ -188,7 +188,7 @@ def requirements(self):
         if self.options.get_safe("with_opentelemetry"):
             self.requires("opentelemetry-cpp/1.21.0")
         if self.options.with_s3:
-            self.requires("aws-sdk-cpp/1.9.234")
+            self.requires("aws-sdk-cpp/[~1.11]")
         if self.options.with_brotli:
             self.requires("brotli/1.1.0")
         if self.options.with_bz2:
@@ -265,6 +265,8 @@ def validate(self):
             raise ConanInvalidConfiguration("arrow:parquet requires arrow:with_thrift")
 
     def build_requirements(self):
+        if self.options.with_protobuf:
+            self.tool_requires("protobuf/<host_version>")
         if Version(self.version) >= "22.0.0":
             self.tool_requires("cmake/[>=3.26 <4]")
         elif Version(self.version) >= "20.0.0":
@@ -447,7 +449,10 @@ def package_info(self):
             self.cpp_info.components["libarrow_substrait"].set_property("pkg_config_name", "arrow_substrait")
             self.cpp_info.components["libarrow_substrait"].set_property("cmake_target_name", f"Arrow::arrow_substrait_{cmake_suffix}")
             self.cpp_info.components["libarrow_substrait"].libs = [f"arrow_substrait{suffix}"]
-            self.cpp_info.components["libarrow_substrait"].requires = ["libparquet", "dataset"]
+            self.cpp_info.components["libarrow_substrait"].requires = ["libparquet"]
+            if self.options.dataset_modules:
+                self.cpp_info.components["libarrow_substrait"].requires.append("dataset")
+
 
         # Plasma was deprecated in Arrow 12.0.0
         del self.options.plasma

recipes/aws-c-auth/all/conandata.yml

@@ -1,4 +1,4 @@
 sources:
-  "0.9.0":
-    url: "https://github.com/awslabs/aws-c-auth/archive/v0.9.0.tar.gz"
-    sha256: "aa6e98864fefb95c249c100da4ae7aed36ba13a8a91415791ec6fad20bec0427"
+  "0.9.1":
+    url: "https://github.com/awslabs/aws-c-auth/archive/v0.9.1.tar.gz"
+    sha256: "adae1e725d9725682366080b8bf8e49481650c436b846ceeb5efe955d5e03273"

recipes/aws-c-auth/all/conanfile.py

@@ -34,11 +34,11 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("aws-c-common/0.12.3", transitive_headers=True, transitive_libs=True)
-        self.requires("aws-c-cal/0.9.2")
+        self.requires("aws-c-common/0.12.5", transitive_headers=True, transitive_libs=True)
+        self.requires("aws-c-cal/0.9.8")
         # Are we overlinking? This has never been a requirement in upstream's CMakeLists.txt
-        self.requires("aws-c-io/0.21.0", transitive_headers=True, transitive_libs=True)
-        self.requires("aws-c-http/0.10.2", transitive_headers=True)
+        self.requires("aws-c-io/0.23.2", transitive_headers=True, transitive_libs=True)
+        self.requires("aws-c-http/0.10.5", transitive_headers=True)
         self.requires("aws-c-sdkutils/0.2.4", transitive_headers=True)
 
     def source(self):
@@ -47,6 +47,7 @@ def source(self):
     def generate(self):
         tc = CMakeToolchain(self)
         tc.variables["BUILD_TESTING"] = False
+        tc.cache_variables['AWS_STATIC_MSVC_RUNTIME_LIBRARY'] = self.settings.os == "Windows" and self.settings.get_safe("compiler.runtime") == "static"
         tc.generate()
 
         deps = CMakeDeps(self)