Upstream patch for OSS backend wrt #289542, thanks to Chaz McGarvey for reporting.

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

3 files changed, 79 insertions, 1 deletions

diff --git a/media-libs/openal/ChangeLog b/media-libs/openal/ChangeLog
index a8cf46e7df82..b266246ebb12 100644
--- a/media-libs/openal/ChangeLog
+++ b/media-libs/openal/ChangeLog
@@ -1,6 +1,13 @@
 # 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.127 2009/10/24 13:03:33 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.128 2009/10/27 18:11:17 ssuominen Exp $
+
+*openal-1.9.563-r1 (27 Oct 2009)
+
+  27 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +openal-1.9.563-r1.ebuild, +files/openal-1.9.563-oss.patch:
+  Upstream patch for OSS backend wrt #289542, thanks to Chaz McGarvey for
+  reporting.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> openal-1.9.563.ebuild:
   ppc stable #287653
diff --git a/media-libs/openal/files/openal-1.9.563-oss.patch b/media-libs/openal/files/openal-1.9.563-oss.patch
new file mode 100644
index 000000000000..4832032c34d4
--- /dev/null
+++ b/media-libs/openal/files/openal-1.9.563-oss.patch
@@ -0,0 +1,27 @@
+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.9.563-r1.ebuild b/media-libs/openal/openal-1.9.563-r1.ebuild
new file mode 100644
index 000000000000..9890fbf08e95
--- /dev/null
+++ b/media-libs/openal/openal-1.9.563-r1.ebuild
@@ -0,0 +1,44 @@
+# 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"
+}