Updates fork with latest changes from master

recipes/arrow/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "21.0.0":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-21.0.0/apache-arrow-21.0.0.tar.gz?action=download"
+    sha256: "5d3f8db7e72fb9f65f4785b7a1634522e8d8e9657a445af53d4a34a3849857b5"
   "20.0.0":
     url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-20.0.0/apache-arrow-20.0.0.tar.gz?action=download"
     sha256: "89efbbf852f5a1f79e9c99ab4c217e2eb7f991837c005cba2d4a2fbd35fad212"
@@ -24,6 +27,10 @@ sources:
     url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.2/apache-arrow-14.0.2.tar.gz?action=download"
     sha256: "1304dedb41896008b89fe0738c71a95d9b81752efc77fa70f264cb1da15d9bc2"
 patches:
+  "21.0.0":
+    - patch_file: "patches/21.0.0-0001-fix-downloaded-mimalloc.patch"
+      patch_description: "use cci package"
+      patch_type: "conan"
   "20.0.0":
     - patch_file: "patches/20.0.0-0001-fix-downloaded-mimalloc.patch"
       patch_description: "use cci package"

recipes/arrow/all/conanfile.py

@@ -142,7 +142,8 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def _requires_rapidjson(self):
-        return self.options.with_json or self.options.encryption
+        return (self.options.with_json or self.options.encryption or
+                (Version(self.version) >= "21.0.0" and self.options.parquet))
 
     def requirements(self):
         if self.options.with_thrift:
@@ -445,6 +446,15 @@ def package_info(self):
             self.cpp_info.components["libacero"].names["cmake_find_package_multi"] = "acero"
             self.cpp_info.components["libacero"].names["pkg_config"] = "acero"
             self.cpp_info.components["libacero"].requires = ["libarrow"]
+            if Version(self.version) >= "21.0.0" and self.options.compute:
+                # libacero depends on compute
+                self.cpp_info.components["libacero"].requires.append("libarrow_compute")
+
+        if Version(self.version) >= "21.0.0" and self.options.compute:
+            self.cpp_info.components["libarrow_compute"].set_property("pkg_config_name", "arrow_compute")
+            self.cpp_info.components["libarrow_compute"].set_property("cmake_target_name", f"ArrowCompute::arrow_compute_{cmake_suffix}")
+            self.cpp_info.components["libarrow_compute"].libs = [f"arrow_compute{suffix}"]
+            self.cpp_info.components["libarrow_compute"].requires = ["libarrow"]
 
         if self.options.gandiva:
             self.cpp_info.components["libgandiva"].set_property("pkg_config_name", "gandiva")

recipes/arrow/all/patches/21.0.0-0001-fix-downloaded-mimalloc.patch

@@ -0,0 +1,15 @@
+diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
+index 7fa4b66..f81c831 100644
+--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
+@@ -2230,6 +2230,10 @@ endif()
+ # mimalloc - Cross-platform high-performance allocator, from Microsoft
+
+ if(ARROW_MIMALLOC)
++  find_package(mimalloc REQUIRED CONFIG)
++endif()
++
++if(0)
+   if(NOT ARROW_ENABLE_THREADING)
+     message(FATAL_ERROR "Can't use mimalloc with ARROW_ENABLE_THREADING=OFF")
+   endif()

recipes/arrow/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "21.0.0":
+    folder: all
   "20.0.0":
     folder: all
   "19.0.1":

recipes/aruco/3.x.x/conandata.yml

@@ -2,6 +2,3 @@ sources:
   "3.1.15":
     url: "https://downloads.sourceforge.net/project/aruco/3.1.15/3.1.15.zip"
     sha256: "8408ad1621b92c885b0740641ab98ec022705d48a08deb6f071ffebf455cc8b2"
-  "3.1.12":
-    url: "https://downloads.sourceforge.net/project/aruco/3.1.12/aruco-3.1.12.zip"
-    sha256: "70b9ec8aa8eac6fe3f622201747a3e32c77bbb5f015e28a95c1c7c91f8ee8a09"

recipes/aruco/3.x.x/conanfile.py

@@ -3,7 +3,7 @@
 from conan.tools.files import collect_libs, copy, get, rmdir, replace_in_file
 import os
 
-required_conan_version = ">=1.53.0"
+required_conan_version = ">=2.0"
 
 
 class ArucoConan(ConanFile):
@@ -39,9 +39,9 @@ def layout(self):
     def requirements(self):
         # Header used in public markerdetector.h
         # cv::FileStorage::FileStorage used by aruco::CameraParameters::saveToFile
-        self.requires("opencv/4.9.0", transitive_headers=True, transitive_libs=True)
+        self.requires("opencv/[>=4.9.0 <5]", transitive_headers=True, transitive_libs=True)
         # Header used in levmarq.h
-        self.requires("eigen/3.4.0", transitive_headers=False)
+        self.requires("eigen/[>=3.4.0 <4]", transitive_headers=False)
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

recipes/aruco/config.yml

@@ -1,5 +1,3 @@
 versions:
   "3.1.15":
     folder: 3.x.x
-  "3.1.12":
-    folder: 3.x.x

recipes/avcpp/all/conandata.yml

@@ -2,29 +2,3 @@ sources:
   "2.4.0":
     url: "https://github.com/h4tr3d/avcpp/archive/refs/tags/v2.4.0.tar.gz"
     sha256: "47e044c10fa232f0d12d80351e675d5a5ef1480f81a93f288f33f8d03e94ae17"
-  "2.3.2":
-    url: "https://github.com/h4tr3d/avcpp/archive/refs/tags/v2.3.2.tar.gz"
-    sha256: "ce1a7296e6b1bf808ad4f9f486723c88e4cd12d80a96e226635ce3316ca73733"
-  "2.3.0":
-    url: "https://github.com/h4tr3d/avcpp/archive/refs/tags/v2.3.0.tar.gz"
-    sha256: "8ecb98caa9640a21772562c326f7c1f6ad99cd7f15d7ea40fe37d114fabbe2b5"
-  "2.1.0":
-    url: "https://github.com/h4tr3d/avcpp/archive/refs/tags/v2.1.0.tar.gz"
-    sha256: "8398217dccb9f5b4cbb41e5bf4f73f47b461ed3ba8c3aefdda9f9dd714649855"
-patches:
-  "2.4.0":
-    - patch_file: "patches/2.3.0-fix-ffmpeg.patch"
-      patch_description: "fix ffmpeg package name and remove ffmpeg from install targets"
-      patch_type: "conan"
-  "2.3.2":
-    - patch_file: "patches/2.3.0-fix-ffmpeg.patch"
-      patch_description: "fix ffmpeg package name and remove ffmpeg from install targets"
-      patch_type: "conan"
-  "2.3.0":
-    - patch_file: "patches/2.3.0-fix-ffmpeg.patch"
-      patch_description: "fix ffmpeg package name and remove ffmpeg from install targets"
-      patch_type: "conan"
-  "2.1.0":
-    - patch_file: "patches/2.1.0-fix-ffmpeg.patch"
-      patch_description: "fix ffmpeg package name and remove ffmpeg from install targets"
-      patch_type: "conan"

recipes/avcpp/all/conanfile.py

@@ -1,12 +1,10 @@
 from conan import ConanFile
-from conan.errors import ConanInvalidConfiguration
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
-from conan.tools.scm import Version
+from conan.tools.files import copy, get, replace_in_file, rmdir
 import os
 
-required_conan_version = ">=1.53.0"
+required_conan_version = ">=2.1"
 
 
 class AvcppConan(ConanFile):
@@ -27,23 +25,6 @@ class AvcppConan(ConanFile):
         "shared": False,
     }
 
-    @property
-    def _min_cppstd(self):
-        return "17"
-
-    @property
-    def _compilers_minimum_version(self):
-        return {
-            "gcc": "8",
-            "clang": "7",
-            "apple-clang": "12.0",
-            "Visual Studio": "15",
-            "msvc": "191",
-        }
-
-    def export_sources(self):
-        export_conandata_patches(self)
-
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
@@ -56,38 +37,36 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("ffmpeg/6.1", transitive_headers=True)
+        self.requires("ffmpeg/[>=6.1 <8]", transitive_headers=True)
 
     def validate(self):
-        if self.settings.compiler.get_safe("cppstd"):
-            check_min_cppstd(self, self._min_cppstd)
-
-        minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)
-        if minimum_version and Version(self.settings.compiler.version) < minimum_version:
-            raise ConanInvalidConfiguration(
-                f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
-            )
+        check_min_cppstd(self, 17)
 
     def build_requirements(self):
-        if Version(self.version) >= "2.2.0":
-            self.tool_requires("cmake/[>=3.19 <4]")
+        self.tool_requires("cmake/[>=3.19]")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
+        # Fix issue with install targets
+        replace_in_file(self, os.path.join(self.source_folder, "src", "CMakeLists.txt"),
+                        "install(TARGETS ${AV_TARGETS} FFmpeg",
+                        'install(TARGETS ${AV_TARGETS}')
+
     def generate(self):
         tc = CMakeToolchain(self)
-        tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True
-        tc.variables["AV_ENABLE_SHARED"] = self.options.shared
-        tc.variables["AV_ENABLE_STATIC"] = not self.options.shared
-        tc.variables["AV_BUILD_EXAMPLES"] = False
+        tc.cache_variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True
+        tc.cache_variables["AV_ENABLE_SHARED"] = self.options.shared
+        tc.cache_variables["AV_ENABLE_STATIC"] = not self.options.shared
+        tc.cache_variables["AV_BUILD_EXAMPLES"] = False
         tc.generate()
 
         deps = CMakeDeps(self)
+        deps.set_property("ffmpeg", "cmake_file_name", "FFmpeg")
+        deps.set_property("ffmpeg", "cmake_target_name", "FFmpeg::FFmpeg")
         deps.generate()
 
     def build(self):
-        apply_conandata_patches(self)
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
@@ -99,23 +78,16 @@ def package(self):
         rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
 
     def package_info(self):
-        target_name = "avcpp" if self.options.shared else "avcpp-static"
 
         self.cpp_info.set_property("cmake_file_name", "avcpp")
-        self.cpp_info.set_property("cmake_target_name", f"avcpp::{target_name}")
+        self.cpp_info.set_property("cmake_target_name", "avcpp::avcpp")
+        if not self.options.shared:
+            # upstream CMakeLists.txt uses "avcpp-static" as target name only
+            # when both shared and static libraries are built, we keep this for compatibility
+            self.cpp_info.set_property("cmake_target_aliases", ["avcpp::avcpp-static"])
+        self.cpp_info.libs = ["avcpp"]
 
-        self.cpp_info.components["AvCpp"].names["cmake_find_package"] = target_name
-        self.cpp_info.components["AvCpp"].names["cmake_find_package_multi"] = target_name
-        self.cpp_info.components["AvCpp"].set_property("cmake_target_name", f"avcpp::{target_name}")
-        self.cpp_info.components["AvCpp"].libs = ["avcpp", ]
-        self.cpp_info.components["AvCpp"].requires = ["ffmpeg::ffmpeg", ]
         if self.settings.os in ["Linux", "FreeBSD"]:
-            self.cpp_info.components["AvCpp"].system_libs = ["mvec"]
+            self.cpp_info.system_libs = ["mvec"]
         if self.settings.os == "Windows":
-            self.cpp_info.components["AvCpp"].system_libs = ["mfplat"]
-
-        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
-        self.cpp_info.filenames["cmake_find_package"] = "avcpp"
-        self.cpp_info.filenames["cmake_find_package_multi"] = "avcpp"
-        self.cpp_info.names["cmake_find_package"] = "avcpp"
-        self.cpp_info.names["cmake_find_package_multi"] = "avcpp"
+            self.cpp_info.system_libs = ["mfplat"]

recipes/avcpp/all/test_package/CMakeLists.txt

@@ -4,9 +4,4 @@ project(test_package LANGUAGES CXX)
 find_package(avcpp REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-if (TARGET avcpp::avcpp)
-    target_link_libraries(${PROJECT_NAME} PRIVATE avcpp::avcpp)
-else()
-    target_link_libraries(${PROJECT_NAME} PRIVATE avcpp::avcpp-static)
-endif()
-target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
+target_link_libraries(${PROJECT_NAME} PRIVATE avcpp::avcpp)

recipes/avcpp/all/test_package/conanfile.py

@@ -6,8 +6,7 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
-    test_type = "explicit"
+    generators = "CMakeToolchain", "CMakeDeps"
 
     def requirements(self):
         self.requires(self.tested_reference_str)
@@ -22,5 +21,5 @@ def build(self):
 
     def test(self):
         if can_run(self):
-            bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
             self.run(bin_path, env="conanrun")

recipes/avcpp/config.yml

@@ -1,9 +1,3 @@
 versions:
   "2.4.0":
     folder: all
-  "2.3.2":
-    folder: all
-  "2.3.0":
-    folder: all
-  "2.1.0":
-    folder: all