From 35f396ee37c6c397b96bae33ccd0d1b98c46f6d7ff5f7a3ea2532099f19da402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 28 Jul 2017 11:38:32 +0000 Subject: [PATCH] Accepting request 512909 from home:oholecek:branches:multimedia:libs - Update to 11 RC1 (10.99.1) * Support for newer AirPlay hardware * USB and bluetooth devices preferred over internal sound cards * Bluetooth HSP headset role implemented * Bluetooth HFP audio gateway role implemented (requires oFono) * Bluetooth HSP audio gateway and HFP hands-free unit roles can be enabled simultaneously * Upmixing can now be disabled without bad side effects * Avoid having unavailable sinks or sources as the default * Option to avoid resampling more often * Option to automatically switch bluetooth profile to HSP more often * Better latency control in module-loopback * Changed module argument names in module-ladspa-sink and module-virtual-surround-sink * Fixed input device handling in module-waveout * Improved bluetooth MTU configuration (warning! this causes some hardware to not work any more, see the details below for how to fix it) * Applications can request LADSPA or virtual surround filtering for their streams * Support for 32-bit applications on 64-bit systems in padsp - add --with-pulsedsp-location='/usr/\\$$LIB/pulseaudio' to enable upstream padsp multiarch fix - remove patch4 padsp-biarch.patch, fixed upstream - remove patch5 pulseaudio-vala-0.36.patch, fixed upstream OBS-URL: https://build.opensuse.org/request/show/512909 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=178 --- padsp-biarch.patch | 36 ----- pulseaudio-10.0.tar.xz | 3 - pulseaudio-10.99.1.tar.xz | 3 + pulseaudio-vala-0.36.patch | 260 ------------------------------------- pulseaudio.changes | 28 ++++ pulseaudio.spec | 63 +++------ 6 files changed, 48 insertions(+), 345 deletions(-) delete mode 100644 padsp-biarch.patch delete mode 100644 pulseaudio-10.0.tar.xz create mode 100644 pulseaudio-10.99.1.tar.xz delete mode 100644 pulseaudio-vala-0.36.patch diff --git a/padsp-biarch.patch b/padsp-biarch.patch deleted file mode 100644 index 29dccba..0000000 --- a/padsp-biarch.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- - src/Makefile.am | 5 ++++- - src/utils/padsp.in | 6 ++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - ---- a/src/utils/padsp.in -+++ b/src/utils/padsp.in -@@ -73,10 +73,12 @@ done - - shift $(( $OPTIND - 1 )) - -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ - if [ x"$LD_PRELOAD" = x ] ; then -- LD_PRELOAD="@pkglibdir@/libpulsedsp.so" -+ LD_PRELOAD="${exec_prefix}/\$LIB/@PACKAGE@/libpulsedsp.so" - else -- LD_PRELOAD="$LD_PRELOAD @pkglibdir@/libpulsedsp.so" -+ LD_PRELOAD="$LD_PRELOAD ${exec_prefix}/\$LIB/@PACKAGE@/libpulsedsp.so" - fi - - export LD_PRELOAD ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -901,7 +901,10 @@ padsplib_LTLIBRARIES = libpulsedsp.la - bin_SCRIPTS += padsp - - edit = @SED@ \ -- -e "s|@pkglibdir[@]|$(pkglibdir)|g" -+ -e "s|@pkglibdir[@]|$(pkglibdir)|g" \ -+ -e "s|@prefix[@]|$(prefix)|g" \ -+ -e "s|@exec_prefix[@]|$(exec_prefix)|g" \ -+ -e "s|@PACKAGE[@]|$(PACKAGE)|g" - - padsp: utils/padsp.in - $(edit) $< > $@ diff --git a/pulseaudio-10.0.tar.xz b/pulseaudio-10.0.tar.xz deleted file mode 100644 index c0adef6..0000000 --- a/pulseaudio-10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 -size 1608040 diff --git a/pulseaudio-10.99.1.tar.xz b/pulseaudio-10.99.1.tar.xz new file mode 100644 index 0000000..f80d2ba --- /dev/null +++ b/pulseaudio-10.99.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9791844569d8d0adb468c183d0d9fb6ac12b9db34a4a078a7773c8bac993f32 +size 1635836 diff --git a/pulseaudio-vala-0.36.patch b/pulseaudio-vala-0.36.patch deleted file mode 100644 index 7fd05fb..0000000 --- a/pulseaudio-vala-0.36.patch +++ /dev/null @@ -1,260 +0,0 @@ -From 94f32ebfcd51b2e13149a95318a497c05c438573 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Corentin=20No=C3=ABl?= -Date: Mon, 26 Dec 2016 11:52:06 +0100 -Subject: vala: use the correct syntax - -Constants should be declared simply with "const". With struct members, -"static" means that all struct instances share the same variable, i.e. -all instances always see the same value. That's of course already -implied in the concept of "constant". Newer Vala versions don't allow -mixing "const" and "static". - -diff --git a/vala/libpulse.vapi b/vala/libpulse.vapi -index 207cedf..107b745 100644 ---- a/vala/libpulse.vapi -+++ b/vala/libpulse.vapi -@@ -110,7 +110,7 @@ namespace PulseAudio { - public uint8 channels; - - [CCode (cname="PA_SAMPLE_SPEC_SNPRINT_MAX")] -- public static const size_t SNPRINT_MAX; -+ public const size_t SNPRINT_MAX; - - [CCode (cname="pa_bytes_per_second")] - public size_t bytes_per_second(); -@@ -170,23 +170,23 @@ namespace PulseAudio { - public struct Volume : uint32 { - - [CCode (cname="PA_SW_VOLUME_SNPRINT_DB_MAX")] -- public static const size_t SW_SNPRINT_DB_MAX; -+ public const size_t SW_SNPRINT_DB_MAX; - - [CCode (cname="PA_VOLUME_SNPRINT_MAX")] -- public static const size_t SNPRINT_MAX; -+ public const size_t SNPRINT_MAX; - - [CCode (cname="PA_VOLUME_MAX")] -- public static const Volume MAX; -+ public const Volume MAX; - - [CCode (cname="PA_VOLUME_NORM")] -- public static const Volume NORM; -+ public const Volume NORM; - - [CCode (cname="PA_VOLUME_MUTED")] -- public static const Volume MUTED; -+ public const Volume MUTED; - - // [CCode (cname="PA_VOLUME_INVALID")] - [CCode (cname="PA_VOLUME_MAX")] -- public static const Volume INVALID; -+ public const Volume INVALID; - - [CCode (cname="pa_volume_snprint", instance_pos = 3.1)] - public unowned string snprint(char[] s); -@@ -245,10 +245,10 @@ namespace PulseAudio { - public Volume values[32]; - - [CCode (cname="PA_SW_CVOLUME_SNPRINT_DB_MAX")] -- public static const size_t SW_SNPRINT_DB_MAX; -+ public const size_t SW_SNPRINT_DB_MAX; - - [CCode (cname="PA_CVOLUME_SNPRINT_MAX")] -- public static const size_t SNPRINT_MAX; -+ public const size_t SNPRINT_MAX; - - [CCode (cname="pa_cvolume_equal")] - public bool equal(CVolume other); -@@ -382,7 +382,7 @@ namespace PulseAudio { - public ChannelPosition map[32]; - - [CCode (cname="PA_CHANNEL_MAP_SNPRINT_MAX")] -- public static const size_t SNPRINT_MAX; -+ public const size_t SNPRINT_MAX; - - [CCode (cname="pa_channel_map_init")] - public ChannelMap(); -@@ -532,121 +532,121 @@ namespace PulseAudio { - public class Proplist { - - [CCode (cname="PA_PROP_MEDIA_NAME")] -- public static const string PROP_MEDIA_NAME; -+ public const string PROP_MEDIA_NAME; - [CCode (cname="PA_PROP_MEDIA_TITLE")] -- public static const string PROP_MEDIA_TITLE; -+ public const string PROP_MEDIA_TITLE; - [CCode (cname="PA_PROP_MEDIA_ARTIST")] -- public static const string PROP_MEDIA_ARTIST; -+ public const string PROP_MEDIA_ARTIST; - [CCode (cname="PA_PROP_MEDIA_COPYRIGHT")] -- public static const string PROP_MEDIA_COPYRIGHT; -+ public const string PROP_MEDIA_COPYRIGHT; - [CCode (cname="PA_PROP_MEDIA_SOFTWARE")] -- public static const string PROP_MEDIA_SOFTWARE; -+ public const string PROP_MEDIA_SOFTWARE; - [CCode (cname="PA_PROP_MEDIA_LANGUAGE")] -- public static const string PROP_MEDIA_LANGUAGE; -+ public const string PROP_MEDIA_LANGUAGE; - [CCode (cname="PA_PROP_MEDIA_FILENAME")] -- public static const string PROP_MEDIA_FILENAME; -+ public const string PROP_MEDIA_FILENAME; - [CCode (cname="PA_PROP_MEDIA_ICON_NAME")] -- public static const string PROP_MEDIA_ICON_NAME; -+ public const string PROP_MEDIA_ICON_NAME; - [CCode (cname="PA_PROP_MEDIA_ROLE")] -- public static const string PROP_MEDIA_ROLE; -+ public const string PROP_MEDIA_ROLE; - [CCode (cname="PA_PROP_EVENT_ID")] -- public static const string PROP_EVENT_ID; -+ public const string PROP_EVENT_ID; - [CCode (cname="PA_PROP_EVENT_DESCRIPTION")] -- public static const string PROP_EVENT_DESCRIPTION; -+ public const string PROP_EVENT_DESCRIPTION; - [CCode (cname="PA_PROP_EVENT_MOUSE_X")] -- public static const string PROP_EVENT_MOUSE_X; -+ public const string PROP_EVENT_MOUSE_X; - [CCode (cname="PA_PROP_EVENT_MOUSE_Y")] -- public static const string PROP_EVENT_MOUSE_Y; -+ public const string PROP_EVENT_MOUSE_Y; - [CCode (cname="PA_PROP_EVENT_MOUSE_HPOS")] -- public static const string PROP_EVENT_MOUSE_HPOS; -+ public const string PROP_EVENT_MOUSE_HPOS; - [CCode (cname="PA_PROP_EVENT_MOUSE_VPOS")] -- public static const string PROP_EVENT_MOUSE_VPOS; -+ public const string PROP_EVENT_MOUSE_VPOS; - [CCode (cname="PA_PROP_EVENT_MOUSE_BUTTON")] -- public static const string PROP_EVENT_MOUSE_BUTTON; -+ public const string PROP_EVENT_MOUSE_BUTTON; - [CCode (cname="PA_PROP_WINDOW_NAME")] -- public static const string PROP_WINDOW_NAME; -+ public const string PROP_WINDOW_NAME; - [CCode (cname="PA_PROP_WINDOW_ID")] -- public static const string PROP_WINDOW_ID; -+ public const string PROP_WINDOW_ID; - [CCode (cname="PA_PROP_WINDOW_ICON_NAME")] -- public static const string PROP_WINDOW_ICON_NAME; -+ public const string PROP_WINDOW_ICON_NAME; - [CCode (cname="PA_PROP_WINDOW_X11_DISPLAY")] -- public static const string PROP_WINDOW_X11_DISPLAY; -+ public const string PROP_WINDOW_X11_DISPLAY; - [CCode (cname="PA_PROP_WINDOW_X11_SCREEN")] -- public static const string PROP_WINDOW_X11_SCREEN; -+ public const string PROP_WINDOW_X11_SCREEN; - [CCode (cname="PA_PROP_WINDOW_X11_MONITOR")] -- public static const string PROP_WINDOW_X11_MONITOR; -+ public const string PROP_WINDOW_X11_MONITOR; - [CCode (cname="PA_PROP_WINDOW_X11_XID")] -- public static const string PROP_WINDOW_X11_XID; -+ public const string PROP_WINDOW_X11_XID; - [CCode (cname="PA_PROP_APPLICATION_NAME")] -- public static const string PROP_APPLICATION_NAME; -+ public const string PROP_APPLICATION_NAME; - [CCode (cname="PA_PROP_APPLICATION_ID")] -- public static const string PROP_APPLICATION_ID; -+ public const string PROP_APPLICATION_ID; - [CCode (cname="PA_PROP_APPLICATION_VERSION")] -- public static const string PROP_APPLICATION_VERSION; -+ public const string PROP_APPLICATION_VERSION; - [CCode (cname="PA_PROP_APPLICATION_ICON_NAME")] -- public static const string PROP_APPLICATION_ICON_NAME; -+ public const string PROP_APPLICATION_ICON_NAME; - [CCode (cname="PA_PROP_APPLICATION_LANGUAGE")] -- public static const string PROP_APPLICATION_LANGUAGE; -+ public const string PROP_APPLICATION_LANGUAGE; - [CCode (cname="PA_PROP_APPLICATION_PROCESS_ID")] -- public static const string PROP_APPLICATION_PROCESS_ID; -+ public const string PROP_APPLICATION_PROCESS_ID; - [CCode (cname="PA_PROP_APPLICATION_PROCESS_BINARY")] -- public static const string PROP_APPLICATION_PROCESS_BINARY; -+ public const string PROP_APPLICATION_PROCESS_BINARY; - [CCode (cname="PA_PROP_APPLICATION_PROCESS_USER")] -- public static const string PROP_APPLICATION_PROCESS_USER; -+ public const string PROP_APPLICATION_PROCESS_USER; - [CCode (cname="PA_PROP_APPLICATION_PROCESS_HOST")] -- public static const string PROP_APPLICATION_PROCESS_HOST; -+ public const string PROP_APPLICATION_PROCESS_HOST; - [CCode (cname="PA_PROP_APPLICATION_PROCESS_MACHINE_ID")] -- public static const string PROP_APPLICATION_PROCESS_MACHINE_ID; -+ public const string PROP_APPLICATION_PROCESS_MACHINE_ID; - [CCode (cname="PA_PROP_APPLICATION_PROCESS_SESSION_ID")] -- public static const string PROP_APPLICATION_PROCESS_SESSION_ID; -+ public const string PROP_APPLICATION_PROCESS_SESSION_ID; - [CCode (cname="PA_PROP_DEVICE_STRING")] -- public static const string PROP_DEVICE_STRING; -+ public const string PROP_DEVICE_STRING; - [CCode (cname="PA_PROP_DEVICE_API")] -- public static const string PROP_DEVICE_API; -+ public const string PROP_DEVICE_API; - [CCode (cname="PA_PROP_DEVICE_DESCRIPTION")] -- public static const string PROP_DEVICE_DESCRIPTION; -+ public const string PROP_DEVICE_DESCRIPTION; - [CCode (cname="PA_PROP_DEVICE_BUS_PATH")] -- public static const string PROP_DEVICE_BUS_PATH; -+ public const string PROP_DEVICE_BUS_PATH; - [CCode (cname="PA_PROP_DEVICE_SERIAL")] -- public static const string PROP_DEVICE_SERIAL; -+ public const string PROP_DEVICE_SERIAL; - [CCode (cname="PA_PROP_DEVICE_VENDOR_ID")] -- public static const string PROP_DEVICE_VENDOR_ID; -+ public const string PROP_DEVICE_VENDOR_ID; - [CCode (cname="PA_PROP_DEVICE_VENDOR_NAME")] -- public static const string PROP_DEVICE_VENDOR_NAME; -+ public const string PROP_DEVICE_VENDOR_NAME; - [CCode (cname="PA_PROP_DEVICE_PRODUCT_ID")] -- public static const string PROP_DEVICE_PRODUCT_ID; -+ public const string PROP_DEVICE_PRODUCT_ID; - [CCode (cname="PA_PROP_DEVICE_PRODUCT_NAME")] -- public static const string PROP_DEVICE_PRODUCT_NAME; -+ public const string PROP_DEVICE_PRODUCT_NAME; - [CCode (cname="PA_PROP_DEVICE_CLASS")] -- public static const string PROP_DEVICE_CLASS; -+ public const string PROP_DEVICE_CLASS; - [CCode (cname="PA_PROP_DEVICE_FORM_FACTOR")] -- public static const string PROP_DEVICE_FORM_FACTOR; -+ public const string PROP_DEVICE_FORM_FACTOR; - [CCode (cname="PA_PROP_DEVICE_BUS")] -- public static const string PROP_DEVICE_BUS; -+ public const string PROP_DEVICE_BUS; - [CCode (cname="PA_PROP_DEVICE_ICON_NAME")] -- public static const string PROP_DEVICE_ICON_NAME; -+ public const string PROP_DEVICE_ICON_NAME; - [CCode (cname="PA_PROP_DEVICE_ACCESS_MODE")] -- public static const string PROP_DEVICE_ACCESS_MODE; -+ public const string PROP_DEVICE_ACCESS_MODE; - [CCode (cname="PA_PROP_DEVICE_MASTER_DEVICE")] -- public static const string PROP_DEVICE_MASTER_DEVICE; -+ public const string PROP_DEVICE_MASTER_DEVICE; - [CCode (cname="PA_PROP_DEVICE_BUFFERING_BUFFER_SIZE")] -- public static const string PROP_DEVICE_BUFFERING_BUFFER_SIZE; -+ public const string PROP_DEVICE_BUFFERING_BUFFER_SIZE; - [CCode (cname="PA_PROP_DEVICE_BUFFERING_FRAGMENT_SIZE")] -- public static const string PROP_DEVICE_BUFFERING_FRAGMENT_SIZE; -+ public const string PROP_DEVICE_BUFFERING_FRAGMENT_SIZE; - [CCode (cname="PA_PROP_DEVICE_PROFILE_NAME")] -- public static const string PROP_DEVICE_PROFILE_NAME; -+ public const string PROP_DEVICE_PROFILE_NAME; - [CCode (cname="PA_PROP_DEVICE_INTENDED_ROLES")] -- public static const string PROP_DEVICE_INTENDED_ROLES; -+ public const string PROP_DEVICE_INTENDED_ROLES; - [CCode (cname="PA_PROP_DEVICE_PROFILE_DESCRIPTION")] -- public static const string PROP_DEVICE_PROFILE_DESCRIPTION; -+ public const string PROP_DEVICE_PROFILE_DESCRIPTION; - [CCode (cname="PA_PROP_MODULE_AUTHOR")] -- public static const string PROP_MODULE_AUTHOR; -+ public const string PROP_MODULE_AUTHOR; - [CCode (cname="PA_PROP_MODULE_DESCRIPTION")] -- public static const string PROP_MODULE_DESCRIPTION; -+ public const string PROP_MODULE_DESCRIPTION; - [CCode (cname="PA_PROP_MODULE_USAGE")] -- public static const string PROP_MODULE_USAGE; -+ public const string PROP_MODULE_USAGE; - [CCode (cname="PA_PROP_MODULE_VERSION")] -- public static const string PROP_MODULE_VERSION; -+ public const string PROP_MODULE_VERSION; - - [CCode (cname="pa_proplist_new")] - public Proplist(); --- -cgit v0.10.2 - - diff --git a/pulseaudio.changes b/pulseaudio.changes index 2d17119..81b3737 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Jul 25 10:48:02 UTC 2017 - oholecek@suse.com + +- Update to 11 RC1 (10.99.1) + * Support for newer AirPlay hardware + * USB and bluetooth devices preferred over internal sound cards + * Bluetooth HSP headset role implemented + * Bluetooth HFP audio gateway role implemented (requires oFono) + * Bluetooth HSP audio gateway and HFP hands-free unit roles can + be enabled simultaneously + * Upmixing can now be disabled without bad side effects + * Avoid having unavailable sinks or sources as the default + * Option to avoid resampling more often + * Option to automatically switch bluetooth profile to HSP more often + * Better latency control in module-loopback + * Changed module argument names in module-ladspa-sink and + module-virtual-surround-sink + * Fixed input device handling in module-waveout + * Improved bluetooth MTU configuration (warning! this causes some + hardware to not work any more, see the details below for how to fix it) + * Applications can request LADSPA or virtual surround filtering for + their streams + * Support for 32-bit applications on 64-bit systems in padsp +- add --with-pulsedsp-location='/usr/\\$$LIB/pulseaudio' to enable + upstream padsp multiarch fix +- remove patch4 padsp-biarch.patch, fixed upstream +- remove patch5 pulseaudio-vala-0.36.patch, fixed upstream + ------------------------------------------------------------------- Tue Mar 14 10:59:24 CET 2017 - kukuk@suse.de diff --git a/pulseaudio.spec b/pulseaudio.spec index 61affa5..e32408e 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,7 +1,7 @@ # # spec file for package pulseaudio # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define drvver 10.0 +%define drvver 10.99 %define soname 0 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services @@ -27,10 +27,10 @@ %define _bluez5used 0%(echo "%{_bluezVersion}" | grep -q '^5' && echo 1) %define _bashcompletionsdir %{_datadir}/bash-completion/completions Name: pulseaudio -Version: 10.0 +Version: 10.99.1 Release: 0 Summary: A Networked Sound Server -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: System/Sound Daemons Url: http://pulseaudio.org Source: http://www.freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz @@ -44,10 +44,6 @@ Source99: baselibs.conf Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff Patch2: pulseaudio-wrong-memset.patch -# PATCH-FIX-OPENSUSE padsp-biarch.patch bnc#968568 -Patch4: padsp-biarch.patch -# PATCH-FIX-UPSTREAM pulseaudio-vala-0.36.patch dimstar@opensuse.org -- Introduce compatibility with vala 0.36 -Patch5: pulseaudio-vala-0.36.patch BuildRequires: alsa-devel >= 1.0.19 # require only minimal bluez, if we are on bluez 5 we will determine in build phase BuildRequires: bluez-devel >= 4.99 @@ -67,6 +63,7 @@ BuildRequires: libudev-devel >= 143 BuildRequires: libwebrtc_audio_processing-devel >= 0.3 BuildRequires: lirc-devel BuildRequires: orc >= 0.4.9 +BuildRequires: pkgconfig BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: translation-update-upstream @@ -90,12 +87,8 @@ Requires: rtkit Requires: udev >= 146 ## needs the same liborc version which was used to build against %requires_eq liborc-0_4-0 -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %fillup_prereq -PreReq: pwdutils -%if 0%{?suse_version} > 1320 -Requires(pre): group(audio) -%endif +Requires(post): pwdutils +Requires(pre): %fillup_prereq Recommends: %{name}-bash-completion Recommends: %{name}-lang Recommends: alsa-plugins-pulse @@ -105,9 +98,9 @@ Obsoletes: libpulsecore9 < 0.9.15 Provides: libpulsecore9 = 0.9.15 Obsoletes: libpulsecore7 < 0.9.13 Provides: libpulsecore7 = 0.9.13 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1320 BuildRequires: speexdsp-devel +Requires(pre): group(audio) %else BuildRequires: speex-devel %endif @@ -290,12 +283,12 @@ server. %package gdm-hooks Summary: PulseAudio GDM integration Group: Productivity/Multimedia/Other +#avoid cycle +#!BuildIgnore: gdm Requires: %{name} = %{version} Requires: gdm >= 2.22 #for the gdm user Requires(pre): gdm -#avoid cycle -#!BuildIgnore: gdm %description gdm-hooks pulseaudio is a networked sound server for Linux and other Unix like @@ -329,8 +322,6 @@ Optional dependency offering zsh completion for various PulseAudio utilities %patch0 %patch1 -p1 %patch2 -%patch4 -p1 -%patch5 -p1 %build ./bootstrap.sh @@ -352,7 +343,9 @@ export CFLAGS="%{optflags} -fPIE" %else --disable-bluez5 \ %endif - --with-udev-rules-dir=%{_udevrulesdir} + --with-udev-rules-dir=%{_udevrulesdir} \ + --with-pulsedsp-location='%{_prefix}/\\$$LIB/pulseaudio' + make %{?_smp_mflags} V=1 make %{?_smp_mflags} doxygen @@ -395,7 +388,7 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_fwdefdir}/pulseaudio-server mkdir -p %{buildroot}%{_sysconfdir}/pulse/client.conf.d mkdir -p %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d # Install disable_flat_volumes.conf -install -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d +install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d # created by setup-pulseaudio script touch %{buildroot}%{_sysconfdir}/pulse/client.conf.d/50-system.conf %fdupes doxygen/html @@ -408,13 +401,9 @@ getent group audio | grep pulse >/dev/null || usermod -a -G audio pulse exit 0 %post -n libpulse%{soname} -p /sbin/ldconfig - %postun -n libpulse%{soname} -p /sbin/ldconfig - %post -n libpulse-mainloop-glib%{soname} -p /sbin/ldconfig - %postun -n libpulse-mainloop-glib%{soname} -p /sbin/ldconfig - %post /sbin/ldconfig %{fillup_only -an sound} @@ -422,7 +411,6 @@ exit 0 setup-pulseaudio --auto > /dev/null %postun -p /sbin/ldconfig - %pre system-wide %service_add_pre pulseaudio.service exit 0 @@ -440,7 +428,6 @@ exit 0 exit 0 %files -%defattr(-,root,root) %doc README LICENSE GPL LGPL %{_bindir}/pulseaudio %{_bindir}/setup-pulseaudio @@ -561,19 +548,16 @@ exit 0 %ghost %{_sysconfdir}/pulse/client.conf.d/50-system.conf %files esound-compat -%defattr(-,root,root) %{_bindir}/esdcompat %{_bindir}/esd %{_mandir}/man1/esdcompat.1* %files gdm-hooks -%defattr(-,root,root) %attr(0750, gdm, gdm) %dir %{_localstatedir}/lib/gdm %attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa %files -n libpulse%{soname} -%defattr(-,root,root) %doc README LICENSE GPL LGPL %dir %{_sysconfdir}/pulse/ %dir %{_sysconfdir}/pulse/client.conf.d @@ -585,7 +569,6 @@ exit 0 %{_libdir}/pulseaudio/libpulsecommon-%{drvver}.so %files -n libpulse-devel -%defattr(-,root,root) %doc doxygen/html %{_includedir}/pulse/ %{_libdir}/libpulse.so @@ -598,12 +581,10 @@ exit 0 %{_datadir}/vala %files -n libpulse-mainloop-glib%{soname} -%defattr(-,root,root) %{_libdir}/libpulse-mainloop-glib.so.%{soname} %{_libdir}/libpulse-mainloop-glib.so.%{soname}.* %files module-bluetooth -%defattr(-,root,root) %dir %{_libdir}/pulse-%{drvver} %dir %{_libdir}/pulse-%{drvver}/modules %{_libdir}/pulse-%{drvver}/modules/module-bluetooth-policy.so @@ -619,7 +600,6 @@ exit 0 %endif %files module-gconf -%defattr(-,root,root) %dir %{_libexecdir}/pulse %dir %{_libdir}/pulse-%{drvver} %dir %{_libdir}/pulse-%{drvver}/modules @@ -627,13 +607,11 @@ exit 0 %{_libexecdir}/pulse/gconf-helper %files module-lirc -%defattr(-,root,root) %dir %{_libdir}/pulse-%{drvver} %dir %{_libdir}/pulse-%{drvver}/modules %{_libdir}/pulse-%{drvver}/modules/module-lirc.so %files module-jack -%defattr(-,root,root) %dir %{_libdir}/pulse-%{drvver} %dir %{_libdir}/pulse-%{drvver}/modules %{_libdir}/pulse-%{drvver}/modules/module-jack-sink.so @@ -641,7 +619,6 @@ exit 0 %{_libdir}/pulse-%{drvver}/modules/module-jackdbus-detect.so %files module-x11 -%defattr(-,root,root) %dir %{_libdir}/pulse-%{drvver} %dir %{_libdir}/pulse-%{drvver}/modules %{_sysconfdir}/xdg/autostart/pulseaudio.desktop @@ -653,7 +630,6 @@ exit 0 %{_mandir}/man1/start-pulseaudio-x11.1* %files module-zeroconf -%defattr(-,root,root) %dir %{_libdir}/pulse-%{drvver} %dir %{_libdir}/pulse-%{drvver}/modules %{_libdir}/pulse-%{drvver}/modules/libavahi-wrap.so @@ -664,7 +640,6 @@ exit 0 %{_libdir}/pulse-%{drvver}/modules/module-zeroconf-publish.so %files utils -%defattr(-,root,root) %{_bindir}/pacat %{_bindir}/pacmd %{_bindir}/pactl @@ -684,21 +659,18 @@ exit 0 %{_mandir}/man1/pasuspender.1* %{_mandir}/man1/padsp.1* %{_mandir}/man1/pax11publish.1* -%{_mandir}/man1/pamon.1.gz -%{_mandir}/man1/parec.1.gz -%{_mandir}/man1/parecord.1.gz +%{_mandir}/man1/pamon.1%{ext_man} +%{_mandir}/man1/parec.1%{ext_man} +%{_mandir}/man1/parecord.1%{ext_man} %files lang -f %{name}.lang -%defattr(-,root,root) %files system-wide -%defattr(-,root,root) %{_sbindir}/rc%{name} %dir %{_libexecdir}/systemd/system %{_libexecdir}/systemd/system/%{name}.service %files bash-completion -%defattr(-,root,root) %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_bashcompletionsdir}/pulseaudio @@ -712,7 +684,6 @@ exit 0 %{_bashcompletionsdir}/pasuspender %files zsh-completion -%defattr(-,root,root) %dir %{_datarootdir}/zsh %dir %{_datarootdir}/zsh/site-functions/ %{_datarootdir}/zsh/site-functions/_pulseaudio