diff --git a/recipes/pulseaudio/all/conandata.yml b/recipes/pulseaudio/all/conandata.yml index 5b2ba2b02d578..1f7fbe0e59229 100644 --- a/recipes/pulseaudio/all/conandata.yml +++ b/recipes/pulseaudio/all/conandata.yml @@ -1,7 +1,10 @@ sources: - "13.0": - url: "https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz" - sha256: "961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057" + "14.2": + url: "https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-14.2.tar.xz" + sha256: "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1" "14.0": url: "https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-14.0.tar.xz" sha256: "a834775d9382b055504e5ee7625dc50768daac29329531deb6597bf05e06c261" + "13.0": + url: "https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz" + sha256: "961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057" diff --git a/recipes/pulseaudio/all/conanfile.py b/recipes/pulseaudio/all/conanfile.py index 99dae371568a8..a3859f6819ec7 100644 --- a/recipes/pulseaudio/all/conanfile.py +++ b/recipes/pulseaudio/all/conanfile.py @@ -1,4 +1,4 @@ -from conans import ConanFile, tools, AutoToolsBuildEnvironment, RunEnvironment +from conans import ConanFile, tools, AutoToolsBuildEnvironment from conans.errors import ConanInvalidConfiguration import os @@ -62,9 +62,9 @@ def requirements(self): if self.options.with_alsa: self.requires("libalsa/1.2.4") if self.options.with_glib: - self.requires("glib/2.67.2") + self.requires("glib/2.67.3") if self.options.get_safe("with_fftw"): - self.requires("fftw/3.3.8") + self.requires("fftw/3.3.9") if self.options.with_x11: self.requires("xorg/system") if self.options.with_openssl: @@ -82,6 +82,7 @@ def validate(self): def build_requirements(self): self.build_requires("gettext/0.20.1") self.build_requires("libtool/2.4.6") + self.build_requires("pkgconf/1.7.3") def source(self): tools.get(**self.conan_data["sources"][self.version]) @@ -103,23 +104,19 @@ def _configure_autotools(self): args.extend(["--enable-shared=no", "--enable-static=yes"]) args.append("--with-udev-rules-dir=%s" % os.path.join(self.package_folder, "bin", "udev", "rules.d")) args.append("--with-systemduserunitdir=%s" % os.path.join(self.build_folder, "ignore")) - with tools.environment_append({"PKG_CONFIG_PATH": self.build_folder}): - env = RunEnvironment(self).vars - if self.options.get_safe("with_fftw"): - env["FFTW_CFLAGS"] = tools.PkgConfig("fftwf").cflags - env["FFTW_LIBS"] = tools.PkgConfig("fftwf").libs - with tools.environment_append(env): - self._autotools.configure(args=args, configure_dir=self._source_subfolder) + self._autotools.configure(args=args, configure_dir=self._source_subfolder) return self._autotools def build(self): - autotools = self._configure_autotools() - autotools.make() + with tools.run_environment(self): + autotools = self._configure_autotools() + autotools.make() def package(self): self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder) - autotools = self._configure_autotools() - autotools.install() + with tools.run_environment(self): + autotools = self._configure_autotools() + autotools.install() tools.rmdir(os.path.join(self.package_folder, "etc")) tools.rmdir(os.path.join(self.package_folder, "share")) tools.rmdir(os.path.join(self.package_folder, "lib", "cmake")) diff --git a/recipes/pulseaudio/config.yml b/recipes/pulseaudio/config.yml index 99af03e4accfc..4aaa9c6cc7082 100644 --- a/recipes/pulseaudio/config.yml +++ b/recipes/pulseaudio/config.yml @@ -1,5 +1,7 @@ versions: - "13.0": + "14.2": folder: all "14.0": folder: all + "13.0": + folder: all