diff --git a/recipes/libalsa/all/conanfile.py b/recipes/libalsa/all/conanfile.py index cac0714be412f9..b5408d4dbbe381 100644 --- a/recipes/libalsa/all/conanfile.py +++ b/recipes/libalsa/all/conanfile.py @@ -1,13 +1,12 @@ from conan import ConanFile from conan.errors import ConanInvalidConfiguration from conan.tools.env import VirtualBuildEnv -from conan.tools.files import apply_conandata_patches, chdir, copy, get, rm, rmdir +from conan.tools.files import apply_conandata_patches, chdir, copy, export_conandata_patches, get, rm, rmdir from conan.tools.gnu import Autotools, AutotoolsToolchain from conan.tools.layout import basic_layout -from conan.tools.microsoft import unix_path import os -required_conan_version = ">=1.50.0" +required_conan_version = ">=1.52.0" class LibalsaConan(ConanFile): @@ -32,8 +31,7 @@ class LibalsaConan(ConanFile): } def export_sources(self): - for p in self.conan_data.get("patches", {}).get(self.version, []): - copy(self, p["patch_file"], self.recipe_folder, self.export_sources_folder) + export_conandata_patches(self) def configure(self): if self.options.shared: @@ -47,6 +45,9 @@ def configure(self): except Exception: pass + def layout(self): + basic_layout(self, src_folder="src") + def validate(self): if self.settings.os != "Linux": raise ConanInvalidConfiguration("Only Linux supported") @@ -54,9 +55,6 @@ def validate(self): def build_requirements(self): self.tool_requires("libtool/2.4.7") - def layout(self): - basic_layout(self, src_folder="src") - def source(self): get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True) @@ -95,6 +93,7 @@ def package_info(self): self.cpp_info.set_property("cmake_target_name", "ALSA::ALSA") self.cpp_info.set_property("pkg_config_name", "alsa") self.cpp_info.libs = ["asound"] + self.cpp_info.resdirs = ["res"] self.cpp_info.system_libs = ["dl", "m", "rt", "pthread"] alsa_config_dir = os.path.join(self.package_folder, "res", "alsa") self.runenv_info.define_path("ALSA_CONFIG_DIR", alsa_config_dir) diff --git a/recipes/libalsa/all/test_package/conanfile.py b/recipes/libalsa/all/test_package/conanfile.py index d120a992c06a69..0a6bc68712d901 100644 --- a/recipes/libalsa/all/test_package/conanfile.py +++ b/recipes/libalsa/all/test_package/conanfile.py @@ -7,13 +7,14 @@ class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv" - - def requirements(self): - self.requires(self.tested_reference_str) + 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()