diff options
author | 2007-05-15 15:21:30 +0000 | |
---|---|---|
committer | 2007-05-15 15:21:30 +0000 | |
commit | a4d89bff97c29c94a8f634dc309e5ed53574c74c (patch) | |
tree | a4619c8d1273e3bc9243404307d760e05b3eddee | |
parent | Fixed compile issue on amd64. (diff) | |
download | secondlife-a4d89bff97c29c94a8f634dc309e5ed53574c74c.tar.gz secondlife-a4d89bff97c29c94a8f634dc309e5ed53574c74c.tar.bz2 secondlife-a4d89bff97c29c94a8f634dc309e5ed53574c74c.zip |
Version bumped.
svn path=/secondlife/; revision=12
-rw-r--r-- | games-simulation/secondlife-bin/Manifest | 16 | ||||
-rw-r--r-- | games-simulation/secondlife-bin/files/digest-secondlife-bin-1.14.0.1 | 3 | ||||
-rw-r--r-- | games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.1.3 | 3 | ||||
-rw-r--r-- | games-simulation/secondlife-bin/secondlife-bin-1.15.1.3.ebuild (renamed from games-simulation/secondlife-bin/secondlife-bin-1.14.0.1.ebuild) | 0 | ||||
-rw-r--r-- | games-simulation/secondlife/Manifest | 14 | ||||
-rw-r--r-- | games-simulation/secondlife/files/digest-secondlife-1.15.1.3 | 9 | ||||
-rw-r--r-- | games-simulation/secondlife/files/secondlife-1.15.1.3-gentoo.patch | 197 | ||||
-rw-r--r-- | games-simulation/secondlife/secondlife-1.15.1.3.ebuild | 133 |
8 files changed, 364 insertions, 11 deletions
diff --git a/games-simulation/secondlife-bin/Manifest b/games-simulation/secondlife-bin/Manifest index 64644ca..b012922 100644 --- a/games-simulation/secondlife-bin/Manifest +++ b/games-simulation/secondlife-bin/Manifest @@ -1,16 +1,16 @@ -DIST SecondLife_i686_1_14_0_1.tar.bz2 50045886 RMD160 a72d8d60f6e1caedfb1469cd599a8e8725bf8406 SHA1 419fe3b376b7434c8f899b56e76be8123d1728eb SHA256 68a04f151fb0970ce4e9826c8a21e788062c39ab6e9d50215e60956397d307e9 DIST SecondLife_i686_1_15_0_2.tar.bz2 50046039 RMD160 b752559cef6e7051f0e441f009afd8596cdaffdc SHA1 c9b5dbf260f439958abcdd25c01be96953ba1093 SHA256 8f502ae879de27ee697ac6f5bea25a633a9d6deb53798fb9a0eeb96dcfd16c3f -EBUILD secondlife-bin-1.14.0.1.ebuild 2200 RMD160 11098688d6171af589aaed3724f1de9b03b2a022 SHA1 2459959d3ab1a6c9cf6aaaf7bf2358a2407b07e2 SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 -MD5 9d1aeab169fa26a6c8b540a026d701f5 secondlife-bin-1.14.0.1.ebuild 2200 -RMD160 11098688d6171af589aaed3724f1de9b03b2a022 secondlife-bin-1.14.0.1.ebuild 2200 -SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 secondlife-bin-1.14.0.1.ebuild 2200 +DIST SecondLife_i686_1_15_1_3.tar.bz2 50243675 RMD160 212a5008a31387b21fc5dc78d6a2310a879709b7 SHA1 b1a4a7d45bd40cc6b8420c46d4aa1ca3a2060d57 SHA256 f41512cb5cb6aafea67cea9e684e1c38d65f7376b0b4d73d87ef485b90667a0d EBUILD secondlife-bin-1.15.0.2.ebuild 2200 RMD160 11098688d6171af589aaed3724f1de9b03b2a022 SHA1 2459959d3ab1a6c9cf6aaaf7bf2358a2407b07e2 SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 MD5 9d1aeab169fa26a6c8b540a026d701f5 secondlife-bin-1.15.0.2.ebuild 2200 RMD160 11098688d6171af589aaed3724f1de9b03b2a022 secondlife-bin-1.15.0.2.ebuild 2200 SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 secondlife-bin-1.15.0.2.ebuild 2200 -MD5 b1f02d4f4acc11ee89133583a8bd0ff6 files/digest-secondlife-bin-1.14.0.1 283 -RMD160 bc2977e154062f2c5954c28819c6230b3491f247 files/digest-secondlife-bin-1.14.0.1 283 -SHA256 8c64b44e94ae38fefca4f8dea89c58de562407826c24d148ce4876cb33a5f26e files/digest-secondlife-bin-1.14.0.1 283 +EBUILD secondlife-bin-1.15.1.3.ebuild 2200 RMD160 11098688d6171af589aaed3724f1de9b03b2a022 SHA1 2459959d3ab1a6c9cf6aaaf7bf2358a2407b07e2 SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 +MD5 9d1aeab169fa26a6c8b540a026d701f5 secondlife-bin-1.15.1.3.ebuild 2200 +RMD160 11098688d6171af589aaed3724f1de9b03b2a022 secondlife-bin-1.15.1.3.ebuild 2200 +SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 secondlife-bin-1.15.1.3.ebuild 2200 MD5 3c6e4e18e415acff764c491005c53aad files/digest-secondlife-bin-1.15.0.2 283 RMD160 55144a321278d96b8eee8b940de0b2517a578586 files/digest-secondlife-bin-1.15.0.2 283 SHA256 481e9610d6083c2dba7efa515134b43aa0162409ec772196819e4f77a94f001f files/digest-secondlife-bin-1.15.0.2 283 +MD5 c8a6622bbeaafa9006573ad576de1d76 files/digest-secondlife-bin-1.15.1.3 283 +RMD160 13b762657d860833ebdd26ca8b559707172c8174 files/digest-secondlife-bin-1.15.1.3 283 +SHA256 f0b6d1b6e5e840171138f656f8794f89f253fe52fc19df773fa4e356aeb614ad files/digest-secondlife-bin-1.15.1.3 283 diff --git a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.14.0.1 b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.14.0.1 deleted file mode 100644 index afef6e7..0000000 --- a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.14.0.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e5c42aee25e0e7baa788a8bbedb8908c SecondLife_i686_1_14_0_1.tar.bz2 50045886 -RMD160 a72d8d60f6e1caedfb1469cd599a8e8725bf8406 SecondLife_i686_1_14_0_1.tar.bz2 50045886 -SHA256 68a04f151fb0970ce4e9826c8a21e788062c39ab6e9d50215e60956397d307e9 SecondLife_i686_1_14_0_1.tar.bz2 50045886 diff --git a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.1.3 b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.1.3 new file mode 100644 index 0000000..91f49ca --- /dev/null +++ b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.1.3 @@ -0,0 +1,3 @@ +MD5 38f02ae5db165df7987a8411082a5d9d SecondLife_i686_1_15_1_3.tar.bz2 50243675 +RMD160 212a5008a31387b21fc5dc78d6a2310a879709b7 SecondLife_i686_1_15_1_3.tar.bz2 50243675 +SHA256 f41512cb5cb6aafea67cea9e684e1c38d65f7376b0b4d73d87ef485b90667a0d SecondLife_i686_1_15_1_3.tar.bz2 50243675 diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.14.0.1.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.15.1.3.ebuild index cba9670..cba9670 100644 --- a/games-simulation/secondlife-bin/secondlife-bin-1.14.0.1.ebuild +++ b/games-simulation/secondlife-bin/secondlife-bin-1.15.1.3.ebuild diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest index 7771f13..b7e4bb4 100644 --- a/games-simulation/secondlife/Manifest +++ b/games-simulation/secondlife/Manifest @@ -14,13 +14,27 @@ AUX secondlife-1.15.0.2-mozlib.patch 6060 RMD160 24ecb4ac17df2c8dd899129b57ce9e1 MD5 8f75b5f0d2fe6913a46f6e760d7c02fe files/secondlife-1.15.0.2-mozlib.patch 6060 RMD160 24ecb4ac17df2c8dd899129b57ce9e17d62f22dc files/secondlife-1.15.0.2-mozlib.patch 6060 SHA256 4923747aefd3f271cb97db43d6a4a2e8f3a93a0cc578abe1635fd63befb72a4f files/secondlife-1.15.0.2-mozlib.patch 6060 +AUX secondlife-1.15.1.3-gentoo.patch 7590 RMD160 b446228bd65cfa6997027bae094a07dbfd78070e SHA1 0b003fb027661a0fb12b64d0c54d757e88adcff2 SHA256 a7fae42856653480c11a03c2a7df8d6d4c82d6aab8b687475007af5717637798 +MD5 6f5b5127d48631c4a2e36ed37fc89ff7 files/secondlife-1.15.1.3-gentoo.patch 7590 +RMD160 b446228bd65cfa6997027bae094a07dbfd78070e files/secondlife-1.15.1.3-gentoo.patch 7590 +SHA256 a7fae42856653480c11a03c2a7df8d6d4c82d6aab8b687475007af5717637798 files/secondlife-1.15.1.3-gentoo.patch 7590 DIST slviewer-artwork-1.15.0.2.zip 24711017 RMD160 7a43bd0c72d20db701c4a9646dde41eae3cfc151 SHA1 97231fe3c589bc582390843ad997d0e1607b13fd SHA256 4c63d01a4377515a6030fdf1ed8ac11a66df93199c1eaf4087d1e9d9168e242d +DIST slviewer-artwork-1.15.1.3.zip 24682087 RMD160 168bba3f46b381adf052cf77c7fed0ddafb57183 SHA1 332031aa85ddd69b84a260eff729ee11047108c3 SHA256 cec10f08073ff3d6182e7e41bb60d13d8005e4484574d6dc7d0b9ca55fe7e562 DIST slviewer-linux-libs-1.15.0.2.tar.gz 26593326 RMD160 45651188a6e15510fec85f9f15efd9b2eec56481 SHA1 ca6c25d111c77bef8525b3abc4318798c6d8a3dd SHA256 81ed4b90a65690916891d758fa72839c0aeb32bbecfe3af6416b009011bfc65f +DIST slviewer-linux-libs-1.15.1.3.tar.gz 26786220 RMD160 b06597f3bfa0750fd6559431539f4878d51e3be0 SHA1 f7b6b179efc58374eee9eb83f051fca2ecae4524 SHA256 16a62e259b16e1426566fa5e55907c7f784f92533c68d92a872889129c4df774 DIST slviewer-src-1.15.0.2.tar.gz 5048294 RMD160 2f15ff2a12935b5ac0bf59f90c026466f7037e4f SHA1 10a0f66a46376e669a4dab55d5a3ec0529e09bde SHA256 4904ce2a2e3036aabf73b4f6dabf5d51cad35b722245c44f9d59bf841599acd9 +DIST slviewer-src-1.15.1.3.tar.gz 5077465 RMD160 cc4f49e09a92aadfd4ea9e95694be30bc6e588d8 SHA1 fe8cb2b475f5395809d6f4bab17817a7209226a2 SHA256 dcac67c84681e32d31baf926ded912823b19570e54d92770371db069c740a3e9 EBUILD secondlife-1.15.0.2.ebuild 3488 RMD160 c346ff3c9aa5b0910a11cf5ee4b7f1cef5968880 SHA1 a8bb5d49483f5f321b873b0d4d59343c50a8c26e SHA256 023c08341252a4e7a76827041e7ced866b387e93be6e5f99c0f37944212a3a7a MD5 f3ae37150239c669f6c066de7c520f8b secondlife-1.15.0.2.ebuild 3488 RMD160 c346ff3c9aa5b0910a11cf5ee4b7f1cef5968880 secondlife-1.15.0.2.ebuild 3488 SHA256 023c08341252a4e7a76827041e7ced866b387e93be6e5f99c0f37944212a3a7a secondlife-1.15.0.2.ebuild 3488 +EBUILD secondlife-1.15.1.3.ebuild 3448 RMD160 0387414804dcd1616a7e8a30b6c55cc4a61e7f63 SHA1 76df7be666160444a18959a98b74b271c47d5e37 SHA256 0c08a59204df177a1647b8146db5e0297887695ae923bee716041a1cd9814f2a +MD5 a71701f69910bcf9d92a32b5dfc2d31e secondlife-1.15.1.3.ebuild 3448 +RMD160 0387414804dcd1616a7e8a30b6c55cc4a61e7f63 secondlife-1.15.1.3.ebuild 3448 +SHA256 0c08a59204df177a1647b8146db5e0297887695ae923bee716041a1cd9814f2a secondlife-1.15.1.3.ebuild 3448 MD5 593847c5a0066bc89031fea0d98cf6b7 files/digest-secondlife-1.15.0.2 834 RMD160 35d441b65186f9514840d7e3e18a32e9db834c7a files/digest-secondlife-1.15.0.2 834 SHA256 d85e3cf9e4a496c8e5f7927441194e23e08ebd1cb8c0483f15bb9bf6d2dad800 files/digest-secondlife-1.15.0.2 834 +MD5 b502c80c45f8e9b1ad5883e6367cb09c files/digest-secondlife-1.15.1.3 834 +RMD160 ffdcba426c01e16ab0c3b1d70c0bc34799375870 files/digest-secondlife-1.15.1.3 834 +SHA256 0e9936e0b4ac96b5d6597ed96092698e6267f5b833e42162decad4049ca76b76 files/digest-secondlife-1.15.1.3 834 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.15.1.3 b/games-simulation/secondlife/files/digest-secondlife-1.15.1.3 new file mode 100644 index 0000000..becd56e --- /dev/null +++ b/games-simulation/secondlife/files/digest-secondlife-1.15.1.3 @@ -0,0 +1,9 @@ +MD5 b31777092081af536360fbb9f39e512b slviewer-artwork-1.15.1.3.zip 24682087 +RMD160 168bba3f46b381adf052cf77c7fed0ddafb57183 slviewer-artwork-1.15.1.3.zip 24682087 +SHA256 cec10f08073ff3d6182e7e41bb60d13d8005e4484574d6dc7d0b9ca55fe7e562 slviewer-artwork-1.15.1.3.zip 24682087 +MD5 f8dec874e6bd2764a3ef3700827bcbf3 slviewer-linux-libs-1.15.1.3.tar.gz 26786220 +RMD160 b06597f3bfa0750fd6559431539f4878d51e3be0 slviewer-linux-libs-1.15.1.3.tar.gz 26786220 +SHA256 16a62e259b16e1426566fa5e55907c7f784f92533c68d92a872889129c4df774 slviewer-linux-libs-1.15.1.3.tar.gz 26786220 +MD5 dc815e6de1d63af137017252bbeb9b78 slviewer-src-1.15.1.3.tar.gz 5077465 +RMD160 cc4f49e09a92aadfd4ea9e95694be30bc6e588d8 slviewer-src-1.15.1.3.tar.gz 5077465 +SHA256 dcac67c84681e32d31baf926ded912823b19570e54d92770371db069c740a3e9 slviewer-src-1.15.1.3.tar.gz 5077465 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 new file mode 100644 index 0000000..111fea4 --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.15.1.3-gentoo.patch @@ -0,0 +1,197 @@ +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/secondlife-1.15.1.3.ebuild b/games-simulation/secondlife/secondlife-1.15.1.3.ebuild new file mode 100644 index 0000000..e94c9e7 --- /dev/null +++ b/games-simulation/secondlife/secondlife-1.15.1.3.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +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/05/slviewer-src-${PV}.tar.gz + http://secondlife.com/developers/opensource/downloads/2007/05/slviewer-artwork-${PV}.zip + http://secondlife.com/developers/opensource/downloads/2007/05/slviewer-linux-libs-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="fmod" +#IUSE="fmod llmozlib" +RESTRICT="mirror" + +RDEPEND=">=x11-libs/gtk+-2 + =dev-libs/apr-1* + =dev-libs/apr-util-1* + dev-libs/boost + >=net-misc/curl-7.15.4 + dev-libs/openssl + media-libs/freetype + media-libs/jpeg + media-libs/libsdl + media-libs/mesa + media-libs/libogg + media-libs/libvorbis + fmod? ( x86? ( =media-libs/fmod-3.75* ) ) + =sys-libs/db-4.2* + dev-libs/expat + sys-libs/zlib + >=dev-libs/xmlrpc-epi-0.51 + dev-libs/elfio + >=media-libs/openjpeg-1.1.1 + media-fonts/kochi-substitute" +# llmozlib? ( net-libs/llmozlib-xulrunner ) + +DEPEND="${RDEPEND} + dev-util/scons + dev-util/pkgconfig + sys-devel/flex + sys-devel/bison" + +S="${WORKDIR}/linden/indra" + +dir="${GAMES_DATADIR}/${PN}" + +src_unpack() { + # unpack font files + unpack slviewer-linux-libs-${PV}.tar.gz + rm -rf linden/libraries + rm -rf linden/indra/newview/app_settings + + unpack slviewer-src-${PV}.tar.gz + unpack slviewer-artwork-${PV}.zip + + cd "${S}" + + # opensecondlife.com + epatch "${FILESDIR}"/opensecondlife-svn41.patch + + epatch "${FILESDIR}"/${P}-gentoo.patch + + cd "${S}"/llwindow/ + epatch "${FILESDIR}"/llwindowssdl_16bit_depth.patch + + sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" "${S}"/SConstruct || die + + # "${S}"/newview/viewer_manifest.py + touch "${S}"/newview/gridargs.dat +} + +src_compile() { + local myopts="BUILD=release BTARGET=client DISTCC=no" + + # if use llmozlib ; then + # myopts="${myopts} MOZLIB=yes" + # else + myopts="${myopts} MOZLIB=no" + # fi + + 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}"/newview/ + + insinto "${dir}" + 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 + newins linux_tools/client-readme.txt README-linux.txt || die + newins res/ll_icon.ico secondlife.ico || die + + insinto "${dir}"/app_settings/ + doins "${WORKDIR}"/linden/scripts/messages/message_template.msg || die + + exeinto "${dir}" + doexe linux_tools/launch_url.sh || die + newexe linux_tools/wrapper.sh secondlife || die + newexe ../linux_crash_logger/linux-crash-logger-*-bin* linux-crash-logger.bin || die + + exeinto "${dir}"/bin/ + newexe secondlife-*-bin do-not-directly-run-secondlife-bin || die + + keepdir "${dir}"/lib + + dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf /usr/share/games/secondlife/unicode.ttf + + games_make_wrapper secondlife ./secondlife "${dir}" + newicon res/ll_icon.ico secondlife.ico || die + make_desktop_entry secondlife "Second Life" secondlife.ico + + dodoc releasenotes.txt + newdoc licenses-linux.txt licenses.txt + newdoc linux_tools/client-readme.txt README-linux.txt + + dohtml lsl_guide.html + + prepgamesdirs +} |