From 4e5397b474bd59befc86362d126855a1ce372bfd Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Sun, 3 Nov 2024 00:56:35 +0000 Subject: [PATCH 1/7] [bot] dpp: add version 10.0.35 --- recipes/dpp/all/conandata.yml | 4 ++++ recipes/dpp/config.yml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/recipes/dpp/all/conandata.yml b/recipes/dpp/all/conandata.yml index 473b795664322..72137f59232db 100644 --- a/recipes/dpp/all/conandata.yml +++ b/recipes/dpp/all/conandata.yml @@ -1,4 +1,8 @@ sources: + "10.0.35": + url: + - "https://github.com/brainboxdotcc/DPP/archive/refs/tags/v10.0.35.zip" + sha256: "ebe82b0c3c7678d31bc26ad7ab9aedfd66057a559c541750ede5d19a0ed0c245" "10.0.34": url: - "https://github.com/brainboxdotcc/DPP/archive/refs/tags/v10.0.34.zip" diff --git a/recipes/dpp/config.yml b/recipes/dpp/config.yml index 74f40185c179a..7b7ac472d8862 100644 --- a/recipes/dpp/config.yml +++ b/recipes/dpp/config.yml @@ -1,3 +1,5 @@ versions: + "10.0.35": + folder: all "10.0.34": folder: all From 06a3963e1ea898675492638e325070eb49e03352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 4 Nov 2024 12:09:28 +0100 Subject: [PATCH 2/7] Remove neon compilation failure workaround --- recipes/dpp/all/conanfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/dpp/all/conanfile.py b/recipes/dpp/all/conanfile.py index 742a484eeee40..a8d6bac4dac97 100644 --- a/recipes/dpp/all/conanfile.py +++ b/recipes/dpp/all/conanfile.py @@ -67,7 +67,9 @@ def generate(self): tc.cache_variables["BUILD_VOICE_SUPPORT"] = True tc.cache_variables["DPP_BUILD_TEST"] = False tc.cache_variables["BUILD_SHARED_LIBS"] = True - tc.cache_variables["AVX_TYPE"] = "AVX0" + if Version(self.version) <= "10.0.34": + # Workaround for Neon not compiling in old versions + tc.cache_variables["AVX_TYPE"] = "AVX0" tc.generate() def build(self): From 4c95c2e9ccb03bcd6255db2928f751a799916c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 4 Nov 2024 13:03:12 +0100 Subject: [PATCH 3/7] Bye bye Conan 1! --- recipes/dpp/all/conanfile.py | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/recipes/dpp/all/conanfile.py b/recipes/dpp/all/conanfile.py index a8d6bac4dac97..5c3adde9bbdf5 100644 --- a/recipes/dpp/all/conanfile.py +++ b/recipes/dpp/all/conanfile.py @@ -6,40 +6,24 @@ from conan.tools.files import get, copy, rmdir from conan.tools.scm import Version -required_conan_version = ">=1.54" +required_conan_version = ">=2" class DPPConan(ConanFile): name = "dpp" license = "Apache-2.0" - package_type = "shared-library" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/brainboxdotcc/DPP" description = "D++ is a lightweight and efficient library for Discord" topics = ("discord") + package_type = "shared-library" settings = "os", "compiler", "build_type", "arch" @property def _min_cppstd(self): return 17 - @property - def _compilers_minimum_version(self): - return { - "apple-clang": "14", - "clang": "10", - "gcc": "8", - "msvc": "191", - "Visual Studio": "16", - } - 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._min_cppstd) def requirements(self): self.requires("nlohmann_json/3.11.2", transitive_libs=True, transitive_headers=True) From a113c0d7f4d878d4e0b807a2db4650db457e821f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 4 Nov 2024 13:05:06 +0100 Subject: [PATCH 4/7] Cleanup --- recipes/dpp/all/conanfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/dpp/all/conanfile.py b/recipes/dpp/all/conanfile.py index 5c3adde9bbdf5..94dccb086130c 100644 --- a/recipes/dpp/all/conanfile.py +++ b/recipes/dpp/all/conanfile.py @@ -1,6 +1,5 @@ import os from conan import ConanFile -from conan.errors import ConanInvalidConfiguration from conan.tools.build import check_min_cppstd from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps from conan.tools.files import get, copy, rmdir @@ -23,7 +22,7 @@ def _min_cppstd(self): return 17 def validate(self): - check_min_cppstd(self._min_cppstd) + check_min_cppstd(self, self._min_cppstd) def requirements(self): self.requires("nlohmann_json/3.11.2", transitive_libs=True, transitive_headers=True) From 79c8b8c46e2e930d1a9b3c54309499c3012beba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 4 Nov 2024 13:06:12 +0100 Subject: [PATCH 5/7] :) --- recipes/dpp/all/conanfile.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes/dpp/all/conanfile.py b/recipes/dpp/all/conanfile.py index 94dccb086130c..9016f57536f6c 100644 --- a/recipes/dpp/all/conanfile.py +++ b/recipes/dpp/all/conanfile.py @@ -17,12 +17,8 @@ class DPPConan(ConanFile): package_type = "shared-library" settings = "os", "compiler", "build_type", "arch" - @property - def _min_cppstd(self): - return 17 - def validate(self): - check_min_cppstd(self, self._min_cppstd) + check_min_cppstd(self, "17") def requirements(self): self.requires("nlohmann_json/3.11.2", transitive_libs=True, transitive_headers=True) From e597bfd96be35cf40ff6707433722ed1d30cc898 Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:58:47 +0000 Subject: [PATCH 6/7] Fix when cross-building x86_64 macOS --- recipes/dpp/all/conanfile.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes/dpp/all/conanfile.py b/recipes/dpp/all/conanfile.py index 9016f57536f6c..352e1df403960 100644 --- a/recipes/dpp/all/conanfile.py +++ b/recipes/dpp/all/conanfile.py @@ -49,6 +49,11 @@ def generate(self): if Version(self.version) <= "10.0.34": # Workaround for Neon not compiling in old versions tc.cache_variables["AVX_TYPE"] = "AVX0" + if self.settings.os == "Macos" and cross_building(self) and self.settings.arch == "x86_64": + tc.cache_variables["AVX1_EXITCODE"] = "0" + tc.cache_variables["AVX2_EXITCODE"] = "0" + tc.cache_variables["AVX512_EXITCODE"] = "-1" + tc.cache_variables["AVX1024_EXITCODE"] = "-1" tc.generate() def build(self): From 280cfaa58ff1a5eff0cf4e54a4c0231d089042de Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:09:26 +0000 Subject: [PATCH 7/7] Update conanfile.py --- recipes/dpp/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/dpp/all/conanfile.py b/recipes/dpp/all/conanfile.py index 352e1df403960..b33af815685ca 100644 --- a/recipes/dpp/all/conanfile.py +++ b/recipes/dpp/all/conanfile.py @@ -1,6 +1,6 @@ import os from conan import ConanFile -from conan.tools.build import check_min_cppstd +from conan.tools.build import check_min_cppstd, cross_building from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps from conan.tools.files import get, copy, rmdir from conan.tools.scm import Version