diff options
| -rw-r--r-- | games-simulation/secondlife-bin/Manifest | 16 | ||||
| -rw-r--r-- | games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.0.2 | 3 | ||||
| -rw-r--r-- | games-simulation/secondlife-bin/files/digest-secondlife-bin-1.16.0.5 | 3 | ||||
| -rw-r--r-- | games-simulation/secondlife-bin/secondlife-bin-1.16.0.5.ebuild (renamed from games-simulation/secondlife-bin/secondlife-bin-1.15.0.2.ebuild) | 0 | ||||
| -rw-r--r-- | games-simulation/secondlife/Manifest | 28 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/digest-secondlife-1.15.0.2 | 9 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/digest-secondlife-1.16.0.5 | 9 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/secondlife-1.15.0.2-gentoo.patch | 226 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/secondlife-1.15.0.2-mozlib.patch | 193 | ||||
| -rw-r--r-- | games-simulation/secondlife/secondlife-1.16.0.5.ebuild (renamed from games-simulation/secondlife/secondlife-1.15.0.2.ebuild) | 9 |
10 files changed, 34 insertions, 462 deletions
diff --git a/games-simulation/secondlife-bin/Manifest b/games-simulation/secondlife-bin/Manifest index b012922..95bc931 100644 --- a/games-simulation/secondlife-bin/Manifest +++ b/games-simulation/secondlife-bin/Manifest @@ -1,16 +1,16 @@ -DIST SecondLife_i686_1_15_0_2.tar.bz2 50046039 RMD160 b752559cef6e7051f0e441f009afd8596cdaffdc SHA1 c9b5dbf260f439958abcdd25c01be96953ba1093 SHA256 8f502ae879de27ee697ac6f5bea25a633a9d6deb53798fb9a0eeb96dcfd16c3f 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 +DIST SecondLife_i686_1_16_0_5.tar.bz2 50251067 RMD160 23001ee6e83be395015b4ec4bed0820468369f4c SHA1 ff725d7a395c139ef4a57d42bf07159196898886 SHA256 7de558121d764c22513b19be03e96ed5f0b49033515f29cd6431a54cc9b913a2 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 +EBUILD secondlife-bin-1.16.0.5.ebuild 2200 RMD160 11098688d6171af589aaed3724f1de9b03b2a022 SHA1 2459959d3ab1a6c9cf6aaaf7bf2358a2407b07e2 SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 +MD5 9d1aeab169fa26a6c8b540a026d701f5 secondlife-bin-1.16.0.5.ebuild 2200 +RMD160 11098688d6171af589aaed3724f1de9b03b2a022 secondlife-bin-1.16.0.5.ebuild 2200 +SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 secondlife-bin-1.16.0.5.ebuild 2200 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 +MD5 0f2241d1024c618c268da984582f477b files/digest-secondlife-bin-1.16.0.5 283 +RMD160 c8a1f838069029ab71067b070daef3996f5d3035 files/digest-secondlife-bin-1.16.0.5 283 +SHA256 f8ee187a5526e940e37edf23cd730d21c6c90d195112e6ee7ecc29617ad1fcac files/digest-secondlife-bin-1.16.0.5 283 diff --git a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.0.2 b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.0.2 deleted file mode 100644 index 8835acb..0000000 --- a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.0.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8d66a1e1bf8810354f214f7f51058ab7 SecondLife_i686_1_15_0_2.tar.bz2 50046039 -RMD160 b752559cef6e7051f0e441f009afd8596cdaffdc SecondLife_i686_1_15_0_2.tar.bz2 50046039 -SHA256 8f502ae879de27ee697ac6f5bea25a633a9d6deb53798fb9a0eeb96dcfd16c3f SecondLife_i686_1_15_0_2.tar.bz2 50046039 diff --git a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.16.0.5 b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.16.0.5 new file mode 100644 index 0000000..2387b76 --- /dev/null +++ b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.16.0.5 @@ -0,0 +1,3 @@ +MD5 b144ac5339996ff54dcdfe53f15dab8f SecondLife_i686_1_16_0_5.tar.bz2 50251067 +RMD160 23001ee6e83be395015b4ec4bed0820468369f4c SecondLife_i686_1_16_0_5.tar.bz2 50251067 +SHA256 7de558121d764c22513b19be03e96ed5f0b49033515f29cd6431a54cc9b913a2 SecondLife_i686_1_16_0_5.tar.bz2 50251067 diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.15.0.2.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.16.0.5.ebuild index cba9670..cba9670 100644 --- a/games-simulation/secondlife-bin/secondlife-bin-1.15.0.2.ebuild +++ b/games-simulation/secondlife-bin/secondlife-bin-1.16.0.5.ebuild diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest index b7e4bb4..bfbdbe0 100644 --- a/games-simulation/secondlife/Manifest +++ b/games-simulation/secondlife/Manifest @@ -6,35 +6,27 @@ AUX opensecondlife-svn41.patch 635 RMD160 4ff31d0a2e52c2ccfa6f5591e0e6e464716096 MD5 23d4c1db16f9351dc2d190120d1962b4 files/opensecondlife-svn41.patch 635 RMD160 4ff31d0a2e52c2ccfa6f5591e0e6e46471609690 files/opensecondlife-svn41.patch 635 SHA256 100a42a60f46bc6abd8b2d77ae81ee2d4ea56edcfabb1ab00b589ce0d9314bce files/opensecondlife-svn41.patch 635 -AUX secondlife-1.15.0.2-gentoo.patch 8904 RMD160 d0286837a9be61eb2116902bceb3a6faf43a640a SHA1 cfb2a483c8ea1916d6a5f421ed1940b6dcdb6a50 SHA256 d1e442d29d60e87b9beae1c57d72b698b8bf6b9f16051d8915ce6dbc39a0fbf2 -MD5 7b1bbe9ce14f5bc4342cb7c749c06d57 files/secondlife-1.15.0.2-gentoo.patch 8904 -RMD160 d0286837a9be61eb2116902bceb3a6faf43a640a files/secondlife-1.15.0.2-gentoo.patch 8904 -SHA256 d1e442d29d60e87b9beae1c57d72b698b8bf6b9f16051d8915ce6dbc39a0fbf2 files/secondlife-1.15.0.2-gentoo.patch 8904 -AUX secondlife-1.15.0.2-mozlib.patch 6060 RMD160 24ecb4ac17df2c8dd899129b57ce9e17d62f22dc SHA1 93d23f7b977b5e5a38b3e0936799d48ecac2c4ad SHA256 4923747aefd3f271cb97db43d6a4a2e8f3a93a0cc578abe1635fd63befb72a4f -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-artwork-1.16.0.5.zip 24682087 RMD160 4451964fefb7c6d27b1723a66f6e1ca0d2c13507 SHA1 9f234f9e4a35b3a7413137de6552a3387f92c822 SHA256 59736b77b9e0ce15f73241e1b8fe0da71ccadc82f85bee8ffe6f544010fd56ca 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-linux-libs-1.16.0.5.tar.gz 26780131 RMD160 ad559681ad92171211fb446e716f32f00c33e216 SHA1 996cb284db0ee4d310d144552f3f3a1590453baf SHA256 025938ba1fafa75b67cde1b6d8b523e4927154b52c7436c0fc12a8e4f25fa99a 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 +DIST slviewer-src-1.16.0.5.tar.gz 5081284 RMD160 80b7554836fdaf3ec16de728c7004b5e87c0aac2 SHA1 357913ed82e7622c955223a6d38ec3b23f1f974f SHA256 e2899f31c54ef11bf747fed9a5433fa5bfdc31110f8cfc78134f06aea4f488ca 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 +EBUILD secondlife-1.16.0.5.ebuild 3458 RMD160 c0181a3d3b07390a2dd36233c5ec34911c03f3da SHA1 2055d9a90f2d35ab2d3056c1efed69031c76faad SHA256 dbc4ded7de05742a55c12e808b7a366c9fdd39346c71f1a1f8ea5a04a95fcd5f +MD5 52b33ff57c5feb56dd643e484096043a secondlife-1.16.0.5.ebuild 3458 +RMD160 c0181a3d3b07390a2dd36233c5ec34911c03f3da secondlife-1.16.0.5.ebuild 3458 +SHA256 dbc4ded7de05742a55c12e808b7a366c9fdd39346c71f1a1f8ea5a04a95fcd5f secondlife-1.16.0.5.ebuild 3458 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 +MD5 9cf0eda601af1be10cfcfb92b0d247eb files/digest-secondlife-1.16.0.5 834 +RMD160 a5ed170d6ba7deef00669bc9b542c7244bbf2411 files/digest-secondlife-1.16.0.5 834 +SHA256 806a34e661b0a6a30e5a0197646066adc9bf173e3e06d798cd6cb86a5ba60455 files/digest-secondlife-1.16.0.5 834 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 - } - } - diff --git a/games-simulation/secondlife/secondlife-1.15.0.2.ebuild b/games-simulation/secondlife/secondlife-1.16.0.5.ebuild index 3b8dbff..885dcc7 100644 --- a/games-simulation/secondlife/secondlife-1.15.0.2.ebuild +++ b/games-simulation/secondlife/secondlife-1.16.0.5.ebuild @@ -6,9 +6,9 @@ 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/04/slviewer-src-${PV}.tar.gz - http://secondlife.com/developers/opensource/downloads/2007/04/slviewer-artwork-${PV}.zip - http://secondlife.com/developers/opensource/downloads/2007/04/slviewer-linux-libs-${PV}.tar.gz" +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" @@ -63,8 +63,7 @@ src_unpack() { # opensecondlife.com epatch "${FILESDIR}"/opensecondlife-svn41.patch - epatch "${FILESDIR}"/${P}-mozlib.patch - epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${PN}-1.15.1.3-gentoo.patch cd "${S}"/llwindow/ epatch "${FILESDIR}"/llwindowssdl_16bit_depth.patch |