r17597 - in /desktop/experimental/esound/debian: changelog patches/17_check_esd.patch patches/18_multiple_instances.patch patches/19_esddsp_mutex.patch patches/series watch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Nov 15 06:08:51 UTC 2008 

Author: joss
Date: Sat Nov 15 06:08:51 2008
New Revision: 17597

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17597
Log:
* Update watch.
* Import patches from Ubuntu:
  + 17_check_esd.patch: do not bother starting esd if it doesn’t 
    exist.
  + 18_multiple_instances.patch: allow multiple instances of esd per 
    user.
  + 19_esddsp_mutex.patch: protect dsp_init against multiple calls 
    with a mutex.

Added:
    desktop/experimental/esound/debian/patches/17_check_esd.patch
    desktop/experimental/esound/debian/patches/18_multiple_instances.patch
    desktop/experimental/esound/debian/patches/19_esddsp_mutex.patch
Modified:
    desktop/experimental/esound/debian/changelog
    desktop/experimental/esound/debian/patches/series
    desktop/experimental/esound/debian/watch

Modified: desktop/experimental/esound/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/changelog?rev=17597&op=diff
==============================================================================
--- desktop/experimental/esound/debian/changelog (original)
+++ desktop/experimental/esound/debian/changelog Sat Nov 15 06:08:51 2008
@@ -9,6 +9,14 @@
     esound-common.
   * Move libesddsp to esound-clients (it’s only used by esddsp).
   * Split the patches that were not merged upstream into a series.
+  * Update watch.
+  * Import patches from Ubuntu:
+    + 17_check_esd.patch: do not bother starting esd if it doesn’t 
+      exist.
+    + 18_multiple_instances.patch: allow multiple instances of esd per 
+      user.
+    + 19_esddsp_mutex.patch: protect dsp_init against multiple calls 
+      with a mutex.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 14 Nov 2008 23:25:03 +0100
 

Added: desktop/experimental/esound/debian/patches/17_check_esd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/patches/17_check_esd.patch?rev=17597&op=file
==============================================================================
--- desktop/experimental/esound/debian/patches/17_check_esd.patch (added)
+++ desktop/experimental/esound/debian/patches/17_check_esd.patch Sat Nov 15 06:08:51 2008
@@ -1,0 +1,17 @@
+LP #134641
+
+Index: esound-0.2.40/esdlib.c
+===================================================================
+--- esound-0.2.40.orig/esdlib.c	2008-11-15 07:00:44.359900070 +0100
++++ esound-0.2.40/esdlib.c	2008-11-15 07:00:55.228681229 +0100
+@@ -890,6 +890,10 @@ int esd_open_sound( const char *rhost )
+ 	/* there's something inherently flaky about this, and if
+ 	   there's no audio device, Bad Things Happen */
+ 
++        /* do not bother trying if esd does not exist */
++        if (access(SERVERDIR"/esd", X_OK) != 0)
++          goto finish_connect;
++
+ 	if (pipe (esd_pipe) < 0)
+ 	  goto finish_connect;
+ 

Added: desktop/experimental/esound/debian/patches/18_multiple_instances.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/patches/18_multiple_instances.patch?rev=17597&op=file
==============================================================================
--- desktop/experimental/esound/debian/patches/18_multiple_instances.patch (added)
+++ desktop/experimental/esound/debian/patches/18_multiple_instances.patch Sat Nov 15 06:08:51 2008
@@ -1,0 +1,33 @@
+LP: #183199
+
+Index: esound-0.2.40/util.c
+===================================================================
+--- esound-0.2.40.orig/util.c	2008-11-15 07:02:28.659897626 +0100
++++ esound-0.2.40/util.c	2008-11-15 07:02:32.580694613 +0100
+@@ -27,15 +27,17 @@ esd_get_socket_dirname (void) 
+ 	const char *audiodev = NULL;
+ 	static char *dirname = NULL;
+ 
+-        if ((audiodev = getenv("AUDIODEV"))) {
+-                char *newdev = strrchr(audiodev, '/');
+-                if (newdev != NULL) {
+-                        audiodev = newdev++;
+-                }
+-        } else
+-            audiodev = "";
+-        dirname = malloc(strlen(audiodev) +  40);
+-        sprintf (dirname, "/tmp/.esd%s-%i", audiodev, getuid());
++        if (dirname == NULL) {
++            if ((audiodev = getenv("AUDIODEV"))) {
++                    char *newdev = strrchr(audiodev, '/');
++                    if (newdev != NULL) {
++                            audiodev = newdev++;
++                    }
++            } else
++                audiodev = "";
++            dirname = malloc(strlen(audiodev) +  40);
++            sprintf (dirname, "/tmp/.esd%s-%i", audiodev, getuid());
++        }
+ 
+ 	return dirname;
+ }

Added: desktop/experimental/esound/debian/patches/19_esddsp_mutex.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/patches/19_esddsp_mutex.patch?rev=17597&op=file
==============================================================================
--- desktop/experimental/esound/debian/patches/19_esddsp_mutex.patch (added)
+++ desktop/experimental/esound/debian/patches/19_esddsp_mutex.patch Sat Nov 15 06:08:51 2008
@@ -1,0 +1,44 @@
+LP #21915
+
+Index: esound-0.2.40/esddsp.c
+===================================================================
+--- esound-0.2.40.orig/esddsp.c	2008-11-15 07:06:02.611902351 +0100
++++ esound-0.2.40/esddsp.c	2008-11-15 07:06:09.123895843 +0100
+@@ -26,6 +26,8 @@
+ 
+ #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+ 
++#define _GNU_SOURCE 1
++
+ #ifdef DSP_DEBUG
+ #define DPRINTF(format, args...)	printf(format, ## args)
+ #else
+@@ -45,6 +47,7 @@
+ #include <sys/time.h>
+ #include <stdio.h>
+ #include <errno.h>
++#include <pthread.h>
+ 
+ #ifdef HAVE_MACHINE_SOUNDCARD_H
+ #  include <machine/soundcard.h>
+@@ -124,9 +127,12 @@ set_volume (int left, int right)
+ }
+ 
+ 
++pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
++
+ static void
+ dsp_init (void)
+ {
++  pthread_mutex_lock(&mutex);
+   if (!ident)
+     {
+       const char *str;
+@@ -158,6 +164,7 @@ dsp_init (void)
+ 	  DPRINTF ("mixer settings file: %s\n", mixer);
+ 	}
+     }
++  pthread_mutex_unlock(&mutex);
+ }
+ 
+ static void

Modified: desktop/experimental/esound/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/patches/series?rev=17597&op=diff
==============================================================================
--- desktop/experimental/esound/debian/patches/series (original)
+++ desktop/experimental/esound/debian/patches/series Sat Nov 15 06:08:51 2008
@@ -14,6 +14,9 @@
 14_ld-preload_esdlib.patch
 15_prettier_debug.patch
 16_alsa_signedness.patch
+17_check_esd.patch
+18_multiple_instances.patch
+19_esddsp_mutex.patch
 31_write_size.patch
 32_sigusr1_reconnect.patch
 33_filter_buffers.patch

Modified: desktop/experimental/esound/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/watch?rev=17597&op=diff
==============================================================================
--- desktop/experimental/esound/debian/watch (original)
+++ desktop/experimental/esound/debian/watch Sat Nov 15 06:08:51 2008
@@ -1,2 +1,2 @@
-# Site		Directory		Pattern			Version	Script
-http://ftp.gnome.org /pub/GNOME/sources/esound/0.2 esound-(.*)\.tar\.gz debian uupdate
+version=2
+http://ftp.gnome.org/pub/gnome/sources/esound/([\d\.]+)[02468]/esound-([\d\.]+)\.tar\.gz

More information about the pkg-gnome-commits mailing list