diff options
author | Leonardo Boshell <leonardop@gentoo.org> | 2005-07-03 16:12:33 +0000 |
---|---|---|
committer | Leonardo Boshell <leonardop@gentoo.org> | 2005-07-03 16:12:33 +0000 |
commit | 09bcb6bcd24562eea93a82c7d68cee0e689db1fb (patch) | |
tree | 21189f5aec9a1167f1c2374cc74a8d84e1d8051c /media-sound | |
parent | - developers cant be herds. Please stop being silly and putting things in met... (diff) | |
download | gentoo-2-09bcb6bcd24562eea93a82c7d68cee0e689db1fb.tar.gz gentoo-2-09bcb6bcd24562eea93a82c7d68cee0e689db1fb.tar.bz2 gentoo-2-09bcb6bcd24562eea93a82c7d68cee0e689db1fb.zip |
New release: 0.2.36 (still hard-masked for testing). Removing obsolete ebuilds/patches.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/esound/ChangeLog | 10 | ||||
-rw-r--r-- | media-sound/esound/Manifest | 19 | ||||
-rw-r--r-- | media-sound/esound/esound-0.2.32-r1.ebuild | 60 | ||||
-rw-r--r-- | media-sound/esound/esound-0.2.32.ebuild | 63 | ||||
-rw-r--r-- | media-sound/esound/esound-0.2.33.ebuild | 64 | ||||
-rw-r--r-- | media-sound/esound/esound-0.2.36.ebuild | 62 | ||||
-rw-r--r-- | media-sound/esound/files/digest-esound-0.2.32 | 1 | ||||
-rw-r--r-- | media-sound/esound/files/digest-esound-0.2.32-r1 | 1 | ||||
-rw-r--r-- | media-sound/esound/files/digest-esound-0.2.33 | 1 | ||||
-rw-r--r-- | media-sound/esound/files/digest-esound-0.2.36 | 1 | ||||
-rw-r--r-- | media-sound/esound/files/esound-0.2.29-alsa-period.diff | 17 | ||||
-rw-r--r-- | media-sound/esound/files/esound-0.2.29-local-vs-remote.diff | 12 | ||||
-rw-r--r-- | media-sound/esound/files/esound-0.2.32-new-alsa.patch | 95 | ||||
-rw-r--r-- | media-sound/esound/files/esound-0.2.33-gcc2_fix.patch | 34 |
14 files changed, 77 insertions, 363 deletions
diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog index efc9b90da1e9..b29e8e74173d 100644 --- a/media-sound/esound/ChangeLog +++ b/media-sound/esound/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/esound -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.49 2004/12/29 01:10:27 ciaranm Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.50 2005/07/03 16:12:33 leonardop Exp $ + +*esound-0.2.36 (03 Jul 2005) + + 03 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> esound-0.2.36.ebuild: + New release. Added support for 'debug' and 'static' USE flags. Replaced + install with "make DESTDIR=$D". 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest index 4a920dface2e..146cae493d15 100644 --- a/media-sound/esound/Manifest +++ b/media-sound/esound/Manifest @@ -1,20 +1,13 @@ -MD5 db2a5a236c57479520328b1067c2d239 esound-0.2.32-r1.ebuild 1415 MD5 616338d1463fcafb1238a7a5887820de ChangeLog 6246 -MD5 0995cc9450d2b0b893e604121f586603 esound-0.2.32.ebuild 1381 +MD5 7fec2214715bbc47190cd12a02c705e5 esound-0.2.36.ebuild 1382 +MD5 86ebfbf2a276b2b2f644491ddd35ca94 .esound-0.2.36.ebuild.swp 12288 MD5 417715c0edef2f8ace79cb428f518a8c esound-0.2.34.ebuild 1297 -MD5 60d8cb57f63e0edc494f5d5feae0a199 esound-0.2.33.ebuild 1331 MD5 7fec2214715bbc47190cd12a02c705e5 esound-0.2.35.ebuild 1382 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177 -MD5 5b001531455e0ff356512be131dc32cb files/digest-esound-0.2.33 66 -MD5 6a04ae174ae4b2bb4ad9734fe09d32e2 files/esound.conf.d 737 -MD5 949eca433956076ac441c57787eedcc0 files/esound-0.2.35-ppc-macos.patch 4422 +MD5 8d815255ab6890911dd9b2bd7904d363 files/digest-esound-0.2.36 66 +MD5 e2bd989e15dcb9b15096d1a9cd29edf0 files/digest-esound-0.2.34 66 MD5 b2f099ec9bcaa69a919e28a72c36d548 files/digest-esound-0.2.35 66 -MD5 675f9471a8062d3365ba0748546ade17 files/esound-0.2.32-new-alsa.patch 2831 MD5 abf9fa5dcfe799ee75cb17808b389739 files/esound-0.2.32-amd64.patch 686 +MD5 949eca433956076ac441c57787eedcc0 files/esound-0.2.35-ppc-macos.patch 4422 +MD5 6a04ae174ae4b2bb4ad9734fe09d32e2 files/esound.conf.d 737 MD5 0af490e6c9b79db177214d01027e800e files/esound.init.d 862 -MD5 75aca7b483f56968b69b28ce2fa2389e files/esound-0.2.29-local-vs-remote.diff 474 -MD5 e2bd989e15dcb9b15096d1a9cd29edf0 files/digest-esound-0.2.34 66 -MD5 f14e22dbd99b25a4b76dcfe42cfb2099 files/esound-0.2.33-gcc2_fix.patch 1097 -MD5 35f489331d7924542abbe9842c58c59c files/digest-esound-0.2.32-r1 66 -MD5 35f489331d7924542abbe9842c58c59c files/digest-esound-0.2.32 66 -MD5 340b8af9191cda014c7963617ede9b77 files/esound-0.2.29-alsa-period.diff 473 diff --git a/media-sound/esound/esound-0.2.32-r1.ebuild b/media-sound/esound/esound-0.2.32-r1.ebuild deleted file mode 100644 index 2649ebf179ee..000000000000 --- a/media-sound/esound/esound-0.2.32-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.32-r1.ebuild,v 1.3 2004/06/24 23:59:03 agriffis Exp $ - -inherit libtool gnome.org eutils - -DESCRIPTION="The Enlightened Sound Daemon" -HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64" -IUSE="tcpd alsa ipv6" - -DEPEND=">=media-libs/audiofile-0.1.5 - alsa? ( >=media-libs/alsa-lib-0.5.10b ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-new-alsa.patch - use amd64 && epatch ${FILESDIR}/${P}-amd64.patch - autoconf || die "autoconf failed" - autoheader || die "autoheader failed" -} - -src_compile() { - elibtoolize - - econf \ - `use_with tcpd libwrap` \ - `use_enable alsa` \ - `use_enable ipv6` \ - --sysconfdir=/etc/esd \ - ${myconf} || die - - make || die -} - -src_install() { - einstall \ - sysconfdir=${D}/etc/esd \ - || die - - dodoc AUTHORS COPYING* ChangeLog README TODO NEWS TIPS - dodoc docs/esound.ps - - dohtml -r docs/html - - insinto /etc/conf.d - newins ${FILESDIR}/esound.conf.d esound - - exeinto /etc/init.d - extradepend="" - use tcpd && extradepend=" portmap" - use alsa && extradepend="$extradepend alsasound" - sed "s/@extradepend@/$extradepend/" <${FILESDIR}/esound.init.d >${T}/esound - doexe ${T}/esound -} diff --git a/media-sound/esound/esound-0.2.32.ebuild b/media-sound/esound/esound-0.2.32.ebuild deleted file mode 100644 index 4efddc5977f9..000000000000 --- a/media-sound/esound/esound-0.2.32.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.32.ebuild,v 1.14 2004/06/24 23:59:03 agriffis Exp $ - -IUSE="tcpd alsa ipv6" - -inherit libtool gnome.org - -DESCRIPTION="The Enlightened Sound Daemon" - -HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html" -SLOT="0" -LICENSE="GPL-2 LGPL-2" -KEYWORDS="x86 sparc ppc alpha hppa amd64 ia64 mips" - -DEPEND=">=media-libs/audiofile-0.1.5 - alsa? ( >=media-libs/alsa-lib-0.5.10b ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )" - -src_compile() { - elibtoolize - - econf \ - `use_with tcpd libwrap` \ - `use_enable alsa` \ - `use_enable ipv6` \ - --sysconfdir=/etc/esd \ - ${myconf} || die - - make || die -} - -src_install() { - einstall \ - sysconfdir=${D}/etc/esd \ - || die - - dodoc AUTHORS COPYING* ChangeLog README TODO NEWS TIPS - dodoc docs/esound.ps - - dohtml -r docs/html - - insinto /etc/conf.d - newins ${FILESDIR}/esound.conf.d esound - - exeinto /etc/init.d - extradepend="" - use tcpd && extradepend=" portmap" - use alsa && extradepend="$extradepend alsasound" - sed "s/@extradepend@/$extradepend/" <${FILESDIR}/esound.init.d >${T}/esound - doexe ${T}/esound - -} - -pkg_postinst() { - # rebuild init deps to include deps on esound - /etc/init.d/depscan.sh -} - -pkg_postrm() { - # rebuild init deps to remove deps on esound - /etc/init.d/depscan.sh -} diff --git a/media-sound/esound/esound-0.2.33.ebuild b/media-sound/esound/esound-0.2.33.ebuild deleted file mode 100644 index c6c765255658..000000000000 --- a/media-sound/esound/esound-0.2.33.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.33.ebuild,v 1.8 2004/06/24 23:59:03 agriffis Exp $ - -inherit libtool gnome.org eutils - -DESCRIPTION="The Enlightened Sound Daemon" -HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc ~alpha ~hppa ~amd64 ~ia64 mips" -IUSE="tcpd alsa ipv6" - -DEPEND=">=media-libs/audiofile-0.1.5 - alsa? ( >=media-libs/alsa-lib-0.5.10b ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )" - -src_unpack() { - - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PN}-0.2.32-amd64.patch - epatch ${FILESDIR}/${P}-gcc2_fix.patch -} - -src_compile() { - - elibtoolize - - econf \ - `use_with tcpd libwrap` \ - `use_enable alsa` \ - `use_enable ipv6` \ - --sysconfdir=/etc/esd \ - || die - - make || die - -} - -src_install() { - - einstall \ - sysconfdir=${D}/etc/esd \ - || die - - dodoc AUTHORS COPYING* ChangeLog README TODO NEWS TIPS - dodoc docs/esound.ps - - dohtml -r docs/html - - insinto /etc/conf.d - newins ${FILESDIR}/esound.conf.d esound - - exeinto /etc/init.d - extradepend="" - use tcpd && extradepend=" portmap" - use alsa && extradepend="$extradepend alsasound" - sed "s/@extradepend@/$extradepend/" <${FILESDIR}/esound.init.d >${T}/esound - doexe ${T}/esound - -} diff --git a/media-sound/esound/esound-0.2.36.ebuild b/media-sound/esound/esound-0.2.36.ebuild new file mode 100644 index 000000000000..16106205c612 --- /dev/null +++ b/media-sound/esound/esound-0.2.36.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36.ebuild,v 1.1 2005/07/03 16:12:33 leonardop Exp $ + +inherit libtool gnome.org eutils + +DESCRIPTION="The Enlightened Sound Daemon" +HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~ppc-macos ~arm" +IUSE="alsa debug ipv6 static tcpd" + +# esound comes with arts support, but it hasn't been tested yet, feel free to +# submit patches/improvements +DEPEND=">=media-libs/audiofile-0.1.5 + alsa? ( >=media-libs/alsa-lib-0.5.10b ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )" +# arts? ( kde-base/arts ) + +src_unpack() { + + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${PN}-0.2.32-amd64.patch + use ppc-macos && epatch ${FILESDIR}/${PN}-0.2.35-ppc-macos.patch +} + +src_compile() { + local myconf="--sysconfdir=/etc/esd $(use_enable ipv6) \ + $(use_enable static) $(use_enable debug debugging) $(use_enable alsa) \ + $(use_with tcpd libwrap)" + + elibtoolize + + econf $myconf || die "Configure failed" + + make || die "Make failed" +} + +src_install() { + + make DESTDIR="${D}" install sysconfdir=${D}/etc/esd || \ + die "Installation failed" + + dodoc AUTHORS ChangeLog MAINTAINERS NEWS README TIPS TODO + + [ -d "docs/html" ] && dohtml -r docs/html/* + + insinto /etc/conf.d + newins ${FILESDIR}/esound.conf.d esound + + exeinto /etc/init.d + extradepend="" + use tcpd && extradepend=" portmap" + use alsa && extradepend="$extradepend alsasound" + sed "s/@extradepend@/$extradepend/" <${FILESDIR}/esound.init.d >${T}/esound + doexe ${T}/esound + +} diff --git a/media-sound/esound/files/digest-esound-0.2.32 b/media-sound/esound/files/digest-esound-0.2.32 deleted file mode 100644 index 154179bdf316..000000000000 --- a/media-sound/esound/files/digest-esound-0.2.32 +++ /dev/null @@ -1 +0,0 @@ -MD5 b2a5e71ec8220fea1c22cc042f5f6e63 esound-0.2.32.tar.bz2 358563 diff --git a/media-sound/esound/files/digest-esound-0.2.32-r1 b/media-sound/esound/files/digest-esound-0.2.32-r1 deleted file mode 100644 index 154179bdf316..000000000000 --- a/media-sound/esound/files/digest-esound-0.2.32-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b2a5e71ec8220fea1c22cc042f5f6e63 esound-0.2.32.tar.bz2 358563 diff --git a/media-sound/esound/files/digest-esound-0.2.33 b/media-sound/esound/files/digest-esound-0.2.33 deleted file mode 100644 index 9b857d3dc89d..000000000000 --- a/media-sound/esound/files/digest-esound-0.2.33 +++ /dev/null @@ -1 +0,0 @@ -MD5 a23262b09f82497deccf7df4b871115d esound-0.2.33.tar.bz2 347932 diff --git a/media-sound/esound/files/digest-esound-0.2.36 b/media-sound/esound/files/digest-esound-0.2.36 new file mode 100644 index 000000000000..171c1f34096e --- /dev/null +++ b/media-sound/esound/files/digest-esound-0.2.36 @@ -0,0 +1 @@ +MD5 3facb5aa0115cc1c31771b9ad454ae76 esound-0.2.36.tar.bz2 369952 diff --git a/media-sound/esound/files/esound-0.2.29-alsa-period.diff b/media-sound/esound/files/esound-0.2.29-alsa-period.diff deleted file mode 100644 index 6e30fdf50432..000000000000 --- a/media-sound/esound/files/esound-0.2.29-alsa-period.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- audio_alsa09.c-dist 2002-11-29 17:19:32.000000000 +0100 -+++ audio_alsa09.c 2002-11-29 17:20:47.000000000 +0100 -@@ -168,6 +168,14 @@ - return handle; - } - -+ periods = 64; -+ err = snd_pcm_hw_params_set_periods_max(handle, hwparams, &periods, 0); -+ if (err < 0) { -+ if (alsadbg) -+ fprintf(stderr, "%s\n", snd_strerror(err)); -+ alsaerr = -1; -+ return handle; -+ } - - err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, BUFFERSIZE); - if (err < 0) { diff --git a/media-sound/esound/files/esound-0.2.29-local-vs-remote.diff b/media-sound/esound/files/esound-0.2.29-local-vs-remote.diff deleted file mode 100644 index 6f4ff4bf4188..000000000000 --- a/media-sound/esound/files/esound-0.2.29-local-vs-remote.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru esound-0.2.29.orig/esdlib.c esound-0.2.29/esdlib.c ---- esound-0.2.29.orig/esdlib.c 2002-07-15 10:28:26.000000000 +0100 -+++ esound-0.2.29/esdlib.c 2003-03-22 14:23:09.000000000 +0000 -@@ -558,7 +558,7 @@ - static int is_host_local(const char* host) - { - char hnbuf[256]=""; -- if (!host || (*host)) return 1; -+ if (!host || (!*host)) return 1; - - gethostname(hnbuf, sizeof(hnbuf)); - return (!strcasecmp(host,hnbuf) || !strcasecmp(host, "localhost")); diff --git a/media-sound/esound/files/esound-0.2.32-new-alsa.patch b/media-sound/esound/files/esound-0.2.32-new-alsa.patch deleted file mode 100644 index 26af05dfab59..000000000000 --- a/media-sound/esound/files/esound-0.2.32-new-alsa.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -Naur esound-0.2.32.orig/acconfig.h esound-0.2.32/acconfig.h ---- esound-0.2.32.orig/acconfig.h 2003-08-01 09:56:21.000000000 -0400 -+++ esound-0.2.32/acconfig.h 2004-02-02 08:53:54.000000000 -0500 -@@ -8,6 +8,8 @@ - #undef DRIVER_ALSA - #undef DRIVER_NEWALSA - #undef DRIVER_ALSA_09 -+#undef DRIVER_ALSA_09_AFTER_RC4 -+#undef ALSA_PCM_NEW_HW_PARAMS_API - #undef DRIVER_DART - #undef DRIVER_COREAUDIO - #undef DRIVER_NONE -diff -Naur esound-0.2.32.orig/audio_alsa09.c esound-0.2.32/audio_alsa09.c ---- esound-0.2.32.orig/audio_alsa09.c 2003-03-20 03:34:19.000000000 -0500 -+++ esound-0.2.32/audio_alsa09.c 2004-02-02 08:58:18.000000000 -0500 -@@ -94,7 +94,11 @@ - snd_pcm_hw_params_t *hwparams; - int err; - int periods; -- -+#ifdef DRIVER_ALSA_09_AFTER_RC4 -+ int t_dir, t_speed; -+ snd_pcm_uframes_t t_bufsize; -+#endif -+ - err = snd_pcm_open(&handle, dev, mode, SND_PCM_NONBLOCK); - if (err < 0) { - if (alsadbg) -@@ -136,15 +140,24 @@ - alsaerr = -1; - return handle; - } -- -+#ifndef DRIVER_ALSA_09_AFTER_RC4 - err = snd_pcm_hw_params_set_rate_near(handle, hwparams, speed, 0); -+#else -+ t_dir=0; -+ t_speed=speed; -+ err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &t_speed, &t_dir); -+#endif - if (err < 0) { - if (alsadbg) - fprintf(stderr, "%s\n", snd_strerror(err)); - alsaerr = -1; - return handle; - } -+#ifndef DRIVER_ALSA_09_AFTER_RC4 - if (err != speed) { -+#else -+ if (t_speed != speed) { -+#endif - if (alsadbg) - fprintf(stderr, "Rate not avaliable %i != %i\n", speed, err); - alsaerr = -1; -@@ -176,8 +189,12 @@ - alsaerr = -1; - return handle; - } -- -+#ifndef DRIVER_ALSA_09_AFTER_RC4 - err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, BUFFERSIZE); -+#else -+ t_bufsize=BUFFERSIZE; -+ err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &t_bufsize); -+#endif - if (err < 0) { - if (alsadbg) - fprintf(stderr, "Buffersize:%s\n", snd_strerror(err)); -diff -Naur esound-0.2.32.orig/configure.in esound-0.2.32/configure.in ---- esound-0.2.32.orig/configure.in 2003-09-03 12:23:23.000000000 -0400 -+++ esound-0.2.32/configure.in 2004-02-02 08:53:54.000000000 -0500 -@@ -269,6 +269,23 @@ - AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(sound,snd_cards)]) - AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(asound,snd_cards)]) - AC_CHECK_FUNC(snd_pcm_pause,,[AC_CHECK_LIB(asound,snd_pcm_pause)]) -+ -+ dnl Check if ALSA uses new API -+ CFLAGS="${CFLAGS} -Werror" -+ AC_TRY_LINK([ -+ #include <alsa/asoundlib.h> -+ ], [ -+ snd_pcm_t *pcm; -+ snd_pcm_hw_params_t *params; -+ unsigned int val; -+ int dir; -+ /* intentionally uses non-pointers, trying to replicate bug 129709 */ -+ snd_pcm_hw_params_set_rate_near(pcm, params, val, dir); -+ ], , [ -+ AC_DEFINE(DRIVER_ALSA_09_AFTER_RC4) -+ AC_DEFINE(ALSA_PCM_NEW_HW_PARAMS_API) -+ ]) -+ - fi - else - AC_DEFINE(DRIVER_NONE) diff --git a/media-sound/esound/files/esound-0.2.33-gcc2_fix.patch b/media-sound/esound/files/esound-0.2.33-gcc2_fix.patch deleted file mode 100644 index 6c3dcad9a242..000000000000 --- a/media-sound/esound/files/esound-0.2.33-gcc2_fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur esound-0.2.33.orig/audio_alsa09.c esound-0.2.33/audio_alsa09.c ---- esound-0.2.33.orig/audio_alsa09.c 2004-03-01 13:32:49.000000000 -0500 -+++ esound-0.2.33/audio_alsa09.c 2004-03-09 14:43:27.000000000 -0500 -@@ -94,6 +94,10 @@ - snd_pcm_hw_params_t *hwparams; - int err; - int periods; -+#ifdef DRIVER_ALSA_09_NEW_PCM_API -+ int t_dir, t_speed; -+ snd_pcm_uframes_t t_bufsize; -+#endif - - err = snd_pcm_open(&handle, dev, mode, SND_PCM_NONBLOCK); - if (err < 0) { -@@ -139,8 +143,8 @@ - #ifndef DRIVER_ALSA_09_NEW_PCM_API - err = snd_pcm_hw_params_set_rate_near(handle, hwparams, speed, 0); - #else -- int t_dir=0; -- int t_speed=speed; -+ t_dir=0; -+ t_speed=speed; - err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &t_speed, &t_dir); - #endif - if (err < 0) { -@@ -188,7 +192,7 @@ - #ifndef DRIVER_ALSA_09_NEW_PCM_API - err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, BUFFERSIZE); - #else -- snd_pcm_uframes_t t_bufsize=BUFFERSIZE; -+ t_bufsize=BUFFERSIZE; - err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &t_bufsize); - #endif - if (err < 0) { |