From 9b986f12e319a2d913a6113238f9f24ac3c5fd52 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Sat, 14 May 2022 21:43:37 +0200 Subject: [PATCH] bump conan dependencies --- .github/workflows/build-cmake-conan.yml | 3 --- conan/playstation2 | 12 ------------ conanfile.py | 8 ++------ 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 conan/playstation2 diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml index 43f85a9..ca45d9f 100644 --- a/.github/workflows/build-cmake-conan.yml +++ b/.github/workflows/build-cmake-conan.yml @@ -30,9 +30,6 @@ jobs: run: | python -m pip install conan conan config init - conan config set log.print_run_commands=True - conan config set general.revisions_enabled=1 - conan remote add bincrafters https://bincrafters.jfrog.io/artifactory/api/conan/public-conan - name: "Create host profile" shell: bash run: | diff --git a/conan/playstation2 b/conan/playstation2 deleted file mode 100644 index ddad52b..0000000 --- a/conan/playstation2 +++ /dev/null @@ -1,12 +0,0 @@ -[settings] -os=Playstation2 -arch=mips -compiler=gcc -compiler.version=3.2 -compiler.libcxx=libstdc++ -build_type=Release -[options] -librw:platform=ps2 -[build_requires] -ps2dev-ps2toolchain/unknown@madebr/testing -[env] diff --git a/conanfile.py b/conanfile.py index 4cefb49..aa36dd5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -53,13 +53,9 @@ class LibrwConan(ConanFile): def requirements(self): if self.options.platform == "gl3": if self.options.gl3_gfxlib == "glfw": - self.requires("glfw/3.3.2") + self.requires("glfw/3.3.7") elif self.options.gl3_gfxlib == "sdl2": - self.requires("sdl2/2.0.12@bincrafters/stable") - elif self.options.platform == "ps2": - self.requires("ps2dev-ps2sdk/unknown@madebr/testing") - if self._os_is_playstation2: - self.requires("ps2dev-cmaketoolchain/{}".format(self.version)) + self.requires("sdl/2.0.20") def export_sources(self): for d in ("cmake", "skeleton", "src", "tools"):