Pass -DPULSEAUDIO=OFF where it doesn't work properly.

(Portage version: 2.2_rc53/cvs/Linux x86_64)

6 files changed, 13 insertions, 106 deletions

diff --git a/media-libs/openal/ChangeLog b/media-libs/openal/ChangeLog
index 3077636f477c..50c93ce81e6f 100644
--- a/media-libs/openal/ChangeLog
+++ b/media-libs/openal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.131 2009/11/28 18:56:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.132 2009/11/29 12:21:51 ssuominen Exp $
+
+  29 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> openal-1.8.466.ebuild,
+  openal-1.9.563.ebuild:
+  Pass -DPULSEAUDIO=OFF where it doesn't work properly.
 
 *openal-1.10.622 (28 Nov 2009)
 
diff --git a/media-libs/openal/files/openal-1.8.466-pa.patch b/media-libs/openal/files/openal-1.8.466-pa.patch
deleted file mode 100644
index 9954ac1fea05..000000000000
--- a/media-libs/openal/files/openal-1.8.466-pa.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur openal-soft-1.8.466.orig/Alc/ALc.c openal-soft-1.8.466/Alc/ALc.c
---- openal-soft-1.8.466.orig/Alc/ALc.c	2009-06-08 01:38:43.000000000 +0300
-+++ openal-soft-1.8.466/Alc/ALc.c	2009-07-17 21:21:02.000000000 +0300
-@@ -44,6 +44,9 @@
-     void (*Init)(BackendFuncs*);
-     BackendFuncs Funcs;
- } BackendList[] = {
-+#ifdef HAVE_PULSEAUDIO
-+    { "pulse", alc_pulse_init, EmptyFuncs },
-+#endif
- #ifdef HAVE_ALSA
-     { "alsa", alc_alsa_init, EmptyFuncs },
- #endif
-@@ -62,9 +65,6 @@
- #ifdef HAVE_PORTAUDIO
-     { "port", alc_pa_init, EmptyFuncs },
- #endif
--#ifdef HAVE_PULSEAUDIO
--    { "pulse", alc_pulse_init, EmptyFuncs },
--#endif
- 
-     { "wave", alc_wave_init, EmptyFuncs },
- 
diff --git a/media-libs/openal/files/openal-1.9.563-oss.patch b/media-libs/openal/files/openal-1.9.563-oss.patch
deleted file mode 100644
index 4832032c34d4..000000000000
--- a/media-libs/openal/files/openal-1.9.563-oss.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur openal-soft-1.9.563.orig/Alc/oss.c openal-soft-1.9.563/Alc/oss.c
---- openal-soft-1.9.563.orig/Alc/oss.c	2009-09-21 03:41:50.000000000 -0600
-+++ openal-soft-1.9.563/Alc/oss.c	2009-10-19 01:39:25.326979984 -0600
-@@ -80,12 +80,12 @@
-     ALCdevice *pDevice = (ALCdevice*)ptr;
-     oss_data *data = (oss_data*)pDevice->ExtraData;
-     ALint frameSize;
--    int wrote;
-+    ssize_t wrote;
- 
-     frameSize = aluChannelsFromFormat(pDevice->Format) *
-                 aluBytesFromFormat(pDevice->Format);
- 
--    while(!data->killNow && !pDevice->Connected)
-+    while(!data->killNow && pDevice->Connected)
-     {
-         ALint len = data->data_size;
-         ALubyte *WritePtr = data->mix_data;
-@@ -96,7 +96,7 @@
-             wrote = write(data->fd, WritePtr, len);
-             if(wrote < 0)
-             {
--                if(errno != EAGAIN && errno != EWOULDBLOCK)
-+                if(errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR)
-                 {
-                     AL_PRINT("write failed: %s\n", strerror(errno));
-                     aluHandleDisconnect(pDevice);
diff --git a/media-libs/openal/openal-1.8.466.ebuild b/media-libs/openal/openal-1.8.466.ebuild
index a4e2d375705b..d8694096bf99 100644
--- a/media-libs/openal/openal-1.8.466.ebuild
+++ b/media-libs/openal/openal-1.8.466.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.8.466.ebuild,v 1.6 2009/09/27 15:36:49 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.8.466.ebuild,v 1.7 2009/11/29 12:21:51 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils eutils
@@ -14,22 +14,20 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="alsa debug oss portaudio pulseaudio"
+IUSE="alsa debug oss portaudio"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )"
+	portaudio? ( >=media-libs/portaudio-19_pre )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 DOCS="alsoftrc.sample"
-PATCHES=( "${FILESDIR}/${P}-pa.patch" )
 
 src_configure() {
 	local mycmakeargs="$(cmake-utils_use alsa ALSA)
 		$(cmake-utils_use oss OSS)
 		$(cmake-utils_use portaudio PORTAUDIO)
-		$(cmake-utils_use pulseaudio PULSEAUDIO)"
+		-DPULSEAUDIO=OFF"
 
 	use debug && mycmakeargs+=" -DCMAKE_BUILD_TYPE=Debug"
 
diff --git a/media-libs/openal/openal-1.9.563-r1.ebuild b/media-libs/openal/openal-1.9.563-r1.ebuild
deleted file mode 100644
index 9890fbf08e95..000000000000
--- a/media-libs/openal/openal-1.9.563-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.9.563-r1.ebuild,v 1.1 2009/10/27 18:11:17 ssuominen Exp $
-
-EAPI=2
-inherit cmake-utils
-
-MY_P=${PN}-soft-${PV}
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://kcat.strangesoft.net/openal.html"
-SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa debug oss portaudio pulseaudio"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-DOCS="alsoftrc.sample"
-PATCHES=( "${FILESDIR}/${P}-oss.patch" )
-
-src_configure() {
-	local mycmakeargs="$(cmake-utils_use alsa ALSA)
-		$(cmake-utils_use oss OSS)
-		$(cmake-utils_use portaudio PORTAUDIO)
-		$(cmake-utils_use pulseaudio PULSEAUDIO)"
-
-	use debug && mycmakeargs+=" -DCMAKE_BUILD_TYPE=Debug"
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "If you have performance problems using this library, then"
-	elog "try add these lines to your ~/.alsoftrc config file:"
-	elog "[alsa]"
-	elog "mmap = off"
-}
diff --git a/media-libs/openal/openal-1.9.563.ebuild b/media-libs/openal/openal-1.9.563.ebuild
index ae35588308ac..e53410753696 100644
--- a/media-libs/openal/openal-1.9.563.ebuild
+++ b/media-libs/openal/openal-1.9.563.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.9.563.ebuild,v 1.7 2009/10/31 14:39:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.9.563.ebuild,v 1.8 2009/11/29 12:21:51 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils
@@ -14,11 +14,10 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="alsa debug oss portaudio pulseaudio"
+IUSE="alsa debug oss portaudio"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )"
+	portaudio? ( >=media-libs/portaudio-19_pre )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -28,7 +27,7 @@ src_configure() {
 	local mycmakeargs="$(cmake-utils_use alsa ALSA)
 		$(cmake-utils_use oss OSS)
 		$(cmake-utils_use portaudio PORTAUDIO)
-		$(cmake-utils_use pulseaudio PULSEAUDIO)"
+		-DPULSEAUDIO=OFF"
 
 	use debug && mycmakeargs+=" -DCMAKE_BUILD_TYPE=Debug"