diff options
Diffstat (limited to 'games-simulation/secondlife/files')
7 files changed, 122 insertions, 278 deletions
diff --git a/games-simulation/secondlife/files/digest-secondlife-1.17.0.12 b/games-simulation/secondlife/files/digest-secondlife-1.17.0.12 deleted file mode 100644 index f230934..0000000 --- a/games-simulation/secondlife/files/digest-secondlife-1.17.0.12 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 ba7f0c092f4e69cfb0b2990eff0b6f29 slviewer-artwork-1.17.0.12.zip 24682087 -RMD160 bc0e789608bb7dbde69ed6123ec017c685aa3cd5 slviewer-artwork-1.17.0.12.zip 24682087 -SHA256 7b7d31a71884d5b116dba57e84ebcea057333ac577edb3fc9d0593c4f886583a slviewer-artwork-1.17.0.12.zip 24682087 -MD5 a0d97271bef07a4d97c01c1c69f61de8 slviewer-linux-libs-1.17.0.12.tar.gz 27190078 -RMD160 8f2ec0d491a9a1a23e2d4fc63db02a03130b85c8 slviewer-linux-libs-1.17.0.12.tar.gz 27190078 -SHA256 b5f2d1a7424b474d8ce3773ac3bf1a5b71e96586017fb653b3364529bff51d61 slviewer-linux-libs-1.17.0.12.tar.gz 27190078 -MD5 e71e146cb4f1ba7e37a06fb4d66d34ae slviewer-src-1.17.0.12.tar.gz 5171734 -RMD160 cb67ad617f0504ad1550a7d0f7578e975365026e slviewer-src-1.17.0.12.tar.gz 5171734 -SHA256 a213ce3b1d027734273ebe434b9cbf4be3e29b3f712d2545fa2e0248b3d5985d slviewer-src-1.17.0.12.tar.gz 5171734 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.17.2.0 b/games-simulation/secondlife/files/digest-secondlife-1.17.2.0 deleted file mode 100644 index 4da1c32..0000000 --- a/games-simulation/secondlife/files/digest-secondlife-1.17.2.0 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 942ca9d4da3338a1bb28742a5d04a54c slviewer-artwork-1.17.2.0.zip 24684316 -RMD160 f95474667f1286c66e846f0c8326cfee63d1d20a slviewer-artwork-1.17.2.0.zip 24684316 -SHA256 32d348a3d294ced0a32607d506b452fd24784529bcf89225a53cb36ae03eb147 slviewer-artwork-1.17.2.0.zip 24684316 -MD5 19f99960fba9856c2da20f05fe263d4c slviewer-linux-libs-1.17.2.0.tar.gz 28127089 -RMD160 6b9de0070f5a950e81e38f56d9c424384dcb9a8c slviewer-linux-libs-1.17.2.0.tar.gz 28127089 -SHA256 4103ba31f6946c098e08e74c934fbb4e4621e1e644572b9f6655da4e5e0c421f slviewer-linux-libs-1.17.2.0.tar.gz 28127089 -MD5 768dc0b7ff5e2dd2751f363fd6b568b3 slviewer-src-1.17.2.0.tar.gz 5198005 -RMD160 6e5772744811c089e21716b579e707fa1322c149 slviewer-src-1.17.2.0.tar.gz 5198005 -SHA256 dc5302fc37bec25dca9b47324f8fea6e56aa2b3da3fc30e3a0d4c56719fa0de4 slviewer-src-1.17.2.0.tar.gz 5198005 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.18.1.2 b/games-simulation/secondlife/files/digest-secondlife-1.18.1.2 new file mode 100644 index 0000000..6940c99 --- /dev/null +++ b/games-simulation/secondlife/files/digest-secondlife-1.18.1.2 @@ -0,0 +1,9 @@ +MD5 44130dede071a42542894e0ab2844f96 slviewer-artwork-1.18.1.2.zip 24702596 +RMD160 64226c9f79599f694c0e5066b3e4113ddd7a9c20 slviewer-artwork-1.18.1.2.zip 24702596 +SHA256 361fb28b6de7ec983eb0e837e55736b45de85c27394a01615d8e39b9a9b22ca0 slviewer-artwork-1.18.1.2.zip 24702596 +MD5 ea533712c4affc2a4d3001ced6588be2 slviewer-linux-libs-1.18.1.2.tar.gz 30547391 +RMD160 a4c50dad871fc68f57dd668ef4e82acb59bece7f slviewer-linux-libs-1.18.1.2.tar.gz 30547391 +SHA256 137b16c2f84398ebe216dcf521a89d88c0fe58208fd2d62716d3571827ed12d6 slviewer-linux-libs-1.18.1.2.tar.gz 30547391 +MD5 2764ac8f80358130f2252cf5857aec49 slviewer-src-1.18.1.2.tar.gz 5395729 +RMD160 4222ec08662cbe9e8ecb18113e37d9a7edc8d127 slviewer-src-1.18.1.2.tar.gz 5395729 +SHA256 dc749594bd1952ba3c3c59587641849d13f420dc52a2e9fa6bc495e05f3a65e1 slviewer-src-1.18.1.2.tar.gz 5395729 diff --git a/games-simulation/secondlife/files/llwindowssdl_16bit_depth.patch b/games-simulation/secondlife/files/llwindowssdl_16bit_depth.patch deleted file mode 100644 index 9b90e70..0000000 --- a/games-simulation/secondlife/files/llwindowssdl_16bit_depth.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: llwindowsdl.cpp -=================================================================== -RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llwindow/llwindowsdl.cpp,v -retrieving revision 1.1 -diff -u -r1.1 llwindowsdl.cpp ---- llwindowsdl.cpp 28 Feb 2007 04:43:12 -0000 1.1 -+++ llwindowsdl.cpp 28 Feb 2007 04:52:45 -0000 -@@ -393,6 +393,13 @@ - } - - mWindow = SDL_SetVideoMode(width, height, bits, sdlflags | SDL_FULLSCREEN); -+ if (!mWindow) -+ { -+ llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl; -+ llwarns << "createContext: Trying again with 16 bit depth buffer" << llendl; -+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); -+ mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); -+ } - - if (mWindow) - { -@@ -435,6 +442,13 @@ - - llinfos << "createContext: creating window " << width << "x" << height << "x" << bits << llendl; - mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); -+ if (!mWindow) -+ { -+ llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl; -+ llwarns << "createContext: Trying again with 16 bit depth buffer" << llendl; -+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); -+ mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); -+ } - - if (!mWindow) - { diff --git a/games-simulation/secondlife/files/opensecondlife-svn41.patch b/games-simulation/secondlife/files/opensecondlife-svn41.patch deleted file mode 100644 index f7f5606..0000000 --- a/games-simulation/secondlife/files/opensecondlife-svn41.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: linden/indra/llcommon/llfasttimer.cpp -=================================================================== ---- linden/indra/llcommon/llfasttimer.cpp (revision 40) -+++ linden/indra/llcommon/llfasttimer.cpp (revision 41) -@@ -90,21 +90,14 @@ - #endif // LL_WINDOWS - - --#if LL_LINUX -+#if LL_LINUX && (defined(__i386__) || defined(__amd64__)) - U64 get_cpu_clock_count() - { - U64 x; - __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x)); - return x; - } --#endif -- --#if LL_DARWIN --// --// Mac implementation of CPU clock --// --// Just use gettimeofday implementation for now -- -+#else - U64 get_cpu_clock_count() - { - return get_clock_count(); diff --git a/games-simulation/secondlife/files/secondlife-1.15.1.3-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.15.1.3-gentoo.patch deleted file mode 100644 index 111fea4..0000000 --- a/games-simulation/secondlife/files/secondlife-1.15.1.3-gentoo.patch +++ /dev/null @@ -1,197 +0,0 @@ -diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct ---- linden.orig/indra/SConstruct 2007-05-15 08:38:33.000000000 +0900 -+++ linden/indra/SConstruct 2007-05-15 12:36:49.000000000 +0900 -@@ -185,13 +185,19 @@ - if arch == 'x86_64' or arch == 'x86_64cross' or not enable_fmod: - 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: -diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp ---- linden.orig/indra/llcommon/llsdserialize_xml.cpp 2007-05-15 08:38:37.000000000 +0900 -+++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -36,7 +36,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-05-15 08:38:37.000000000 +0900 -+++ linden/indra/llcommon/llsys.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -31,7 +31,7 @@ - #include "llsys.h" - - #include <iostream> --#include <zlib/zlib.h> -+#include <zlib.h> - - #include "processor.h" - -diff -Naur linden.orig/indra/llimage/llimagejpeg.h linden/indra/llimage/llimagejpeg.h ---- linden.orig/indra/llimage/llimagejpeg.h 2007-05-15 08:38:37.000000000 +0900 -+++ linden/indra/llimage/llimagejpeg.h 2007-05-15 12:34:01.000000000 +0900 -@@ -34,8 +34,8 @@ - #include "llimage.h" - - extern "C" { --#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-05-15 08:38:37.000000000 +0900 -+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -31,7 +31,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-05-15 08:38:40.000000000 +0900 -+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -77,7 +77,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-05-15 08:38:40.000000000 +0900 -+++ linden/indra/llmessage/llhttpassetstorage.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -38,7 +38,7 @@ - #include "llvfile.h" - #include "llvfs.h" - --#include "zlib/zlib.h" -+#include "zlib.h" - - const U32 MAX_RUNNING_REQUESTS = 1; - 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-05-15 08:38:43.000000000 +0900 -+++ linden/indra/llrender/llfont.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -31,11 +31,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-05-15 08:38:45.000000000 +0900 -+++ linden/indra/llxml/llxmlnode.h 2007-05-15 12:34:01.000000000 +0900 -@@ -30,7 +30,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-05-15 08:38:45.000000000 +0900 -+++ linden/indra/llxml/llxmlparser.h 2007-05-15 12:34:01.000000000 +0900 -@@ -30,7 +30,7 @@ - #define LL_LLXMLPARSER_H - - #define XML_STATIC --#include "expat/expat.h" -+#include "expat.h" - - class LLXmlParser - { -diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp ---- linden.orig/indra/newview/lluserauth.cpp 2007-05-15 08:38:53.000000000 +0900 -+++ linden/indra/newview/lluserauth.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -42,7 +42,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-05-15 08:38:55.000000000 +0900 -+++ linden/indra/newview/llviewerobjectlist.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -61,7 +61,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-05-15 08:38:50.000000000 +0900 -+++ linden/indra/newview/llwebbrowserctrl.h 2007-05-15 12:34:01.000000000 +0900 -@@ -92,6 +92,7 @@ - #include "lldynamictexture.h" - #include "llmozlib.h" - -+class LLUICtrlFactory; - class LLViewBorder; - class LLWebBrowserTexture; - -@@ -249,7 +250,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-05-15 08:38:54.000000000 +0900 -+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-05-15 12:34:01.000000000 +0900 -@@ -34,7 +34,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.18.1.2-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.18.1.2-gentoo.patch new file mode 100644 index 0000000..28f712c --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.18.1.2-gentoo.patch @@ -0,0 +1,113 @@ +diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct +--- linden.orig/indra/SConstruct 2007-08-03 06:13:06.000000000 +0900 ++++ linden/indra/SConstruct 2007-08-05 08:13:12.000000000 +0900 +@@ -158,6 +158,9 @@ + 'vorbisfile', + ] + ++if enable_gstreamer: ++ standalone_pkgs += [ 'gstreamer-0.10' ] ++ + def pkgconfig(opt, pkgs=None): + return os.popen('pkg-config %s %s' % + (opt, pkgs or ' '.join(standalone_pkgs))).read().strip() +@@ -213,16 +216,7 @@ + """ + + '../libraries/' + system_str + '/include' ) + +- if platform == 'linux' and build_target == 'client': +- if arch == 'x86_64' and os.path.exists('/usr/lib64'): +- client_external_libs = [File('/usr/lib64/libresolv.a')] +- else: +- # Custom libresolv build which avoids a billion flavors of +- # brokenness prevalent in common libresolvs out there. +- client_external_libs = ['resolv'] +- include_dirs += ['../libraries/' + system_str + '/include/llresolv8'] +- else: +- client_external_libs = ['resolv'] ++ client_external_libs = ['resolv'] + + system_link_flags = '' + +diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp +--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-08-03 06:13:06.000000000 +0900 ++++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-08-04 06:03:28.000000000 +0900 +@@ -31,7 +31,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-08-03 06:13:07.000000000 +0900 ++++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-08-04 06:03:28.000000000 +0900 +@@ -77,7 +77,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/newview/llsrv.cpp linden/indra/newview/llsrv.cpp +--- linden.orig/indra/newview/llsrv.cpp 2007-08-03 06:13:14.000000000 +0900 ++++ linden/indra/newview/llsrv.cpp 2007-08-04 06:24:20.000000000 +0900 +@@ -73,6 +73,7 @@ + + #include <netdb.h> + ++#define HOMEGROWN_RESPONSE_PARSER + #ifdef HOMEGROWN_RESPONSE_PARSER + + // We ought to be using libresolv's ns_initparse and ns_parserr to +diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp +--- linden.orig/indra/newview/lluserauth.cpp 2007-08-03 06:13:13.000000000 +0900 ++++ linden/indra/newview/lluserauth.cpp 2007-08-04 06:03:28.000000000 +0900 +@@ -42,7 +42,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/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp +--- linden.orig/indra/newview/llvoiceclient.cpp 2007-08-03 06:13:14.000000000 +0900 ++++ linden/indra/newview/llvoiceclient.cpp 2007-08-05 07:52:19.000000000 +0900 +@@ -36,7 +36,7 @@ + #include "llvoavatar.h" + #include "llbufferstream.h" + #include "llfile.h" +-#include "expat/expat.h" ++#include "expat.h" + #include "llcallbacklist.h" + #include "llviewerregion.h" + #include "llviewernetwork.h" // for gUserServerChoice +diff -Naur linden.orig/indra/newview/llwebbrowserctrl.h linden/indra/newview/llwebbrowserctrl.h +--- linden.orig/indra/newview/llwebbrowserctrl.h 2007-08-03 06:13:13.000000000 +0900 ++++ linden/indra/newview/llwebbrowserctrl.h 2007-08-04 06:03:28.000000000 +0900 +@@ -92,6 +92,7 @@ + #include "lldynamictexture.h" + #include "llmozlib.h" + ++class LLUICtrlFactory; + class LLViewBorder; + class LLWebBrowserTexture; + +diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp +--- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-08-03 06:13:14.000000000 +0900 ++++ linden/indra/newview/llxmlrpctransaction.cpp 2007-08-04 06:03:28.000000000 +0900 +@@ -34,7 +34,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" + |