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

pulseaudio: make xorg requirement more specifc #22241

Merged
merged 2 commits into from
Jan 25, 2024
Merged

pulseaudio: make xorg requirement more specifc #22241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7fa73d
pulseaudio: make xorg requirement more specifc
valgur Jan 10, 2024
b0a0a45
pulseaudio: add xorg::x11-xcb dependency
valgur Jan 10, 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
6 changes: 3 additions & 3 deletions recipes/pulseaudio/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
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:
Expand All @@ -81,7 +81,7 @@
if self.options.get_safe("with_fftw"):
if not self.dependencies["fftw"].options.precision_single:
raise ConanInvalidConfiguration(
f"Pulse audio uses fftw single precision. "

Check warning on line 84 in recipes/pulseaudio/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Using an f-string that does not have any interpolated variables
"Either set option -o fftw/*:precision_single=True or -o pulseaudio/*:with_fftw=False"
)

Expand All @@ -89,7 +89,7 @@
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)
Expand Down Expand Up @@ -146,7 +146,7 @@
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.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:
Expand Down