- updated to 2.1

- removed obsolete udev-deprecated patch

diff --git a/pulseaudio.spec b/pulseaudio.spec
index 2a359d7799923bdfe076947b32984f761d710161..4357da6ce8a3459409338e4552b01970696ef199 100644 (file)
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -13,18 +13,17 @@
 Summary:       Modular sound server
 Summary(pl.UTF-8):     Modularny serwer dźwięku
 Name:          pulseaudio
-Version:       2.0
-Release:       5
+Version:       2.1
+Release:       1
 License:       GPL v2+ (server and libpulsecore), LGPL v2+ (libpulse)
 Group:         Libraries
 Source0:       http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 9bbde657c353fe675c3b693054175a8e
+# Source0-md5: 33e85023259d530f0a763d5204e8bad9
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
 Patch0:                %{name}-suid.patch
 Patch1:                %{name}-pa-machine-id.patch
-Patch2:                udev-deprecated.patch
 URL:           http://pulseaudio.org/
 BuildRequires: GConf2-devel >= 2.4.0
 BuildRequires: alsa-lib-devel >= 1.0.19
@@ -345,7 +344,6 @@ Sterownik parawirtualny Xen dla PulseAudio.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e '1s,#!/usr/bin/env python,#!/usr/bin/python,' src/utils/qpaeq
 
@@ -477,6 +475,7 @@ fi
 %attr(755,root,root) %{_libdir}/pulse-*/modules/libprotocol-simple.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/libraop.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/librtp.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/libwebrtc-util.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-always-sink.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-augment-properties.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-card-restore.so
@@ -585,7 +584,7 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libpulse-simple.so.0
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/libpulsedsp.so
-%attr(755,root,root) %{_libdir}/%{name}/libpulsecommon-2.0.so
+%attr(755,root,root) %{_libdir}/%{name}/libpulsecommon-%{version}.so
 %dir %{_sysconfdir}/pulse
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pulse/client.conf
 %dir %{_datadir}/pulseaudio

diff --git a/udev-deprecated.patch b/udev-deprecated.patch
deleted file mode 100644 (file)
index 7b55a5d..0000000
--- a/udev-deprecated.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
-index 1192194..31416bd 100644
---- a/src/modules/module-udev-detect.c
-+++ b/src/modules/module-udev-detect.c
-@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
-@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) {
-     pa_assert(u);
-     pa_assert(d);
- 
--    cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path));
-+    cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path));
-     accessible = access(cd, R_OK|W_OK) >= 0;
-     pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible));
- 
-@@ -621,7 +621,6 @@ fail:
- }
- 
- static int setup_inotify(struct userdata *u) {
--    char *dev_snd;
-     int r;
- 
-     if (u->inotify_fd >= 0)
-@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) {
-         return -1;
-     }
- 
--    dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev));
--    r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
--    pa_xfree(dev_snd);
-+    r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
- 
-     if (r < 0) {
-         int saved_errno = errno;
-diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c
-index 2f18bc4..b0bb17d 100644
---- a/src/modules/udev-util.c
-+++ b/src/modules/udev-util.c
-@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
-@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
-