Fix audio streaming on amd64; remove old

(Portage version: 2.1.6.11/cvs/Linux x86_64)

4 files changed, 51 insertions, 114 deletions

diff --git a/games-simulation/secondlife-bin/ChangeLog b/games-simulation/secondlife-bin/ChangeLog
index cbec4ae4744a..c38e67df84b6 100644
--- a/games-simulation/secondlife-bin/ChangeLog
+++ b/games-simulation/secondlife-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-simulation/secondlife-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.16 2009/03/11 23:41:21 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/ChangeLog,v 1.17 2009/04/16 19:42:28 lavajoe Exp $
+
+*secondlife-bin-1.22_rc11-r1 (16 Apr 2009)
+
+  16 Apr 2009; Joe Peterson <lavajoe@gentoo.org>
+  +files/secondlife-bin-1.22_rc11-amd64-audio-streaming-fix.patch,
+  -secondlife-bin-1.22_rc10.ebuild, -secondlife-bin-1.22_rc11.ebuild,
+  +secondlife-bin-1.22_rc11-r1.ebuild:
+  Fix audio streaming on amd64; remove old
 
 *secondlife-bin-1.22_rc11 (11 Mar 2009)
 
diff --git a/games-simulation/secondlife-bin/files/secondlife-bin-1.22_rc11-amd64-audio-streaming-fix.patch b/games-simulation/secondlife-bin/files/secondlife-bin-1.22_rc11-amd64-audio-streaming-fix.patch
new file mode 100644
index 000000000000..3341f4306c24
--- /dev/null
+++ b/games-simulation/secondlife-bin/files/secondlife-bin-1.22_rc11-amd64-audio-streaming-fix.patch
@@ -0,0 +1,11 @@
+--- secondlife.old	2009-03-06 16:05:19.000000000 -0700
++++ secondlife	2009-04-16 12:21:50.000000000 -0600
+@@ -5,7 +5,7 @@
+ ## testing phase; you should not usually need to touch them.
+ 
+ ## - Avoids using any OpenAL audio driver.
+-#export LL_BAD_OPENAL_DRIVER=x
++export LL_BAD_OPENAL_DRIVER=x
+ ## - Avoids using any FMOD audio driver.
+ #export LL_BAD_FMOD_DRIVER=x
+ 
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.22_rc10.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.22_rc10.ebuild
deleted file mode 100644
index 11bc2d91c0e9..000000000000
--- a/games-simulation/secondlife-bin/secondlife-bin-1.22_rc10.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.22_rc10.ebuild,v 1.1 2009/03/02 02:07:11 lavajoe Exp $
-
-inherit eutils multilib games versionator
-
-SECONDLIFE_REVISION=112620
-SECONDLIFE_MAJOR_VER=$(get_version_component_range 1-2)
-SECONDLIFE_MINOR_VER=$(get_version_component_range 3)
-SECONDLIFE_MINOR_VER=${SECONDLIFE_MINOR_VER/rc/}
-MY_P="SecondLife-i686-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}.${SECONDLIFE_REVISION}"
-
-DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
-HOMEPAGE="http://secondlife.com/"
-SRC_URI="http://release-candidate-secondlife-com.s3.amazonaws.com/${MY_P}.tar.bz2"
-RESTRICT="mirror strip"
-
-LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-# Note, used to RDEPEND on:
-# media-fonts/kochi-substitute
-RDEPEND="sys-libs/glibc
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		dev-libs/libgcrypt
-		dev-libs/libgpg-error
-		dev-libs/openssl
-		media-libs/freetype
-		media-libs/libogg
-		media-libs/libsdl
-		media-libs/libvorbis
-		net-libs/gnutls
-		net-misc/curl
-		sys-libs/zlib
-		virtual/glu
-		virtual/opengl
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-gtklibs
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-SECONDLIFE_HOME="${GAMES_PREFIX_OPT}/secondlife"
-
-QA_TEXTRELS="${SECONDLIFE_HOME:1}/bin/libllkdu.so
-	${SECONDLIFE_HOME:1}/lib/libkdu_v42R.so
-	${SECONDLIFE_HOME:1}/lib/libfmod-3.75.so
-	${SECONDLIFE_HOME:1}/lib/libvivoxsdk.so
-	${SECONDLIFE_HOME:1}/app_settings/mozilla-runtime-linux-i686/libxul.so"
-QA_EXECSTACK="${SECONDLIFE_HOME:1}/bin/do-not-directly-run-secondlife-bin
-	${SECONDLIFE_HOME:1}/bin/libllkdu.so
-	${SECONDLIFE_HOME:1}/lib/libSDL-1.2.so.0
-	${SECONDLIFE_HOME:1}/lib/libcrypto.so.0.9.7
-	${SECONDLIFE_HOME:1}/lib/libkdu_v42R.so
-	${SECONDLIFE_HOME:1}/lib/libfmod-3.75.so
-	${SECONDLIFE_HOME:1}/app_settings/mozilla-runtime-linux-i686/libxul.so"
-
-pkg_setup() {
-	# x86 binary package, ABI=x86
-	has_multilib_profile && ABI="x86"
-}
-
-src_install() {
-	exeinto "${SECONDLIFE_HOME}"
-	doexe launch_url.sh linux-crash-logger.bin secondlife || die
-	rm -rf launch_url.sh linux-crash-logger.bin secondlife
-
-	exeinto "${SECONDLIFE_HOME}"/bin
-	doexe bin/* || die
-	rm -rf bin
-
-	exeinto "${SECONDLIFE_HOME}"/lib
-	doexe lib/* || die
-	rm -rf lib
-
-	insinto "${SECONDLIFE_HOME}"
-	doins -r * || die "doins * failed"
-
-	#dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf "${SECONDLIFE_HOME}"/unicode.ttf
-
-	games_make_wrapper secondlife-bin "./secondlife --set VersionChannelName Gentoo" "${SECONDLIFE_HOME}" "${SECONDLIFE_HOME}"/lib
-	make_desktop_entry secondlife-bin "Second Life" /opt/secondlife/secondlife_icon.png
-
-	prepgamesdirs
-}
diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.22_rc11.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.22_rc11-r1.ebuild
index adc359e95d39..bc659730505d 100644
--- a/games-simulation/secondlife-bin/secondlife-bin-1.22_rc11.ebuild
+++ b/games-simulation/secondlife-bin/secondlife-bin-1.22_rc11-r1.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/games-simulation/secondlife-bin/secondlife-bin-1.22_rc11.ebuild,v 1.1 2009/03/11 23:41:21 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife-bin/secondlife-bin-1.22_rc11-r1.ebuild,v 1.1 2009/04/16 19:42:28 lavajoe Exp $
 
 inherit eutils multilib games versionator
 
@@ -17,30 +17,30 @@ RESTRICT="mirror strip"
 
 LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # Note, used to RDEPEND on:
 # media-fonts/kochi-substitute
 RDEPEND="sys-libs/glibc
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		dev-libs/libgcrypt
-		dev-libs/libgpg-error
-		dev-libs/openssl
-		media-libs/freetype
-		media-libs/libogg
-		media-libs/libsdl
-		media-libs/libvorbis
-		net-libs/gnutls
-		net-misc/curl
-		sys-libs/zlib
-		virtual/glu
-		virtual/opengl
-	)
+	sys-apps/dbus
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	dev-libs/libgcrypt
+	dev-libs/libgpg-error
+	dev-libs/openssl
+	media-libs/freetype
+	media-libs/libogg
+	media-libs/libsdl
+	media-libs/libvorbis
+	media-libs/gstreamer
+	net-libs/gnutls
+	net-misc/curl
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
 	amd64? (
 		app-emulation/emul-linux-x86-sdl
 		app-emulation/emul-linux-x86-gtklibs
@@ -64,10 +64,21 @@ QA_EXECSTACK="${SECONDLIFE_HOME:1}/bin/do-not-directly-run-secondlife-bin
 	${SECONDLIFE_HOME:1}/app_settings/mozilla-runtime-linux-i686/libxul.so"
 
 pkg_setup() {
+	games_pkg_setup
+
 	# x86 binary package, ABI=x86
 	has_multilib_profile && ABI="x86"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# On 64-bit systems, we need to uncomment LL_BAD_OPENAL_DRIVER=x
+	# to fix streaming audio.
+	use amd64 && epatch "${FILESDIR}"/${P}-amd64-audio-streaming-fix.patch
+}
+
 src_install() {
 	exeinto "${SECONDLIFE_HOME}"
 	doexe launch_url.sh linux-crash-logger.bin secondlife || die