From 46e6a9f145cec3116121d9a9b0adb2b3c61831f9d65e4528b63912cbb2b925db Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Fri, 27 Sep 2013 14:33:41 +0000
Subject: [PATCH] Accepting request 201099 from
home:dimstar:branches:GNOME:Factory
- bnc#840845: Update to git master (PA 5.0 on the way) (6f94c).
+ Various code cleanups for inclusion of bluez5 stack.
- No longer pass --enable-bluez5 --disable-bluez4 to configure:
master only speaks bluez5.
OBS-URL: https://build.opensuse.org/request/show/201099
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=129
---
pulseaudio-4.0-140-gbf9b3.tar.xz | 3 ---
pulseaudio-4.0-187-g6f94c.tar.xz | 3 +++
pulseaudio.changes | 8 ++++++++
pulseaudio.spec | 9 +++++----
4 files changed, 16 insertions(+), 7 deletions(-)
delete mode 100644 pulseaudio-4.0-140-gbf9b3.tar.xz
create mode 100644 pulseaudio-4.0-187-g6f94c.tar.xz
diff --git a/pulseaudio-4.0-140-gbf9b3.tar.xz b/pulseaudio-4.0-140-gbf9b3.tar.xz
deleted file mode 100644
index 8851e94..0000000
--- a/pulseaudio-4.0-140-gbf9b3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:314af4d7d6be94097de613646280140f43de939c434d71440dd3eea696123181
-size 1382144
diff --git a/pulseaudio-4.0-187-g6f94c.tar.xz b/pulseaudio-4.0-187-g6f94c.tar.xz
new file mode 100644
index 0000000..2c5e53f
--- /dev/null
+++ b/pulseaudio-4.0-187-g6f94c.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c38a314fe2dfffefb32709b697c9599ceaf809a21c6bc3b09a8d05709883e1c
+size 1390096
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 346980f..7a726c4 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:48:30 UTC 2013 - dimstar@opensuse.org
+
+- bnc#840845: Update to git master (PA 5.0 on the way) (6f94c).
+ + Various code cleanups for inclusion of bluez5 stack.
+- No longer pass --enable-bluez5 --disable-bluez4 to configure:
+ master only speaks bluez5.
+
-------------------------------------------------------------------
Sat Sep 7 11:30:40 UTC 2013 - dimstar@opensuse.org
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 98e27ce..14d9883 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -19,7 +19,7 @@
Name: pulseaudio
Version: 4.0+git
Release: 0
-%define _version 4.0-140-gbf9b3
+%define _version 4.0-187-g6f94c
%define drvver 4.0
%define soname 0
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
@@ -28,7 +28,7 @@ Summary: A Networked Sound Server
License: GPL-2.0+ and LGPL-2.1+
Group: System/Sound Daemons
Url: http://pulseaudio.org
-# git clone of http://cgit.freedesktop.org/pulseaudio/pulseaudio/log/?h=bluez5
+# git clone of http://cgit.freedesktop.org/pulseaudio/pulseaudio
Source: %{name}-%{_version}.tar.xz
Source1: default.pa-for-gdm
Source2: setup-pulseaudio
@@ -281,8 +281,7 @@ NOCONFIGURE=1 ./bootstrap.sh
--with-system-group=pulse \
--with-access-group=pulse-access \
--disable-hal-compat \
- --with-udev-rules-dir=%{_udevrulesdir} \
- --enable-bluez5 --disable-bluez4
+ --with-udev-rules-dir=%{_udevrulesdir}
make %{?_smp_mflags} V=1
make doxygen
@@ -426,7 +425,9 @@ setup-pulseaudio --auto > /dev/null
%{_libdir}/pulse-%{drvver}/modules/module-systemd-login.so
%endif
%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so
+%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink-new.so
%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so
+%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source-new.so
%{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so
%{_libdir}/pulse-%{drvver}/modules/module-virtual-sink.so
%{_libdir}/pulse-%{drvver}/modules/module-virtual-source.so