Added patch from openal-devel list, submitted by Timothy Redaelli <drizzt@gentoo.org>. Closing bug #142509.

Package-Manager: portage-2.1.2_pre3-r3

3 files changed, 86 insertions, 8 deletions

diff --git a/media-libs/openal/ChangeLog b/media-libs/openal/ChangeLog
index 70478cfeb020..55b14a870307 100644
--- a/media-libs/openal/ChangeLog
+++ b/media-libs/openal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openal
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.70 2006/10/13 16:32:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.71 2006/10/17 14:12:58 wolf31o2 Exp $
+
+  17 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/0.0.8/000_all_freebsd.patch:
+  Added patch from openal-devel list, submitted by Timothy Redaelli
+  <drizzt@gentoo.org>. Closing bug #142509.
 
   13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   openal-0.0.8-r1.ebuild:
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 0d45d40877f2..8e5d7c5e643b 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.0.8/000_all_freebsd.patch 1529 RMD160 83e606793f0f1026805788d5cefe25741b46f5b4 SHA1 183e95e2c904326b0168c0cab20ce32025ae444a SHA256 88786243c636461e33a6b23af59a626ca8697d7c070eaa0e299250319472f949
+MD5 fc3ae54c46dc0942697bf72fef2a2112 files/0.0.8/000_all_freebsd.patch 1529
+RMD160 83e606793f0f1026805788d5cefe25741b46f5b4 files/0.0.8/000_all_freebsd.patch 1529
+SHA256 88786243c636461e33a6b23af59a626ca8697d7c070eaa0e299250319472f949 files/0.0.8/000_all_freebsd.patch 1529
 AUX 0.0.8/002_all_alc_context.patch 513 RMD160 c6cc5325f2aa392bb3c132d551c8e682c4aed3b3 SHA1 7f11175192c994252712a80faf09d157d65534a2 SHA256 f2528c180dc98b445cf9de45f5f50f38bf66927baaf89e4e590332743b8e8faa
 MD5 3d6ff3a9dde26f36b0df8151cd32cd36 files/0.0.8/002_all_alc_context.patch 513
 RMD160 c6cc5325f2aa392bb3c132d551c8e682c4aed3b3 files/0.0.8/002_all_alc_context.patch 513
@@ -26,10 +30,10 @@ EBUILD openal-0.0.8.ebuild 1374 RMD160 37b7c20dd3a54d33152d1b0ce50ca5338212f9f9
 MD5 b699c077c3544f91c2b1cf0e410b41a0 openal-0.0.8.ebuild 1374
 RMD160 37b7c20dd3a54d33152d1b0ce50ca5338212f9f9 openal-0.0.8.ebuild 1374
 SHA256 c1ac6a03a188cf6a398b674649c9d1a1fafb46d5938d0abd0247b383ac5238ea openal-0.0.8.ebuild 1374
-MISC ChangeLog 10412 RMD160 23a0d5cc27d92ed75aa96050adcd3031f952bd1d SHA1 97f2aabfc03ca6eef649e1032b08e05873a4d0cc SHA256 c42bb1469855207e33c1b2a256bf964723076aeb802fa8f2aacf38698ddb6b3b
-MD5 3d6ef2be6ab5075d8e0a73e0f67ac24c ChangeLog 10412
-RMD160 23a0d5cc27d92ed75aa96050adcd3031f952bd1d ChangeLog 10412
-SHA256 c42bb1469855207e33c1b2a256bf964723076aeb802fa8f2aacf38698ddb6b3b ChangeLog 10412
+MISC ChangeLog 10617 RMD160 9468200f26021729983e7dc40fb36e1ee87865d5 SHA1 6005371a12915772ce859f42e8e2093c10ed6f94 SHA256 e144603a47c3eb2b106ef640cbc792ebb50b90191a2fe84f373db763dd363586
+MD5 c39a9dafc156f208543b634f73a9a75a ChangeLog 10617
+RMD160 9468200f26021729983e7dc40fb36e1ee87865d5 ChangeLog 10617
+SHA256 e144603a47c3eb2b106ef640cbc792ebb50b90191a2fe84f373db763dd363586 ChangeLog 10617
 MISC metadata.xml 254 RMD160 644af66426d6eb797cd765c1c2e535b5d087ea57 SHA1 a95604d0e8bc9b8b04265487ab3b8c81fb2359e7 SHA256 696bf530d6cfd1ba1081ac29536d76e7fc8fd002e6f17d4a77463eeba34e4ba4
 MD5 ec6dcddda50a0138e1f50eb0d1299798 metadata.xml 254
 RMD160 644af66426d6eb797cd765c1c2e535b5d087ea57 metadata.xml 254
@@ -43,7 +47,7 @@ SHA256 464c3f71037e0d7692230557ba1321a83fc2236fa2bb799621ef8459a24d495d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFL7+vkT4lNIS36YERAojqAKDBz8q8g+BCSO1l3qw2JT6pcMPAkQCffVSG
-ydNYUOZz+XqnqgjxANf5WfE=
-=iliN
+iD8DBQFFNOT4kT4lNIS36YERArOGAKCYqZE/ANC4iI4W0z2Hr0SAGv+lsQCdHhXU
+0bVLzFQTvuXSaNVHPLwfx4s=
+=Gg4m
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openal/files/0.0.8/000_all_freebsd.patch b/media-libs/openal/files/0.0.8/000_all_freebsd.patch
new file mode 100644
index 000000000000..8de0a05ce023
--- /dev/null
+++ b/media-libs/openal/files/0.0.8/000_all_freebsd.patch
@@ -0,0 +1,69 @@
+--- src/backends/alc_backend_bsd.c.orig	Sat Apr 22 12:25:15 2006
++++ src/backends/alc_backend_bsd.c	Sat Apr 22 12:26:15 2006
+@@ -9,7 +9,10 @@
+  */
+ #include "al_siteconfig.h"
+ 
++#define __BSD_VISIBLE 1
++
+ #include <AL/al.h>
++#include <AL/alext.h>
+ #include <assert.h>
+ #include <fcntl.h>
+ #include <sys/soundcard.h>
+@@ -113,7 +114,6 @@
+  */
+ static void *grab_write_native(void) {
+	const char *dsppath = "/dev/dsp";
+-	int divisor = _alSpot(_AL_DEF_BUFSIZ) | (2<<16);
+
+	dsp_fd = open(dsppath, O_WRONLY | O_NONBLOCK);
+
+@@ -126,10 +126,6 @@
+		perror("fcntl");
+	}
+
+-	if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
+-		perror("ioctl SETFRAGMENT");
+-	}
+-
+	FD_ZERO(&dsp_fd_set);
+	FD_SET(dsp_fd, &dsp_fd_set);
+
+@@ -318,10 +314,11 @@
+ }
+
+ static ALboolean set_write_native(UNUSED(void *handle),
+-				  UNUSED(unsigned int *bufsiz),
++				  unsigned int *bufsiz,
+				  ALenum *fmt,
+				  unsigned int *speed) {
+	ALuint channels = _alGetChannelsFromFormat(*fmt);
++	int divisor;
+
+	if(dsp_fd < 0) {
+		return AL_FALSE;
+@@ -363,6 +360,23 @@
+
+
+	*fmt = BSD2ALFMT(*fmt, channels);
++
++	if(ioctl(dsp_fd, SNDCTL_DSP_GETBLKSIZE, bufsiz) < 0) {
++#ifdef DEBUG_MAXIMUS
++		fprintf(stderr, "blksize %d\n", *bufsiz);
++		perror("get_devsp blksize ioctl");
++#endif
++		return AL_FALSE;
++	}
++
++	divisor = _alSpot(*bufsiz) | (2<<16);
++	if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
++#ifdef DEBUG_MAXIMUS
++		fprintf(stderr, "divisor %d\n", divisor);
++		perror("set_devsp fragment ioctl");
++#endif
++		return AL_FALSE;
++	}
+
+	return AL_TRUE;
+ }