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

libdisplay-info: move hwdata to build requirements unconditionally + bump hwdata #21246

Merged
merged 4 commits into from
Nov 20, 2024
Merged

libdisplay-info: move hwdata to build requirements unconditionally + bump hwdata #21246

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7413aa2
move hwdata to build requirements unconditionally
SpaceIm Nov 19, 2023
4c925cc
simplify _has_build_profile
SpaceIm Nov 19, 2023
c48fe13
Some updates
perseoGI Nov 20, 2024
309ccf3
Merge branch 'master' into libdisplay-info-hwadata-one-profile
perseoGI Nov 20, 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
33 changes: 11 additions & 22 deletions recipes/libdisplay-info/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
import os


required_conan_version = ">=1.53.0"
required_conan_version = ">=2.0.9"


class LibdisplayInfoConan(ConanFile):
name = "libdisplay-info"
description = "EDID and DisplayID library."
description = "EDID and DisplayID library"
license = "MIT"
url = "https://github.com/conan-io/conan-center-index"
homepage = "https://gitlab.freedesktop.org/emersion/libdisplay-info"
Expand All @@ -29,14 +29,7 @@ class LibdisplayInfoConan(ConanFile):
"shared": False,
"fPIC": True,
}

@property
def _has_build_profile(self):
return getattr(self, "settings_build", None)

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
implements = ["auto_shared_fpic"]

def configure(self):
if self.options.shared:
Expand All @@ -47,35 +40,31 @@ def configure(self):
def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
if not self._has_build_profile:
self.requires("hwdata/0.374")

def validate(self):
if not self.settings.os in ["FreeBSD", "Linux"]:
raise ConanInvalidConfiguration(f"{self.ref} is not supported on {self.settings.os}")

def build_requirements(self):
if self._has_build_profile:
self.tool_requires("hwdata/0.374")
self.tool_requires("meson/1.2.3")
self.tool_requires("hwdata/0.376")
self.tool_requires("meson/[>=1.2.3 <2]")
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/2.0.3")
self.tool_requires("pkgconf/[>=2.2 <3]")

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

def generate(self):
env = VirtualBuildEnv(self)
env.generate()
tc = MesonToolchain(self)
if cross_building(self):
# https://mesonbuild.com/Builtin-options.html#specifying-options-per-machine
tc.project_options["build.pkg_config_path"] = self.generators_folder
tc.generate()

pkg_config_deps = PkgConfigDeps(self)
if self._has_build_profile:
pkg_config_deps.build_context_activated = ["hwdata"]
pkg_config_deps.build_context_activated = ["hwdata"]
pkg_config_deps.generate()
virtual_build_env = VirtualBuildEnv(self)
virtual_build_env.generate()

def _patch_sources(self):
replace_in_file(self, os.path.join(self.source_folder, "meson.build"), "subdir('test')", "# subdir('test')")
Expand Down