Skip to content

Commit

Permalink
(conan-io#20454) Bump deps in sdl to avoid conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
czoido authored and BASILI Michel committed Mar 18, 2024
1 parent 2fa7c49 commit 2054e4b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions recipes/sdl/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ def requirements(self):
self.requires("libiconv/1.17")
if self.settings.os == "Linux":
if self.options.alsa:
self.requires("libalsa/1.2.7.2")
self.requires("libalsa/1.2.10")
if self.options.pulse:
self.requires("pulseaudio/14.2")
if self.options.opengl:
self.requires("opengl/system")
if self.options.nas:
self.requires("nas/1.9.5")
if self.options.wayland:
self.requires("wayland/1.21.0")
self.requires("wayland/1.22.0")
self.requires("xkbcommon/1.4.1")
self.requires("egl/system")
if self.options.libunwind:
Expand Down Expand Up @@ -188,7 +188,7 @@ def build_requirements(self):
if self.settings.os == "Linux" and not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/1.9.3")
if hasattr(self, "settings_build") and self.options.get_safe("wayland"):
self.build_requires("wayland/1.21.0") # Provides wayland-scanner
self.build_requires("wayland/1.22.0") # Provides wayland-scanner

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True,
Expand Down

0 comments on commit 2054e4b

Please sign in to comment.