From 6fdbc918514dc0455817cf78b8a13b0f5ce8be4d Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 30 Jun 2023 10:41:41 +0200 Subject: [PATCH 1/4] (#18157) nss 3.91 --- recipes/nss/all/conandata.yml | 3 +++ recipes/nss/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/nss/all/conandata.yml b/recipes/nss/all/conandata.yml index 1d61f4b23cee2..254439032f647 100644 --- a/recipes/nss/all/conandata.yml +++ b/recipes/nss/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.91": + url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_91_RTM/src/nss-3.91.tar.gz" + sha256: "84bd46376df17118c55f6d73d30fd93a0af21296c66e7690471547e5898fc4b3" "3.89": url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_RTM/src/nss-3.89.tar.gz" sha256: "55c37a3f4da010d0574fb8b39264cb1e7b4ce9e6c2954c1c7ecf9f41ee00bed5" diff --git a/recipes/nss/config.yml b/recipes/nss/config.yml index 4e88bb8ad9d3b..741d3aab48e70 100644 --- a/recipes/nss/config.yml +++ b/recipes/nss/config.yml @@ -1,4 +1,6 @@ versions: + "3.91": + folder: all "3.89": folder: all "3.88.1": From 07a8274231f1df6826fdd84f2574276d76a1e464 Mon Sep 17 00:00:00 2001 From: Conan Center Index Bot <54393557+conan-center-bot@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:03:02 +0200 Subject: [PATCH 2/4] (#18156) [bot] Update list of references (prod-v2/ListPackages) --- .c3i/conan_v2_ready_references.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml index fe68488eaa9b1..b5b3f1ea7f622 100644 --- a/.c3i/conan_v2_ready_references.yml +++ b/.c3i/conan_v2_ready_references.yml @@ -113,6 +113,7 @@ required_for_references: - celero - cereal - ceres-solver +- certify - cfgfile - cfitsio - cgal @@ -147,6 +148,7 @@ required_for_references: - concurrencpp - concurrentqueue - console_bridge +- continuable - cpp-httplib - cpp-jwt - cpp-lazy @@ -155,6 +157,7 @@ required_for_references: - cpp-sort - cppbenchmark - cppcheck +- cppcmd - cppcodec - cppcommon - cppdap @@ -170,17 +173,20 @@ required_for_references: - cqrlib - crc32c - create-dmg +- croncpp - crunch - cryptopp - cs_libguarded - csm - cspice - csvmonkey +- ctml - ctre - cub - cubicinterpolation - cuda-api-wrappers - cuda-kat +- cute_headers - cwalk - cxxopts - cyclonedds @@ -194,6 +200,7 @@ required_for_references: - daw_utf_range - dbcppp - dbus +- debug_assert - decimal_for_cpp - dirent - discount @@ -293,6 +300,7 @@ required_for_references: - gperf - gperftools - graphene +- greatest - grpc - grpc-proto - gsl @@ -316,6 +324,7 @@ required_for_references: - hiredis - homog2d - http_parser +- icecream-cpp - icu - id3v2lib - iir1 @@ -337,8 +346,11 @@ required_for_references: - json-schema-validator - jsoncons - jsoncpp +- jsonnet - jwt-cpp +- kainjow-mustache - kangaru +- khrplatform - kmod - ktx - kuba-zip @@ -384,6 +396,7 @@ required_for_references: - libgphoto2 - libiberty - libiconv +- libinterpolate - libjpeg - libjpeg-turbo - libkml @@ -420,6 +433,7 @@ required_for_references: - libressl - librttopo - libsamplerate +- libsecret - libselinux - libserial - libsgp4 @@ -460,6 +474,7 @@ required_for_references: - libzip - libzippp - lief +- linux-headers-generic - linux-syscall-support - llhttp - lodepng @@ -475,6 +490,7 @@ required_for_references: - make - mariadb-connector-c - matchit +- mattiasgustavsson-libs - mawk - mbedtls - mbits-args @@ -518,6 +534,7 @@ required_for_references: - nasm - netcdf - nettle +- nextsilicon-cpp-subprocess - ninja - nlohmann_json - nng @@ -526,6 +543,7 @@ required_for_references: - nsync - numcpp - nuraft +- nv-codec-headers - octomap - odbc - ogdf @@ -574,6 +592,7 @@ required_for_references: - plutovg - poco - popt +- portable-file-dialogs - proj - prometheus-cpp - proposal @@ -591,11 +610,13 @@ required_for_references: - quantlib - quill - quirc +- r8brain-free-src - rabbitmq-c - ragel - rang - range-v3 - rapidcheck +- rapidcsv - rapidfuzz - rapidjson - rapidxml @@ -619,6 +640,7 @@ required_for_references: - s2n - samurai - sbepp +- sbp - scnlib - scons - screen_capture_lite @@ -629,6 +651,7 @@ required_for_references: - semimap - sentry-breakpad - sentry-crashpad +- sentry-native - serd - sfml - shield @@ -640,6 +663,7 @@ required_for_references: - sml - snappy - soci +- sonic-cpp - sophus - soplex - soxr @@ -658,6 +682,7 @@ required_for_references: - stlab - strawberryperl - string-view-lite +- stringtoolbox - strong_type - svgwrite - symengine @@ -686,6 +711,7 @@ required_for_references: - tlx - toml11 - trantor +- tsl-hopscotch-map - turtle - tz - uni-algo @@ -708,6 +734,7 @@ required_for_references: - vo-amrwbenc - volk - vorbis +- vsg - vtu11 - vulkan-headers - vulkan-loader @@ -721,6 +748,7 @@ required_for_references: - wayland-protocols - websocketpp - wg21-linear_algebra +- wglext - wil - winflexbison - wiringpi From fffe21550205239cd9ead2faed43153031f10a39 Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 30 Jun 2023 18:22:36 +0900 Subject: [PATCH 3/4] (#18144) tinyexr: add version 1.0.6, add package_type --- recipes/tinyexr/all/conandata.yml | 3 +++ recipes/tinyexr/all/conanfile.py | 4 ++-- recipes/tinyexr/config.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/tinyexr/all/conandata.yml b/recipes/tinyexr/all/conandata.yml index 6fdffb908d2c6..2b4deeb06840b 100644 --- a/recipes/tinyexr/all/conandata.yml +++ b/recipes/tinyexr/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.0.6": + url: "https://github.com/syoyo/tinyexr/archive/v1.0.6.tar.gz" + sha256: "807a5665a7da8dc5ba4dd2c0f69079d87f37a147399680a54e3b38f86486aa67" "1.0.1": url: "https://github.com/syoyo/tinyexr/archive/v1.0.1.tar.gz" sha256: "4dbbd8c7d17597ad557518de5eb923bd02683d26d0de765f9224e8d57d121677" diff --git a/recipes/tinyexr/all/conanfile.py b/recipes/tinyexr/all/conanfile.py index 889c4c311e95f..26a07647634a1 100644 --- a/recipes/tinyexr/all/conanfile.py +++ b/recipes/tinyexr/all/conanfile.py @@ -13,7 +13,7 @@ class TinyExrConan(ConanFile): url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/syoyo/tinyexr" topics = ("exr", "header-only") - + package_type = "header-library" settings = "os", "arch", "compiler", "build_type" options = { "with_z": ["zlib", "miniz"], @@ -38,7 +38,7 @@ def layout(self): def requirements(self): if self.options.with_z == "miniz": - self.requires("miniz/3.0.1") + self.requires("miniz/3.0.2") else: self.requires("zlib/1.2.13") if self.options.with_zfp: diff --git a/recipes/tinyexr/config.yml b/recipes/tinyexr/config.yml index af3bb0714e65c..b08dcb504fac7 100644 --- a/recipes/tinyexr/config.yml +++ b/recipes/tinyexr/config.yml @@ -1,4 +1,6 @@ versions: + "1.0.6": + folder: all "1.0.1": folder: all "1.0.0": From 464303621333b8ec0bcc17385a85060db4c7f4d7 Mon Sep 17 00:00:00 2001 From: fcorso2016 <35567462+fcorso2016@users.noreply.github.com> Date: Fri, 30 Jun 2023 05:44:47 -0400 Subject: [PATCH 4/4] (#17813) [dr_libs] New library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added the dr_libs conanfile * Added new line character * Removed trailing spaces * Used the suggested version number Co-authored-by: Uilian Ries * Update recipes/dr_libs/all/conanfile.py Co-authored-by: Uilian Ries * Added a test for the package to verify functionality * Changed test to not read in an audio file * Switched to use NULL instead of nullptr * some fixes * Update recipes/dr_libs/all/test_package/CMakeLists.txt Co-authored-by: Uilian Ries * check_min_cppstd * Update recipes/dr_libs/all/test_package/CMakeLists.txt * Add min compiler version check * fix imports --------- Co-authored-by: Uilian Ries Co-authored-by: czoido Co-authored-by: Rubén Rincón Blanco --- recipes/dr_libs/all/conandata.yml | 4 ++ recipes/dr_libs/all/conanfile.py | 71 +++++++++++++++++++ .../dr_libs/all/test_package/CMakeLists.txt | 7 ++ recipes/dr_libs/all/test_package/conanfile.py | 27 +++++++ .../dr_libs/all/test_package/test_package.cpp | 24 +++++++ recipes/dr_libs/config.yml | 3 + 6 files changed, 136 insertions(+) create mode 100644 recipes/dr_libs/all/conandata.yml create mode 100644 recipes/dr_libs/all/conanfile.py create mode 100644 recipes/dr_libs/all/test_package/CMakeLists.txt create mode 100644 recipes/dr_libs/all/test_package/conanfile.py create mode 100644 recipes/dr_libs/all/test_package/test_package.cpp create mode 100644 recipes/dr_libs/config.yml diff --git a/recipes/dr_libs/all/conandata.yml b/recipes/dr_libs/all/conandata.yml new file mode 100644 index 0000000000000..3781cb3dd93e8 --- /dev/null +++ b/recipes/dr_libs/all/conandata.yml @@ -0,0 +1,4 @@ +sources: + "cci.20230529": + url: "https://github.com/mackron/dr_libs/archive/dbbd08d81fd2b084c5ae931531871d0c5fd83b87.tar.gz" + sha256: "9e8d488092c9a0a6b08d9aafc631b1c8d75e707bc10a56a5f4bb1709213702c1" diff --git a/recipes/dr_libs/all/conanfile.py b/recipes/dr_libs/all/conanfile.py new file mode 100644 index 0000000000000..a0572bd8f2cdd --- /dev/null +++ b/recipes/dr_libs/all/conanfile.py @@ -0,0 +1,71 @@ +from conan import ConanFile +from conan.tools.files import get, copy +from conan.tools.build import check_min_cppstd +from conan.tools.layout import basic_layout +from conan.tools.microsoft import is_msvc, check_min_vs +from conan.tools.scm import Version +from conan.errors import ConanInvalidConfiguration + +import os + +required_conan_version = ">=1.52.0" + + +class DrLibsConan(ConanFile): + name = "dr_libs" + description = "Public domain, single file audio decoding libraries for C and C++." + license = ("Unlicense", "MIT-0") + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/mackron/dr_libs" + topics = ("audio", "encoding", "header-only") + no_copy_source = True + settings = "os", "arch", "compiler", "build_type" + package_type = "header-library" + + @property + def _min_cppstd(self): + return 11 + + @property + def _compilers_minimum_version(self): + return { + "gcc": "4.7", + "clang": "3.4", + "apple-clang": "6", + } + + def validate(self): + if self.settings.get_safe("compiler.cppstd"): + check_min_cppstd(self, self._min_cppstd) + check_min_vs(self, 180) + 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: + raise ConanInvalidConfiguration( + f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support." + ) + + def layout(self): + basic_layout(self, src_folder="src") + + def package_id(self): + self.info.clear() + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + 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=self.source_folder, + excludes=("old/*", "wip/*", "tests/*") + ) + + def package_info(self): + self.cpp_info.bindirs = [] + self.cpp_info.libdirs = [] diff --git a/recipes/dr_libs/all/test_package/CMakeLists.txt b/recipes/dr_libs/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..ebee798816d9d --- /dev/null +++ b/recipes/dr_libs/all/test_package/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.15) +project(test_DrLibs LANGUAGES CXX) +find_package(dr_libs REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE dr_libs::dr_libs) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/recipes/dr_libs/all/test_package/conanfile.py b/recipes/dr_libs/all/test_package/conanfile.py new file mode 100644 index 0000000000000..70d86ba6525a6 --- /dev/null +++ b/recipes/dr_libs/all/test_package/conanfile.py @@ -0,0 +1,27 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import cmake_layout, CMake +import os + + +# It will become the standard on Conan 2.x +class TestDrLibsConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + test_type = "explicit" + + def layout(self): + cmake_layout(self) + + def requirements(self): + self.requires(self.tested_reference_str) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindir, "test_DrLibs") + self.run(bin_path, env="conanrun") diff --git a/recipes/dr_libs/all/test_package/test_package.cpp b/recipes/dr_libs/all/test_package/test_package.cpp new file mode 100644 index 0000000000000..eca29117d03db --- /dev/null +++ b/recipes/dr_libs/all/test_package/test_package.cpp @@ -0,0 +1,24 @@ +#define DR_WAV_IMPLEMENTATION +#include "dr_wav.h" +#include +#include +#include + +#define BUFFER_SIZE 255 + +int main() { + srand(time(NULL)); + + // Create fake PCM data + std::vector buffer(BUFFER_SIZE); + for (size_t i = 0; i < BUFFER_SIZE; i++) + buffer[i] = rand() % std::numeric_limits::max(); + + // Convert it to 32-bit floating point + std::vector asFloat(buffer.size()); + drwav_s16_to_f32(asFloat.data(), buffer.data(), buffer.size()); + + // If we get here with no issues, then it's a success + std::cout << "Test success!" << std::endl; + return DRWAV_SUCCESS; +} diff --git a/recipes/dr_libs/config.yml b/recipes/dr_libs/config.yml new file mode 100644 index 0000000000000..612a58a0b962e --- /dev/null +++ b/recipes/dr_libs/config.yml @@ -0,0 +1,3 @@ +versions: + "cci.20230529": + folder: all