Add new 1.23_rc5; remove old

Package-Manager: portage-2.1.7.1/cvs/Linux x86_64

7 files changed, 80 insertions, 7 deletions

diff --git a/games-simulation/secondlife/ChangeLog b/games-simulation/secondlife/ChangeLog
index 7404581c05bf..543d8b46219c 100644
--- a/games-simulation/secondlife/ChangeLog
+++ b/games-simulation/secondlife/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for games-simulation/secondlife
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/ChangeLog,v 1.5 2009/08/22 21:04:59 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/ChangeLog,v 1.6 2009/10/23 04:08:01 lavajoe Exp $
+
+*secondlife-1.23_rc5 (23 Oct 2009)
+
+  23 Oct 2009; Joe Peterson <lavajoe@gentoo.org>
+  -secondlife-1.23_rc4-r1.ebuild, +secondlife-1.23_rc5.ebuild,
+  +files/secondlife-1.23_rc5-amd64-audio-streaming-fix.patch,
+  +files/secondlife-1.23_rc5-fix-memset-error.patch,
+  +files/secondlife-1.23_rc5-fix-printf-format-error.patch,
+  +files/secondlife-1.23_rc5-fix-uninitialized-gdkcolor.patch:
+  Add new 1.23_rc5; remove old
 
   22 Aug 2009; William Hubbs <williamh@gentoo.org>
   secondlife-1.23_rc4-r1.ebuild:
diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest
index f41efe31d2f3..82ebb3b17c63 100644
--- a/games-simulation/secondlife/Manifest
+++ b/games-simulation/secondlife/Manifest
@@ -5,10 +5,14 @@ AUX secondlife-1.23_rc4-amd64-audio-streaming-fix.patch 1170 RMD160 af09589d950b
 AUX secondlife-1.23_rc4-fix-memset-error.patch 477 RMD160 04884855bfdb1cf1c5500942c8ff2ff4dfa78ab3 SHA1 63db029995464160a2e0fb8e56b4eeea6f9e63a7 SHA256 3046b715b667a39fcf9f66fabe9b131d0839e48aa40b9a814889db5b73e35f83
 AUX secondlife-1.23_rc4-fix-printf-format-error.patch 546 RMD160 a89790fcb463a3b65b251da90731088f7dca4529 SHA1 b2abbce7bfec0e38515ea7f575dd5156724eb6d2 SHA256 1ad359259c6187ae65b23f18f5990afc6234b2e620194fa3a44baf9433f0c987
 AUX secondlife-1.23_rc4-fix-uninitialized-gdkcolor.patch 416 RMD160 f24518fcb869b082618f73d344745da620e19eb2 SHA1 5eb11f83f5593515c738fceb1799983a61bb61bd SHA256 1e0183f61dbfaa97067bf10657b6e587119dde597c898cb2ec5a7e89c8d49b96
+AUX secondlife-1.23_rc5-amd64-audio-streaming-fix.patch 1170 RMD160 af09589d950bd7f321644713eee83603711a2c1b SHA1 d4597fe55c4831ff7d7ea7a3a311f1068a08ad9f SHA256 2a4592adf1ebb7fcee62e571c6847d426b184a86f43dc037729a1da24500e2e2
+AUX secondlife-1.23_rc5-fix-memset-error.patch 477 RMD160 04884855bfdb1cf1c5500942c8ff2ff4dfa78ab3 SHA1 63db029995464160a2e0fb8e56b4eeea6f9e63a7 SHA256 3046b715b667a39fcf9f66fabe9b131d0839e48aa40b9a814889db5b73e35f83
+AUX secondlife-1.23_rc5-fix-printf-format-error.patch 546 RMD160 a89790fcb463a3b65b251da90731088f7dca4529 SHA1 b2abbce7bfec0e38515ea7f575dd5156724eb6d2 SHA256 1ad359259c6187ae65b23f18f5990afc6234b2e620194fa3a44baf9433f0c987
+AUX secondlife-1.23_rc5-fix-uninitialized-gdkcolor.patch 416 RMD160 f24518fcb869b082618f73d344745da620e19eb2 SHA1 5eb11f83f5593515c738fceb1799983a61bb61bd SHA256 1e0183f61dbfaa97067bf10657b6e587119dde597c898cb2ec5a7e89c8d49b96
 AUX secondlife-disable-ndof.patch 302 RMD160 e4f7947c8362d914808d4eb7fef90c7044883280 SHA1 8b76332cf5093b9c77d443986cde01aae3db6bc6 SHA256 e532e9618afc28e543f79c0ec4195b16f2c945d7184abb7d121a42275c6e58b7
 AUX secondlife-fix-cmake-include-path.patch 444 RMD160 0cb80fe8aecb0d88027c844577158054884018f1 SHA1 472a39c127324d7801284d9c362b6fc916ca4fe9 SHA256 9934aea45e6a8303ea9a059855e4cbfdcb60570adea43967d483003310ae2b05
-DIST slviewer-artwork-viewer-rc-frozen-1.23.4.123523.zip 10127954 RMD160 019707a81587a1bb4d26949d03c033b3e5fa6943 SHA1 9d32a63a9c582f243bf6555ae6894cbc95e11464 SHA256 f2b7644fdef739846a61509f8de1ee3cfc18898b97bdda0ddcd986ded2f95baf
-DIST slviewer-src-viewer-rc-frozen-1.23.4.123523.tar.gz 8461103 RMD160 a58b7b38f77ae5d395ef9cdfa909c3f8497a15c6 SHA1 61d04d4307b76396a7f788560950a9f63413d8bc SHA256 607b8859c764f358cb0adab8b2b8c6e1de7e1eb9879d6fb315de9fd81a4f6f16
-EBUILD secondlife-1.23_rc4-r1.ebuild 3439 RMD160 268c67a862f0aa4973d7950aeccd48430f2fafe3 SHA1 402982734b1d9715749e1968d0f7700eadc7763a SHA256 116416963d31a1374c104ac71a2de44e4e5cafb1f4cf3fc793a7962385a8dafb
-MISC ChangeLog 2006 RMD160 4f378379a6278eac2df91d6aed061a336018658a SHA1 0bd205ad9878e9708017baf6e19271dbed55b16b SHA256 561a27bced1e11d78dc6d1712c366420dec03b3b219ecefc21af6b1e2f75411d
+DIST slviewer-artwork-viewer-rc-frozen-1.23.5.136262.zip 10127954 RMD160 fef9794a6f70c14d968cc98aab74997dc241eb70 SHA1 a1a192841603e0eee7ae737474b6f2c57fbb06e5 SHA256 a089922dc6aaf33f5ca5826c238ec8e36dd0e96fc718653f728baa992f5bc002
+DIST slviewer-src-viewer-rc-frozen-1.23.5.136262.tar.gz 8463860 RMD160 8af9d03061f1f42d61ec66971f99a16222085041 SHA1 ea8fc59fd778c693043bd43d28acaf41d75e2209 SHA256 d763f8a6f942347927833acfb143c930017505ed910c23029a9c054825369bb8
+EBUILD secondlife-1.23_rc5.ebuild 3435 RMD160 8d688ea8d93bcc2d98e3232734d6dfbaf6129c49 SHA1 67422631cbbc310258d98ccc6d7e1b6bc1c95c73 SHA256 0e5830f63ec3e4681c8810516f83603cd7437607da25ea97be9b60e3415f3571
+MISC ChangeLog 2423 RMD160 89823766dea1b4c5d9526af31fcbf7513bc5e9eb SHA1 8967a2cd5cd882d4c0f6019a2528ab26cf58b1d1 SHA256 f8a8465370bcb542f188a6a9194bbce22c970ae36749e27128fc0e0f26fc534e
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/games-simulation/secondlife/files/secondlife-1.23_rc5-amd64-audio-streaming-fix.patch b/games-simulation/secondlife/files/secondlife-1.23_rc5-amd64-audio-streaming-fix.patch
new file mode 100644
index 000000000000..62fd2b40d963
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.23_rc5-amd64-audio-streaming-fix.patch
@@ -0,0 +1,26 @@
+--- indra/newview/linux_tools/wrapper.sh.old	2009-06-09 08:53:20.000000000 -0600
++++ indra/newview/linux_tools/wrapper.sh	2009-06-14 12:16:32.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
+ 
+@@ -48,10 +48,10 @@
+ ## - GStreamer is automatically disabled - for now - on 64-bit systems due
+ ##   to common fatal incompatibilities; remove/comment these lines if you want
+ ##   to try anyway.
+-if [ "`uname -m`" = "x86_64" ]; then
+-    export LL_DISABLE_GSTREAMER=x
+-    echo '64-bit Linux detected: Disabling GStreamer (streaming video and music) by default; edit ./secondlife to re-enable.'
+-fi
++#if [ "`uname -m`" = "x86_64" ]; then
++#    export LL_DISABLE_GSTREAMER=x
++#    echo '64-bit Linux detected: Disabling GStreamer (streaming video and music) by default; edit ./secondlife to re-enable.'
++#fi
+ 
+ ## Everything below this line is just for advanced troubleshooters.
+ ##-------------------------------------------------------------------
diff --git a/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-memset-error.patch b/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-memset-error.patch
new file mode 100644
index 000000000000..edff470da052
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-memset-error.patch
@@ -0,0 +1,12 @@
+--- linden/indra/llmessage/lltemplatemessagereader.cpp~	2009-05-20 15:26:15.000000000 -0600
++++ linden/indra/llmessage/lltemplatemessagereader.cpp	2009-05-25 21:56:50.000000000 -0600
+@@ -676,8 +676,7 @@
+ 
+ 						// default to 0s.
+ 						U32 size = mvci.getSize();
+-						std::vector<U8> data(size);
+-						memset(&(data[0]), 0, size);
++						std::vector<U8> data(size, 0);
+ 						cur_data_block->addData(mvci.getName(), &(data[0]), 
+ 												size, mvci.getType());
+ 					}
diff --git a/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-printf-format-error.patch b/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-printf-format-error.patch
new file mode 100644
index 000000000000..c99b5302b3da
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-printf-format-error.patch
@@ -0,0 +1,11 @@
+--- linden/indra/newview/llappviewerlinux.cpp~	2009-05-20 15:26:19.000000000 -0600
++++ linden/indra/newview/llappviewerlinux.cpp	2009-05-25 23:24:31.000000000 -0600
+@@ -188,7 +188,7 @@
+ 		for (i = 0; i < size; i++)
+ 		{
+ 			// the format of the StraceFile is very specific, to allow (kludgy) machine-parsing
+-			fprintf(StraceFile, "%-3d ", i);
++                    fprintf(StraceFile, "%-3ld ", (long) i);
+ 			fprintf(StraceFile, "%-32s\t", "unknown");
+ 			fprintf(StraceFile, "%p ", stackarray[i]);
+ 			fprintf(StraceFile, "%s\n", strings[i]);
diff --git a/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-uninitialized-gdkcolor.patch b/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-uninitialized-gdkcolor.patch
new file mode 100644
index 000000000000..e51edaeea883
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.23_rc5-fix-uninitialized-gdkcolor.patch
@@ -0,0 +1,10 @@
+--- linden/indra/llwindow/llwindowsdl.cpp~	2009-05-20 15:26:16.000000000 -0600
++++ linden/indra/llwindow/llwindowsdl.cpp	2009-05-25 21:42:55.000000000 -0600
+@@ -2195,6 +2195,7 @@
+ 		orig_color.red = guint16(65535 * *r);
+ 		orig_color.green= guint16(65535 * *g);
+ 		orig_color.blue = guint16(65535 * *b);
++		orig_color.pixel = 0;
+ 		color = orig_color;
+ 
+ 		gtk_color_selection_set_previous_color (colorsel, &color);
diff --git a/games-simulation/secondlife/secondlife-1.23_rc4-r1.ebuild b/games-simulation/secondlife/secondlife-1.23_rc5.ebuild
index 711b4f4e55ad..78f1cde2eaaa 100644
--- a/games-simulation/secondlife/secondlife-1.23_rc4-r1.ebuild
+++ b/games-simulation/secondlife/secondlife-1.23_rc5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/secondlife-1.23_rc4-r1.ebuild,v 1.3 2009/08/22 21:04:59 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/secondlife-1.23_rc5.ebuild,v 1.1 2009/10/23 04:08:01 lavajoe Exp $
 
 inherit eutils multilib games versionator
 
-SECONDLIFE_REVISION=123523
+SECONDLIFE_REVISION=136262
 SECONDLIFE_MAJOR_VER=$(get_version_component_range 1-2)
 SECONDLIFE_MINOR_VER=$(get_version_component_range 3)
 SECONDLIFE_MINOR_VER=${SECONDLIFE_MINOR_VER/rc/}