r17600 - in /desktop/experimental/esound/debian: changelog control control.in esound-common.README.Debian patches/12_esddsp_mmap64.patch patches/18_multiple_instances.patch patches/19_esddsp_mutex.patch patches/21_requires.private patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Nov 15 12:28:08 UTC 2008 

Author: joss
Date: Sat Nov 15 12:28:08 2008
New Revision: 17600

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17600
Log:
  + Exists with GNOME logout. Closes: #504694, #415216.
* Convert to cdbs. Incidentally closes: #465092.
* Generate architectures list with type-handling.
  Closes: #288903, #469860.
* Split the patches that were not merged upstream into a quilt 
  series.
    user. Closes: #147532
    with a mutex. Closes: #347751, #348019, #257354.
* 21_requires.private: new patch. Use Requires.private for audiofile 
  in the pkg-config file. Closes: #375804.    
* 12_esddsp_mmap64.patch: replace the mmap64 implementation by one 
  that accepts off64_t. Closes: #415713.
* 50_alsa_drain.patch: disabled for now, it should be fixed in ALSA.
* Set libesd-alsa0 to be the default in shlibs.
  Closes: #286406, #385014.
* Only suggest esound-clients. Closes: #486374.
* Mention the two versions of the library in README.Debian.
  Closes: #248118.

Added:
    desktop/experimental/esound/debian/patches/21_requires.private
Modified:
    desktop/experimental/esound/debian/changelog
    desktop/experimental/esound/debian/control
    desktop/experimental/esound/debian/control.in
    desktop/experimental/esound/debian/esound-common.README.Debian
    desktop/experimental/esound/debian/patches/12_esddsp_mmap64.patch
    desktop/experimental/esound/debian/patches/18_multiple_instances.patch
    desktop/experimental/esound/debian/patches/19_esddsp_mutex.patch
    desktop/experimental/esound/debian/patches/series

Modified: desktop/experimental/esound/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/changelog?rev=17600&op=diff
==============================================================================
--- desktop/experimental/esound/debian/changelog (original)
+++ desktop/experimental/esound/debian/changelog Sat Nov 15 12:28:08 2008
@@ -2,23 +2,37 @@
 
   * New maintainer.
   * New upstream release. Closes: #422590, #452720.
-  * Convert to cdbs + quilt.
+    + Exists with GNOME logout. Closes: #504694, #415216.
+  * Convert to cdbs. Incidentally closes: #465092.
   * Enable IPv6 support.
   * Update copyright information.
+  * Generate architectures list with type-handling.
+    Closes: #288903, #469860.
   * Add documentation (and associated doc-base registration) to 
     esound-common.
   * Move libesddsp to esound-clients (it’s only used by esddsp).
-  * Split the patches that were not merged upstream into a series.
+  * Split the patches that were not merged upstream into a quilt 
+    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.
+      user. Closes: #147532
     + 19_esddsp_mutex.patch: protect dsp_init against multiple calls 
-      with a mutex.
+      with a mutex. Closes: #347751, #348019, #257354.
   * 20_manpage_errors.patch: new patch. Add standard pod2man header to 
     esdcat.1.in.
+  * 21_requires.private: new patch. Use Requires.private for audiofile 
+    in the pkg-config file. Closes: #375804.    
+  * 12_esddsp_mmap64.patch: replace the mmap64 implementation by one 
+    that accepts off64_t. Closes: #415713.
+  * 50_alsa_drain.patch: disabled for now, it should be fixed in ALSA.
+  * Set libesd-alsa0 to be the default in shlibs.
+    Closes: #286406, #385014.
+  * Only suggest esound-clients. Closes: #486374.
+  * Mention the two versions of the library in README.Debian.
+    Closes: #248118.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 14 Nov 2008 23:25:03 +0100
 

Modified: desktop/experimental/esound/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/control?rev=17600&op=diff
==============================================================================
--- desktop/experimental/esound/debian/control (original)
+++ desktop/experimental/esound/debian/control Sat Nov 15 12:28:08 2008
@@ -40,9 +40,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
-Recommends: esound-clients
+Suggests: esound-clients, esound
 Conflicts: esound-clients (<< 0.2.36-1)
-Suggests: esound
 Description: Enlightened Sound Daemon - Shared libraries
  This program is designed to mix together several digitized 
  audio streams for playback by a single device.
@@ -66,9 +65,8 @@
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
 Section: libs
 Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
-Suggests: esound
+Suggests: esound, esound-clients
 Priority: extra
-Recommends: esound-clients
 Conflicts: libesd0, esound-clients (<< 0.2.36-1)
 Provides: libesd0
 Description: Enlightened Sound Daemon (ALSA) - Shared libraries

Modified: desktop/experimental/esound/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/control.in?rev=17600&op=diff
==============================================================================
--- desktop/experimental/esound/debian/control.in (original)
+++ desktop/experimental/esound/debian/control.in Sat Nov 15 12:28:08 2008
@@ -40,9 +40,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
-Recommends: esound-clients
+Suggests: esound-clients, esound
 Conflicts: esound-clients (<< 0.2.36-1)
-Suggests: esound
 Description: Enlightened Sound Daemon - Shared libraries
  This program is designed to mix together several digitized 
  audio streams for playback by a single device.
@@ -66,9 +65,8 @@
 Architecture: @ALSA_ARCHES@
 Section: libs
 Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
-Suggests: esound
+Suggests: esound, esound-clients
 Priority: extra
-Recommends: esound-clients
 Conflicts: libesd0, esound-clients (<< 0.2.36-1)
 Provides: libesd0
 Description: Enlightened Sound Daemon (ALSA) - Shared libraries

Modified: desktop/experimental/esound/debian/esound-common.README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/esound-common.README.Debian?rev=17600&op=diff
==============================================================================
--- desktop/experimental/esound/debian/esound-common.README.Debian (original)
+++ desktop/experimental/esound/debian/esound-common.README.Debian Sat Nov 15 12:28:08 2008
@@ -1,10 +1,17 @@
-esound for Debian
------------------
+EsounD for Debian
+=================
 
-When using the -tcp option
---------------------------
+The Debian packages for EsounD can work over OSS or ALSA. However, the 
+sound driver is hardcoded into the library, so the way to change it is 
+to install the libesd-alsa0 package for ALSA, and the libesd0 package 
+for OSS. Both are mutually exclusive.
 
-Q: I get the error message "unable to bind port 16001"
+
+A few frequently asked questions
+--------------------------------
+
+Q: When using the -tcp option, I get the error message "unable to bind 
+port 16001"
 
 A:	1. esd is already running, bound to port 16001.
 	2. TCP/IP networking is not configured.  You need at least the lo

Modified: desktop/experimental/esound/debian/patches/12_esddsp_mmap64.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/patches/12_esddsp_mmap64.patch?rev=17600&op=diff
==============================================================================
--- desktop/experimental/esound/debian/patches/12_esddsp_mmap64.patch (original)
+++ desktop/experimental/esound/debian/patches/12_esddsp_mmap64.patch Sat Nov 15 12:28:08 2008
@@ -1,67 +1,36 @@
 Index: esound-0.2.40/esddsp.c
 ===================================================================
---- esound-0.2.40.orig/esddsp.c	2008-11-15 06:00:41.000000000 +0100
-+++ esound-0.2.40/esddsp.c	2008-11-15 06:01:47.000000000 +0100
-@@ -653,14 +653,10 @@
-   return (*func) (fd);
- }
- 
--void *
--mmap (void  *start,  size_t length, int prot, int flags, int fd, off_t offset)
-+static void *
-+mmap_wrapper (void *(*func) (void *, size_t, int, int, int, off_t),
-+              void  *start,  size_t length, int prot, int flags, int fd, off_t offset)
- {
--  static void *(*func) (void *, size_t, int, int, int, off_t) = NULL;
--  
--  if (!func)
--    func = (void * (*) (void *, size_t, int, int, int, off_t)) dlsym (REAL_LIBC, "mmap");
--
-   if(fd != sndfd || sndfd == -1)
-     return (*func)(start,length,prot,flags,fd,offset);
-   else
-@@ -680,6 +676,46 @@
+--- esound-0.2.40.orig/esddsp.c	2008-11-15 07:00:00.675903990 +0100
++++ esound-0.2.40/esddsp.c	2008-11-15 12:53:16.283897185 +0100
+@@ -680,6 +680,33 @@ mmap (void  *start,  size_t length, int 
    return (void *)-1;
  }
  
 +void *
-+mmap (void  *start,  size_t length, int prot, int flags, int fd, off_t offset)
++mmap64 (void  *start,  size_t length, int prot, int flags, int fd, off64_t offset)
 +{
-+  static void *(*func) (void *, size_t, int, int, int, off_t) = NULL;
++  static void *(*func) (void *, size_t, int, int, int, off64_t) = NULL;
++  
++  if (!func)
++    func = (void * (*) (void *, size_t, int, int, int, off64_t)) dlsym (REAL_LIBC, "mmap64");
 +
-+  DPRINTF ("mmap\n");
-+
-+  if (!func) 
++  if(fd != sndfd || sndfd == -1)
++    return (*func)(start,length,prot,flags,fd,offset);
++  else
 +    {
-+      func = (void * (*) (void *, size_t, int, int, int, off_t)) dlsym (REAL_LIBC, "mmap");
-+      if (!func) 
++      DPRINTF ("esddsp: mmap64 - start = %x, length = %d, prot = %d\n",
++	       start, length, prot);
++      DPRINTF ("      flags = %d, fd = %d, offset = %lld\n",flags, fd,offset);
++      if(mmapemu)
 +	{
-+	  fprintf(stderr, "esddsp: error: Cannot find symbol 'mmap'\n");
-+	  return NULL;
++	  mmapemu_osize = length;
++	  mmapemu_obuffer = malloc(length);
++	  mmapemu_ocount.ptr = mmapemu_ocount.blocks = mmapemu_ocount.bytes = 0;
++	  return mmapemu_obuffer;
 +	}
++      else DPRINTF ("esddsp: /dev/dsp mmap64 (unsupported, try -m option)...\n");
 +    }
-+
-+  return mmap_wrapper(func, start, length, prot, flags, fd, offset);
-+}
-+
-+void *
-+mmap64 (void  *start,  size_t length, int prot, int flags, int fd, off_t offset)
-+{
-+  static void *(*func) (void *, size_t, int, int, int, off_t) = NULL;
-+
-+  DPRINTF ("mmap64\n");
-+
-+  if (!func) 
-+    {
-+      func = (void * (*) (void *, size_t, int, int, int, off_t)) dlsym (REAL_LIBC, "mmap64");
-+      if (!func) 
-+	{
-+	  fprintf(stderr, "esddsp: error: Cannot find symbol 'mmap64'\n");
-+	  return NULL;
-+	}
-+    }
-+
-+  return mmap_wrapper(func, start, length, prot, flags, fd, offset);
++  return (void *)-1;
 +}
 +
  int

Modified: 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=17600&op=diff
==============================================================================
--- desktop/experimental/esound/debian/patches/18_multiple_instances.patch (original)
+++ desktop/experimental/esound/debian/patches/18_multiple_instances.patch Sat Nov 15 12:28:08 2008
@@ -1,4 +1,5 @@
 LP: #183199
+Debian #147532
 
 Index: esound-0.2.40/util.c
 ===================================================================

Modified: 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=17600&op=diff
==============================================================================
--- desktop/experimental/esound/debian/patches/19_esddsp_mutex.patch (original)
+++ desktop/experimental/esound/debian/patches/19_esddsp_mutex.patch Sat Nov 15 12:28:08 2008
@@ -1,4 +1,5 @@
 LP #21915
+Debian #347751
 
 Index: esound-0.2.40/esddsp.c
 ===================================================================

Added: desktop/experimental/esound/debian/patches/21_requires.private
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/patches/21_requires.private?rev=17600&op=file
==============================================================================
--- desktop/experimental/esound/debian/patches/21_requires.private (added)
+++ desktop/experimental/esound/debian/patches/21_requires.private Sat Nov 15 12:28:08 2008
@@ -1,0 +1,13 @@
+Index: esound-0.2.40/esound.pc.in
+===================================================================
+--- esound-0.2.40.orig/esound.pc.in	2008-11-15 13:20:05.848400775 +0100
++++ esound-0.2.40/esound.pc.in	2008-11-15 13:21:01.167898644 +0100
+@@ -6,7 +6,7 @@ esd_serverdir=@ESD_PC_DIR@
+ 
+ Name: esound
+ Description: esound
+-Requires: audiofile
++Requires.private: audiofile
+ Version: @VERSION@
+ Libs: -L${libdir} -lesd @SOUND_LIBS@
+ Cflags: -I${includedir}

Modified: desktop/experimental/esound/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/esound/debian/patches/series?rev=17600&op=diff
==============================================================================
--- desktop/experimental/esound/debian/patches/series (original)
+++ desktop/experimental/esound/debian/patches/series Sat Nov 15 12:28:08 2008
@@ -18,6 +18,7 @@
 18_multiple_instances.patch
 19_esddsp_mutex.patch
 20_manpage_errors.patch
+21_requires.private
 31_write_size.patch
 32_sigusr1_reconnect.patch
 33_filter_buffers.patch

More information about the pkg-gnome-commits mailing list