From f7fa73d6881047328adceec01131f00508a005fa Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 10 Jan 2024 15:53:46 +0200 Subject: [PATCH 1/2] pulseaudio: make xorg requirement more specifc --- recipes/pulseaudio/all/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/pulseaudio/all/conanfile.py b/recipes/pulseaudio/all/conanfile.py index 1a469fa5694df..4bfa077aab640 100644 --- a/recipes/pulseaudio/all/conanfile.py +++ b/recipes/pulseaudio/all/conanfile.py @@ -64,7 +64,7 @@ def requirements(self): if self.options.with_alsa: self.requires("libalsa/1.2.10") if self.options.with_glib: - self.requires("glib/2.78.1") + self.requires("glib/2.78.3") if self.options.get_safe("with_fftw"): self.requires("fftw/3.3.10") if self.options.with_x11: @@ -89,7 +89,7 @@ def build_requirements(self): self.tool_requires("gettext/0.21") self.tool_requires("libtool/2.4.7") if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/2.0.3") + self.tool_requires("pkgconf/2.1.0") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) @@ -146,7 +146,7 @@ def package_info(self): if self.options.get_safe("with_fftw"): self.cpp_info.components["pulse"].requires.append("fftw::fftw") if self.options.with_x11: - self.cpp_info.components["pulse"].requires.append("xorg::xorg") + self.cpp_info.components["pulse"].requires.append("xorg::x11") if self.options.with_openssl: self.cpp_info.components["pulse"].requires.append("openssl::openssl") if self.options.with_dbus: From b0a0a4589c81902280a11990fb09fe56e612c092 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 10 Jan 2024 17:03:35 +0200 Subject: [PATCH 2/2] pulseaudio: add xorg::x11-xcb dependency --- recipes/pulseaudio/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pulseaudio/all/conanfile.py b/recipes/pulseaudio/all/conanfile.py index 4bfa077aab640..d4ada3ef9ee78 100644 --- a/recipes/pulseaudio/all/conanfile.py +++ b/recipes/pulseaudio/all/conanfile.py @@ -146,7 +146,7 @@ def package_info(self): if self.options.get_safe("with_fftw"): self.cpp_info.components["pulse"].requires.append("fftw::fftw") if self.options.with_x11: - self.cpp_info.components["pulse"].requires.append("xorg::x11") + self.cpp_info.components["pulse"].requires.extend(["xorg::x11", "xorg::x11-xcb"]) if self.options.with_openssl: self.cpp_info.components["pulse"].requires.append("openssl::openssl") if self.options.with_dbus: