Merge branch 'conan-io:master' into feature/AddOpenUSD

.c3i/authorized_users.yml

@@ -966,7 +966,7 @@ authorized_users:
 - kletoz
 - agilemapper
 - ZXfkSIE
-- RubenRBS
+- AbrilRBS
 - Alex-PLACET
 - antekone
 - ambroff
@@ -1377,3 +1377,6 @@ authorized_users:
 - glywk
 - aniederl
 - SvenRoederer
+- MridulS
+- leemaguire
+- RobinQu

.c3i/reviewers.yml

@@ -9,21 +9,45 @@ reviewers:
   - user: "lasote"
     type: "team"
     request_reviews: false
-  - user: "jgsogo"
-    type: "community"
-    request_reviews: false
   - user: "czoido"
     type: "team"
     request_reviews: false
   - user: "memsharded"
     type: "team"
     request_reviews: false
-  - user: "SSE4"
-    type: "community"
-    request_reviews: false
   - user: "uilianries"
     type: "team"
     request_reviews: true
+  - user: "jcar87"
+    type: "team"
+    request_reviews: true
+  - user: "franramirez688"
+    type: "team"
+    request_reviews: true
+  - user: "AbrilRBS"
+    type: "team"
+    request_reviews: true
+  - user: "davidsanfal"
+    type: "team"
+    request_reviews: false
+  - user: "juansblanco"
+    type: "team"
+    request_reviews: false
+  - user: "perseoGI"
+    type: "team"
+    request_reviews: false
+  - user: "ErniGH"
+    type: "team"
+    request_reviews: false
+  ########
+  ### Begin community reviewers
+  ########
+  - user: "jgsogo"
+    type: "community"
+    request_reviews: false
+  - user: "SSE4"
+    type: "community"
+    request_reviews: false
   - user: "madebr"
     type: "community"
     request_reviews: false
@@ -54,21 +78,12 @@ reviewers:
   - user: "MartinDelille"
     type: "community"
     request_reviews: false
-  - user: "jcar87"
-    type: "team"
-    request_reviews: true
-  - user: "franramirez688"
-    type: "team"
-    request_reviews: true
   - user: "paulocoutinhox"
     type: "community"
     request_reviews: false
   - user: "jwillikers"
     type: "community"
     request_reviews: false
-  - user: "RubenRBS"
-    type: "team"
-    request_reviews: true
   - user: "System-Arch"
     type: "community"
     request_reviews: false
@@ -78,19 +93,6 @@ reviewers:
   - user: "StellaSmith"
     type: "community"
     request_reviews: false
-  - user: "davidsanfal"
-    type: "team"
-    request_reviews: false
-  - user: "juansblanco"
-    type: "team"
-    request_reviews: false
   - user: "valgur"
     type: "community"
     request_reviews: false
-  - user: "perseoGI"
-    type: "team"
-    request_reviews: false
-  - user: "ErniGH"
-    type: "team"
-    request_reviews: false
-

recipes/aravis/all/conandata.yml

@@ -8,9 +8,6 @@ sources:
   "0.8.25":    # latest version that supports GenDC data format (supported by U3V 1.1)
     url: "https://github.com/AravisProject/aravis/releases/download/0.8.25/aravis-0.8.25.tar.xz"
     sha256: "3ba18f941ae4e2c898fed1f63c4ce67ea41a800a902ee5684eef4ffdb87f1c09"
-  "0.8.20":
-    url: "https://github.com/AravisProject/aravis/releases/download/0.8.20/aravis-0.8.20.tar.xz"
-    sha256: "0c0eb5a76109f29180c09c7e6a23fd403633bf22bbe8468a0ae44995c4449f46"
 patches:
   "0.8.30":
     - patch_file: "patches/0.8.29-gst-shared-lib.patch"
@@ -24,7 +21,3 @@ patches:
     - patch_file: "patches/0.8.25-gst-shared-lib.patch"
       patch_description: "remove forcing of shared library built for gst-plugins"
       patch_type: conan
-  "0.8.20":
-    - patch_file: "patches/0.8.19-gst-shared-lib.patch"
-      patch_description: "remove forcing of shared library built for gst-plugins"
-      patch_type: conan

recipes/aravis/all/conanfile.py

@@ -33,7 +33,6 @@ class AravisConan(ConanFile):
         "gst_plugin": [True, False],
         "tools": [True, False],
         "introspection": [True, False],
-        "gv_n_buffers": ["ANY"],
     }
     default_options = {
         "shared": False,
@@ -43,7 +42,6 @@ class AravisConan(ConanFile):
         "gst_plugin": False,
         "tools": True,
         "introspection": False,
-        "gv_n_buffers": 16,
     }
 
     def export_sources(self):
@@ -54,10 +52,6 @@ def config_options(self):
             del self.options.fPIC
         if self.settings.os not in ["Linux", "FreeBSD"]:
             del self.options.packet_socket
-        # https://github.com/AravisProject/aravis/commit/b4211e5e0266d0226e936818b3faefd6d0daaa3a#diff-f28598af2e23aa5d2bc7c72e022ae2c56a33802eb970afffaeca1e40607f97fe
-        if Version(self.version) < "0.8.21":
-            del self.options.gv_n_buffers
-
 
     def configure(self):
         if self.options.shared:
@@ -72,8 +66,8 @@ def layout(self):
 
     def requirements(self):
         # glib-object.h and gio/gio.h are used in several public headers
-        self.requires("glib/2.78.1", transitive_headers=True)
-        self.requires("libxml2/2.12.3")
+        self.requires("glib/2.78.3", transitive_headers=True)
+        self.requires("libxml2/[>=2.12.5 <3]")
         self.requires("zlib/[>=1.2.11 <2]")
 
         if self.options.usb:
@@ -93,18 +87,9 @@ def validate(self):
                 "conan-io/conan#7324 gets merged to fix macOS SIP issue #8443"
             )
 
-        if self.options.get_safe("gv_n_buffers"):
-            try:
-                gv_n_buffers_val = int(str(self.options.gv_n_buffers))
-                if gv_n_buffers_val < 1:
-                    raise ConanInvalidConfiguration(
-                        f"gv_n_buffers_val must be greater than 1 Provided: {gv_n_buffers_val}")
-            except ValueError as e:
-                raise ConanInvalidConfiguration("gv_n_buffers_val must be an integer.") from e
-
     def build_requirements(self):
         #windows build: meson/1.2.1 works, meson/1.2.2 breaks for some reason!
-        self.tool_requires("meson/1.3.1")
+        self.tool_requires("meson/1.4.0")
         self.tool_requires("glib/<host_version>")
         if not self.conf.get("tools.gnu:pkg_config", check_type=str):
             self.tool_requires("pkgconf/2.1.0")
@@ -129,10 +114,6 @@ def generate(self):
         tc.project_options["viewer"] = "disabled"
         tc.project_options["tests"] = False
         tc.project_options["documentation"] = "disabled"
-
-        if  self.options.get_safe("gv_n_buffers"):
-            tc.project_options["gv-n-buffers"] = int(str(self.options.gv_n_buffers))
-
         tc.project_options["fast-heartbeat"] = False
         if self.settings.get_safe("compiler.runtime"):
             tc.project_options["b_vscrt"] = msvc_runtime_flag(self).lower()

recipes/aravis/config.yml

@@ -6,5 +6,3 @@ versions:
   # 0.8.25 is the last version to support GenDC data format
   "0.8.25":
     folder: all
-  "0.8.20":
-    folder: all

recipes/artery-font-format/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.1":
+    url: "https://github.com/Chlumsky/artery-font-format/archive/v1.1.tar.gz"
+    sha256: "cd8eb58590d85069312b831ce5bc6eba21778ef2fa8ca8ac06e1ecf8eca53a7c"
   "1.0.1":
     url: "https://github.com/Chlumsky/artery-font-format/archive/v1.0.1.tar.gz"
     sha256: "23dc9450d2364c9f1a67fcb0ae8f2bef365fabc5a3f4af55d9a646f8fbcdc537"

recipes/artery-font-format/all/conanfile.py

@@ -1,4 +1,5 @@
 from conan import ConanFile
+from conan.tools.build import check_min_cppstd
 from conan.tools.files import get, copy
 import os
 
@@ -7,24 +8,29 @@
 
 class ArteryFontFormatConan(ConanFile):
     name = "artery-font-format"
+    description = "Artery Atlas Font format library"
     license = "MIT"
-    homepage = "https://github.com/Chlumsky/artery-font-format"
     url = "https://github.com/conan-io/conan-center-index"
-    description = "Artery Atlas Font format library"
-    topics = ("artery", "font", "atlas")
+    homepage = "https://github.com/Chlumsky/artery-font-format"
+    topics = ("artery", "font", "atlas", "header-only")
     package_type = "header-library"
+    settings = "os", "arch", "compiler", "build_type"
     no_copy_source = True
 
+    @property
+    def _min_cppstd(self):
+        return 11
+
     def package_id(self):
         self.info.clear()
 
+    def validate(self):
+        if self.settings.compiler.get_safe("cppstd"):
+            check_min_cppstd(self, self._min_cppstd)
+
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
-    def build(self):
-        # header only: no build step
-        pass
-
     def package(self):
         copy(self, pattern="LICENSE.txt", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
         copy(
@@ -39,3 +45,7 @@ def package(self):
             dst=os.path.join(self.package_folder, "include"),
             src=self.source_folder,
         )
+
+    def package_info(self):
+        self.cpp_info.bindirs = []
+        self.cpp_info.libdirs = []

recipes/artery-font-format/all/test_package/CMakeLists.txt

@@ -4,5 +4,5 @@ project(test_package LANGUAGES CXX)
 find_package(artery-font-format REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} artery-font-format::artery-font-format)
+target_link_libraries(${PROJECT_NAME} PRIVATE artery-font-format::artery-font-format)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)

recipes/artery-font-format/all/test_package/conanfile.py

@@ -4,7 +4,6 @@
 import os
 
 
-# It will become the standard on Conan 2.x
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
     generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"

recipes/artery-font-format/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.1":
+    folder: all
   "1.0.1":
     folder: all
   "1.0":

recipes/daw_header_libraries/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "2.106.1":
+    url: "https://github.com/beached/header_libraries/archive/v2.106.1.tar.gz"
+    sha256: "393815fbf249ca1220a216899cae3d2672ca193f9db228a0b99925a9b0f90854"
   "2.106.0":
     url: "https://github.com/beached/header_libraries/archive/v2.106.0.tar.gz"
     sha256: "7838ada09afa69e7a42d742991c4b24b32ba27681e7b4dadf7b1e45c168937b5"
@@ -14,30 +17,3 @@ sources:
   "2.96.1":
     url: "https://github.com/beached/header_libraries/archive/v2.96.1.tar.gz"
     sha256: "2a9a5c33baa9e3adc1d82fa13a56522638af13cc39372a0c1c8f5c5d984f1464"
-  "2.95.0":
-    url: "https://github.com/beached/header_libraries/archive/v2.95.0.tar.gz"
-    sha256: "8799c06f0587b202fd6049d95e70b04675acbfdbf6e86ac3bbd061cbb9d42b54"
-  "2.93.1":
-    url: "https://github.com/beached/header_libraries/archive/v2.93.1.tar.gz"
-    sha256: "200690094237e4a2c37ac81c23c8c5138ba90ccdeeb2a1dda37690a9d32301ad"
-  "2.92.0":
-    url: "https://github.com/beached/header_libraries/archive/v2.92.0.tar.gz"
-    sha256: "96835f0ff4d3082a38b4ef4c14653c88e193cd26a08cd406fdbfadcfd654d136"
-  "2.88.0":
-    url: "https://github.com/beached/header_libraries/archive/v2.88.0.tar.gz"
-    sha256: "2a634763f3d34f206f6b352ac9609a89d501059afea0ba7c857bd55adc435890"
-  "2.85.1":
-    url: "https://github.com/beached/header_libraries/archive/v2.85.1.tar.gz"
-    sha256: "fb4880e254a481e3c750261fdb75a1696afc9ef4404e095a7f3ba0683bcd9930"
-  "2.79.0":
-    url: "https://github.com/beached/header_libraries/archive/v2.79.0.tar.gz"
-    sha256: "2dfa8fc9495499379cff39ed648c6bba156a87eb177fc91a860045a410aebb99"
-  "2.76.3":
-    url: "https://github.com/beached/header_libraries/archive/v2.76.3.tar.gz"
-    sha256: "2d66f9aec38fb9a42779e0283fa2fc5842e04d34f2bf655c72a9beb4bf5cc8c8"
-  "2.76.2":
-    url: "https://github.com/beached/header_libraries/archive/v2.76.2.tar.gz"
-    sha256: "bfa2da192360a66e400d03a52f8a7bf0fccd23de1f446a812a8890b11df2c592"
-  "2.74.2":
-    url: "https://github.com/beached/header_libraries/archive/v2.74.2.tar.gz"
-    sha256: "32871df3d314cc9b4e293a9a8c79968d1c963dfd3dd60965dbf704eb18acb218"

recipes/daw_header_libraries/all/conanfile.py

@@ -16,7 +16,7 @@ class DawHeaderLibrariesConan(ConanFile):
     license = "BSL-1.0"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/beached/header_libraries"
-    topics = ("algorithms", "helpers", "data-structures")
+    topics = ("algorithms", "helpers", "data-structures", "header-only")
     package_type = "header-library"
     settings = "os", "arch", "compiler", "build_type"
     no_copy_source = True
@@ -44,7 +44,6 @@ def package_id(self):
     def validate(self):
         if self.settings.get_safe("compiler.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.get_safe("compiler.version")) < minimum_version:
             raise ConanInvalidConfiguration(
@@ -54,9 +53,6 @@ def validate(self):
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
-    def build(self):
-        pass
-
     def package(self):
         copy(self, pattern="LICENSE*", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
         copy(self, pattern="*.h", dst=os.path.join(self.package_folder, "include"), src=os.path.join(self.source_folder, "include"))

recipes/daw_header_libraries/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "2.106.1":
+    folder: all
   "2.106.0":
     folder: all
   "2.101.0":
@@ -9,21 +11,3 @@ versions:
     folder: all
   "2.96.1":
     folder: all
-  "2.95.0":
-    folder: all
-  "2.93.1":
-    folder: all
-  "2.92.0":
-    folder: all
-  "2.88.0":
-    folder: all
-  "2.85.1":
-    folder: all
-  "2.79.0":
-    folder: all
-  "2.76.3":
-    folder: all
-  "2.76.2":
-    folder: all
-  "2.74.2":
-    folder: all