Merge pull request #43160 from jtojnar/pulseaudio-12

pulseaudio: 11.1 → 12.2
This commit is contained in:
Jan Tojnar 2018-07-29 22:40:54 +02:00 committed by GitHub
commit 63ef1e9381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 49 deletions

View File

@ -1,21 +1,16 @@
{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm
, dbus-glib, GConf, gconfmm, intltool }:
{ fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "paprefs-0.9.10";
name = "paprefs-1.0";
src = fetchurl {
url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz";
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
sha256 = "0y77i9gaaassvvjrpwb4xbgqcmr51zmj5rh4z8zm687i5izf84md";
};
buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ];
nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkgconfig intltool ];
propagatedUserEnvPkgs = [ GConf ];
configureFlags = [ "--disable-lynx" ];
buildInputs = [ pulseaudioFull gtkmm3 dbus-glib ];
meta = with stdenv.lib; {
description = "PulseAudio Preferences";

View File

@ -1,13 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 3c71472..71b5c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -620,6 +620,8 @@ AC_ARG_WITH([caps],
if test "x${with_caps}" != "xno"; then
AC_SEARCH_LIBS([cap_init], [cap], [], [])
+ AS_IF([test "x${with_caps}" != "xyes" -a "x${with_caps}" != "x"],
+ LIBS="-L${with_caps}/lib $LIBS")
# Only give an error on hosts that we know could support capabilities
AC_CHECK_HEADERS([sys/capability.h], [], [

View File

@ -1,9 +1,9 @@
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook
, libsndfile, libtool
, xorg, libcap, alsaLib, glib
{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook
, libsndfile, libtool, makeWrapper
, xorg, libcap, alsaLib, glib, gnome3
, avahi, libjack2, libasyncns, lirc, dbus
, sbc, bluez5, udev, openssl, fftwFloat
, speexdsp, systemd, webrtc-audio-processing, gconf ? null
, speexdsp, systemd, webrtc-audio-processing
, x11Support ? false
@ -17,8 +17,6 @@
, airtunesSupport ? false
, gconfSupport ? false
, bluetoothSupport ? false
, remoteControlSupport ? false
@ -33,27 +31,16 @@
stdenv.mkDerivation rec {
name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
version = "11.1";
version = "12.2";
src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj";
sha256 = "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0";
};
patches = [ ./caps-fix.patch (fetchpatch {
name = "glibc-2.27.patch";
url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb";
sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv";
}) ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
name = "padsp-fix.patch";
url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244";
sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q";
});
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
nativeBuildInputs = [ pkgconfig intltool autoreconfHook makeWrapper ];
propagatedBuildInputs =
lib.optionals stdenv.isLinux [ libcap ];
@ -69,7 +56,6 @@ stdenv.mkDerivation rec {
++ lib.optional useSystemd systemd
++ lib.optionals stdenv.isLinux [ alsaLib udev ]
++ lib.optional airtunesSupport openssl
++ lib.optional gconfSupport gconf
++ lib.optionals bluetoothSupport [ bluez5 sbc ]
++ lib.optional remoteControlSupport lirc
++ lib.optional zeroconfSupport avahi
@ -125,6 +111,12 @@ stdenv.mkDerivation rec {
''
+ ''moveToOutput lib/cmake "$dev" '';
preFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/libexec/pulse/gsettings-helper \
--prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
--prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules"
'';
meta = {
description = "Sound server for POSIX and Win32 systems";
homepage = http://www.pulseaudio.org/;

View File

@ -12978,11 +12978,9 @@ with pkgs;
};
pulseaudioFull = pulseaudio.override {
gconf = gnome2.GConf;
x11Support = true;
jackaudioSupport = true;
airtunesSupport = true;
gconfSupport = true;
bluetoothSupport = true;
remoteControlSupport = true;
zeroconfSupport = true;
@ -17725,9 +17723,7 @@ with pkgs;
panotools = callPackage ../applications/graphics/panotools { };
paprefs = callPackage ../applications/audio/paprefs {
inherit (gnome2) libglademm gconfmm GConf;
};
paprefs = callPackage ../applications/audio/paprefs { };
pavucontrol = callPackage ../applications/audio/pavucontrol { };