diff options
Diffstat (limited to 'games-simulation/secondlife/files/secondlife-1.18.5.3-gentoo.patch')
| -rw-r--r-- | games-simulation/secondlife/files/secondlife-1.18.5.3-gentoo.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/games-simulation/secondlife/files/secondlife-1.18.5.3-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.18.5.3-gentoo.patch new file mode 100644 index 0000000..7c8c6e2 --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.18.5.3-gentoo.patch @@ -0,0 +1,107 @@ +diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct +--- linden.orig/indra/SConstruct 2007-11-30 07:47:10.000000000 +0900 ++++ linden/indra/SConstruct 2008-01-29 00:35:06.000000000 +0900 +@@ -112,7 +112,7 @@ + channel = optenv['CHANNEL'] + standalone = optenv['STANDALONE'] + opensource = standalone or optenv['OPENSOURCE'] +-enable_fmod = not opensource and optenv['FMOD'] ++enable_fmod = optenv['FMOD'] + elfio = optenv['ELFIO'] + + targets = [ target_param ] +@@ -135,6 +135,7 @@ + 'gdk-pixbuf-2.0', + 'glib-2.0', + 'gmodule-2.0', ++ 'gthread-2.0', + 'gtk+-2.0', + 'libpng', + 'pango', +@@ -155,6 +156,9 @@ + 'libssl', + ] + ++if enable_gstreamer: ++ standalone_pkgs += [ 'gstreamer-0.10' ] ++ + def pkgconfig(opt, pkgs=None): + if pkgs is None: + pkgs = standalone_pkgs + standalone_net_pkgs +@@ -243,7 +247,7 @@ + ############## + + # Generic GCC flags +- cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions ' ++ cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions ' + cxxflags = '' + cppflags = '-D_FORTIFY_SOURCE=2 ' + if standalone: +diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp +--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-11-30 07:47:11.000000000 +0900 ++++ linden/indra/llimagej2coj/llimagej2coj.cpp 2008-01-29 00:34:21.000000000 +0900 +@@ -33,7 +33,7 @@ + #include "llimagej2coj.h" + + // this is defined so that we get static linking. +-#include "openjpeg/openjpeg.h" ++#include "openjpeg.h" + + #include "lltimer.h" + #include "llmemory.h" +diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquaternion.cpp +--- linden.orig/indra/llmath/llquaternion.cpp 2007-11-30 07:47:11.000000000 +0900 ++++ linden/indra/llmath/llquaternion.cpp 2008-01-29 00:34:21.000000000 +0900 +@@ -698,22 +698,22 @@ + { + default: + case LLQuaternion::XYZ: +- p = "XYZ"; ++ strcpy(p, "XYZ"); + break; + case LLQuaternion::YZX: +- p = "YZX"; ++ strcpy(p, "YZX"); + break; + case LLQuaternion::ZXY: +- p = "ZXY"; ++ strcpy(p, "ZXY"); + break; + case LLQuaternion::XZY: +- p = "XZY"; ++ strcpy(p, "XZY"); + break; + case LLQuaternion::YXZ: +- p = "YXZ"; ++ strcpy(p, "YXZ"); + break; + case LLQuaternion::ZYX: +- p = "ZYX"; ++ strcpy(p, "ZYX"); + break; + } + return p; +diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp +--- linden.orig/indra/llwindow/llgl.cpp 2007-11-30 07:47:12.000000000 +0900 ++++ linden/indra/llwindow/llgl.cpp 2008-01-29 00:34:21.000000000 +0900 +@@ -64,7 +64,7 @@ + # include "GL/glxext.h" + // Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol + // is considered 'legacy' but works on more machines. +-# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p)) ++# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddress((const GLubyte*)(p)) + #endif // LL_LINUX && !LL_MESA_HEADLESS + + +diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp +--- linden.orig/indra/newview/llvoiceclient.cpp 2007-11-30 07:47:17.000000000 +0900 ++++ linden/indra/newview/llvoiceclient.cpp 2008-01-29 00:34:21.000000000 +0900 +@@ -39,7 +39,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 |