diff options
Diffstat (limited to 'games-simulation/secondlife/files')
4 files changed, 9 insertions, 428 deletions
diff --git a/games-simulation/secondlife/files/digest-secondlife-1.15.0.2 b/games-simulation/secondlife/files/digest-secondlife-1.15.0.2 deleted file mode 100644 index 059372d..0000000 --- a/games-simulation/secondlife/files/digest-secondlife-1.15.0.2 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 bf35cc6ccc3b2fd362dc18910f37f7af slviewer-artwork-1.15.0.2.zip 24711017 -RMD160 7a43bd0c72d20db701c4a9646dde41eae3cfc151 slviewer-artwork-1.15.0.2.zip 24711017 -SHA256 4c63d01a4377515a6030fdf1ed8ac11a66df93199c1eaf4087d1e9d9168e242d slviewer-artwork-1.15.0.2.zip 24711017 -MD5 ee2f9d7a39e145d3c065b61bac2fb7cc slviewer-linux-libs-1.15.0.2.tar.gz 26593326 -RMD160 45651188a6e15510fec85f9f15efd9b2eec56481 slviewer-linux-libs-1.15.0.2.tar.gz 26593326 -SHA256 81ed4b90a65690916891d758fa72839c0aeb32bbecfe3af6416b009011bfc65f slviewer-linux-libs-1.15.0.2.tar.gz 26593326 -MD5 96bcb32f5c3705c176ac517b355b1f5a slviewer-src-1.15.0.2.tar.gz 5048294 -RMD160 2f15ff2a12935b5ac0bf59f90c026466f7037e4f slviewer-src-1.15.0.2.tar.gz 5048294 -SHA256 4904ce2a2e3036aabf73b4f6dabf5d51cad35b722245c44f9d59bf841599acd9 slviewer-src-1.15.0.2.tar.gz 5048294 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.16.0.5 b/games-simulation/secondlife/files/digest-secondlife-1.16.0.5 new file mode 100644 index 0000000..d8ebb2e --- /dev/null +++ b/games-simulation/secondlife/files/digest-secondlife-1.16.0.5 @@ -0,0 +1,9 @@ +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/secondlife-1.15.0.2-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.15.0.2-gentoo.patch deleted file mode 100644 index d9bc40c..0000000 --- a/games-simulation/secondlife/files/secondlife-1.15.0.2-gentoo.patch +++ /dev/null @@ -1,226 +0,0 @@ -diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct ---- linden.orig/indra/SConstruct 2007-04-26 04:12:56.000000000 +0900 -+++ linden/indra/SConstruct 2007-04-26 08:21:20.000000000 +0900 -@@ -55,6 +55,7 @@ - allowed_values=('client', 'server', 'all')), - BoolOption('DISTCC', 'Enabled distcc', True), - BoolOption('MOZLIB', 'Enabled llmozlib/mozilla support', True), -+ BoolOption('FMOD', 'Enabled fmod support', True), - BoolOption('COLORGCC', 'Enabled colorgcc', True), - EnumOption('GRID', 'Client package\'s default grid', 'default', - allowed_values=('default', 'aditi', 'agni', 'dmz', 'durga', 'firstlook', 'ganga', 'shakti', 'siva', 'soma', 'uma', 'vaak')), -@@ -68,6 +69,7 @@ - target_param = optenv['BTARGET'] - enable_distcc = optenv['DISTCC'] - enable_mozlib = optenv['MOZLIB'] -+enable_fmod = optenv['FMOD'] - enable_colorgcc = optenv['COLORGCC'] - grid = optenv['GRID'] - opensource = optenv['OPENSOURCE'] -@@ -180,16 +182,22 @@ - flags += '-DLL_LINUX=1 ' - if build_target == 'client': - flags += '-DAPPID=secondlife -DLL_SDL=1 ' -- if arch == 'x86_64' or arch == 'x86_64cross': -+ if not enable_fmod 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: -@@ -415,7 +423,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 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-26 04:12:58.000000000 +0900 -+++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-04-26 08:21:20.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-04-26 04:12:59.000000000 +0900 -+++ linden/indra/llcommon/llsys.cpp 2007-04-26 08:21:20.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-04-26 04:12:59.000000000 +0900 -+++ linden/indra/llimage/llimagejpeg.h 2007-04-26 08:21:20.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-04-26 04:12:59.000000000 +0900 -+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-04-26 08:21:20.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-04-26 04:13:01.000000000 +0900 -+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-04-26 08:21:20.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-04-26 04:13:01.000000000 +0900 -+++ linden/indra/llmessage/llhttpassetstorage.cpp 2007-04-26 08:21:20.000000000 +0900 -@@ -37,7 +37,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-04-26 04:13:02.000000000 +0900 -+++ linden/indra/llrender/llfont.cpp 2007-04-26 08:21:20.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-04-26 04:13:05.000000000 +0900 -+++ linden/indra/llxml/llxmlnode.h 2007-04-26 08:21:20.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-04-26 04:13:05.000000000 +0900 -+++ linden/indra/llxml/llxmlparser.h 2007-04-26 08:21:20.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-04-26 04:13:13.000000000 +0900 -+++ linden/indra/newview/lluserauth.cpp 2007-04-26 08:21:42.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-04-26 04:13:15.000000000 +0900 -+++ linden/indra/newview/llviewerobjectlist.cpp 2007-04-26 08:21:42.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-04-26 04:13:10.000000000 +0900 -+++ linden/indra/newview/llwebbrowserctrl.h 2007-04-26 08:21:42.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-04-26 04:13:14.000000000 +0900 -+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-04-26 08:21:42.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.15.0.2-mozlib.patch b/games-simulation/secondlife/files/secondlife-1.15.0.2-mozlib.patch deleted file mode 100644 index 85a4ddd..0000000 --- a/games-simulation/secondlife/files/secondlife-1.15.0.2-mozlib.patch +++ /dev/null @@ -1,193 +0,0 @@ -Index: ../indra/newview/llfloaterhtml.cpp -=================================================================== ---- ../indra/newview/llfloaterhtml.cpp (revision 60775) -+++ ../indra/newview/llfloaterhtml.cpp (working copy) -@@ -29,8 +29,12 @@ - //////////////////////////////////////////////////////////////////////////////// - // - LLFloaterHtml::LLFloaterHtml() --: LLFloater( "HTML Floater" ), -+: LLFloater( "HTML Floater" ) -+ -+#if LL_LIBXUL_ENABLED -+ , - mWebBrowser( 0 ) -+#endif // LL_LIBXUL_ENABLED - { - // create floater from its XML definition - gUICtrlFactory->buildFloater( this, "floater_html.xml" ); -@@ -40,6 +44,7 @@ - reshape( rect.getWidth(), rect.getHeight(), FALSE ); - setRect( rect ); - -+#if LL_LIBXUL_ENABLED - mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this, "html_floater_browser" ); - if ( mWebBrowser ) - { -@@ -52,7 +57,8 @@ - // don't automatically open secondlife links since we want to catch - // special ones that do other stuff (like open F1 Help) - mWebBrowser->setOpenSecondLifeLinksInMap( false ); -- }; -+ } -+#endif // LL_LIBXUL_ENABLED - - childSetAction("close_btn", onClickClose, this); - setDefaultBtn("close_btn"); -@@ -62,9 +68,11 @@ - // - LLFloaterHtml::~LLFloaterHtml() - { -+#if LL_LIBXUL_ENABLED - // stop observing browser events - if ( mWebBrowser ) - mWebBrowser->remObserver( this ); -+#endif // LL_LIBXUL_ENABLED - - // save position of floater - gSavedSettings.setRect( "HtmlFloaterRect", mRect ); -@@ -83,9 +91,11 @@ - // set the title - setTitle( childGetValue( title_str ).asString() ); - -+#if LL_LIBXUL_ENABLED - // navigate to the URL - if ( mWebBrowser ) - mWebBrowser->navigateTo( childGetValue( url_str ).asString() ); -+#endif // LL_LIBXUL_ENABLED - - // make floater appear - setVisibleAndFrontmost(); -@@ -111,6 +121,7 @@ - // - void LLFloaterHtml::onClickLinkSecondLife( const EventType& eventIn ) - { -+#if LL_LIBXUL_ENABLED - const std::string protocol( "secondlife://app." ); - - // special 'app' secondlife link (using a different protocol - one that isn't registered in the browser) causes bad -@@ -124,11 +135,12 @@ - if ( LLString::compareInsensitive( cmd.c_str() , "floater.html.help" ) == 0 ) - { - gViewerHtmlHelp.show(); -- }; -+ } - } - else - // regular secondlife link - just open the map as normal - { - mWebBrowser->openMapAtlocation( eventIn.getStringValue() ); -- }; --}; -\ No newline at end of file -+ } -+#endif // LL_LIBXUL_ENABLED -+}; -Index: ../indra/newview/llfloaterhtml.h -=================================================================== ---- ../indra/newview/llfloaterhtml.h (revision 60775) -+++ ../indra/newview/llfloaterhtml.h (working copy) -@@ -31,9 +31,11 @@ - - private: - LLFloaterHtml(); -+#if LL_LIBXUL_ENABLED - LLWebBrowserCtrl* mWebBrowser; -+#endif // LL_LIBXUL_ENABLED - static LLFloaterHtml* sInstance; - LLButton* mCloseButton; - }; - --#endif -\ No newline at end of file -+#endif -Index: ../indra/newview/llpreviewscript.cpp -=================================================================== ---- ../indra/newview/llpreviewscript.cpp (revision 60775) -+++ ../indra/newview/llpreviewscript.cpp (working copy) -@@ -450,12 +450,14 @@ - LLFloater* help_floater = LLFloater::getFloaterByHandle(mLiveHelpHandle); - if (!help_floater) return; - -+#if LL_LIBXUL_ENABLED - // update back and forward buttons - LLButton* fwd_button = LLUICtrlFactory::getButtonByName(help_floater, "fwd_btn"); - LLButton* back_button = LLUICtrlFactory::getButtonByName(help_floater, "back_btn"); - LLWebBrowserCtrl* browser = LLUICtrlFactory::getWebBrowserCtrlByName(help_floater, "lsl_guide_html"); - back_button->setEnabled(browser->canNavigateBack()); - fwd_button->setEnabled(browser->canNavigateForward()); -+#endif // LL_LIBXUL_ENABLED - - if (!immediate && !gSavedSettings.getBOOL("ScriptHelpFollowsCursor")) - { -@@ -523,7 +525,9 @@ - url_string.setArg("[LSL_STRING]", help_string); - - addHelpItemToHistory(help_string); -+#if LL_LIBXUL_ENABLED - web_browser->navigateTo(url_string); -+#endif // LL_LIBXUL_ENABLED - } - - void LLScriptEdCore::addHelpItemToHistory(const LLString& help_string) -@@ -655,8 +659,10 @@ - live_help_floater->childSetAction("back_btn", onClickBack, userdata); - live_help_floater->childSetAction("fwd_btn", onClickForward, userdata); - -+#if LL_LIBXUL_ENABLED - LLWebBrowserCtrl* browser = LLUICtrlFactory::getWebBrowserCtrlByName(live_help_floater, "lsl_guide_html"); - browser->setAlwaysRefresh(TRUE); -+#endif // LL_LIBXUL_ENABLED - - LLComboBox* help_combo = LLUICtrlFactory::getComboBoxByName(live_help_floater, "history_combo"); - LLKeywordToken *token; -@@ -680,6 +686,7 @@ - //static - void LLScriptEdCore::onClickBack(void* userdata) - { -+#if LL_LIBXUL_ENABLED - LLScriptEdCore* corep = (LLScriptEdCore*)userdata; - LLFloater* live_help_floater = LLFloater::getFloaterByHandle(corep->mLiveHelpHandle); - if (live_help_floater) -@@ -690,11 +697,13 @@ - browserp->navigateBack(); - } - } -+#endif // LL_LIBXUL_ENABLED - } - - //static - void LLScriptEdCore::onClickForward(void* userdata) - { -+#if LL_LIBXUL_ENABLED - LLScriptEdCore* corep = (LLScriptEdCore*)userdata; - LLFloater* live_help_floater = LLFloater::getFloaterByHandle(corep->mLiveHelpHandle); - if (live_help_floater) -@@ -705,6 +714,7 @@ - browserp->navigateForward(); - } - } -+#endif // LL_LIBXUL_ENABLED - } - - // static -@@ -737,16 +747,17 @@ - LLFloater* live_help_floater = LLFloater::getFloaterByHandle(corep->mLiveHelpHandle); - if (live_help_floater) - { -- LLWebBrowserCtrl* web_browser = gUICtrlFactory->getWebBrowserCtrlByName(live_help_floater, "lsl_guide_html"); -- - LLString help_string = ctrl->getValue().asString(); - - corep->addHelpItemToHistory(help_string); - -+#if LL_LIBXUL_ENABLED -+ LLWebBrowserCtrl* web_browser = gUICtrlFactory->getWebBrowserCtrlByName(live_help_floater, "lsl_guide_html"); - LLUIString url_string = gSavedSettings.getString("LSLHelpURL"); - url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir()); - url_string.setArg("[LSL_STRING]", help_string); - web_browser->navigateTo(url_string); -+#endif // LL_LIBXUL_ENABLED - } - } - |