--- esound-0.2.38.orig/esdlib.c +++ esound-0.2.38/esdlib.c @@ -754,6 +754,10 @@ /* 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; --- esound-0.2.38.orig/debian/control +++ esound-0.2.38/debian/control @@ -0,0 +1,69 @@ +Source: esound +Section: sound +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Ryan Murray +Standards-Version: 3.6.2 +Build-Depends: libaudiofile-dev, libasound2-dev [alpha amd64 arm hppa i386 ia64 lpia m68k mips mipsel powerpc s390 sparc], debhelper, libwrap0-dev, pkg-config + +Package: esound +Architecture: any +Depends: ${shlibs:Depends}, esound-common (>= ${Source-Version}) +Description: Enlightened Sound Daemon - Support binaries + This program is designed to mix together several digitized + audio streams for playback by a single device. + +Package: esound-clients +Architecture: any +Depends: ${shlibs:Depends}, esound-common (>= ${Source-Version}) +Conflicts: libesd0 (<< 0.2.36-1), libesd-alsa0 (<< 0.2.36-1) +Description: Enlightened Sound Daemon - clients + Utilities that control and interact with the Enlightened Sound Daemon. + +Package: esound-common +Architecture: all +Description: Enlightened Sound Daemon - Common files + This program is designed to mix together several digitized + audio streams for playback by a single device. + . + This package contains the documentation and configuration files. + +Package: libesd0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, esound-common (>= ${Source-Version}) +Recommends: esound-clients +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. + . + This package is for use with OSS sound drivers. + +Package: libesd0-dev +Architecture: any +Section: libdevel +Depends: libesd-alsa0 (= ${Source-Version}) | libesd0 (= ${Source-Version}), libaudiofile-dev, esound-common (>= ${Source-Version}) +Description: Enlightened Sound Daemon - Development files + This program is designed to mix together several digitized + audio streams for playback by a single device. + . + This package contains the header files needed to compile applications that + use libesd0. + +Package: libesd-alsa0 +Architecture: alpha amd64 arm hppa i386 ia64 lpia m68k mips mipsel powerpc s390 sh sparc +Section: libs +Depends: ${shlibs:Depends}, esound-common (>= ${Source-Version}) +Suggests: esound +Priority: extra +Recommends: esound-clients +Conflicts: libesd0, esound-clients (<< 0.2.36-1) +Provides: libesd0 +Description: Enlightened Sound Daemon (ALSA) - Shared libraries + This program is designed to mix together several digitized + audio streams for playback by a single device. + . + This package is for use with ALSA sound drivers. + --- esound-0.2.38.orig/debian/esound-clients.files +++ esound-0.2.38/debian/esound-clients.files @@ -0,0 +1,18 @@ +usr/bin/esdcat +usr/bin/esdctl +usr/bin/esddsp +usr/bin/esdfilt +usr/bin/esdloop +usr/bin/esdmon +usr/bin/esdplay +usr/bin/esdrec +usr/bin/esdsample +usr/share/man/man1/esdcat.1.gz +usr/share/man/man1/esdctl.1.gz +usr/share/man/man1/esddsp.1.gz +usr/share/man/man1/esdfilt.1.gz +usr/share/man/man1/esdloop.1.gz +usr/share/man/man1/esdmon.1.gz +usr/share/man/man1/esdplay.1.gz +usr/share/man/man1/esdrec.1.gz +usr/share/man/man1/esdsample.1.gz --- esound-0.2.38.orig/debian/esound-common.copyright +++ esound-0.2.38/debian/esound-common.copyright @@ -0,0 +1,19 @@ +This package was debianized by Brian M. Almeida bma@debian.org on +Mon, 8 Jun 1998 13:35:35 -0400. + +It was downloaded from ftp://ftp.gnome.org/pub/GNOME/stable/sources/esound/ + +Author: Eric Mitchell + +Copyright: + +The software in this package falls into several categories, and is +licensed under either the Gnu GPL or Gnu LGPL as appropriate: + +The Enlightened Sound Daemon (esd) - GPL v2 +The Enlightened Sound Daemon Client Library (libesd.so, libesd.a) - LGPL v2 +The ESD-DSP wrapper script and support library (esddsp, libesddsp.so) - LGPL v2 +The Example programs and command line utilities - LGPL v2 + +You can find the full text of the GPL in /usr/share/common-licenses/GPL-2 and +the full text of the LGPL in /usr/share/common-licenses/LGPL-2 --- esound-0.2.38.orig/debian/watch +++ esound-0.2.38/debian/watch @@ -0,0 +1,2 @@ +# Site Directory Pattern Version Script +http://ftp.gnome.org /pub/GNOME/sources/esound/0.2 esound-(.*)\.tar\.gz debian uupdate --- esound-0.2.38.orig/debian/libesd-alsa0.files +++ esound-0.2.38/debian/libesd-alsa0.files @@ -0,0 +1,2 @@ +usr/lib/*.so.* +usr/lib/libesd.so.* --- esound-0.2.38.orig/debian/libesd0-dev.files +++ esound-0.2.38/debian/libesd0-dev.files @@ -0,0 +1,8 @@ +usr/lib/libesd.so +usr/lib/libesd.la +usr/lib/libesd.a +usr/include +usr/bin/esd-config +usr/share/aclocal/esd.m4 +usr/share/man/man1/esd-config.1.gz +usr/lib/pkgconfig/esound.pc --- esound-0.2.38.orig/debian/esound.files +++ esound-0.2.38/debian/esound.files @@ -0,0 +1,2 @@ +usr/bin/esd +usr/share/man/man1/esd.1.gz --- esound-0.2.38.orig/debian/esound-clients.files.hurd-i386 +++ esound-0.2.38/debian/esound-clients.files.hurd-i386 @@ -0,0 +1,16 @@ +usr/bin/esdcat +usr/bin/esdctl +usr/bin/esdfilt +usr/bin/esdloop +usr/bin/esdmon +usr/bin/esdplay +usr/bin/esdrec +usr/bin/esdsample +usr/share/man/man1/esdcat.1.gz +usr/share/man/man1/esdctl.1.gz +usr/share/man/man1/esdfilt.1.gz +usr/share/man/man1/esdloop.1.gz +usr/share/man/man1/esdmon.1.gz +usr/share/man/man1/esdplay.1.gz +usr/share/man/man1/esdrec.1.gz +usr/share/man/man1/esdsample.1.gz --- esound-0.2.38.orig/debian/changelog +++ esound-0.2.38/debian/changelog @@ -0,0 +1,946 @@ +esound (0.2.38-0ubuntu6) hardy; urgency=low + + * esdlib.c: The previous patch leaks pipe file descriptors in the case + that /usr/bin/esd doesn't exist. Fix that bug by only opening the + pipes after we know that the esd executable exists (LP: #183411). + + -- Ryan Lortie Tue, 15 Jan 2008 22:08:19 -0500 + +esound (0.2.38-0ubuntu5) hardy; urgency=low + + * No change rebuild to attempt to unbreak the world. Soyuz clearly got + hungry, and ate one of the binaries. Feed it more often next time! + + -- Sarah Hobbs Sat, 22 Dec 2007 23:50:56 +1100 + +esound (0.2.38-0ubuntu4) gutsy; urgency=low + + * esdlib.c: Check if the esd binary exists at all. If not, forego forking + a shell and trying to execute it. This both improves startup time and also + avoids the "/bin/sh: /usr/bin/esd: not found" warning. (LP: #134641) + + -- Martin Pitt Fri, 05 Oct 2007 14:00:43 +0200 + +esound (0.2.38-0ubuntu3) gutsy; urgency=low + + * Add lpia to the list of supported architectures. + + -- Matthias Klose Tue, 07 Aug 2007 16:07:05 +0000 + +esound (0.2.38-0ubuntu2) gutsy; urgency=low + + * Previous upload dropped all Debian and Ubuntu patches. Reintroduce the + critical ones for Tribe 3 for now: + - esd.conf: Enable autospawn mode. + - esddsp.c: Protect dsp_init() with a mutex to prevent race conditions + from multiple calls (which hanged the desktop session). (LP: #21915) + + -- Martin Pitt Wed, 18 Jul 2007 12:03:22 +0200 + +esound (0.2.38-0ubuntu1) gutsy; urgency=low + + * New upstream release (0.2.38): + * Fix 100% CPU problem introduced in 0.2.37 + * Fix libesddsp not linking against libesd + * Fix file descriptor leaks + * Fix a build problem with the read/write wrapper + * Chdir to "/" when starting up + * Only install the esddsp man page if we build the binary + * New upstream release (0.2.37): + * Fix null derefs and leaks reported by Covertiy + * Build fixes + * Disable autospawning + * Close filedescriptors and sockets + * Don't terminate until the last sample is done + * Add checks for clients disconnecting + * Updated man pages + * Use pkg-config to check for audiofile + * debian/control + * Add pkg-config to build-depends + * debian/rules + * Remove pod2man of docs, fix building manpages + + -- Aron Sisak Wed, 04 Jul 2007 12:50:39 +0200 + +esound (0.2.36-3ubuntu4) feisty; urgency=low + + * debian/control: Update maintainer fields according to debian- + maintainer-field spec. + + -- Martin Pitt Thu, 22 Feb 2007 13:29:32 +0000 + +esound (0.2.36-3ubuntu3) dapper; urgency=low + + * esd.conf: Drop autospawn timeout to 1 second. Closes: LP#34818 + + -- Martin Pitt Tue, 28 Mar 2006 12:21:45 +0200 + +esound (0.2.36-3ubuntu2) dapper; urgency=low + + [Tollef Fog Heen] + * dsp_init(): Enclose function body in a mutex. dsp_init() was sometimes + called several times which caused race conditions with the global + variables and lead to a crash. + + [Martin Pitt] + * debian/rules, debian/control: Prefer libesd-alsa0 in shlibs and + dependencies. + + -- Martin Pitt Mon, 23 Jan 2006 19:00:58 +0100 + +esound (0.2.36-3ubuntu1) dapper; urgency=low + + * Manually resynchronize to Debian, cleaned up a lot of cruft from the diff. + * Remaining changes: + - esd.conf: Enable auto_spawn. + - debian/rules: Build with --enable-debugging to provide -v[tcm] options. + - esd.c: Disable tracing options by default. + - util.c: Support multiple esd instances (one per user). + * clients.c: Fix variable declaration to fix FTBFS. + + -- Martin Pitt Fri, 13 Jan 2006 20:10:24 +0100 + +esound (0.2.36-3) unstable; urgency=low + + * Only include *64 functions if necessary in libesddsp for things + that check at runtime rather than compile time (closes: #347751) + + -- Ryan Murray Fri, 13 Jan 2006 00:33:23 -0800 + +esound (0.2.36-2) unstable; urgency=low + + * Allow playing of everything current libaudiofile supports (closes: #318145) + * Apply patch to wrap *64 functions, too (closes: #257146) + * Pull several patches from Ubuntu: (closes: #343174, #315668) + * Rebuild on hppa with fixed headers (closes: #328872) + + [ Martin Pitt ] + + esound (0.2.36-1ubuntu5) breezy; urgency=low + * audio_alsa09.c, esd_audio_close(): + - Call snd_pcm_hw_free() before snd_pcm_close(). This closes the file + descriptor to the sound device even if the device is not physically + present any more. + - This fixes the esound/hotplug deadlock when removing a currently active + sound device. + + esound (0.2.36-1ubuntu2) breezy; urgency=low + * audio_alsa09.c: Disable snd_pcm_drain() call for now since it sometimes + triggers a race condition in the ALSA kernel driver which causes the + esd process to hang. This is not a proper bug fix, but at least makes all + those broken Colony installations out there work again. (Ubuntu #12276) + + esound (0.2.36-0ubuntu2) breezy; urgency=low + * esd.c: Install signal handler for SIGUSR1 that reconnects to the ALSA + driver. This is useful after changing the ALSA configuration file. + * client.c: Integrate driver reconnection into client loop. + * audio_alsa09.c, initAlsa(): Call snd_config_update_free_global() to purge + configuration cache and to properly reload configuration files. + + [ Jeff Waugh ] + + esound (0.2.35-2ubuntu2) hoary; urgency=low + * esdlib.c: + - More thorough fixage, avoid stupid breakage thanks to Paolo Borelli + and James Henstridge. + + esound (0.2.35-2ubuntu1) hoary; urgency=low + * esdlib.c: + - Do not modify host passed to esd_sound_open, because that is highly + offensive. (Fixes GStreamer using ESPEAKER.) Thanks to Jan Schmidt + who should take full credit for finding this bogon. + + -- Ryan Murray Wed, 11 Jan 2006 01:42:15 -0800 + +esound (0.2.36-1ubuntu6) dapper; urgency=low + + * esd.conf: Enable autospawn by default so that esd is not started when + using direct ALSA output; see http://wiki.ubuntu.com/GstreamerAudioBackend + spec. + + -- Martin Pitt Tue, 3 Jan 2006 16:38:17 +0100 + +esound (0.2.36-1ubuntu5) breezy; urgency=low + + * audio_alsa09.c, esd_audio_close(): + - Call snd_pcm_hw_free() before snd_pcm_close(). This closes the file + descriptor to the sound device even if the device is not physically + present any more. + - This fixes the esound/hotplug deadlock when removing a currently active + sound device. + + -- Martin Pitt Mon, 22 Aug 2005 13:05:36 +0200 + +esound (0.2.36-1ubuntu4) breezy; urgency=low + + * Make esd work for several users in parallel (Ubuntu #3671, Debian + #147532): + - util.c, esd_get_socket_dirname(): Append the user id to the socket + name so that socket names for multiple users don't collide. + - esd.conf: Add default option "-as 5" to release the soundcard after 5 + seconds of inactivity. That way, other users can actually use it, too. + * util.c, esd_get_socket_dirname(): Some code cleanup to fix some potential + crashers. + + -- Martin Pitt Thu, 18 Aug 2005 23:16:36 +0200 + +esound (0.2.36-1ubuntu3) breezy; urgency=low + + * debian/rules: Configure with --enable-debugging to provide -vt/-vc options. + * esd.c: Disable debug tracing by default, it can be enabled with -vt/-vc. + + -- Martin Pitt Wed, 6 Jul 2005 12:02:53 +0200 + +esound (0.2.36-1ubuntu2) breezy; urgency=low + + * audio_alsa09.c: Disable snd_pcm_drain() call for now since it sometimes + triggers a race condition in the ALSA kernel driver which causes the + esd process to hang. This is not a proper bug fix, but at least makes all + those broken Colony installations out there work again. (Ubuntu #12276) + + -- Martin Pitt Wed, 6 Jul 2005 09:52:37 +0200 + +esound (0.2.36-1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, resolved minor conflicts. + + -- Martin Pitt Tue, 28 Jun 2005 17:01:59 +0200 + +esound (0.2.36-1) unstable; urgency=medium + + * New upstream release (closes: #313378, #313563, #314294, #283814) + * Revert changes in unsanctioned NMU. + * Increase shlib to 0.2.35, when esd_default_options was introduced. + (closes: #279108) + * Remove all non dh maintainer scripts -- they're no longer needed. + * Remove obsolete (potato or earlier) dependencies. + * Remove html documentation. It's horribly incomplete, and the + manpages are updated more frequently. (closes: #283235) + * Add amd64 to alsa list (closes: #277860) + * Bump DH_COMPAT to 4 + * Reject clients that we can't mix for (closes: #312087) + * Move libesddsp to /usr/lib/esound (closes: #220058) + * Some buffer size and delay timing tweaks. + + -- Ryan Murray Sat, 25 Jun 2005 16:13:24 -0700 + +esound (0.2.36-0ubuntu2) breezy; urgency=low + + * esd.c: Install signal handler for SIGUSR1 that reconnects to the ALSA + driver. This is useful after changing the ALSA configuration file. + * client.c: Integrate driver reconnection into client loop. + * audio_alsa09.c, initAlsa(): Call snd_config_update_free_global() to purge + configuration cache and to properly reload configuration files. + + -- Martin Pitt Fri, 24 Jun 2005 17:27:28 +0200 + +esound (0.2.36-0ubuntu1) breezy; urgency=low + + * New upstream release. Now should work much better with the current ALSA + library (#11903) + + -- Martin Pitt Wed, 22 Jun 2005 13:34:10 +0200 + +esound (0.2.35-2.1ubuntu1) breezy; urgency=low + + * Merged Debian changes. + + -- Martin Pitt Wed, 15 Jun 2005 09:17:57 +0200 + +esound (0.2.35-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Applied patch to add amd64 and ppc64 support, thanks Andreas Jochens + (closes: #288903) + + -- Luk Claes Thu, 5 May 2005 17:08:34 +0200 + +esound (0.2.35-2ubuntu2) hoary; urgency=low + + * esdlib.c: + - More thorough fixage, avoid stupid breakage thanks to Paolo Borelli + and James Henstridge. + + -- Jeff Waugh Thu, 17 Feb 2005 05:04:18 +1100 + +esound (0.2.35-2ubuntu1) hoary; urgency=low + + * esdlib.c: + - Do not modify host passed to esd_sound_open, because that is highly + offensive. (Fixes GStreamer using ESPEAKER.) Thanks to Jan Schmidt + who should take full credit for finding this bogon. + + -- Jeff Waugh Thu, 17 Feb 2005 01:19:05 +1100 + +esound (0.2.35-2) unstable; urgency=low + + * Relibtoolize. + + -- Ryan Murray Sat, 23 Oct 2004 17:55:29 -0700 + +esound (0.2.35-1) unstable; urgency=high + + * New upstream release (closes: #249375, #270098, #216736) + * Open OSS device similar to xmms (closes: #265432) + * Fix esd_comm_loop() so recording works (closes: #211867) + * Fix filter buffer handling so filters work (closes: #202027) + * Don't call write() with a NULL buffer and 0 length (closes: #188637) + * Remove libasound2 item from README.Debian (closes: #270269) + * Keep writing audio until it is all gone (closes: #239299) + * Remove static esddsp library, .so link, and .la file from + libesd0-dev. It's only meant for LD_PRELOAD. + + -- Ryan Murray Fri, 22 Oct 2004 02:59:31 -0700 + +esound (0.2.34-1) unstable; urgency=low + + * New upstream release (closes: #125803, #203913, #244840, #262376, #254130) + * Revert custom esd_audio_write from -2 (closes: #264981) + * Use --release sarge (closes: #214939) + + -- Ryan Murray Thu, 12 Aug 2004 17:59:29 -0700 + +esound (0.2.29-2) unstable; urgency=low + + * Instead of using select() for OSS, use SNDCTL_DSP_GETOSPACE. + * Revert changes in unsanctioned NMU. + + -- Ryan Murray Mon, 9 Aug 2004 20:28:59 -0700 + +esound (0.2.29-1) unstable; urgency=low + + * New upstream release (closes: #170923) + * Rewrote generic esd_audio_write to attempt to use select if the driver + seems to support it, and to write in a blocksize that can be changed by + audio open functions. + (closes: #57905, #95394, #122627, #159915) + * Fix endian swapping code (closes: #126879) + * build with libasound2-dev as libasound1-dev is no longer installable + (closes: #118022) + * Correct is_host_local check (closes: #153819) + * correct doc-base index file (closes: #152091) + * Correct handling while playing samples (closes: #112877, #144211) + * add a MIME control file for esdplay (closes: #153279) + * Take stdio emu code from libartsc (closes: #148259, #120829) + * Remove libesddsp from LD_PRELOAD when autospawning esd (closes: #151434) + * Document esd.conf in the esd manpage (closes: #129555) + * Correct license in audio_alsa09.c (upstream bug 108799) + + -- Ryan Murray Wed, 19 Mar 2003 17:42:21 -0800 + +esound (0.2.28-2) unstable; urgency=low + + * Fix quoting on LD_PRELOAD (closes: #151496) + * Fix -s parsing in esdctl (closes: #130720) + + -- Ryan Murray Mon, 1 Jul 2002 01:17:42 -0700 + +esound (0.2.28-1) unstable; urgency=low + + * New upstream release (closes: #144366, #130403, #114761) + * Fix README.Debian WRT -tcpip vs -tcp (closes: #129127) + * Add version of GPL to copyright statement (closes: #133495) + * Correct esdplay manpage title (closes: #141317) + * Don't install esddsp for hurd-i386 (closes: #144678) + + -- Ryan Murray Sat, 29 Jun 2002 21:01:34 -0700 + +esound (0.2.23-3) unstable; urgency=low + + * Ship esound.pc (closes: #120798) + * Prepend to LD_PRELOAD in esddsp (closes: #126402) + * Add fclose to go with fopen + + -- Ryan Murray Fri, 28 Dec 2001 11:02:46 -0800 + +esound (0.2.23-2) unstable; urgency=low + + * Update config.guess/config.sub + + -- Ryan Murray Wed, 21 Nov 2001 11:16:21 -0800 + +esound (0.2.23-1) unstable; urgency=low + + * New upstream release + * "For the Glory of the Creator" release. + * Build libaesd0-alsa on all Linux architectures, and change shlib for hurd + (closes: #114051) + * esound socket has moved back to /tmp/.esd, to be binary compatible with + other distributions. + * Remove debconf template/config (closes: #105871, #104105) + * Change default configuration to have auto spawning disabled + (closes: #113313) + * Fix path to config file in esd manpage (closes: #107354) + * Updated esdfilt and esdmon manpages (closes: #117925) + * Update README.Debian + * Added fopen() wrapper for esddsp (closes: #76301) + + -- Ryan Murray Mon, 19 Nov 2001 00:57:18 -0800 + +esound (0.2.22-6) unstable; urgency=low + + * Update conflicts to the appropriate packages (closes: #103858, #103751) + (closes: #101799) + * Added Spanish debconf template (closes: #103230) + * Seems some delay is needed on the reopen for recording. I've added + a usleep, hopefully that is enough to make it work, yet not enough + to be overly annoying (closes: #103772) + + -- Ryan Murray Sun, 8 Jul 2001 03:21:59 -0700 + +esound (0.2.22-5) unstable; urgency=low + + * libesd-alsa0 should be extra. Changing it back. + * add a conflicts against older esound due to the move of the unix domain + socket (closes: #99782) + + -- Ryan Murray Sun, 3 Jun 2001 12:12:32 -0700 + +esound (0.2.22-4) unstable; urgency=low + + * Fix dependency generation for esound-clients and esound. + * Change libesd-alsa0's priority to optional to match override file. + * Build without sound support for the hurd (closes: #89461) + * Close alsa PCM handle on errors in handle setup (closes: #83429) + * Add sleeps when the writes are small for alsa (closes: #87334, #83346) + * Add FILES section with esound.conf to esd manpage (closes: #87860) + * Move esound socket dir to /var/run (closes: #90612, #86807) + * Add mips to alsa architectures + * Update some of the dependencies/conflicts (closes: #95751) + * Update config.guess/config.sub (closes: #96729) + * Move unix domain socket to /var/run/esound (closes: #98946, #86807) + * Broke -terminate sometime ago (0.2.20-1 or so?) fixed now. + (closes: #95596) + * Update esdctl and esddsp pod pages (closes: #93993) + * Implement play, loop, and stop in esdctl, as the docs say (closes: #81236) + * Add Swedish, Dutch, and German templates (closes: #83502, #85553, #86217) + * Switch to debhelper v3, and simplified the rules file + + -- Ryan Murray Sun, 27 May 2001 21:33:18 -0700 + +esound (0.2.22-3) unstable; urgency=low + + * Change ALSA from block to stream, and fix up code for dealing with + underrun's (closes: #81022) + * Remove Suggests: for non-existant package + * Don't sleep when attempting to reopen for recording. (closes: #81398) + * Really remove hosts.allow updating logic. (closes: #75966) + + -- Ryan Murray Tue, 23 Jan 2001 14:12:39 -0800 + +esound (0.2.22-2) unstable; urgency=low + + * Remove ugly sleep(1) hack that attempts to work around what appears to be + a kernel bug. + * Apply a mixing patch from Matthew Ashton that fixes + 32k samples turning into static when 8k samples played in the middle + (closes: #79145) + * Add Replaces: for old -alsa packages. + * Don't use tcp wrappers on unix domain sockets (closes: #79014) + * Remove hosts.allow updating logic. (closes: #75966) + * Move man pages into packages with the binaries, since they aren't + packaged twice anymore. + + -- Ryan Murray Fri, 8 Dec 2000 23:13:55 -0800 + +esound (0.2.22-1) unstable; urgency=low + + * New upstream release + * remove esound-alsa and libesd-alsa0-dev packages. The only thing + that needs a seperate alsa package is the library. + * Rewrote mixing to mix the minimum that is available. This seems to make + mixed sounds work correctly now. It used to be writing random bytes + to the socket. (closes: #77553, #59331) + * Only build twice the things we actually package twice (libesd) + * Retry writes if device is busy. (closes: #76345, #65268) + * Use strtok_r if available (closes: #76567) + * Re-enable unix domain sockets, and make it the default. + (closes: #75064, #66724) + * Sleep for a bit if resume fails (closes: #64484) + + -- Ryan Murray Tue, 5 Dec 2000 23:11:24 -0800 + +esound (0.2.20-2) unstable; urgency=low + + * Fix missing esound-common documentation (closes: #74561, #74964, #74763) + * Update package description (closes: #75109) + * Add recommends of esound-clients to the esd libraries + * Moved client manpages to esound-clients (closes: #75108) + + -- Ryan Murray Sun, 22 Oct 2000 02:39:54 -0700 + +esound (0.2.20-1) unstable; urgency=low + + * New upstream release + * Make -d in esound-alsa take a card number parameter, instead of ignoring + -d. (closes: #72653) + * Buffer overrun fix (closes: #66759) + * only call accept if a new connection is waiting. Saves a system call + on every sound packet. + * Add esound-clients package. Lots of other package reorganizations. + (closes: #72304, #69856) + * Add an entry to /etc/hosts.allow to allow localhost by default, if there + is no entry. (closes: #66433, #67219, #67437, #72794) + + -- Ryan Murray Mon, 9 Oct 2000 02:36:34 -0700 + +esound (0.2.19-5) unstable; urgency=low + + * Make list of ALSA archs in rules match the list in control (closes: #69671) + + -- Ryan Murray Mon, 21 Aug 2000 21:49:36 -0700 + +esound (0.2.19-4) unstable; urgency=low + + * Fix segmentation fault when using ALSA (closes: #69449) + + -- Ryan Murray Sun, 20 Aug 2000 19:28:18 -0700 + +esound (0.2.19-3) unstable; urgency=low + + * sparc and powerpc now have libasound1 available, so update the + build-depends to fix it... + + -- Ryan Murray Fri, 18 Aug 2000 17:05:27 -0700 + +esound (0.2.19-2) unstable; urgency=low + + * Fix version in esddsp (closes: #67658) + + -- Ryan Murray Fri, 11 Aug 2000 04:09:12 -0700 + +esound (0.2.19-1) unstable; urgency=low + + * New upstream release (closes: #63206) + * Remove autogenerated files from the diff. + + -- Ryan Murray Sun, 23 Jul 2000 01:14:48 -0700 + +esound (0.2.18-3) unstable; urgency=low + + * New Maintainer. + * Reword debconf text to try to make it clear that sound must be setup. + * Add nobeeps option to manpage, closes: #65359 + * Update Build-Depends to be libasound1-dev, and add libwrap0-dev + * Add a README.Debian with one FAQ, closes: #65198 + * Add all architectures that currently have a libasound-dev library + to build esd-alsa + + -- Ryan Murray Sun, 18 Jun 2000 20:49:50 -0700 + +esound (0.2.18-2) unstable; urgency=low + + * Applied patch from Juergen E Fischer , + closes: #61959, #62054 + * s/0.2.17/0.2.18/ in esddsp.in, closes: #62130 + + -- Brian M. Almeida Mon, 10 Apr 2000 13:24:30 -0400 + +esound (0.2.18-1) unstable; urgency=low + + * New upstream release + * Updated download location and author's email in debian/copyright + * New upstream HTML documentation + * Compiled against ALSA 0.5 + + -- Brian M. Almeida Wed, 5 Apr 2000 11:45:38 -0400 + +esound (0.2.17-8) unstable; urgency=low + + * Removed garbage from beginning of esound.html, closes: #60804 + * Removed test if daemon is running in esddsp, it's not really + needed anymore anyways, closes: #60681 + + -- Brian M. Almeida Mon, 20 Mar 2000 14:10:28 -0500 + +esound (0.2.17-7) frozen unstable; urgency=low + + * Fix doc-base entry, closes: #60231 + + -- Brian M. Almeida Sun, 12 Mar 2000 15:40:53 -0500 + +esound (0.2.17-6) frozen unstable; urgency=low + + * Print 'opening socket' to stderr (esdcat.c, esdloop.c, esdmon.c, + esdrec.c, esdsample.c), closes: #59610 + + -- Brian M. Almeida Mon, 6 Mar 2000 13:35:06 -0500 + +esound (0.2.17-5) frozen unstable; urgency=low + + * Change ' to " so LD_PRELOAD works, closes: #59085 + + -- Brian M. Almeida Mon, 28 Feb 2000 12:58:38 -0500 + +esound (0.2.17-4) frozen unstable; urgency=low + + * Fixed a bug in the esddsp shellscript, closes: #58871 + + -- Brian M. Almeida Thu, 24 Feb 2000 16:10:02 -0500 + +esound (0.2.17-3) frozen unstable; urgency=medium + + * Fix Build-Depends (change libaudiofile0-dev to libaudiofile-dev, + only depend on libasoun0.4 on i386 and sparc), closes: #58295 + + -- Brian M. Almeida Thu, 17 Feb 2000 08:12:30 -0500 + +esound (0.2.17-2) frozen unstable; urgency=medium + + * Security fix, needs to go into potato + * Change esd to use TCP/IP and turn off UNIX domain sockets, closes: #58054 + + -- Brian M. Almeida Wed, 16 Feb 2000 16:14:33 -0500 + +esound (0.2.17-1) frozen unstable; urgency=medium + + * New upstream version + * Contains security fixes only, needs to go into potato + + -- Brian M. Almeida Fri, 4 Feb 2000 15:14:44 -0500 + +esound (0.2.16-4) unstable; urgency=low + + * Added debhelper to Build-Depends + + -- Brian M. Almeida Thu, 13 Jan 2000 10:35:05 -0500 + +esound (0.2.16-3) unstable; urgency=low + + * Policy version 3.1.1 + * Added Build-Depends + + -- Brian M. Almeida Thu, 13 Jan 2000 10:04:23 -0500 + +esound (0.2.16-2) unstable; urgency=low + + * Fixed esddsp to use newest shlibs, removed some code from + esddsp.c that didn't make sense with unix domain sockets, closes: #53602 + + -- Brian M. Almeida Tue, 28 Dec 1999 09:46:47 -0500 + +esound (0.2.16-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Wed, 22 Dec 1999 14:38:10 -0500 + +esound (0.2.15-14) unstable; urgency=low + + * Build in seperate directories, thanks to Adam Heath + for telling me about the ../configure trick, closes: #53246, #53248 + Closes: #53249, #53278 + + -- Brian M. Almeida Wed, 22 Dec 1999 07:18:11 -0500 + +esound (0.2.15-13) unstable; urgency=low + + * Patch from Richard Guenther to chdir to a "safe" directory, closes: #51959 + * Convert esound.sgml to HTML, closes: #52188 + * esd-config may not be in -dev, but it is in -common, which -dev + now Depends: on, closes: #52208 + * Loosen dependencies again, closes: #52232 + * Merged in patch from NMU, closes: #52443 + + -- Brian M. Almeida Mon, 20 Dec 1999 15:49:21 -0500 + +esound (0.2.15-12.1) unstable; urgency=low + + * Non maintainer upload during the bugsquashing party. + * Applied the patch from Roman to debian/rules. Closes: #52443 + + -- Raphael Hertzog Sun, 19 Dec 1999 21:16:25 +0100 + +esound (0.2.15-12) unstable; urgency=medium + + * Changed priority of the *alsa* packages to extra, since alsa is extra + + -- Brian M. Almeida Sun, 5 Dec 1999 13:46:50 -0500 + +esound (0.2.15-11) unstable; urgency=medium + + * Removed restriction on shlibs, closes: #51873 + + -- Brian M. Almeida Sun, 5 Dec 1999 08:46:41 -0500 + +esound (0.2.15-10) unstable; urgency=medium + + * Added conflicts (libesd0-dev << 0.2.15-8) on esound-common, closes: #51791 + + -- Brian M. Almeida Thu, 2 Dec 1999 07:23:58 -0500 + +esound (0.2.15-9) unstable; urgency=medium + + * Moved debconf templates into esound-common, closes: #51585, #51759 + * Only compile ALSA packages on i386 and sparc, closes: #51699 + + -- Brian M. Almeida Wed, 1 Dec 1999 22:09:35 -0500 + +esound (0.2.15-8) unstable; urgency=medium + + * Make esound-alsa, split common data between esound and esound-alsa + into esound-common (closes: #50941) + + -- Brian M. Almeida Tue, 23 Nov 1999 11:55:03 -0500 + +esound (0.2.15-7) unstable; urgency=medium + + * Removed remark about default setting in postinst, closes: #49961 + + -- Brian M. Almeida Fri, 12 Nov 1999 11:07:19 -0500 + +esound (0.2.15-6) unstable; urgency=medium + + * Include *.a files, oops + + -- Brian M. Almeida Thu, 11 Nov 1999 00:09:26 -0500 + +esound (0.2.15-5) unstable; urgency=medium + + * Ask questions in debconf's config script, closes: #49511 + + -- Brian M. Almeida Sun, 7 Nov 1999 19:06:29 -0500 + +esound (0.2.15-4) unstable; urgency=medium + + * Applied patch for PPC architectures, closes: #49086 + + -- Brian M. Almeida Fri, 5 Nov 1999 08:42:14 -0500 + +esound (0.2.15-3) unstable; urgency=medium + + * Updated versions of config.guess and config.sub, hopefully + this will fix bug#49086 (PowerPC people, please test!) + + -- Brian M. Almeida Thu, 4 Nov 1999 14:38:54 -0500 + +esound (0.2.15-2) unstable; urgency=low + + * Added manpages for all programs (pod owns!), closes: #39486, #39478 + * References correct doc-base path, closes: #47742 + * Compiles static library (fixed in last release), closes: #47928 + + -- Brian M. Almeida Thu, 4 Nov 1999 14:03:46 -0500 + +esound (0.2.15-1) unstable; urgency=low + + * New maintainer (ping, pong, ping, pong) + * New upstream version, closes: #47506, #48276 + * Uses debconf, closes #47617 + * Compiled with --with-libwrap, closes: #49042 + * Simplified debian/rules + + -- Brian M. Almeida Wed, 3 Nov 1999 21:08:16 -0500 + +esound (0.2.14-0.2) unstable; urgency=low + + * New maintainer + * Non-maintainer release for new maintainer :) + * New upstream version, closes: #44139 + * Fixed bad perms on /tmp/.esd, closes: #41454 + * esound now depends on libesd0, closes: #45682 + * esddsp now uses correct library versions, closes: #46466 + * applied patch to esd.m4, closes: #42527 + * Inform user how to rerun config script, closes: #40962 + * Updated to standards 3.0.1.1 + * Updated to FHS + + -- Brian M. Almeida Wed, 6 Oct 1999 08:33:14 -0400 + +esound (0.2.14-0.1) unstable; urgency=low + + * New upstream version NMU for gnome-1.0.50 + + -- Michael Alan Dorman Wed, 29 Sep 1999 16:06:47 -0400 + +esound (0.2.10-0.19990424.6.2) unstable; urgency=medium + + * Non-Maintainer Upload + * Conditionalized the ARCH variable thing for Alpha (so as not to break + HURD) + + -- David Huggins-Daines Sat, 3 Jul 1999 13:50:09 -0400 + +esound (0.2.10-0.19990424.6.1) unstable; urgency=medium + + * Non-Maintainer Upload + * Recompiled without ALSA (both to make GNOME work again, and because + this is a policy violation) + * Also added an ARCH variable to make Alpha compiles work better. + + -- David Huggins-Daines Sat, 3 Jul 1999 01:21:13 -0400 + +esound (0.2.10-0.19990424.6) unstable; urgency=low + + * Made /usr/sbin/esdconfig executable (closes: #39187) + * Applied esdlib.c cleanup patch from BTS (closes: #39188) + + -- Brian M. Almeida Wed, 9 Jun 1999 10:20:04 -0400 + +esound (0.2.10-0.19990424.5) unstable; urgency=low + + * Added esdconfig script to configure /etc/esound/esd.conf (closes: #38707) + + -- Brian M. Almeida Sun, 6 Jun 1999 22:27:51 -0400 + +esound (0.2.10-0.19990424.4) unstable; urgency=medium + + * Ok, REALLY fixed the doc-base stuff (closes: #38208, #38223) + + Added shebang to libesd0.prerm ("oops?") + + Use correct name of document + + -- Brian M. Almeida Mon, 24 May 1999 07:28:19 -0400 + +esound (0.2.10-0.19990424.3) unstable; urgency=low + + * Fixed incorrect doc-base commands (closes: #37976) + + -- Brian M. Almeida Sat, 22 May 1999 22:25:07 -0400 + +esound (0.2.10-0.19990424.2) unstable; urgency=low + + * use -V option of dh_makeshlibs (closes: #37646) + + -- Brian M. Almeida Mon, 17 May 1999 22:54:28 -0400 + +esound (0.2.10-0.19990424.1) unstable; urgency=low + + * Fixed dual instance of libaudiofile0 in esound's Depends: + + -- Brian M. Almeida Tue, 27 Apr 1999 07:23:31 -0400 + +esound (0.2.10-0.19990424) unstable; urgency=low + + * Upstream CVS release + * Don't use -as 2 as default anymore (esddsp issues) + * esddsp.in - don't try to connect to esound if it's not running + * Added postinst script for esound, kills esd processes if running, + will be respawned by esdlib upon next access (closes: #36163) + + -- Brian M. Almeida Sat, 24 Apr 1999 18:07:48 -0400 + +esound (0.2.8-4) unstable; urgency=low + + * Applied upstream patches + * Uses Unix domain sockets by default, for less sound breakup + * esd now has a conf file (/etc/esd.conf or ~/.esd.conf) + * Uses INADDR constants instead of inet_addr calls + * More miscellaneous stuff, see /usr/doc/esound/changelog.gz + * Added esd.conf conffile + * Bumped standards version to 2.5.0.0 + * Updated debian/copyright + * Added /usr/doc/esound/esound.sgml, registers with doc-base + + -- Brian M. Almeida Wed, 14 Apr 1999 18:49:45 -0400 + +esound (0.2.8-3) unstable; urgency=low + + * libesd0-dev depends on libaudiofile-dev. closes: #35322 + + -- Brian M. Almeida Wed, 31 Mar 1999 07:00:16 -0500 + +esound (0.2.8-2) unstable; urgency=low + + * Added Author's name and email in copyright (#34183) + + -- Brian M. Almeida Sat, 6 Mar 1999 22:28:15 -0500 + +esound (0.2.8-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Sat, 20 Feb 1999 13:19:08 -0500 + +esound (0.2.7-0.19990216) unstable; urgency=low + + * Fixed rpath stuff + * Updated to 19990216 snapshot + + -- Brian M. Almeida Tue, 16 Feb 1999 08:44:37 -0500 + +esound (0.2.7-0.19990209) unstable; urgency=low + + * CVS snapshot release for GNOME stuff (#32575) + + -- Brian M. Almeida Tue, 9 Feb 1999 23:21:44 -0500 + +esound (0.2.6-4) unstable; urgency=low + + * Fixes bug #30283 (esd.m4 not included in -dev package) + + -- Brian M. Almeida Wed, 3 Dec 1998 08:22:00 -0500 + +esound (0.2.6-3) frozen unstable; urgency=low + + * Fixes bug #29761 + + -- Brian M. Almeida Fri, 20 Oct 1998 08:12:00 -0500 + +esound (0.2.6-2) unstable; urgency=low + + * Most odd, disntall complained about there being an esound 0.2.6-1. + I'm still puzzling over that one. Anyways, here's one to override it. + + -- Brian M. Almeida Mon, 9 Oct 1998 16:21:00 -0400 + +esound (0.2.6-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Sat, 31 Oct 1998 01:21:00 -0400 + +esound (0.2.5-5) unstable; urgency=low + + * Added libaudiofile0 dependency on esound so it can use esdplay + + -- Brian M. Almeida Wed, 14 Oct 1998 20:21:00 -0400 + +esound (0.2.5-4) unstable; urgency=low + + * Changed Recommends: esound to Suggests: esound in debian/control (#27907) + + -- Brian M. Almeida Wed, 14 Oct 1998 15:00:00 -0400 + +esound (0.2.5-3) unstable; urgency=low + + * Fixed debian/control to put esound in the correct sections + + -- Brian M. Almeida Wed, 6 Oct 1998 13:45:00 -0400 + +esound (0.2.5-2) unstable; urgency=low + + * Doh! Forgot to change Maintainer: in debian/control + * Cleaned up debian/rules to use debhelper correctly. + + -- Brian M. Almeida Mon, 5 Oct 1998 13:50:00 -0400 + +esound (0.2.5-1) unstable; urgency=low + + * New maintainer. + + -- Brian M. Almeida Wed, 30 Sep 1998 20:18:38 -0400 + +esound (0.2.5-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release from CVS snapshot 19980929, needed for new + release of eMusic (esd_close() function needed). 0.2.5-final + will be released after some more testing. + * The buzzing sound has been fixed...yay! + + -- Brian M. Almeida Thu, 29 Sep 1998 18:18:38 -0400 + +esound (0.2.4-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + + -- Brian M. Almeida Tue, 14 Jul 1998 23:49:38 -0400 + +esound (0.2.1-2) unstable; urgency=low + + * Updated esd.h so it didn't include the local config.h file + * Fixed copyright file. + + -- Scott K. Ellis Mon, 8 Jun 1998 14:49:38 -0400 + +esound (0.2.1-1) unstable; urgency=low + + * Initial Release. + + -- Scott K. Ellis Mon, 8 Jun 1998 13:35:35 -0400 --- esound-0.2.38.orig/debian/libesd0.files +++ esound-0.2.38/debian/libesd0.files @@ -0,0 +1 @@ +usr/lib/*.so.* --- esound-0.2.38.orig/debian/libesd-alsa0.dirs +++ esound-0.2.38/debian/libesd-alsa0.dirs @@ -0,0 +1 @@ +usr/lib/esound --- esound-0.2.38.orig/debian/rules +++ esound-0.2.38/debian/rules @@ -0,0 +1,115 @@ +#!/usr/bin/make -f + +DEB_BUILD_ARCH:=$(shell dpkg --print-installation-architecture) + +INSTALL:=$(shell pwd)/debian/tmp +INSTALL_ALSA:=$(INSTALL)-alsa +export DH_COMPAT=4 + +ifeq ($(DEB_BUILD_ARCH),hurd-i386) + CONFIG_OPTS:=--disable-local-sound + SHLIB:="libesd0 (>= 0.2.35)" + build-targets:=build-debstamp + install-targets:=install-debstamp + binary-targets:=normal +else + CONFIG_OPTS:= + SHLIB:="libesd-alsa0 (>= 0.2.35) | libesd0 (>= 0.2.35)" + build-targets:=build-debstamp build-alsa-debstamp + install-targets:=install-debstamp install-alsa-debstamp + binary-targets:=alsa normal +endif + +CONFIG_OPTS+= --enable-debugging + +build: $(build-targets) + +build-debstamp: + dh_testdir + mkdir build-normal + cd build-normal && CFLAGS="-O2" ../configure --prefix=/usr --sysconfdir=/etc/esound --disable-dependency-tracking --with-tags= --disable-alsa --with-libwrap $(CONFIG_OPTS) + $(MAKE) -C build-normal all + touch $@ + +build-alsa-debstamp: + dh_testdir + mkdir build-alsa + cd build-alsa && CFLAGS="-O2" ../configure --prefix=/usr --sysconfdir=/etc/esound --enable-alsa --disable-dependency-tracking --with-tags= --with-libwrap + $(MAKE) -C build-alsa esd-config libesd.la + touch $@ + +clean: + dh_testdir + -rm -fr build-normal build-alsa + -rm -f build-debstamp build-alsa-debstamp install-debstamp install-alsa-debstamp + -rm -f `find . -name "*~"` + -rm -rf `find . -name "\.deps"` + -rm -rf `find . -name "\.libs"` + -rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core + -rm -f debian/*substvars debian/shlibs.local debian/shlibs + -rm -f docs/*.1 + dh_clean + +install: $(install-targets) +install-debstamp: build-debstamp + dh_testdir + dh_testroot + dh_clean + dh_installdirs + $(MAKE) -C build-normal DESTDIR=$(INSTALL) install + mkdir -p $(INSTALL)/usr/share/man/man1 + cp build-normal/docs/*.1 $(INSTALL)/usr/share/man/man1 + gzip -9 $(INSTALL)/usr/share/man/man1/*.1 + touch $@ + +install-alsa-debstamp: build-alsa-debstamp + dh_testdir + dh_testroot + dh_installdirs + $(MAKE) -C build-alsa DESTDIR=$(INSTALL_ALSA) install-libLTLIBRARIES + touch $@ + +binary-indep: build-debstamp install-debstamp + dh_installchangelogs -i ChangeLog + dh_movefiles --sourcedir=debian/tmp -i + dh_compress -i + dh_installdocs -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +alsa: install-alsa-debstamp + dh_movefiles --sourcedir=debian/tmp-alsa -plibesd-alsa0 + mv debian/libesd-alsa0/usr/lib/libesddsp* debian/libesd-alsa0/usr/lib/esound/ + dh_installdocs -plibesd-alsa0 + rmdir debian/libesd-alsa0/usr/share/doc/libesd-alsa0 + ln -s esound-common debian/libesd-alsa0/usr/share/doc/libesd-alsa0 + +normal: install-debstamp + dh_movefiles --sourcedir=debian/tmp -s -Nlibesd-alsa0 + if [ -f debian/libesd0/usr/lib/libesddsp.so.0 ]; then \ + mv debian/libesd0/usr/lib/libesddsp* debian/libesd0/usr/lib/esound/ ;\ + fi + dh_strip -s + dh_compress -s + dh_fixperms -s + dh_installdocs -s -Nlibesd-alsa0 + dh_installmime -pesound-clients + for i in esound-clients libesd0 libesd0-dev esound; do \ + rmdir debian/$$i/usr/share/doc/$$i; \ + ln -s esound-common debian/$$i/usr/share/doc/$$i; \ + done + dh_makeshlibs -s -V $(SHLIB) + dh_installdeb -s + dh_shlibdeps -s -ldebian/libesd0/usr/lib + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary-arch: install $(binary-targets) + +binary: binary-indep binary-arch + +.PHONY: binary clean binary-indep binary-arch build install install-save install-saved --- esound-0.2.38.orig/debian/esound-common.docs +++ esound-0.2.38/debian/esound-common.docs @@ -0,0 +1 @@ +NEWS README TODO TIPS --- esound-0.2.38.orig/debian/libesd0.dirs +++ esound-0.2.38/debian/libesd0.dirs @@ -0,0 +1 @@ +usr/lib/esound --- esound-0.2.38.orig/debian/esound-common.README.Debian +++ esound-0.2.38/debian/esound-common.README.Debian @@ -0,0 +1,58 @@ +esound for Debian +----------------- + +When using the -tcp option +-------------------------- + +Q: 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 + interface configured for esound to work. + To configure the interface, try ifup lo + If that does not work, try ifconfig lo 127.0.0.1 + +Q: Applications saying they can't connect to esd? + +A: 1. Ensure that esd is running, or is set to autospawn. You can + set it back to autospawn by editing /etc/esound/esd.conf + 2. Ensure that TCP wrappers allow the connection. If a default is + specified to deny all traffic, ESD will be denied. + 3. If you are trying to do remote esd, make sure -public is specified + when starting ESD on the server end (the one with sound hardware) + and that TCP wrappers will allow the remote connection. + +Q: Why does esound not default to autospawn? + +A: esound used to default to autospawning, which means that programs +would try to start the esd daemon if it wasn't running. The problem +is, if you don't have sound hardware correctly setup, esd would take a +long time to try opening the sound device(s) at all possible supported +rates, and people would think that the Gnome desktop had "hung" for +two minutes. + +Q: Why don't you make it configurable, like it used to be? + +A: esd.conf is a conffile, and you can edit it if you want the default to be +autospawning. I've set up the default to work with Gnome and esound, the +main two users of libesd. As esd.conf is a conffile, it can't be edited +by maintainer scripts, including debconf. The question is also a very +confusing one for new users, so I think it is much better if the default +works with the users of libesd, and experts can edit the conffile to turn +on autospawning if they like. + +Q: Esound should be a daemon, that's what the D is for in esd, right? + +A: Esound was designed mainly to be used as a "daemon" that is started on each +login session, and ended when the user logs off, much like the other gnome +bits (gconf, oaf, etc). While it can be used as a system daemon and stay +running all the time, it does open some security issues for a multi-user +system. The default of upstream and this packaging is for a multi-user system +with users allowed to use audio in the audio group. + +Q: esddsp hangs when I use it with application! + +A: esddsp is a set of wrappers around libc functions, including open, fopen, +close, and fclose. These wrappers are NOT thread safe, so when using them +with a threaded program, you often end up with the application hanging. +This hasn't been fixed yet. (patches welcome) --- esound-0.2.38.orig/debian/esound-clients.mime +++ esound-0.2.38/debian/esound-clients.mime @@ -0,0 +1,3 @@ +audio/basic; /usr/bin/esdplay %s +audio/x-wav; /usr/bin/esdplay %s +audio/x-aiff; /usr/bin/esdplay %s --- esound-0.2.38.orig/debian/esound-common.files +++ esound-0.2.38/debian/esound-common.files @@ -0,0 +1 @@ +etc/esound/esd.conf --- esound-0.2.38.orig/esddsp.c +++ esound-0.2.38/esddsp.c @@ -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 #include #include +#include #ifdef HAVE_MACHINE_SOUNDCARD_H # include @@ -124,9 +127,12 @@ } +pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + static void dsp_init (void) { + pthread_mutex_lock(&mutex); if (!ident) { const char *str; @@ -157,6 +163,7 @@ DPRINTF ("mixer settings file: %s\n", mixer); } } + pthread_mutex_unlock(&mutex); } static void --- esound-0.2.38.orig/esd.conf +++ esound-0.2.38/esd.conf @@ -3,7 +3,7 @@ # right. If you want your login session to be using a sound daemon, # you should start it from the session controller, not some random # app inside. -auto_spawn=0 +auto_spawn=1 spawn_options=-terminate -nobeeps -as 2 spawn_wait_ms=100 # default options are used in spawned and non-spawned mode