From 08fda1b0bbc852ef73160f856b84c441f873cb1a Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Sun, 10 May 2026 12:38:34 +0000 Subject: [PATCH] Update dependencies (#19) Reviewed-on: https://git.romainboullard.com/BigfootDev/ConanPackages/pulls/19 Co-authored-by: Romain BOULLARD Co-committed-by: Romain BOULLARD --- .gitea/workflows/ci.yml | 10 +++--- glm/all/conandata.yml | 10 ++++++ glm/all/conanfile.py | 52 +++++++++++++++++++++++++++ glm/all/test_package/CMakeLists.txt | 7 ++++ glm/all/test_package/conanfile.py | 26 ++++++++++++++ glm/all/test_package/test_package.cpp | 11 ++++++ glm/config.yml | 7 ++++ imgui/all/conandata.yml | 7 ++++ imgui/config.yml | 2 ++ meshoptimizer/all/conandata.yml | 3 ++ meshoptimizer/config.yml | 2 ++ mimalloc/all/conandata.yml | 3 ++ mimalloc/config.yml | 2 ++ sqlite3/all/conandata.yml | 3 ++ sqlite3/config.yml | 2 ++ 15 files changed, 143 insertions(+), 4 deletions(-) create mode 100644 glm/all/conandata.yml create mode 100644 glm/all/conanfile.py create mode 100644 glm/all/test_package/CMakeLists.txt create mode 100644 glm/all/test_package/conanfile.py create mode 100644 glm/all/test_package/test_package.cpp create mode 100644 glm/config.yml diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 0249068..0b00b98 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -37,15 +37,17 @@ jobs: { name: "stduuid", version: "1.2.3", location: "all" }, { name: "flatbuffers", version: "25.12.19-2026-02-06-03fffb2-bigfoot", location: "all" }, + { name: "glm", version: "1.0.3", location: "all" }, + { name: "unordered_dense", version: "4.8.1", location: "all" }, - { name: "mimalloc", version: "3.3.1", location: "all" }, - { name: "meshoptimizer", version: "1.0", location: "all" }, - { name: "sqlite3", version: "3.51.2", location: "all" }, + { name: "mimalloc", version: "3.3.2", location: "all" }, + { name: "meshoptimizer", version: "1.1", location: "all" }, + { name: "sqlite3", version: "3.53.1", location: "all" }, { name: "rapidhash", version: "3.0", location: "all" }, { name: "cli11", version: "2.6.1", location: "all" }, { name: "assimp", version: "6.0.4", location: "5.x" }, - { name: "imgui", version: "1.92.6-docking", location: "all" }, + { name: "imgui", version: "1.92.7-docking", location: "all" }, ] name: "Package ${{matrix.package.name }}/${{ matrix.package.version }}" steps: diff --git a/glm/all/conandata.yml b/glm/all/conandata.yml new file mode 100644 index 0000000..6ebd105 --- /dev/null +++ b/glm/all/conandata.yml @@ -0,0 +1,10 @@ +sources: + "1.0.3": + url: "https://github.com/g-truc/glm/releases/download/1.0.3/glm-1.0.3.zip" + sha256: "1c0a0fced9b0d87c7b7bc94e40be490cff6d4c83c25db8488d8f33754e7fdeb2" + "1.0.1": + url: "https://github.com/g-truc/glm/releases/download/1.0.1/glm-1.0.1-light.zip" + sha256: "9A995DE4DA09723BD33EF194E6B79818950E5A8F2E154792F02E4615277CFB8D" + "0.9.9.8": + url: "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip" + sha256: "37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c" diff --git a/glm/all/conanfile.py b/glm/all/conanfile.py new file mode 100644 index 0000000..f4a50d4 --- /dev/null +++ b/glm/all/conanfile.py @@ -0,0 +1,52 @@ +from conan import ConanFile +from conan.tools.files import copy, get +from conan.tools.layout import basic_layout +from conan.tools.scm import Version +import os + +required_conan_version = ">=1.50.0" + + +class GlmConan(ConanFile): + name = "glm" + description = "OpenGL Mathematics (GLM)" + topics = ("glm", "opengl", "mathematics") + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/g-truc/glm" + license = "MIT" + package_type = "header-library" + settings = "os", "arch", "compiler", "build_type" + no_copy_source = True + + 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=self.version < Version("1.0.0")) + + def build(self): + pass + + def package(self): + if self.version < Version("1.0.0"): + copy(self, "copying.txt", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses")) + else: + copy(self, "copying.txt", src=os.path.join(self.source_folder, "glm"), dst=os.path.join(self.package_folder, "licenses")) + + if self.version < Version("1.0.2"): + for headers in ("*.hpp", "*.inl", "*.h", "*.cppm"): + copy(self, headers, src=os.path.join(self.source_folder, "glm"), + dst=os.path.join(self.package_folder, "include", "glm")) + else: + for headers in ("*.hpp", "*.inl", "*.h", "*.cppm"): + copy(self, headers, src=os.path.join(self.source_folder, "glm"), + dst=os.path.join(self.package_folder, "include")) + + def package_info(self): + self.cpp_info.set_property("cmake_file_name", "glm") + self.cpp_info.set_property("cmake_target_name", "glm::glm") + self.cpp_info.bindirs = [] + self.cpp_info.libdirs = [] diff --git a/glm/all/test_package/CMakeLists.txt b/glm/all/test_package/CMakeLists.txt new file mode 100644 index 0000000..5de0300 --- /dev/null +++ b/glm/all/test_package/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES CXX) + +find_package(glm REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE glm::glm) diff --git a/glm/all/test_package/conanfile.py b/glm/all/test_package/conanfile.py new file mode 100644 index 0000000..0a6bc68 --- /dev/null +++ b/glm/all/test_package/conanfile.py @@ -0,0 +1,26 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import CMake, cmake_layout +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeToolchain", "CMakeDeps", "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.bindirs[0], "test_package") + self.run(bin_path, env="conanrun") diff --git a/glm/all/test_package/test_package.cpp b/glm/all/test_package/test_package.cpp new file mode 100644 index 0000000..a2fcaaf --- /dev/null +++ b/glm/all/test_package/test_package.cpp @@ -0,0 +1,11 @@ +#include +#include "glm/glm.hpp" + +int main (int argc, char * argv[]) { + glm::vec4 position = glm::vec4(glm::vec3(0.0), 1.0); + glm::mat4 model = glm::mat4(1.0); + model[3] = glm::vec4(1.0, 1.0, 0.0, 1.0); + glm::vec4 transformed = model * position; + + return EXIT_SUCCESS; +} diff --git a/glm/config.yml b/glm/config.yml new file mode 100644 index 0000000..068a6c5 --- /dev/null +++ b/glm/config.yml @@ -0,0 +1,7 @@ +versions: + "1.0.3": + folder: all + "1.0.1": + folder: all + "0.9.9.8": + folder: all diff --git a/imgui/all/conandata.yml b/imgui/all/conandata.yml index c246a4d..593cad2 100644 --- a/imgui/all/conandata.yml +++ b/imgui/all/conandata.yml @@ -1,6 +1,13 @@ # this package's recipe relies on version suffixes to handle imgui's docking branch. # Suffix: -docking for docking branch sources sources: + "1.92.7-docking": + core: + url: "https://github.com/ocornut/imgui/archive/v1.92.7-docking.tar.gz" + sha256: "2c58e28c957497eba0ed01c48a0bc5f118ec5f10a1c3721ba9436253a623bd72" + testengine: + url: "https://github.com/ocornut/imgui_test_engine/archive/v1.92.7.tar.gz" + sha256: "3bb2320044854abb479facdde01c38c8af2e0257a630eb4b582b100a4fa60043" "1.92.6": core: url: "https://github.com/ocornut/imgui/archive/v1.92.6.tar.gz" diff --git a/imgui/config.yml b/imgui/config.yml index 27e816d..6620b75 100644 --- a/imgui/config.yml +++ b/imgui/config.yml @@ -1,4 +1,6 @@ versions: + "1.92.7-docking": + folder: all "1.92.6": folder: all "1.92.6-docking": diff --git a/meshoptimizer/all/conandata.yml b/meshoptimizer/all/conandata.yml index 260c26c..4966676 100644 --- a/meshoptimizer/all/conandata.yml +++ b/meshoptimizer/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.1": + url: "https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.1.tar.gz" + sha256: "b787011f81b4b3069c2f9065b7c191efdd4189a49be32ba5282dd5579f05261a" "1.0": url: "https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.0.tar.gz" sha256: "30d1c3651986b2074e847b17223a7269c9612ab7f148b944250f81214fed4993" diff --git a/meshoptimizer/config.yml b/meshoptimizer/config.yml index 13f9acc..c3200f8 100644 --- a/meshoptimizer/config.yml +++ b/meshoptimizer/config.yml @@ -1,4 +1,6 @@ versions: + "1.1": + folder: all "1.0": folder: all "0.25": diff --git a/mimalloc/all/conandata.yml b/mimalloc/all/conandata.yml index 7784d6a..d309109 100644 --- a/mimalloc/all/conandata.yml +++ b/mimalloc/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.3.2": + url: "https://github.com/microsoft/mimalloc/archive/v3.3.2.tar.gz" + sha256: "ca02384e007f46950598500dfaebde5ff9948c1d231f5a81b058799afa64bbbb" "3.3.1": url: "https://github.com/microsoft/mimalloc/archive/v3.3.1.tar.gz" sha256: "42c16914168ac6741eeb407e83b93a12b2b7ee25a7e14e6b4807fab8b577a540" diff --git a/mimalloc/config.yml b/mimalloc/config.yml index d5845c2..054c4cd 100644 --- a/mimalloc/config.yml +++ b/mimalloc/config.yml @@ -1,4 +1,6 @@ versions: + "3.3.2": + folder: all "3.3.1": folder: all "3.2.8": diff --git a/sqlite3/all/conandata.yml b/sqlite3/all/conandata.yml index b48f50f..b9d6e79 100644 --- a/sqlite3/all/conandata.yml +++ b/sqlite3/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.53.1": + url: "https://sqlite.org/2026/sqlite-amalgamation-3530100.zip" + sha256: "36ad6e7f38540a3b21a2ac36340833f0a9e426bc1c752751c3ba669466827eae" "3.51.2": url: "https://sqlite.org/2026/sqlite-amalgamation-3510200.zip" sha256: "6e2a845a493026bdbad0618b2b5a0cf48584faab47384480ed9f592d912f23ec" diff --git a/sqlite3/config.yml b/sqlite3/config.yml index bd2666d..f79188a 100644 --- a/sqlite3/config.yml +++ b/sqlite3/config.yml @@ -1,4 +1,6 @@ versions: + "3.53.1": + folder: all "3.51.2": folder: all "3.51.0":