Accepting request 333441 from multimedia:libs
1 OBS-URL: https://build.opensuse.org/request/show/333441 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=131
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
32f6dad677
@ -1,31 +0,0 @@
|
||||
From 5598923b8e64de873a417b512d709c5674f3a96d Mon Sep 17 00:00:00 2001
|
||||
From: David Henningsson <david.henningsson@canonical.com>
|
||||
Date: Tue, 5 May 2015 09:43:32 +0200
|
||||
Subject: [PATCH] alsa-mixer: Make line out path unavailable when "Front
|
||||
Headphone" is plugged in
|
||||
|
||||
This case was apparently overlooked.
|
||||
|
||||
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
||||
---
|
||||
src/modules/alsa/mixer/paths/analog-output-lineout.conf | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
|
||||
index 53ee2f453922..68f444ae80a9 100644
|
||||
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
|
||||
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
|
||||
@@ -29,6 +29,10 @@ required-any = any
|
||||
state.plugged = no
|
||||
state.unplugged = unknown
|
||||
|
||||
+[Jack Front Headphone]
|
||||
+state.plugged = no
|
||||
+state.unplugged = unknown
|
||||
+
|
||||
[Jack Line Out Front]
|
||||
required-any = any
|
||||
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6
|
||||
size 1469248
|
||||
3
pulseaudio-7.0.tar.xz
Normal file
3
pulseaudio-7.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa
|
||||
size 1505864
|
||||
@ -1,3 +1,34 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 24 06:21:35 UTC 2015 - oholecek@suse.com
|
||||
|
||||
- Update to 7.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 13 07:31:40 UTC 2015 - oholecek@suse.com
|
||||
|
||||
- Update to 7.0 RC2 (6.99.2)
|
||||
+ better support for Creative SoundBlaster Omni Surround 5.1 USB
|
||||
+ coverity scan fixes
|
||||
+ bug fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 28 17:15:40 UTC 2015 - oholecek@suse.com
|
||||
|
||||
- spec-cleaner run
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 28 16:54:43 UTC 2015 - oholecek@suse.com
|
||||
|
||||
- Update to 7.0 RC1 (6.99.1)
|
||||
+ LFE channel synthesis with low-pass filtering
|
||||
+ New libsoxr based resamplers
|
||||
+ Socket activation support for TCP
|
||||
+ The "srbchannel" IPC mechanism enabled by default
|
||||
+ More flexible jack detection support when using UCM
|
||||
+ Exiting due to SIGTERM isn't considered a failure
|
||||
- remove patch 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch
|
||||
(upstreamed)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 31 09:40:24 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
|
||||
110
pulseaudio.spec
110
pulseaudio.spec
@ -16,18 +16,19 @@
|
||||
#
|
||||
|
||||
|
||||
Name: pulseaudio
|
||||
Version: 6.0
|
||||
Release: 0
|
||||
%define drvver 6.0
|
||||
%define drvver 7.0
|
||||
%define soname 0
|
||||
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
|
||||
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
|
||||
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||
# store bluez version from bluez-devel and check for bluez4/5
|
||||
# _bluezVersion is than also used in requires for bluetooth subpackage
|
||||
# once oS 12.3 is EOL, this can be removed as there will probably be nothing providing bluez4
|
||||
%define _bluezVersion %(LC_ALL="C" rpm --qf '%%{VERSION}' -q bluez-devel | grep -v 'not installed')
|
||||
%define _bluez5used 0%(echo "%{_bluezVersion}" | grep -q '^5' && echo 1)
|
||||
%define _bashcompletionsdir %{_datadir}/bash-completion/completions
|
||||
Name: pulseaudio
|
||||
Version: 7.0
|
||||
Release: 0
|
||||
Summary: A Networked Sound Server
|
||||
License: GPL-2.0+ and LGPL-2.1+
|
||||
Group: System/Sound Daemons
|
||||
@ -42,8 +43,6 @@ Source99: baselibs.conf
|
||||
Patch0: disabled-start.diff
|
||||
Patch1: suppress-socket-error-msg.diff
|
||||
Patch2: pulseaudio-wrong-memset.patch
|
||||
# PATCH-FIX-UPSTREAM 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch boo#934850
|
||||
Patch101: 0001-alsa-mixer-Make-line-out-path-unavailable-when-Front.patch
|
||||
# PATCH-FIX-UPSTREAM 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch boo#934850
|
||||
Patch102: 0002-alsa-mixer-Recognize-Dock-Line-Out-jack.patch
|
||||
BuildRequires: alsa-devel >= 1.0.19
|
||||
@ -51,31 +50,25 @@ BuildRequires: alsa-devel >= 1.0.19
|
||||
BuildRequires: bluez-devel >= 4.99
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: fftw3-devel >= 3.0
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: intltool
|
||||
BuildRequires: jack-devel
|
||||
BuildRequires: libatomic_ops-devel >= 1.2
|
||||
BuildRequires: libavahi-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libsndfile-devel >= 1.0.18
|
||||
#our libtdb-devel does not have a .pc file
|
||||
BuildRequires: fftw3-devel >= 3.0
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libtdb-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libudev-devel >= 143
|
||||
BuildRequires: libwebrtc_audio_processing-devel
|
||||
BuildRequires: lirc-devel
|
||||
BuildRequires: orc >= 0.4.9
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: speexdsp-devel
|
||||
%else
|
||||
BuildRequires: speex-devel
|
||||
%endif
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: translation-update-upstream
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(bash-completion)
|
||||
BuildRequires: pkgconfig(dbus-1) >= 1.4.12
|
||||
BuildRequires: pkgconfig(gconf-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
@ -84,26 +77,35 @@ BuildRequires: pkgconfig(ice)
|
||||
BuildRequires: pkgconfig(json) >= 0.11
|
||||
BuildRequires: pkgconfig(sbc) >= 1.0
|
||||
BuildRequires: pkgconfig(sm)
|
||||
BuildRequires: pkgconfig(soxr)
|
||||
BuildRequires: pkgconfig(tdb)
|
||||
BuildRequires: pkgconfig(udev)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(x11-xcb)
|
||||
BuildRequires: pkgconfig(xcb)
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
PreReq: %fillup_prereq
|
||||
PreReq: pwdutils
|
||||
Requires: rtkit
|
||||
Requires: udev >= 146
|
||||
## needs the same liborc version which was used to build against
|
||||
%requires_eq liborc-0_4-0
|
||||
Recommends: %{name}-lang
|
||||
# FIXME: use proper Requires(pre/post/preun/...)
|
||||
PreReq: %fillup_prereq
|
||||
PreReq: pwdutils
|
||||
Recommends: %{name}-bash-completion
|
||||
Recommends: %{name}-lang
|
||||
Recommends: alsa-plugins-pulse
|
||||
Suggests: libsoxr0 >= 0.1.1
|
||||
Conflicts: kernel < 2.6.31
|
||||
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
|
||||
Conflicts: kernel < 2.6.31
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: speexdsp-devel
|
||||
%else
|
||||
BuildRequires: speex-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
pulseaudio is a networked sound server for Linux, other Unix like
|
||||
@ -182,7 +184,6 @@ mode:
|
||||
|
||||
http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide
|
||||
|
||||
|
||||
%package module-jack
|
||||
Summary: JACK support for the PulseAudio sound server
|
||||
Group: System/Sound Daemons
|
||||
@ -302,7 +303,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
|
||||
Summary: PulseAudio Bash completion
|
||||
Group: System/Shells
|
||||
Requires: %{name}-utils = %{version}
|
||||
Requires: bash
|
||||
Requires: bash-completion
|
||||
|
||||
%description bash-completion
|
||||
Optional dependency offering bash completion for various PulseAudio utilities
|
||||
@ -317,22 +318,21 @@ Requires: zsh
|
||||
Optional dependency offering zsh completion for various PulseAudio utilities
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q -T -b0
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
|
||||
%build
|
||||
echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in
|
||||
export LDFLAGS="-pie"
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fPIE"
|
||||
export CFLAGS="%{optflags} -fPIE"
|
||||
%configure \
|
||||
--disable-static \
|
||||
--disable-rpath \
|
||||
--enable-systemd \
|
||||
%ifarch armv5tel armv6hl
|
||||
--disable-neon-opt \
|
||||
%endif
|
||||
@ -347,9 +347,8 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIE"
|
||||
--disable-bluez5 \
|
||||
%endif
|
||||
--with-udev-rules-dir=%{_udevrulesdir}
|
||||
|
||||
make %{?_smp_mflags} V=1
|
||||
make doxygen
|
||||
make %{?_smp_mflags} doxygen
|
||||
|
||||
%install
|
||||
%make_install
|
||||
@ -361,7 +360,7 @@ rm -rf \
|
||||
# configure --disable-static had no effect; delete manually.
|
||||
rm -rf "%{buildroot}%{_libdir}"/*.a
|
||||
|
||||
install -D -m 0644 %{SOURCE5} %{buildroot}/usr/lib/systemd/system/%{name}.service
|
||||
install -D -m 0644 %{SOURCE5} %{buildroot}%{_libexecdir}/systemd/system/%{name}.service
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
||||
|
||||
@ -384,13 +383,13 @@ ln -s esdcompat %{buildroot}%{_bindir}/esd
|
||||
# install firewall rule on SUSE
|
||||
%if %{defined suse_version}
|
||||
mkdir -p %{buildroot}/%{_fwdefdir}
|
||||
install -m 0644 %{S:4} %{buildroot}/%{_fwdefdir}/pulseaudio-server
|
||||
install -m 0644 %{SOURCE4} %{buildroot}/%{_fwdefdir}/pulseaudio-server
|
||||
%endif
|
||||
%fdupes doxygen/html
|
||||
|
||||
%pre
|
||||
getent group pulse >/dev/null || groupadd -r pulse
|
||||
getent passwd pulse >/dev/null || useradd -r -g pulse -d /var/lib/pulseaudio -s /sbin/nologin -c "PulseAudio daemon" pulse
|
||||
getent passwd pulse >/dev/null || useradd -r -g pulse -d %{_localstatedir}/lib/pulseaudio -s /sbin/nologin -c "PulseAudio daemon" pulse
|
||||
getent group pulse-access >/dev/null || groupadd -r pulse-access
|
||||
getent group audio | grep pulse >/dev/null || usermod -a -G audio pulse
|
||||
exit 0
|
||||
@ -522,11 +521,11 @@ exit 0
|
||||
%{_libdir}/pulse-%{drvver}/modules/module-remap-source.so
|
||||
%{_libdir}/pulse-%{drvver}/modules/module-role-ducking.so
|
||||
%{_udevrulesdir}/90-pulseaudio.rules
|
||||
%doc %{_mandir}/man1/pulseaudio.1*
|
||||
%doc %{_mandir}/man5/default.pa.5*
|
||||
%doc %{_mandir}/man5/pulse-client.conf.5*
|
||||
%doc %{_mandir}/man5/pulse-daemon.conf.5*
|
||||
%doc %{_mandir}/man5/pulse-cli-syntax.5*
|
||||
%{_mandir}/man1/pulseaudio.1*
|
||||
%{_mandir}/man5/default.pa.5*
|
||||
%{_mandir}/man5/pulse-client.conf.5*
|
||||
%{_mandir}/man5/pulse-daemon.conf.5*
|
||||
%{_mandir}/man5/pulse-cli-syntax.5*
|
||||
%dir %{_sysconfdir}/pulse/
|
||||
%config(noreplace) %{_sysconfdir}/pulse/daemon.conf
|
||||
%config(noreplace) %{_sysconfdir}/pulse/default.pa
|
||||
@ -549,7 +548,7 @@ exit 0
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/esdcompat
|
||||
%{_bindir}/esd
|
||||
%doc %{_mandir}/man1/esdcompat.1*
|
||||
%{_mandir}/man1/esdcompat.1*
|
||||
|
||||
%files gdm-hooks
|
||||
%defattr(-,root,root)
|
||||
@ -624,7 +623,7 @@ exit 0
|
||||
%{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so
|
||||
%{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so
|
||||
%{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so
|
||||
%doc %{_mandir}/man1/start-pulseaudio-x11.1*
|
||||
%{_mandir}/man1/start-pulseaudio-x11.1*
|
||||
|
||||
%files module-zeroconf
|
||||
%defattr(-,root,root)
|
||||
@ -647,15 +646,19 @@ exit 0
|
||||
%{_bindir}/pax11publish
|
||||
%{_bindir}/padsp
|
||||
%{_bindir}/pasuspender
|
||||
%doc %{_mandir}/man1/pacat.1*
|
||||
%doc %{_mandir}/man1/pacmd.1*
|
||||
%doc %{_mandir}/man1/pactl.1*
|
||||
%doc %{_mandir}/man1/paplay.1*
|
||||
%doc %{_mandir}/man1/pasuspender.1*
|
||||
%doc %{_mandir}/man1/padsp.1*
|
||||
%doc %{_mandir}/man1/pax11publish.1*
|
||||
%{_mandir}/man1/pacat.1*
|
||||
%{_mandir}/man1/pacmd.1*
|
||||
%{_mandir}/man1/pactl.1*
|
||||
%{_mandir}/man1/paplay.1*
|
||||
%{_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
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
|
||||
%files system-wide
|
||||
%defattr(-,root,root)
|
||||
@ -665,16 +668,15 @@ exit 0
|
||||
|
||||
%files bash-completion
|
||||
%defattr(-,root,root)
|
||||
%dir %{_sysconfdir}/bash_completion.d
|
||||
%config %{_sysconfdir}/bash_completion.d/pulseaudio
|
||||
%config %{_sysconfdir}/bash_completion.d/pacat
|
||||
%config %{_sysconfdir}/bash_completion.d/pacmd
|
||||
%config %{_sysconfdir}/bash_completion.d/pactl
|
||||
%config %{_sysconfdir}/bash_completion.d/padsp
|
||||
%config %{_sysconfdir}/bash_completion.d/paplay
|
||||
%config %{_sysconfdir}/bash_completion.d/parec
|
||||
%config %{_sysconfdir}/bash_completion.d/parecord
|
||||
%config %{_sysconfdir}/bash_completion.d/pasuspender
|
||||
%config %{_bashcompletionsdir}/pulseaudio
|
||||
%config %{_bashcompletionsdir}/pacat
|
||||
%config %{_bashcompletionsdir}/pacmd
|
||||
%config %{_bashcompletionsdir}/pactl
|
||||
%config %{_bashcompletionsdir}/padsp
|
||||
%config %{_bashcompletionsdir}/paplay
|
||||
%config %{_bashcompletionsdir}/parec
|
||||
%config %{_bashcompletionsdir}/parecord
|
||||
%config %{_bashcompletionsdir}/pasuspender
|
||||
|
||||
%files zsh-completion
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user