Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-libs/openal/ChangeLog6
-rw-r--r--media-libs/openal/Manifest9
-rw-r--r--media-libs/openal/files/openal-1.8.466-pa.patch23
-rw-r--r--media-libs/openal/files/openal-1.9.563-oss.patch27
-rw-r--r--media-libs/openal/openal-1.8.466.ebuild10
-rw-r--r--media-libs/openal/openal-1.9.563-r1.ebuild44
-rw-r--r--media-libs/openal/openal-1.9.563.ebuild9
7 files changed, 16 insertions, 112 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/Manifest b/media-libs/openal/Manifest
index 67dc20b65157..d5aed9103d65 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,3 @@
-AUX openal-1.8.466-pa.patch 682 RMD160 90a2115437be920f7f8a5d7abea8a33671b88ed5 SHA1 d792a7932453b4ec41b46ef0e2e418ebd4378784 SHA256 66f79406ad82da333287050bc2cfd479fa9ba59205f608ecee5ab8bd32d21c4a
-AUX openal-1.9.563-oss.patch 1091 RMD160 df761d78d9600af196389a7e9b4b59a4e9a5b069 SHA1 995309a6a3a2046ba3cc014da3a804c5f372d6b5 SHA256 01d2a92e11de627ed90c3a41f609127c38dca4039150dbc91387a43c7df8057e
AUX openal-soft-1.7.411-multilib.patch 429 RMD160 67194aace37895c177cd366510de1400e6c2e952 SHA1 7db11463f81b8513af5b75ea23e7540f850df2cf SHA256 0c03b75b081bbc67819ba6089a82852efa3e70bd0df94da8f348d4f47b884f78
DIST openal-soft-1.10.622.tar.bz2 93313 RMD160 3bc0c2b2302742489ed16f9d8c38c4e962925503 SHA1 8bdfe82ec5503922bd73ce0c087378a5f81339e4 SHA256 b59438e2daf38a02e2ad482f4102d2ceb861ac6c185e2f058d13db73c9ce2437
DIST openal-soft-1.7.411.tar.bz2 82002 RMD160 14b9e87970fa0042d3bc46dfd8424043f52f017f SHA1 b43085f176a29746aba7cef54d362a023f4deed1 SHA256 11319e09e03a7a7a6330196ed6c4d377d5af05ac5544e13b13b77888c0db78d9
@@ -7,8 +5,7 @@ DIST openal-soft-1.8.466.tar.bz2 88588 RMD160 559656b637231c701d9c8c9d53a624f64f
DIST openal-soft-1.9.563.tar.bz2 92049 RMD160 57b62b161f188bbe04fd573feca88d6eabb7b530 SHA1 69f18499bc9588241ce526e6d21cb1d2aac32471 SHA256 6bf41cb2c18902eea10a02fa2cd5a48a5d35216da5dd276a21eece235234a097
EBUILD openal-1.10.622.ebuild 1011 RMD160 4c820f7679a70b42a522ca847e778f0b897afe8d SHA1 0463e84dc34364f7b7287c11df7f4f8201740d5c SHA256 2c305a597f09cbede94f86f2aec6bafd43706e1a5853e09af762099835c72974
EBUILD openal-1.7.411.ebuild 1223 RMD160 3c03c673f694e5cf5d1c24e1742e136f4054a47c SHA1 a7a30407521c4516c87b400ca50b5f79016b0ea6 SHA256 0889dc826a193c30f4039eac190be073789fe2618084691137801e9c08b5ca2f
-EBUILD openal-1.8.466.ebuild 1295 RMD160 bd719f457c2dcf7fff04e5a2cd8f03923db0d637 SHA1 0604109bb402ab735efb37e961ecbbccde6a9489 SHA256 0f381607053481039ac579fdd6a15330d5a91e2d8c3fbd568213d6726fd46d5c
-EBUILD openal-1.9.563-r1.ebuild 1301 RMD160 6696096cab4edd20d63d78feb34e8ed095c05dfb SHA1 2d023953b4cedf12f37b3f067fe55446d74aeb83 SHA256 7845df78973cb2d6292ec5ac6adacdc1a2383a8ae7273fd0e93ef7833f323d87
-EBUILD openal-1.9.563.ebuild 1247 RMD160 4cd22b94611563c04d9759163e714457e3e4ad38 SHA1 83974a7dd2828f7214efcf40b2ce7b0342ec1f80 SHA256 6035fd0573c01a5a2b4b875d1f332d4b930a2d7bac3123569ef01b1df6eb141c
-MISC ChangeLog 18623 RMD160 a68c44427968c2fc876b7e5fd073df6664bafa8a SHA1 8259f646208b87a30de563e221006ba8c8c35633 SHA256 5802c8710074cfa44b36b732c7a7d58732bc0ed07cfde231a9c5ba94b5b30eb9
+EBUILD openal-1.8.466.ebuild 1183 RMD160 48c775863f3ce78ef7fe4b38522e148bef653135 SHA1 d62c8ea69becd9fd315cb72714a933c3a2d4246e SHA256 1e66e8641aeef5f5a23cae47195ea3c1a734b1a966d866a32062c8fd1dd962bf
+EBUILD openal-1.9.563.ebuild 1175 RMD160 2bd2e3968f34a2e5a629779b576916909a5bfa88 SHA1 c675b6ca24d945a5ae1cc087b673c8c557b727b5 SHA256 895a25f2107ac0cf42a3d98969af723eea9a460973f418576009a7603bf34857
+MISC ChangeLog 18782 RMD160 01e65329f776d553a0f513c4b48e13471b22f36d SHA1 89cfaf07d5a6ed5b7d825b5c8960372e51de7a4a SHA256 cfcf2d036611fc4fe253754a371be0a779e7059ecf51e8625e3e089d9af87d19
MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
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"