packages: pulseaudio/pulseaudio.spec, pulseaudio/udev-deprecated.patch - ud...

[kiesiu]

Author: kiesiu                       Date: Sun Jun  3 19:36:13 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- udev-depracated patch updated with changes from upstream git
- rel 5; fixes segfaults with udev-183

---- Files affected:
packages/pulseaudio:
   pulseaudio.spec (1.104 -> 1.105) , udev-deprecated.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/pulseaudio/pulseaudio.spec
diff -u packages/pulseaudio/pulseaudio.spec:1.104 packages/pulseaudio/pulseaudio.spec:1.105
--- packages/pulseaudio/pulseaudio.spec:1.104	Sat Jun  2 17:57:22 2012
+++ packages/pulseaudio/pulseaudio.spec	Sun Jun  3 21:36:08 2012
@@ -15,7 +15,7 @@
 Summary(pl.UTF-8):	Modularny serwer dźwięku
 Name:		pulseaudio
 Version:	2.0
-Release:	4
+Release:	5
 License:	GPL v2+ (server and libpulsecore), LGPL v2+ (libpulse)
 Group:		Libraries
 Source0:	http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz
@@ -685,6 +685,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105  2012/06/03 19:36:08  kiesiu
+- udev-depracated patch updated with changes from upstream git
+- rel 5; fixes segfaults with udev-183
+
 Revision 1.104  2012/06/02 15:57:22  baggins
 - rel 4
 - udev_get_{dev,sys}path are deprecated and have been removed in udev 183

================================================================
Index: packages/pulseaudio/udev-deprecated.patch
diff -u packages/pulseaudio/udev-deprecated.patch:1.1 packages/pulseaudio/udev-deprecated.patch:1.2
--- packages/pulseaudio/udev-deprecated.patch:1.1	Sat Jun  2 17:57:22 2012
+++ packages/pulseaudio/udev-deprecated.patch	Sun Jun  3 21:36:08 2012
@@ -1,6 +1,8 @@
---- pulseaudio-2.0/src/modules/module-udev-detect.c~	2012-03-01 10:02:19.000000000 +0100
-+++ pulseaudio-2.0/src/modules/module-udev-detect.c	2012-06-02 17:53:21.236278620 +0200
-@@ -123,7 +123,7 @@
+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;
      }
  
@@ -9,7 +11,7 @@
      card = udev_device_new_from_syspath(udev, t);
      pa_xfree(t);
  
-@@ -282,7 +282,7 @@
+@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) {
      pa_assert(u);
      pa_assert(d);
  
@@ -18,12 +20,44 @@
      accessible = access(cd, R_OK|W_OK) >= 0;
      pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible));
  
-@@ -632,7 +632,7 @@
+@@ -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));
-+    dev_snd = pa_sprintf_malloc("/dev/snd");
-     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);
+-    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);
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/pulseaudio/pulseaudio.spec?r1=1.104&r2=1.105
    http://cvs.pld-linux.org/packages/pulseaudio/udev-deprecated.patch?r1=1.1&r2=1.2