summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-simulation/secondlife/files')
-rw-r--r--games-simulation/secondlife/files/digest-secondlife-1.16.0.59
-rw-r--r--games-simulation/secondlife/files/digest-secondlife-1.17.2.09
-rw-r--r--games-simulation/secondlife/files/secondlife-1.17.2.0-gentoo.patch185
-rw-r--r--games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch12
4 files changed, 206 insertions, 9 deletions
diff --git a/games-simulation/secondlife/files/digest-secondlife-1.16.0.5 b/games-simulation/secondlife/files/digest-secondlife-1.16.0.5
deleted file mode 100644
index d8ebb2e..0000000
--- a/games-simulation/secondlife/files/digest-secondlife-1.16.0.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a6daefbf9b53e1ac5501312c3754e911 slviewer-artwork-1.16.0.5.zip 24682087
-RMD160 4451964fefb7c6d27b1723a66f6e1ca0d2c13507 slviewer-artwork-1.16.0.5.zip 24682087
-SHA256 59736b77b9e0ce15f73241e1b8fe0da71ccadc82f85bee8ffe6f544010fd56ca slviewer-artwork-1.16.0.5.zip 24682087
-MD5 85f5b3efd9375c7c23fbf739c9dcdec5 slviewer-linux-libs-1.16.0.5.tar.gz 26780131
-RMD160 ad559681ad92171211fb446e716f32f00c33e216 slviewer-linux-libs-1.16.0.5.tar.gz 26780131
-SHA256 025938ba1fafa75b67cde1b6d8b523e4927154b52c7436c0fc12a8e4f25fa99a slviewer-linux-libs-1.16.0.5.tar.gz 26780131
-MD5 f5503775cf3bcd805360887cc50aa14e slviewer-src-1.16.0.5.tar.gz 5081284
-RMD160 80b7554836fdaf3ec16de728c7004b5e87c0aac2 slviewer-src-1.16.0.5.tar.gz 5081284
-SHA256 e2899f31c54ef11bf747fed9a5433fa5bfdc31110f8cfc78134f06aea4f488ca slviewer-src-1.16.0.5.tar.gz 5081284
diff --git a/games-simulation/secondlife/files/digest-secondlife-1.17.2.0 b/games-simulation/secondlife/files/digest-secondlife-1.17.2.0
new file mode 100644
index 0000000..4da1c32
--- /dev/null
+++ b/games-simulation/secondlife/files/digest-secondlife-1.17.2.0
@@ -0,0 +1,9 @@
+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/secondlife-1.17.2.0-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.17.2.0-gentoo.patch
new file mode 100644
index 0000000..3422c71
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.17.2.0-gentoo.patch
@@ -0,0 +1,185 @@
+diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct
+--- linden.orig/indra/SConstruct 2007-06-26 08:48:21.000000000 +0900
++++ linden/indra/SConstruct 2007-07-03 00:12:22.000000000 +0900
+@@ -133,7 +133,7 @@
+ if standalone and platform != 'linux':
+ print >> sys.stderr, 'Warning: standalone builds have only been tested on Linux'
+
+-standalone_pkgs = 'cairo glib-2.0 gtk+-2.0 sdl vorbis vorbisenc vorbisfile'
++standalone_pkgs = 'cairo glib-2.0 gtk+-2.0 sdl vorbis vorbisenc vorbisfile freetype2'
+
+ def pkgconfig(opt, pkgs=None):
+ return os.popen('pkg-config %s %s' %
+@@ -267,7 +267,7 @@
+ for d in incdirs]
+
+ if elfio:
+- client_external_libs += [ 'elfio' ]
++ client_external_libs += [ 'ELFIO' ]
+ else:
+ cppflags += '-DLL_ELFBIN=0 '
+
+diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp
+--- linden.orig/indra/llcommon/llsdserialize_xml.cpp 2007-06-26 08:48:22.000000000 +0900
++++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-06-27 14:54:31.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-06-26 08:48:22.000000000 +0900
++++ linden/indra/llcommon/llsys.cpp 2007-06-27 14:54:31.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-06-26 08:48:23.000000000 +0900
++++ linden/indra/llimage/llimagejpeg.h 2007-06-27 14:54:31.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-06-26 08:48:23.000000000 +0900
++++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-06-27 14:54:31.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-06-26 08:48:24.000000000 +0900
++++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-06-27 14:54:31.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-06-26 08:48:24.000000000 +0900
++++ linden/indra/llmessage/llhttpassetstorage.cpp 2007-06-27 14:54:31.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-06-26 08:48:25.000000000 +0900
++++ linden/indra/llrender/llfont.cpp 2007-06-27 14:54:31.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-06-26 08:48:26.000000000 +0900
++++ linden/indra/llxml/llxmlnode.h 2007-06-27 14:54:31.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-06-26 08:48:26.000000000 +0900
++++ linden/indra/llxml/llxmlparser.h 2007-06-27 14:54:31.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-06-26 08:48:31.000000000 +0900
++++ linden/indra/newview/lluserauth.cpp 2007-06-27 14:54:31.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-06-26 08:48:33.000000000 +0900
++++ linden/indra/newview/llviewerobjectlist.cpp 2007-06-27 14:54:31.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-06-26 08:48:30.000000000 +0900
++++ linden/indra/newview/llwebbrowserctrl.h 2007-06-27 14:54:31.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-06-26 08:48:32.000000000 +0900
++++ linden/indra/newview/llxmlrpctransaction.cpp 2007-06-27 14:54:31.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.17.2.0-size_t.patch b/games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch
new file mode 100644
index 0000000..06ca2f6
--- /dev/null
+++ b/games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch
@@ -0,0 +1,12 @@
+diff -Naur linden.orig/indra/newview/viewer.cpp linden/indra/newview/viewer.cpp
+--- linden.orig/indra/newview/viewer.cpp 2007-06-26 08:48:31.000000000 +0900
++++ linden/indra/newview/viewer.cpp 2007-07-02 23:57:04.000000000 +0900
+@@ -2368,7 +2368,7 @@
+ size_t btpos;
+ for (btpos = 0; btpos < btsize; ++btpos)
+ {
+- fprintf(StraceFile, "%d:\t", btpos);
++ fprintf(StraceFile, "%zd:\t", btpos);
+ int symidx;
+ for (symidx = 0; symidx < nSymNo; ++symidx)
+ {