Updated to CVS HEAD and closing bug #110270.

Package-Manager: portage-2.0.53_rc6

5 files changed, 133 insertions, 2 deletions

diff --git a/media-libs/openal/ChangeLog b/media-libs/openal/ChangeLog
index 86e773e75ca3..3ac41791189d 100644
--- a/media-libs/openal/ChangeLog
+++ b/media-libs/openal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.45 2005/10/11 23:55:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.46 2005/10/24 16:53:14 wolf31o2 Exp $
+
+*openal-20051024 (24 Oct 2005)
+
+  24 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/openal-20051024-alsa_dmix.patch, +openal-20051024.ebuild:
+  Updated to CVS HEAD and closing bug #110270.
 
   11 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   openal-20050504-r2.ebuild:
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 46ed18f04928..23059add6bee 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,14 +1,17 @@
-MD5 82b9a5e58d9d6d458ecd270d26aee1c1 ChangeLog 6135
+MD5 01d017a6da49a2372991ea3968718bdd ChangeLog 6336
 MD5 7a79e920a2131ac669da96c4cf5e66e9 files/digest-openal-20040817 69
 MD5 cb37c0311b2a968a888b843afb2d6b94 files/digest-openal-20050504-r1 69
 MD5 cb37c0311b2a968a888b843afb2d6b94 files/digest-openal-20050504-r2 69
+MD5 97a5e481613edc51dee250d88095df28 files/digest-openal-20051024 69
 MD5 526498c24d3601f624e025aaa7c46de2 files/openal-20040817-alsa_capture.diff 12172
 MD5 7d1289ab83aa79eaa7e09d5e4ccacc45 files/openal-20040817-destdir.patch 498
 MD5 68ac7979713ff68db71dc5c4c84562d0 files/openal-20050504-alsa_capture.patch 11190
 MD5 91872ec26d41d4a593d31b96f3a379c4 files/openal-20050504-alsa_dmix.patch 2136
 MD5 fb8620e95bf8f669b19915d079769a6c files/openal-20050504-destdir.patch 539
+MD5 8f54e2a7d59c6bd9f0fb71e2534f0908 files/openal-20051024-alsa_dmix.patch 2136
 MD5 8072d11c3e5e44c43407bed8c67b4031 files/openalrc 221
 MD5 ec6dcddda50a0138e1f50eb0d1299798 metadata.xml 254
 MD5 3bf1037b4a549bb486b65602e073e0db openal-20040817.ebuild 1942
 MD5 180aec9d8b31090126293bd6434ce24c openal-20050504-r1.ebuild 2109
 MD5 dcf4efbec0387cb25d97b9b6aec88ffe openal-20050504-r2.ebuild 2154
+MD5 9ecf2765c3465e63dda67a94e86ddcec openal-20051024.ebuild 2068
diff --git a/media-libs/openal/files/digest-openal-20051024 b/media-libs/openal/files/digest-openal-20051024
new file mode 100644
index 000000000000..a66c057f2520
--- /dev/null
+++ b/media-libs/openal/files/digest-openal-20051024
@@ -0,0 +1 @@
+MD5 c375bd9751f044e8a77882ad4ab3c9f8 openal-20051024.tar.bz2 4983129
diff --git a/media-libs/openal/files/openal-20051024-alsa_dmix.patch b/media-libs/openal/files/openal-20051024-alsa_dmix.patch
new file mode 100644
index 000000000000..3e35ebbaaf6a
--- /dev/null
+++ b/media-libs/openal/files/openal-20051024-alsa_dmix.patch
@@ -0,0 +1,41 @@
+--- ./openal-20051024/linux/src/arch/alsa/alsa.c	2005-03-25 11:48:23.000000000 +0100
++++ ./openal-modified/linux/src/arch/alsa/alsa.c	2005-09-01 16:31:45.000000000 +0200
+@@ -58,6 +58,7 @@
+ static int (*psnd_pcm_hw_params_set_channels)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val) = NULL;
+ static int (*psnd_pcm_hw_params_set_format)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val) = NULL;
+ static int (*psnd_pcm_hw_params_set_periods)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir) = NULL;
++static int (*psnd_pcm_hw_params_set_periods_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) = NULL;
+ static int (*psnd_pcm_hw_params_set_rate)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir) = NULL;
+ static int (*psnd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) = NULL;
+ static size_t (*psnd_pcm_hw_params_sizeof)(void) = NULL;
+@@ -143,6 +144,7 @@
+ 	OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_format);
+ 	OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_period_size);
+ 	OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_periods);
++	OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_periods_near);
+ 	OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_rate);
+ 	OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_rate_near);
+ 	OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_sizeof);
+@@ -450,7 +452,7 @@
+ 		return AL_FALSE;
+ 	}
+ 
+-	err = psnd_pcm_hw_params_set_periods(phandle, setup, ai->periods, 0);
++	err = psnd_pcm_hw_params_set_periods_near(phandle, setup, &ai->periods, 0);
+ 	if (err < 0) {
+ 		_alDebug(ALD_MAXIMUS, __FILE__, __LINE__,
+ 				"set_read_alsa: %s\n", psnd_strerror(err));
+@@ -622,7 +624,7 @@
+ 
+ 
+ 	/* Set number of periods. Periods used to be called fragments. */
+-	err = psnd_pcm_hw_params_set_periods(phandle, setup, ai->periods, 0);
++	err = psnd_pcm_hw_params_set_periods_near(phandle, setup, &ai->periods, 0);
+ 	if (err < 0) {
+ 		_alDebug(ALD_MAXIMUS, __FILE__, __LINE__,
+ 				"set_write_alsa: %s\n", psnd_strerror(err));
+@@ -812,4 +814,3 @@
+ 
+ 	return(retval*chans);
+ }
+-
diff --git a/media-libs/openal/openal-20051024.ebuild b/media-libs/openal/openal-20051024.ebuild
new file mode 100644
index 000000000000..4102e0b2e7fd
--- /dev/null
+++ b/media-libs/openal/openal-20051024.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20051024.ebuild,v 1.1 2005/10/24 16:53:14 wolf31o2 Exp $
+
+inherit eutils gnuconfig
+
+IUSE="alsa arts esd sdl debug vorbis mpeg"
+DESCRIPTION="OpenAL, the Open Audio Library, is an open, vendor-neutral, cross-platform API for interactive, primarily spatialized audio"
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/openal/${P}.tar.bz2"
+HOMEPAGE="http://www.openal.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.2 )
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	sdl? ( media-libs/libsdl )
+	vorbis? ( media-libs/libvorbis )
+	mpeg? ( media-libs/smpeg )"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-devel/autoconf
+	sys-devel/automake
+	sys-devel/libtool"
+
+S="${S}/linux"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use alsa && epatch ${FILESDIR}/${P}-alsa_dmix.patch
+
+	gnuconfig_update
+
+	export WANT_AUTOCONF=2.5
+	autoheader || die
+	autoconf || die
+}
+
+src_compile() {
+	local myconf
+
+	use esd && myconf="${myconf} --enable-esd"
+	use sdl && myconf="${myconf} --enable-sdl"
+	use alsa && myconf="${myconf} --enable-alsa"
+	use arts && myconf="${myconf} --enable-arts"
+	use mpeg && myconf="${myconf} --enable-smpeg"
+	use vorbis && myconf="${myconf} --enable-vorbis"
+	use debug && myconf="${myconf} --enable-debug-maximus"
+
+	econf ${myconf} --enable-paranoid-locks --libdir=/usr/$(get_libdir) \
+		--enable-capture --enable-optimize || die
+	emake all || die
+}
+
+src_install() {
+	cd ${S}/linux
+
+	make install DESTDIR="${D}" || die
+
+	dodoc CREDITS ChangeLog INSTALL NOTES PLATFORM TODO
+	dodoc ${FILESDIR}/openalrc
+	makeinfo doc/openal.texi
+	doinfo doc/openal.info
+
+	cd ${S}
+	dodoc CHANGES COPYING CREDITS
+	dohtml docs/*.html
+}
+
+pkg_postinst() {
+	einfo "There is a sample openalrc file in /usr/share/doc/${P} which"
+	einfo "sets up 4 speaker surround sound with ALSA.  Simply copy it to your:"
+	einfo " ~/.openalrc"
+	einfo "to use it."
+}