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--games-simulation/secondlife/Manifest26
-rw-r--r--games-simulation/secondlife/files/digest-secondlife-1.13.3.595586
-rw-r--r--games-simulation/secondlife/files/digest-secondlife-1.14.0.16
-rw-r--r--games-simulation/secondlife/files/secondlife-1.14.0.1-gentoo.patch249
-rw-r--r--games-simulation/secondlife/files/secondlife-1.14.0.1-llversion.patch12
-rw-r--r--games-simulation/secondlife/secondlife-1.14.0.1.ebuild (renamed from games-simulation/secondlife/secondlife-1.13.3.59558.ebuild)59
6 files changed, 311 insertions, 47 deletions
diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest
index 7077648..410937a 100644
--- a/games-simulation/secondlife/Manifest
+++ b/games-simulation/secondlife/Manifest
@@ -14,21 +14,29 @@ AUX secondlife-1.13.3.59558-gentoo.patch 8462 RMD160 3d2715f60eda6f71a4c0818d2cd
MD5 3beae9383416e21674415afc3e6dba62 files/secondlife-1.13.3.59558-gentoo.patch 8462
RMD160 3d2715f60eda6f71a4c0818d2cd3bfe05a1408b6 files/secondlife-1.13.3.59558-gentoo.patch 8462
SHA256 c19dc238b3f6217799e1d4a94d722c93a497654d21812185ab9ab832ebaa55f5 files/secondlife-1.13.3.59558-gentoo.patch 8462
+AUX secondlife-1.14.0.1-gentoo.patch 9631 RMD160 1a81ae51d8ade19f12c8130094210abe3979a91e SHA1 31a2b8c9cbec151bf9d6a56dabc1d488bcb864f3 SHA256 ccaa01b2ec2ae7375877c6f196efa46b00120babaa8b5ee490f11d8ddf20a4a4
+MD5 9e8042891190fac8c4812b9519f888df files/secondlife-1.14.0.1-gentoo.patch 9631
+RMD160 1a81ae51d8ade19f12c8130094210abe3979a91e files/secondlife-1.14.0.1-gentoo.patch 9631
+SHA256 ccaa01b2ec2ae7375877c6f196efa46b00120babaa8b5ee490f11d8ddf20a4a4 files/secondlife-1.14.0.1-gentoo.patch 9631
+AUX secondlife-1.14.0.1-llversion.patch 427 RMD160 d69a83076e4d43cb8f94753892c6bdb144d2823f SHA1 9bd25f84a2e022c4f6579bc47db7fc3e01b5b15e SHA256 90d6a6867ff8b62f302c9406aa1d4999dd5349cbf947a1eb8645435ef4bc3a7a
+MD5 f8808833fd80bb6221f6b669cf43c726 files/secondlife-1.14.0.1-llversion.patch 427
+RMD160 d69a83076e4d43cb8f94753892c6bdb144d2823f files/secondlife-1.14.0.1-llversion.patch 427
+SHA256 90d6a6867ff8b62f302c9406aa1d4999dd5349cbf947a1eb8645435ef4bc3a7a files/secondlife-1.14.0.1-llversion.patch 427
DIST slviewer-artwork-1.14.0.0.zip 20005643 RMD160 6ea313fb227e73c853c25754d2e89d2fc289d22a SHA1 0e9e1906097731cd390cbbb6cec521f078c4fb5f SHA256 793111dfebe03eca7c78cc1bed50d4dfa6daf2b70856bc1cc51abb880a3dbea1
-DIST slviewer-artwork-FL-1.13.3.59558.zip 20005643 RMD160 bdc64269107054da2176d462f146140ea953e272 SHA1 da987b9201ce44ba72c530e50f0d270fda1c8921 SHA256 0bd2f8c2135184bcab756517c95bc5154e11666014439c56040332d4817b64a0
+DIST slviewer-artwork-1.14.0.1.zip 20005643 RMD160 cb662db2692bcf7e3594104c6f2cf14b2c61dc66 SHA1 ecb5689d014e917de6fc774ce702023c20f2aaeb SHA256 e35fc5632d16e1a229e2d6bd353ca5ad50018c7397b724579a38b1dcddeca77c
DIST slviewer-src-1.14.0.0.tar.gz 9749469 RMD160 6a8113c1ae2fb5447e8e364363ad91b4422209df SHA1 1b3117e3e3702e35731b4155600ba64918456fad SHA256 c2a98c1e8021aa35119d2b486ba4f3c71ab135dde5730c6af9f803a926011b7e
-DIST slviewer-src-FL-1.13.3.59558.tar.gz 9706079 RMD160 2ab28df4625813f629365c193c447915fb37dd1d SHA1 9ea1223291e304a36004ea3912b101228fd368ac SHA256 fc56a90120915d5b229458cf0d158e3cafac14338aa5e4f9f4c2a44c5b168f87
-EBUILD secondlife-1.13.3.59558.ebuild 3593 RMD160 6f3f6a505a9d32ffbb69006b18a27b9e5d1220de SHA1 a36ae4abe73c10b755cdeeb46b3e1ff90843e016 SHA256 05c31ca98dbf3d8a3564353ce3955cd77fc092345ecf95c71c80bd4dc0428237
-MD5 c30810965b99927436aee9ce1c8bbe18 secondlife-1.13.3.59558.ebuild 3593
-RMD160 6f3f6a505a9d32ffbb69006b18a27b9e5d1220de secondlife-1.13.3.59558.ebuild 3593
-SHA256 05c31ca98dbf3d8a3564353ce3955cd77fc092345ecf95c71c80bd4dc0428237 secondlife-1.13.3.59558.ebuild 3593
+DIST slviewer-src-1.14.0.1.tar.gz 9750313 RMD160 c58d1b0b8800f9acabb8091935edce62c1742606 SHA1 c858c7c68611b74c8b550537ac1a1c0da10939dd SHA256 18905eab642cda5932f4dd6a792c402723c4fa655695b8b7d0ad1372ccad989e
EBUILD secondlife-1.14.0.0.ebuild 3224 RMD160 6e0144577b5413b915237bc6bd21ea3598f4e0d1 SHA1 6746b3b5d4a042f1b0e595abf330731f55c23fcc SHA256 c218afe4b4e02f4f058812dabf886cfbdd5010161935597e487e4e7fff2ffbaf
MD5 9b06c6dbf39e459f98a418ead441a98d secondlife-1.14.0.0.ebuild 3224
RMD160 6e0144577b5413b915237bc6bd21ea3598f4e0d1 secondlife-1.14.0.0.ebuild 3224
SHA256 c218afe4b4e02f4f058812dabf886cfbdd5010161935597e487e4e7fff2ffbaf secondlife-1.14.0.0.ebuild 3224
-MD5 5c5223731df04a37b47f37a14572e7c1 files/digest-secondlife-1.13.3.59558 584
-RMD160 fa83237fb5a462f2ff8a49664b9a78371c322220 files/digest-secondlife-1.13.3.59558 584
-SHA256 2f7dffdd4cecc746870e0ac2a6905b555adc6914aa908f06dc66ba35f74e8878 files/digest-secondlife-1.13.3.59558 584
+EBUILD secondlife-1.14.0.1.ebuild 3190 RMD160 7e6d25aba74ff88ef6f474c5325eeeae3db1c27a SHA1 d28ba750be8f88bea7309fc803380ba95631ac64 SHA256 bb77fad600dfb61f04af8f518deceb6fd819d36ce5afb1af297078c5aa99c581
+MD5 d49c2868bbc2f015797e6c553a4b8786 secondlife-1.14.0.1.ebuild 3190
+RMD160 7e6d25aba74ff88ef6f474c5325eeeae3db1c27a secondlife-1.14.0.1.ebuild 3190
+SHA256 bb77fad600dfb61f04af8f518deceb6fd819d36ce5afb1af297078c5aa99c581 secondlife-1.14.0.1.ebuild 3190
MD5 95899a80bae2ff5f68b42ddca0de5f0e files/digest-secondlife-1.14.0.0 542
RMD160 76a8e4217f3397814c635689773f49add730a3e2 files/digest-secondlife-1.14.0.0 542
SHA256 ec16b717890866c32e47eb47fac62ab1411856f37897d3b0b1e9cf03839116b6 files/digest-secondlife-1.14.0.0 542
+MD5 7472ca696355573accfb942f3a18f0d7 files/digest-secondlife-1.14.0.1 542
+RMD160 530da94440cf00685dbb411cd7d2804afc129517 files/digest-secondlife-1.14.0.1 542
+SHA256 310216f9e613c4ae30ab57ce827877299b750e5dd38aa5c1b145e3708a0d807f files/digest-secondlife-1.14.0.1 542
diff --git a/games-simulation/secondlife/files/digest-secondlife-1.13.3.59558 b/games-simulation/secondlife/files/digest-secondlife-1.13.3.59558
deleted file mode 100644
index b537cb3..0000000
--- a/games-simulation/secondlife/files/digest-secondlife-1.13.3.59558
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ed38c3e7e11467a3cd140e24453c3884 slviewer-artwork-FL-1.13.3.59558.zip 20005643
-RMD160 bdc64269107054da2176d462f146140ea953e272 slviewer-artwork-FL-1.13.3.59558.zip 20005643
-SHA256 0bd2f8c2135184bcab756517c95bc5154e11666014439c56040332d4817b64a0 slviewer-artwork-FL-1.13.3.59558.zip 20005643
-MD5 0b4ff4cf369f1414d257742ce2d7ab6b slviewer-src-FL-1.13.3.59558.tar.gz 9706079
-RMD160 2ab28df4625813f629365c193c447915fb37dd1d slviewer-src-FL-1.13.3.59558.tar.gz 9706079
-SHA256 fc56a90120915d5b229458cf0d158e3cafac14338aa5e4f9f4c2a44c5b168f87 slviewer-src-FL-1.13.3.59558.tar.gz 9706079
diff --git a/games-simulation/secondlife/files/digest-secondlife-1.14.0.1 b/games-simulation/secondlife/files/digest-secondlife-1.14.0.1
new file mode 100644
index 0000000..b551626
--- /dev/null
+++ b/games-simulation/secondlife/files/digest-secondlife-1.14.0.1
@@ -0,0 +1,6 @@
+MD5 b85927ee629c3287259ed21f7738888a slviewer-artwork-1.14.0.1.zip 20005643
+RMD160 cb662db2692bcf7e3594104c6f2cf14b2c61dc66 slviewer-artwork-1.14.0.1.zip 20005643
+SHA256 e35fc5632d16e1a229e2d6bd353ca5ad50018c7397b724579a38b1dcddeca77c slviewer-artwork-1.14.0.1.zip 20005643
+MD5 65f3201a07bbd24d5253d3e5f82de4af slviewer-src-1.14.0.1.tar.gz 9750313
+RMD160 c58d1b0b8800f9acabb8091935edce62c1742606 slviewer-src-1.14.0.1.tar.gz 9750313
+SHA256 18905eab642cda5932f4dd6a792c402723c4fa655695b8b7d0ad1372ccad989e slviewer-src-1.14.0.1.tar.gz 9750313
diff --git a/games-simulation/secondlife/files/secondlife-1.14.0.1-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.14.0.1-gentoo.patch
new file mode 100644
index 0000000..39c539e
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.14.0.1-gentoo.patch
@@ -0,0 +1,249 @@
+diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
+--- linden.orig/indra/SConstruct 2007-04-04 00:40:46.000000000 +0900
++++ linden/indra/SConstruct 2007-04-04 18:32:46.000000000 +0900
+@@ -63,6 +63,8 @@
+ opts.Add(EnumOption('OPENSOURCE', 'Build using only non-proprietary dependencies',
+ 'yes',# OPENSOURCE: do not edit this line
+ allowed_values=('yes', 'no')))
++opts.Add(EnumOption('FMOD', 'Enabled fmod support', 'yes',
++ allowed_values=('yes', 'no')))
+ helpenv = Environment(options = opts)
+ Help(opts.GenerateHelpText(helpenv))
+
+@@ -75,6 +77,7 @@
+ grid = ARGUMENTS.get('GRID', 'default')
+ # OPENSOURCE: do not edit the following line:
+ opensource = ARGUMENTS.get('OPENSOURCE', 'yes')
++enable_fmod = ARGUMENTS.get('FMOD', 'yes')
+
+ targets = [ target_param ]
+
+@@ -184,16 +187,22 @@
+ flags += '-DLL_LINUX=1 '
+ if build_target == 'client':
+ flags += '-DAPPID=secondlife -DLL_SDL=1 '
+- if arch == 'x86_64' or arch == 'x86_64cross':
++ if enable_fmod == 'no' or arch == 'x86_64' or arch == 'x86_64cross':
+ flags += '-DLL_FMOD=0 '
+ flags += '-DLL_X11=1 -DLL_GTK=1 '
+- client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]
++ client_external_libs += [ 'gtk-x11-2.0', 'ELFIO' ]
+ include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]
+ include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0']
+ include_dirs += [ '../libraries/' + system_str + '/include/pango-1.0' ]
+ include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]
+ include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
+ include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]
++ pipe = os.popen('pkg-config gtk+-2.0 --cflags')
++ flags += pipe.read().rstrip('\n') + ' '
++ pipe.close()
++ pipe = os.popen('freetype-config --cflags')
++ flags += pipe.read().rstrip('\n') + ' '
++ pipe.close()
+
+ # llmozlib stuff
+ if enable_mozlib == 'yes':
+@@ -209,7 +218,7 @@
+ ### Build type-specific flags ###
+
+ debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 '
+- release_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 '
++ release_opts = flags + '-DNDEBUG -DLL_RELEASE=1 '
+ releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 '
+ releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
+
+@@ -419,7 +428,7 @@
+
+ external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'db-4.2', 'openjpeg' ]
+
+- if arch != 'x86_64' and arch != 'x86_64cross':
++ if enable_fmod == 'yes' and arch != 'x86_64' and arch != 'x86_64cross':
+ external_libs += [ 'fmod-3.75' ]
+
+ external_libs.remove('cares')
+diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp
+--- linden.orig/indra/llcommon/llsdserialize_xml.cpp 2007-04-04 00:40:49.000000000 +0900
++++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -35,7 +35,7 @@
+
+ extern "C"
+ {
+-#include "expat/expat.h"
++#include "expat.h"
+ }
+
+ /**
+diff -Naur linden.orig/indra/llcommon/llsys.cpp linden/indra/llcommon/llsys.cpp
+--- linden.orig/indra/llcommon/llsys.cpp 2007-04-04 00:40:49.000000000 +0900
++++ linden/indra/llcommon/llsys.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -30,7 +30,7 @@
+ #include "llsys.h"
+
+ #include <iostream>
+-#include <zlib/zlib.h>
++#include <zlib.h>
+ #include "processor.h"
+
+ #if LL_WINDOWS
+diff -Naur linden.orig/indra/llimage/llimagejpeg.h linden/indra/llimage/llimagejpeg.h
+--- linden.orig/indra/llimage/llimagejpeg.h 2007-04-04 00:40:49.000000000 +0900
++++ linden/indra/llimage/llimagejpeg.h 2007-04-04 17:49:58.000000000 +0900
+@@ -33,9 +33,8 @@
+ #include "llimage.h"
+
+ extern "C" {
+-#include "jpeglib/jinclude.h"
+-#include "jpeglib/jpeglib.h"
+-#include "jpeglib/jerror.h"
++#include "jpeglib.h"
++#include "jerror.h"
+ }
+
+ class LLImageJPEG : public LLImageFormatted
+diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp
+--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-04-04 00:40:50.000000000 +0900
++++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -30,7 +30,7 @@
+
+ // this is defined so that we get static linking.
+ #define OPJ_STATIC
+-#include "openjpeg/openjpeg.h"
++#include "openjpeg.h"
+
+ #include "lltimer.h"
+ #include "llmemory.h"
+diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp
+--- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-04-04 00:40:52.000000000 +0900
++++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -76,7 +76,7 @@
+
+ #include <sstream>
+ #include <iterator>
+-#include <xmlrpc-epi/xmlrpc.h>
++#include <xmlrpc.h>
+ #include "apr-1/apr_base64.h"
+
+ #include "llbuffer.h"
+diff -Naur linden.orig/indra/llmessage/llhttpassetstorage.cpp linden/indra/llmessage/llhttpassetstorage.cpp
+--- linden.orig/indra/llmessage/llhttpassetstorage.cpp 2007-04-04 00:40:53.000000000 +0900
++++ linden/indra/llmessage/llhttpassetstorage.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -36,7 +36,7 @@
+ #include "llvfile.h"
+ #include "llvfs.h"
+
+-#include "zlib/zlib.h"
++#include "zlib.h"
+
+ const U32 MAX_RUNNING_REQUESTS = 4;
+ const F32 MAX_PROCESSING_TIME = 0.005f;
+diff -Naur linden.orig/indra/llrender/llfont.cpp linden/indra/llrender/llfont.cpp
+--- linden.orig/indra/llrender/llfont.cpp 2007-04-04 00:40:54.000000000 +0900
++++ linden/indra/llrender/llfont.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -30,11 +30,11 @@
+ #include "llfont.h"
+
+ // Freetype stuff
+-#if LL_LINUX // I had to do some work to avoid the system-installed FreeType headers... --ryan.
+-#include "llfreetype2/freetype/ft2build.h"
+-#else
++// #if LL_LINUX // I had to do some work to avoid the system-installed FreeType headers... --ryan.
++// #include "llfreetype2/freetype/ft2build.h"
++// #else
+ #include <ft2build.h>
+-#endif
++// #endif
+
+ // For some reason, this won't work if it's not wrapped in the ifdef
+ #ifdef FT_FREETYPE_H
+diff -Naur linden.orig/indra/llxml/llxmlnode.h linden/indra/llxml/llxmlnode.h
+--- linden.orig/indra/llxml/llxmlnode.h 2007-04-04 00:40:56.000000000 +0900
++++ linden/indra/llxml/llxmlnode.h 2007-04-04 17:49:58.000000000 +0900
+@@ -29,7 +29,7 @@
+ #define LL_LLXMLNODE_H
+
+ #define XML_STATIC
+-#include "expat/expat.h"
++#include "expat.h"
+ #include <map>
+
+ #include "indra_constants.h"
+diff -Naur linden.orig/indra/llxml/llxmlparser.h linden/indra/llxml/llxmlparser.h
+--- linden.orig/indra/llxml/llxmlparser.h 2007-04-04 00:40:56.000000000 +0900
++++ linden/indra/llxml/llxmlparser.h 2007-04-04 17:49:58.000000000 +0900
+@@ -29,7 +29,7 @@
+ #define LL_LLXMLPARSER_H
+
+ #define XML_STATIC
+-#include "expat/expat.h"
++#include "expat.h"
+
+ class LLXmlParser
+ {
+diff -Naur linden.orig/indra/newview/llfloaterpostcard.cpp linden/indra/newview/llfloaterpostcard.cpp
+--- linden.orig/indra/newview/llfloaterpostcard.cpp 2007-04-04 00:41:09.000000000 +0900
++++ linden/indra/newview/llfloaterpostcard.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -237,7 +237,7 @@
+ {
+ }
+ // *TODO define custom uploadFailed here so it's not such a generic message
+- void LLSendPostcardResponder::uploadComplete(const LLSD& content)
++ void uploadComplete(const LLSD& content)
+ {
+ // we don't care about what the server returns from this post, just clean up the UI
+ LLUploadDialog::modalUploadFinished();
+diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp
+--- linden.orig/indra/newview/lluserauth.cpp 2007-04-04 00:41:05.000000000 +0900
++++ linden/indra/newview/lluserauth.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -40,7 +40,7 @@
+
+ // NOTE: MUST include these after otherincludes since queue gets redefined!?!!
+ #include <curl/curl.h>
+-#include <xmlrpc-epi/xmlrpc.h>
++#include <xmlrpc.h>
+
+
+
+diff -Naur linden.orig/indra/newview/llviewerobjectlist.cpp linden/indra/newview/llviewerobjectlist.cpp
+--- linden.orig/indra/newview/llviewerobjectlist.cpp 2007-04-04 00:41:08.000000000 +0900
++++ linden/indra/newview/llviewerobjectlist.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -60,7 +60,7 @@
+ #include "u64.h"
+ #include "llviewerimagelist.h"
+ #include "lldatapacker.h"
+-#include <zlib/zlib.h>
++#include <zlib.h>
+ #include "object_flags.h"
+
+ extern BOOL gVelocityInterpolate;
+diff -Naur linden.orig/indra/newview/llwebbrowserctrl.h linden/indra/newview/llwebbrowserctrl.h
+--- linden.orig/indra/newview/llwebbrowserctrl.h 2007-04-04 00:41:01.000000000 +0900
++++ linden/indra/newview/llwebbrowserctrl.h 2007-04-04 17:49:58.000000000 +0900
+@@ -91,6 +91,7 @@
+ #include "lldynamictexture.h"
+ #include "llmozlib.h"
+
++class LLUICtrlFactory;
+ class LLViewBorder;
+ class LLWebBrowserTexture;
+
+@@ -239,7 +240,7 @@
+ class LLWebBrowserTexture : public LLDynamicTexture
+ {
+ public:
+- LLWebBrowserTexture::LLWebBrowserTexture( S32 width, S32 height, LLWebBrowserCtrl* browserCtrl, int browserWindow );
++ LLWebBrowserTexture( S32 width, S32 height, LLWebBrowserCtrl* browserCtrl, int browserWindow );
+ virtual ~LLWebBrowserTexture();
+
+ virtual void preRender( BOOL clear_depth = TRUE ) {};
+diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp
+--- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-04-04 00:41:06.000000000 +0900
++++ linden/indra/newview/llxmlrpctransaction.cpp 2007-04-04 17:49:58.000000000 +0900
+@@ -33,7 +33,7 @@
+
+ // Have to include these last to avoid queue redefinition!
+ #include <curl/curl.h>
+-#include <xmlrpc-epi/xmlrpc.h>
++#include <xmlrpc.h>
+
+ #include "viewer.h"
+
diff --git a/games-simulation/secondlife/files/secondlife-1.14.0.1-llversion.patch b/games-simulation/secondlife/files/secondlife-1.14.0.1-llversion.patch
new file mode 100644
index 0000000..8e73a8e
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.14.0.1-llversion.patch
@@ -0,0 +1,12 @@
+diff -Naur linden.orig/indra/llcommon/llversion.h linden/indra/llcommon/llversion.h
+--- linden.orig/indra/llcommon/llversion.h 2007-04-04 00:40:48.000000000 +0900
++++ linden/indra/llcommon/llversion.h 2007-04-05 00:12:31.000000000 +0900
+@@ -34,7 +34,7 @@
+ const S32 LL_VERSION_MAJOR = 1;
+ const S32 LL_VERSION_MINOR = 14;
+ const S32 LL_VERSION_PATCH = 0;
+-const S32 LL_VERSION_BUILD = 0;
++const S32 LL_VERSION_BUILD = 1;
+
+
+
diff --git a/games-simulation/secondlife/secondlife-1.13.3.59558.ebuild b/games-simulation/secondlife/secondlife-1.14.0.1.ebuild
index 4869a95..71fa658 100644
--- a/games-simulation/secondlife/secondlife-1.13.3.59558.ebuild
+++ b/games-simulation/secondlife/secondlife-1.14.0.1.ebuild
@@ -6,15 +6,13 @@ inherit games toolchain-funcs
DESCRIPTION="A 3D MMORPG virtual world entirely built and owned by its residents"
HOMEPAGE="http://secondlife.com/"
-#SRC_URI="http://secondlife.com/developers/opensource/downloads/2007/03/slviewer-src-${PV}.tar.gz
-# http://secondlife.com/developers/opensource/downloads/2007/03/slviewer-artwork-${PV}.zip"
-SRC_URI="http://secondlife.com/developers/opensource/downloads/2007/03/slviewer-src-FL-${PV}.tar.gz
- http://secondlife.com/developers/opensource/downloads/2007/03/slviewer-artwork-FL-${PV}.zip"
+SRC_URI="http://secondlife.com/developers/opensource/downloads/2007/04/slviewer-src-${PV}.tar.gz
+ http://secondlife.com/developers/opensource/downloads/2007/04/slviewer-artwork-${PV}.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-#IUSE="fmod xulrunner"
+#IUSE="fmod llmozlib"
IUSE="fmod"
RESTRICT="mirror"
@@ -38,7 +36,7 @@ RDEPEND=">=x11-libs/gtk+-2
dev-libs/elfio
>=media-libs/openjpeg-1.1.1
media-fonts/kochi-substitute"
-# xulrunner? ( net-libs/xulrunner )
+# llmozlib? ( net-libs/llmozlib-xulrunner )
DEPEND="${RDEPEND}
dev-util/scons
@@ -46,56 +44,53 @@ DEPEND="${RDEPEND}
sys-devel/flex
sys-devel/bison"
-S="${WORKDIR}/linden"
+S="${WORKDIR}/linden/indra"
dir="${GAMES_DATADIR}/${PN}"
src_unpack() {
unpack ${A}
- cd "${S}"/indra
-
- if ! use fmod || [ "${ARCH}" != "x86" ] ; then
- epatch "${FILESDIR}"/${PN}-1.13.3.59315-no_fmod.patch
- fi
+ cd "${S}"
# VWR-100
epatch "${FILESDIR}"/${PN}-1.13.3.2-llimagej2coj_debug.patch
-
+ # opensecondlife.com
epatch "${FILESDIR}"/opensecondlife-svn41.patch
+
epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-llversion.patch
- sed -i -e "s/gcc_bin = .*$/gcc_bin = '$(tc-getCXX)'/" SConstruct || die
+ sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" SConstruct || die
- # "${S}"/indra/newview/viewer_manifest.py
- # touch newview/gridargs.dat
- sed -i -e 's|\(http://secondlife\.com/app/login/\)|\1firstlook/|' \
- newview/skins/xui/en-us/panel_login.xml || die
- echo -n '-settings settings_firstlook.xml' > newview/gridargs.dat
+ # "${S}"/newview/viewer_manifest.py
+ touch newview/gridargs.dat
}
src_compile() {
- local mozlib
+ local myopts="BUILD=release BTARGET=client DISTCC=no"
- cd "${S}"/indra
-
- # if use xulrunner; then
- # mozlib="yes"
+ # if use llmozlib ; then
+ # myopts="${myopts} MOZLIB=yes"
#else
- mozlib="no"
+ myopts="${myopts} MOZLIB=no"
#fi
- CLIENT_CPPFLAGS="${CXXFLAGS}" TEMP_BUILD_DIR="/" \
- scons BUILD=release BTARGET=client DISTCC=no GRID=firstlook MOZLIB=${mozlib} || die
+ if use fmod && [ "${ARCH}" == "x86" ] ; then
+ myopts="${myopts} FMOD=yes"
+ else
+ myopts="${myopts} FMOD=no"
+ fi
+
+ CLIENT_CPPFLAGS="${CXXFLAGS}" TEMP_BUILD_DIR=/ scons ${myopts} || die
}
src_install() {
- cd "${S}"/indra/newview/
+ cd "${S}"/newview/
insinto "${dir}"
- #doins featuretable.txt featuretable_mac.txt gpu_table.txt gridargs.dat || die
- doins featuretable.txt gpu_table.txt .txt gridargs.dat || die
- doins -r app_settings character fonts help skins res-sdl || die
+ doins featuretable.txt gpu_table.txt gridargs.dat || die
+ doins -r app_settings character fonts skins res-sdl || die
doins lsl_guide.html releasenotes.txt || die
newins licenses-linux.txt licenses.txt || die
@@ -103,7 +98,7 @@ src_install() {
newins res/ll_icon.ico secondlife.ico || die
insinto "${dir}"/app_settings/
- doins "${S}"/scripts/messages/message_template.msg || die
+ doins "${WORKDIR}"/linden/scripts/messages/message_template.msg || die
exeinto "${dir}"
doexe linux_tools/launch_url.sh || die