Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wayland: Add version 1.23.0 #24633

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+13 −4
Open

wayland: Add version 1.23.0 #24633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a29df27
wayland: Add version 1.23.0
jwillikers Jul 15, 2024
021d927
Bump pkgconf
jwillikers Jul 15, 2024
04ed653
Use a version range for Meson
jwillikers Jul 15, 2024
d695b03
Fix the test package when cross-compiling
jwillikers Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/wayland/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.23.0":
url: "https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.23.0/downloads/wayland-1.23.0.tar.xz"
sha256: "05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2"
"1.22.0":
url: "https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.22.0/downloads/wayland-1.22.0.tar.xz"
sha256: "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842"
Expand Down
4 changes: 2 additions & 2 deletions recipes/wayland/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ def validate(self):
raise ConanInvalidConfiguration(f"{self.ref} only supports Linux")

def build_requirements(self):
self.tool_requires("meson/1.4.0")
self.tool_requires("meson/[>=1.4.0 <2]")
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/2.1.0")
self.tool_requires("pkgconf/2.2.0")
if not can_run(self):
self.tool_requires(str(self.ref))

Expand Down
8 changes: 6 additions & 2 deletions recipes/wayland/all/test_package/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from conan import ConanFile
from conan.tools.build import can_run
from conan.tools.cmake import CMake, cmake_layout, CMakeDeps, CMakeToolchain
from conan.tools.env import VirtualBuildEnv
from conan.tools.env import Environment, VirtualBuildEnv
from conan.tools.gnu import PkgConfig, PkgConfigDeps


Expand All @@ -21,7 +21,7 @@ def requirements(self):
def build_requirements(self):
self.tool_requires(self.tested_reference_str)
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/2.1.0")
self.tool_requires("pkgconf/2.2.0")

def layout(self):
cmake_layout(self)
Expand All @@ -38,6 +38,10 @@ def generate(self):
pkg_config_deps.generate()
virtual_build_env = VirtualBuildEnv(self)
virtual_build_env.generate()
if self._has_build_profile:
env = Environment()
env.append_path("PKG_CONFIG_PATH", self.generators_folder)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll need to understand why this is needed before being comfortable approving - maybe @jcar87 has also some insight, he has been fighting with pkgconfig this last week :)

env.vars(self).save_script("conanbuild_cmake")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 2 additions & 0 deletions recipes/wayland/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.23.0":
folder: all
"1.22.0":
folder: all
"1.21.0":
Expand Down
Loading