Merge branch 'master' into ar/meson-finalize

conan-io · Sep 19, 2024 · 19940f5 · 19940f5
2 parents 146b510 + 73992ee
commit 19940f5
Show file tree

Hide file tree

Showing 468 changed files with 7,907 additions and 2,615 deletions.
diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml
@@ -1406,3 +1406,19 @@ authorized_users:
 - dcoburnMEDITECH
 - mattangus
 - arnaudmathias
+- hankhsu1996
+- stephematician
+- awest03
+- sun-mir
+- fhamonic
+- simbahebinbo
+- alessiosacco
+- Blackflame576
+- Bakul-Gaur
+- itsmejoeeey
+- JustCallMeRay
+- shun2wang
+- czheng-bt
+- jorgen
+- simshi
+- alatarum
diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml
@@ -84,6 +84,7 @@ required_for_references:
 - aws-libfabric
 - aws-sdk-cpp
 - azure-sdk-for-cpp
+- azure-storage-cpp
 - b2
 - b64
 - backport-cpp
@@ -93,6 +94,7 @@ required_for_references:
 - bandit
 - base64
 - basu
+- battery-embed
 - bazel
 - bdwgc
 - bear
@@ -180,6 +182,7 @@ required_for_references:
 - chipmunk2d
 - choc
 - chunkio
+- cigi-ccl
 - cimg
 - circularbuffer
 - cista
@@ -210,6 +213,7 @@ required_for_references:
 - coin-osi
 - coin-utils
 - commata
+- compute_library
 - concurrencpp
 - concurrentqueue
 - console_bridge
@@ -279,6 +283,7 @@ required_for_references:
 - cuda-samples
 - cunit
 - cute_headers
+- cutlass
 - cvplot
 - cwalk
 - cxxgraph
@@ -412,6 +417,7 @@ required_for_references:
 - fftw
 - fire-hpp
 - fixed-containers
+- fixed_math
 - flac
 - flann
 - flatbuffers
@@ -427,6 +433,7 @@ required_for_references:
 - fmi3
 - fmt
 - fmtlog
+- folly
 - fontconfig
 - foonathan-lexy
 - foonathan-memory
@@ -470,6 +477,7 @@ required_for_references:
 - geographiclib
 - geos
 - geotrans
+- getdns
 - getopt-for-visual-studio
 - gettext
 - gf-complete
@@ -500,6 +508,7 @@ required_for_references:
 - gnu-config
 - gnulib
 - gnutls
+- gobject-introspection
 - godot-cpp
 - godot_headers
 - googleapis
@@ -587,6 +596,7 @@ required_for_references:
 - inversify-cpp
 - iowow
 - ipaddress
+- iphreeqc
 - iqa
 - irrxml
 - isa-l
@@ -711,6 +721,7 @@ required_for_references:
 - libevdev
 - libevent
 - libexif
+- libfabric
 - libfdk_aac
 - libffi
 - libfork
@@ -747,6 +758,7 @@ required_for_references:
 - libjxl
 - libkml
 - libliftoff
+- liblqr
 - liblsl
 - libltc
 - liblzf
@@ -757,6 +769,7 @@ required_for_references:
 - libmd
 - libmediainfo
 - libmemcached
+- libmeshb
 - libmetalink
 - libmicrohttpd
 - libmikmod
@@ -788,6 +801,7 @@ required_for_references:
 - libpfm4
 - libphonenumber
 - libpng
+- libpointmatcher
 - libpq
 - libpqxx
 - libproperties
@@ -969,6 +983,7 @@ required_for_references:
 - miniz
 - minizip
 - minizip-ng
+- minmea
 - mio
 - mlpack
 - mm_file
@@ -1016,6 +1031,7 @@ required_for_references:
 - nasm
 - ncurses
 - neargye-semver
+- net-snmp
 - netcdf
 - nettle
 - newmat
@@ -1100,9 +1116,11 @@ required_for_references:
 - openjpeg
 - openldap
 - openmesh
+- openmpi
 - openmvg
 - openpam
 - openscenegraph
+- openslide
 - openssh
 - openssl
 - opensubdiv
@@ -1265,6 +1283,7 @@ required_for_references:
 - readerwriterqueue
 - readline
 - readosm
+- rebound
 - recastnavigation
 - reckless
 - rectanglebinpack
@@ -1320,6 +1339,7 @@ required_for_references:
 - sdf
 - sdl
 - sdl_image
+- sdl_mixer
 - sdl_net
 - sdl_ttf
 - seadex-essentials
@@ -1598,6 +1618,7 @@ required_for_references:
 - wslay
 - wt
 - wtl
+- wxwidgets
 - wyhash
 - xapian-core
 - xbyak

diff --git a/.c3i/config_v1.yml b/.c3i/config_v1.yml
@@ -3,7 +3,7 @@
 id: 'conan-io/conan-center-index'
 
 conan:
-  version: 1.64.1
+  version: 1.65.0
 
 artifactory:
   url: "https://c3i.jfrog.io/c3i"

diff --git a/.c3i/config_v2.yml b/.c3i/config_v2.yml
@@ -3,7 +3,7 @@
 id: 'conan-io/conan-center-index'
 
 conan:
-  version: 2.5.0
+  version: 2.7.1
   backup_sources:
     upload_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"
     download_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"

diff --git a/.c3i/waitlist_users.yml b/.c3i/waitlist_users.yml
@@ -7,3 +7,6 @@ waitlist_users:
 - wer14
 - connor-i-clark
 - NeXuS4Developer
+- sabapathim
+- pixelsoba
+- liss-h
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### 12-Sep-2024 - 09:23 CEST
+
+- [feature] Add support for Conan 2.7.1 in the CI
+- [feature] Add support for Conan 1.65.0 in the CI
+
 ### 10-Jul-2024 - 13:22 CEST
 
 - [feature] Add support for Conan 2.5.0 in the CI

diff --git a/docs/package_templates/autotools_package/all/conanfile.py b/docs/package_templates/autotools_package/all/conanfile.py
@@ -105,7 +105,7 @@ def build_requirements(self):
         self.tool_requires("libtool/x.y.z")
         # only if upstream configure.ac relies on PKG_CHECK_MODULES macro
         if not self.conf.get("tools.gnu:pkg_config", check_type=str):
-            self.tool_requires("pkgconf/x.y.z")
+            self.tool_requires("pkgconf/[>=1.2.3 <2]")
         # required to suppport windows as a build machine
         if self._settings_build.os == "Windows":
             self.win_bash = True

diff --git a/docs/package_templates/meson_package/all/conanfile.py b/docs/package_templates/meson_package/all/conanfile.py
@@ -98,10 +98,10 @@ def validate(self):
     # if another tool than the compiler or Meson is required to build the project (pkgconf, bison, flex etc)
     def build_requirements(self):
         # CCI policy assumes that Meson may not be installed on consumers machine
-        self.tool_requires("meson/1.2.3")
+        self.tool_requires("meson/[>=1.2.3 <2]")
         # pkgconf is largely used by Meson, it should be added in build requirement when there are dependencies
         if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
-            self.tool_requires("pkgconf/2.0.3")
+            self.tool_requires("pkgconf/[>=2.2 <3]")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

diff --git a/docs/package_templates/meson_package/all/test_package/conanfile.py b/docs/package_templates/meson_package/all/test_package/conanfile.py
@@ -18,9 +18,9 @@ def requirements(self):
         self.requires(self.tested_reference_str)
 
     def build_requirements(self):
-        self.tool_requires("meson/1.2.3")
+        self.tool_requires("meson/[>=1.2.3 <2]")
         if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
-            self.tool_requires("pkgconf/2.0.3")
+            self.tool_requires("pkgconf/[>=2.2 <3]")
 
     def build(self):
         meson = Meson(self)

diff --git a/recipes/ada/all/conandata.yml b/recipes/ada/all/conandata.yml
@@ -1,4 +1,10 @@
 sources:
+  "2.9.2":
+    url: "https://github.com/ada-url/ada/archive/v2.9.2.tar.gz"
+    sha256: "f41575ad7eec833afd9f6a0d6101ee7dc2f947fdf19ae8f1b54a71d59f4ba5ec"
+  "2.9.1":
+    url: "https://github.com/ada-url/ada/archive/v2.9.1.tar.gz"
+    sha256: "64eb3d91db941645d1b68ac8d1cbb7b534fbe446b66c1da11e384e17fca975e7"
   "2.9.0":
     url: "https://github.com/ada-url/ada/archive/v2.9.0.tar.gz"
     sha256: "8b992f0ce9134cb4eafb74b164d2ce2cb3af1900902162713b0e0c5ab0b6acd8"

diff --git a/recipes/ada/config.yml b/recipes/ada/config.yml
@@ -1,4 +1,8 @@
 versions:
+  "2.9.2":
+    folder: all
+  "2.9.1":
+    folder: all
   "2.9.0":
     folder: all
   "2.8.0":

diff --git a/recipes/angelscript/all/conandata.yml b/recipes/angelscript/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.37.0":
+    url: "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.37.0.zip"
+    sha256: "0c52d1688016a0b2484e9ca549471c4e295df060770c57840144c64815f54f10"
   "2.36.1":
     url: "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.36.1.zip"
     sha256: "58bb749af9c7e386304705f4e6e627ae41dfe03e0b6a73c3d0d2e017c4fc948f"

diff --git a/recipes/angelscript/all/conanfile.py b/recipes/angelscript/all/conanfile.py
@@ -10,13 +10,13 @@
 
 class AngelScriptConan(ConanFile):
     name = "angelscript"
-    license = "Zlib"
-    homepage = "http://www.angelcode.com/angelscript"
-    url = "https://github.com/conan-io/conan-center-index"
     description = (
         "An extremely flexible cross-platform scripting library designed to "
         "allow applications to extend their functionality through external scripts."
     )
+    license = "Zlib"
+    url = "https://github.com/conan-io/conan-center-index"
+    homepage = "http://www.angelcode.com/angelscript"
     topics = ("angelcode", "embedded", "scripting", "language", "compiler", "interpreter")
 
     package_type = "library"
@@ -90,7 +90,7 @@ def package_info(self):
         # TODO: back to global scope in conan v2 once cmake_find_package* generators removed
         self.cpp_info.components["_angelscript"].libs = [f"angelscript{postfix}"]
         if self.settings.os in ("Linux", "FreeBSD", "SunOS"):
-            self.cpp_info.components["_angelscript"].system_libs.append("pthread")
+            self.cpp_info.components["_angelscript"].system_libs.extend(["m", "pthread"])
 
         # TODO: to remove in conan v2 once cmake_find_package* generators removed
         self.cpp_info.names["cmake_find_package"] = "Angelscript"

diff --git a/recipes/angelscript/config.yml b/recipes/angelscript/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.37.0":
+    folder: all
   "2.36.1":
     folder: all
   "2.36.0":

diff --git a/recipes/ann/all/CMakeLists.txt b/recipes/ann/all/CMakeLists.txt
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.15)
+project(ANN LANGUAGES CXX)
+
+include(GNUInstallDirs)
+
+file(GLOB ANN_SRC_FILES ${ANN_SRC_DIR}/src/*.cpp)
+
+add_library(ANN ${ANN_SRC_FILES})
+target_include_directories(ANN PUBLIC ${ANN_SRC_DIR}/include)
+
+if(WIN32)
+    if(BUILD_SHARED_LIBS)
+        set_target_properties(ANN PROPERTIES
+            CXX_VISIBILITY_PRESET hidden
+            VISIBILITY_INLINES_HIDDEN TRUE
+        )
+        target_compile_definitions(ANN PRIVATE DLL_EXPORTS)
+    else()
+        target_compile_definitions(ANN PUBLIC ANN_STATIC)
+    endif()
+endif()
+
+install(DIRECTORY ${ANN_SRC_DIR}/include/ANN DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(
+    TARGETS ANN
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/recipes/ann/all/conandata.yml b/recipes/ann/all/conandata.yml
@@ -0,0 +1,12 @@
+sources:
+  "1.1.2":
+    url: "https://www.cs.umd.edu/~mount/ANN/Files/1.1.2/ann_1.1.2.tar.gz"
+    sha256: "eea03f2e224b66813226d775053316675375dcec45bd263674c052d9324a49a5"
+patches:
+  "1.1.2":
+    - patch_file: "patches/1.1.2-0001-fix-windows-static.patch"
+      patch_description: "Fix windows static"
+      patch_type: "portability"
+    - patch_file: "patches/1.1.2-0002-fix-cppstd17+-register-keyword.patch"
+      patch_description: "Fix compilation with C++17 (or above) standard, by removing register keyword"
+      patch_type: "portability"