Merge branch 'master' into new/gici-open

recipes/cimg/all/conanfile.py

@@ -70,7 +70,7 @@ def requirements(self):
         if self.options.enable_openexr:
             self.requires("openexr/3.2.1")
         if self.options.enable_png:
-            self.requires("libpng/1.6.40")
+            self.requires("libpng/[>=1.6 <2]")
         if self.options.enable_tiff:
             self.requires("libtiff/4.6.0")
         if self.options.enable_ffmpeg:

recipes/libgd/all/conanfile.py

@@ -57,7 +57,7 @@ def layout(self):
     def requirements(self):
         self.requires("zlib/[>=1.2.11 <2]")
         if self.options.with_png:
-            self.requires("libpng/1.6.40")
+            self.requires("libpng/[>=1.6 <2]")
             if is_msvc(self):
                 self.requires("getopt-for-visual-studio/20200201")
         if self.options.with_jpeg:

recipes/pcl/all/conanfile.py

@@ -367,7 +367,7 @@ def requirements(self):
         if self._is_enabled("flann"):
             self.requires("flann/1.9.2", transitive_headers=True)
         if self._is_enabled("png"):
-            self.requires("libpng/1.6.40")
+            self.requires("libpng/[>=1.6 <2]")
         if self._is_enabled("qhull"):
             self.requires("qhull/8.0.1", transitive_headers=True)
         if self._is_enabled("qt"):

recipes/pulseaudio/meson/conanfile.py

@@ -76,9 +76,10 @@ def validate(self):
                 )
 
     def build_requirements(self):
-        self.tool_requires("meson/1.3.1")
+        self.tool_requires("m4/1.4.19")
+        self.tool_requires("meson/1.3.2")
         if not self.conf.get("tools.gnu:pkg_config", check_type=str):
-            self.tool_requires("pkgconf/2.0.3")
+            self.tool_requires("pkgconf/2.1.0")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

recipes/sail/all/conanfile.py

@@ -58,7 +58,7 @@ def requirements(self):
         if self.options.with_highest_priority_codecs:
             self.requires("giflib/5.2.1")
             self.requires("libjpeg/9e")
-            self.requires("libpng/1.6.40")
+            self.requires("libpng/[>=1.6 <2]")
             self.requires("libtiff/4.6.0")
         if self.options.with_high_priority_codecs:
             if Version(self.version) >= "0.9.1":

recipes/yoga/all/conandata.yml

@@ -1,11 +1,18 @@
 sources:
+  "3.0.2":
+    url: "https://github.com/facebook/yoga/archive/refs/tags/v3.0.2.tar.gz"
+    sha256: "73a81c51d9ceb5b95cd3abcafeb4c840041801d59f5048dacce91fbaab0cc6f9"
   "2.0.1":
     url: "https://github.com/facebook/yoga/archive/refs/tags/v2.0.1.tar.gz"
     sha256: "4c80663b557027cdaa6a836cc087d735bb149b8ff27cbe8442fc5e09cec5ed92"
   "2.0.0":
     url: "https://github.com/facebook/yoga/archive/refs/tags/v2.0.0.tar.gz"
     sha256: "29eaf05191dd857f76b6db97c77cce66db3c0067c88bd5e052909386ea66b8c5"
 patches:
+  "3.0.2":
+    - patch_file: "patches/0001-delete-tests.patch"
+      patch_description: "Delete test targets from cmake"
+      patch_type: "conan"
   "2.0.1":
     - patch_file: "patches/0001-delete-tests.patch"
       patch_description: "Delete test targets from cmake"

recipes/yoga/all/conanfile.py

@@ -26,15 +26,22 @@ class YogaConan(ConanFile):
 
     @property
     def _min_cppstd(self):
-        return 14
+        return 20 if Version(self.version) >= "3.0.0" else 14
 
     @property
     def _compilers_minimum_version(self):
-        return {
-            "gcc": "5",
-            "clang": "3.4",
-            "apple-clang": "10",
-        }
+        if Version(self.version) >= "3.0.0":
+            return {  # C++20 with bit_cast
+                "gcc": "11",
+                "clang": "14",
+                "apple-clang": "14"
+            }
+        else:
+            return {
+                "gcc": "5",
+                "clang": "3.4",
+                "apple-clang": "10",
+            }
 
     def export_sources(self):
         export_conandata_patches(self)
@@ -49,7 +56,7 @@ def layout(self):
     def validate(self):
         if self.settings.compiler.cppstd:
             check_min_cppstd(self, self._min_cppstd)
-        check_min_vs(self, 191)
+        check_min_vs(self, 192 if Version(self.version) >= "3.0.0" else 191)
         if not is_msvc(self):
             minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)
             if minimum_version and Version(self.settings.compiler.version) < minimum_version:

recipes/yoga/all/patches/0001-delete-tests.patch

@@ -2,11 +2,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index f4ce73cc..9f414127 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -10,7 +10,6 @@ set(CMAKE_VERBOSE_MAKEFILE on)
+@@ -10,4 +10,3 @@ set(CMAKE_VERBOSE_MAKEFILE on)
  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/project-defaults.cmake)
 
  add_subdirectory(yoga)
 -add_subdirectory(tests)
-
- # cmake install config
- include(GNUInstallDirs)

recipes/yoga/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "3.0.2":
+    folder: all
   "2.0.1":
     folder: all
   "2.0.0":