|
@@ -1,25 +1,37 @@
|
|
|
-%bcond_with consolekit
|
|
|
+%bcond_with systemd
|
|
|
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
-%define drvver 12.2
|
|
|
+%define drvver 13.0
|
|
|
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
Name: pulseaudio
|
|
|
Summary: PulseAudio sound server
|
|
|
Summary(ja): PulseAudio サウンドサーバ
|
|
|
-Version: 12.2
|
|
|
-Release: 1%{?_dist_release}
|
|
|
-License: GPLv2+
|
|
|
-URL: http://pulseaudio.org
|
|
|
+Version: 13.0
|
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: System Environment/Daemons
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+Packager: daisuke
|
|
|
|
|
|
-Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.xz
|
|
|
+License: GPLv2+
|
|
|
+URL: https://www.freedesktop.org/wiki/Software/PulseAudio/
|
|
|
+Source0: https://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz
|
|
|
Source1: default.pa-for-gdm
|
|
|
-Patch0: pulseaudio-12.2-elogind.patch
|
|
|
+Patch0: pulseaudio-13.0-elogind.patch
|
|
|
+
|
|
|
+# revert upstream commit to rely solely on autospawn for autostart, instead
|
|
|
+# include a fallback to manual launch when autospawn fails, like when
|
|
|
+# user disables autospawn, or logging in as root
|
|
|
+# valid even when using systemd socket activation too
|
|
|
+Patch201: pulseaudio-autostart.patch
|
|
|
+
|
|
|
+# disable autospawn
|
|
|
+Patch206: pulseaudio-11.1-autospawn_disable.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
-BuildRequires: tcp_wrappers, libsamplerate-devel, libsndfile-devel
|
|
|
+BuildRequires: libsamplerate-devel, libsndfile-devel
|
|
|
BuildRequires: liboil-devel, m4, libcap-devel,
|
|
|
BuildRequires: libtool-ltdl-devel >= 2.2.6
|
|
|
BuildRequires: pkgconfig
|
|
@@ -35,21 +47,21 @@ BuildRequires: openssl-devel
|
|
|
BuildRequires: gdbm-devel
|
|
|
BuildRequires: gtk2-devel
|
|
|
BuildRequires: json-c-devel >= 0.11
|
|
|
-BuildRequires: eudev-libudev-devel
|
|
|
BuildRequires: xcb-util-devel
|
|
|
BuildRequires: libtdb-devel
|
|
|
BuildRequires: libasyncns-devel
|
|
|
BuildRequires: orc-devel
|
|
|
BuildRequires: libuuid-devel
|
|
|
BuildRequires: libtool
|
|
|
+%if %{with systemd}
|
|
|
+BuildRequires: systemd-devel
|
|
|
+%{?systemd_requires}
|
|
|
+%else
|
|
|
+BuildRequires: eudev-libudev-devel
|
|
|
BuildRequires: elogind-devel
|
|
|
+%endif
|
|
|
Requires: %{name}-core-libs = %{version}-%{release}
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
-Packager: daisuke
|
|
|
-
|
|
|
-
|
|
|
%description
|
|
|
PulseAudio is a sound server for Linux and other Unix like operating
|
|
|
systems. It is intended to be an improved drop-in replacement for the
|
|
@@ -255,9 +267,16 @@ Requires: compat32-glib2-devel
|
|
|
Headers and libraries for developing applications that can communicate with
|
|
|
a PulseAudio sound server.
|
|
|
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q -T -b0
|
|
|
-%patch0 -p1
|
|
|
+%patch201 -p1 -b .autostart
|
|
|
+%if %{with systemd}
|
|
|
+%patch206 -p1 -b .autospawn_disable
|
|
|
+%else
|
|
|
+%patch0 -p1 -b .elogind
|
|
|
+%endif
|
|
|
+
|
|
|
|
|
|
%build
|
|
|
./bootstrap.sh
|
|
@@ -269,19 +288,25 @@ a PulseAudio sound server.
|
|
|
--with-access-group=pulse-access \
|
|
|
--disable-oss-output \
|
|
|
--without-fftw \
|
|
|
+%if %{with systemd}
|
|
|
+ --enable-systemd-daemon \
|
|
|
+ --enable-systemd-login \
|
|
|
+ --enable-systemd-journal \
|
|
|
+%else
|
|
|
--disable-systemd-daemon \
|
|
|
--disable-systemd-login \
|
|
|
--disable-systemd-journal \
|
|
|
-%if %{with consolekit}
|
|
|
--enable-elogind \
|
|
|
%endif
|
|
|
--enable-gconf \
|
|
|
--enable-gsettings \
|
|
|
- --disable-bluez4 --enable-bluez5
|
|
|
+ --enable-bluez5 \
|
|
|
+ --disable-tcpwrap
|
|
|
|
|
|
make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
|
|
|
make doxygen
|
|
|
|
|
|
+
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
make DESTDIR=$RPM_BUILD_ROOT install
|
|
@@ -302,16 +327,14 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/pulse
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse
|
|
|
cp $RPM_SOURCE_DIR/default.pa-for-gdm $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
|
|
|
|
|
|
-%if %{with consolekit}
|
|
|
-rm -f %{buildroot}%{_libdir}/pulse-%{drvver}/modules/module-systemd-login.so
|
|
|
-%else
|
|
|
# (cg) We require systemd now, so no point in using CK
|
|
|
rm -f %{buildroot}%{_libdir}/pulse-%{drvver}/modules/module-console-kit.so
|
|
|
-%endif
|
|
|
+
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
+
|
|
|
%pre
|
|
|
groupadd -r pulse &>/dev/null || :
|
|
|
useradd -r -c 'PulseAudio daemon' \
|
|
@@ -319,7 +342,18 @@ useradd -r -c 'PulseAudio daemon' \
|
|
|
groupadd -r pulse-rt &>/dev/null || :
|
|
|
groupadd -r pulse-access &>/dev/null || :
|
|
|
|
|
|
-%post -p /sbin/ldconfig
|
|
|
+%post
|
|
|
+/sbin/ldconfig
|
|
|
+%if %{with systemd}
|
|
|
+#systemd_user_post pulseaudio.service
|
|
|
+%systemd_user_post pulseaudio.socket
|
|
|
+%endif
|
|
|
+
|
|
|
+%if %{with systemd}
|
|
|
+%preun
|
|
|
+#systemd_user_preun pulseaudio.service
|
|
|
+%systemd_user_preun pulseaudio.socket
|
|
|
+%endif
|
|
|
|
|
|
%postun
|
|
|
/sbin/ldconfig
|
|
@@ -350,7 +384,8 @@ fi
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
-%doc README LICENSE GPL LGPL
|
|
|
+%license LICENSE GPL LGPL
|
|
|
+%doc README NEWS
|
|
|
%dir %{_sysconfdir}/pulse/
|
|
|
%config(noreplace) %{_sysconfdir}/pulse/daemon.conf
|
|
|
%config(noreplace) %{_sysconfdir}/pulse/default.pa
|
|
@@ -382,11 +417,7 @@ fi
|
|
|
%{_libdir}/pulse-%{drvver}/modules/module-cli.so
|
|
|
%{_libdir}/pulse-%{drvver}/modules/module-combine.so
|
|
|
%{_libdir}/pulse-%{drvver}/modules/module-combine-sink.so
|
|
|
-%if %{with consolekit}
|
|
|
-%{_libdir}/pulse-%{drvver}/modules/module-console-kit.so
|
|
|
-%else
|
|
|
%{_libdir}/pulse-%{drvver}/modules/module-systemd-login.so
|
|
|
-%endif
|
|
|
%{_libdir}/pulse-%{drvver}/modules/module-dbus-protocol.so
|
|
|
%{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
|
|
|
%{_libdir}/pulse-%{drvver}/modules/module-device-manager.so
|
|
@@ -458,6 +489,10 @@ fi
|
|
|
/lib/udev/rules.d/90-pulseaudio.rules
|
|
|
%dir %{_libexecdir}/pulse
|
|
|
%attr(0700, pulse, pulse) %dir %{_localstatedir}/lib/pulse
|
|
|
+%if %{with systemd}
|
|
|
+%{_userunitdir}/pulseaudio.service
|
|
|
+%{_userunitdir}/pulseaudio.socket
|
|
|
+%endif
|
|
|
|
|
|
%files esound-compat
|
|
|
%defattr(-,root,root)
|
|
@@ -552,6 +587,7 @@ fi
|
|
|
|
|
|
%files utils
|
|
|
%defattr(-,root,root)
|
|
|
+%{_bindir}/pa-info
|
|
|
%{_bindir}/pacat
|
|
|
%{_bindir}/pacmd
|
|
|
%{_bindir}/pactl
|
|
@@ -601,6 +637,10 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 13.0-1
|
|
|
+- updated to 13.0.
|
|
|
+- added systemd support (disabled as default).
|
|
|
+
|
|
|
* Tue Dec 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 12.2-1
|
|
|
- updated to 12.2.
|
|
|
- enabled elogind.
|