diff options
author | 2007-04-26 17:10:29 +0000 | |
---|---|---|
committer | 2007-04-26 17:10:29 +0000 | |
commit | bb55d4475a0a62b4bffd00ec644fdacbbb45b789 (patch) | |
tree | 1c46253a510a6458a522be3886211c2ad5676718 | |
parent | Version bumped. Fixed ccache related problem. (diff) | |
download | secondlife-bb55d4475a0a62b4bffd00ec644fdacbbb45b789.tar.gz secondlife-bb55d4475a0a62b4bffd00ec644fdacbbb45b789.tar.bz2 secondlife-bb55d4475a0a62b4bffd00ec644fdacbbb45b789.zip |
Version bumped.
svn path=/secondlife/; revision=9
13 files changed, 533 insertions, 306 deletions
diff --git a/games-simulation/secondlife-bin/Manifest b/games-simulation/secondlife-bin/Manifest index 84ae367..64644ca 100644 --- a/games-simulation/secondlife-bin/Manifest +++ b/games-simulation/secondlife-bin/Manifest @@ -1,16 +1,16 @@ -DIST SecondLife_i686_1_14_0_0.tar.bz2 50045366 RMD160 86abfd7529dc04c54b8152f7c8e1ef565bf98e75 SHA1 93606cab7c47546ecee355429843aa9fb6332c9e SHA256 639cb010a10e09534605daff4a429f7a32ecb7e6d1246bcadbffd9e2115fea91 DIST SecondLife_i686_1_14_0_1.tar.bz2 50045886 RMD160 a72d8d60f6e1caedfb1469cd599a8e8725bf8406 SHA1 419fe3b376b7434c8f899b56e76be8123d1728eb SHA256 68a04f151fb0970ce4e9826c8a21e788062c39ab6e9d50215e60956397d307e9 -EBUILD secondlife-bin-1.14.0.0.ebuild 2200 RMD160 11098688d6171af589aaed3724f1de9b03b2a022 SHA1 2459959d3ab1a6c9cf6aaaf7bf2358a2407b07e2 SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 -MD5 9d1aeab169fa26a6c8b540a026d701f5 secondlife-bin-1.14.0.0.ebuild 2200 -RMD160 11098688d6171af589aaed3724f1de9b03b2a022 secondlife-bin-1.14.0.0.ebuild 2200 -SHA256 74f923651938a1cad98eaf5378fc19d9ad666f0e2f71800515bdbe76eb7fd8d0 secondlife-bin-1.14.0.0.ebuild 2200 +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 -MD5 f11029ee5f994d4200bafc47ff75cffe files/digest-secondlife-bin-1.14.0.0 283 -RMD160 185c0f96743782c46b419f702e8f995231c37eb9 files/digest-secondlife-bin-1.14.0.0 283 -SHA256 2fe10a173fe00a46233647db555e689b000b6c2e55b0d3a0f555358c4a3f11ec files/digest-secondlife-bin-1.14.0.0 283 +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 +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 diff --git a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.14.0.0 b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.14.0.0 deleted file mode 100644 index 4843668..0000000 --- a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.14.0.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 af7f9ed0aecaafc4fef711b0d54e09bf SecondLife_i686_1_14_0_0.tar.bz2 50045366 -RMD160 86abfd7529dc04c54b8152f7c8e1ef565bf98e75 SecondLife_i686_1_14_0_0.tar.bz2 50045366 -SHA256 639cb010a10e09534605daff4a429f7a32ecb7e6d1246bcadbffd9e2115fea91 SecondLife_i686_1_14_0_0.tar.bz2 50045366 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 new file mode 100644 index 0000000..8835acb --- /dev/null +++ b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.15.0.2 @@ -0,0 +1,3 @@ +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/secondlife-bin-1.14.0.0.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.15.0.2.ebuild index cba9670..cba9670 100644 --- a/games-simulation/secondlife-bin/secondlife-bin-1.14.0.0.ebuild +++ b/games-simulation/secondlife-bin/secondlife-bin-1.15.0.2.ebuild diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest index 410937a..6fbd61e 100644 --- a/games-simulation/secondlife/Manifest +++ b/games-simulation/secondlife/Manifest @@ -1,3 +1,7 @@ +AUX llwindowssdl_16bit_depth.patch 1298 RMD160 a95ce90da9e466cee96f80afbc4b182dc1217566 SHA1 b8892f2d734b4a9ababe9dcec19b7b6c80dfd012 SHA256 1b4d67b6d12d6d5f23b393dd11d81d670ff09a2276fbba91161ce4ac60125b98 +MD5 d39398d4cacb5431f042ed6c99c6c810 files/llwindowssdl_16bit_depth.patch 1298 +RMD160 a95ce90da9e466cee96f80afbc4b182dc1217566 files/llwindowssdl_16bit_depth.patch 1298 +SHA256 1b4d67b6d12d6d5f23b393dd11d81d670ff09a2276fbba91161ce4ac60125b98 files/llwindowssdl_16bit_depth.patch 1298 AUX opensecondlife-svn41.patch 635 RMD160 4ff31d0a2e52c2ccfa6f5591e0e6e46471609690 SHA1 03998427597e06ede4d702ab4a91a7c8ae6bf824 SHA256 100a42a60f46bc6abd8b2d77ae81ee2d4ea56edcfabb1ab00b589ce0d9314bce MD5 23d4c1db16f9351dc2d190120d1962b4 files/opensecondlife-svn41.patch 635 RMD160 4ff31d0a2e52c2ccfa6f5591e0e6e46471609690 files/opensecondlife-svn41.patch 635 @@ -6,14 +10,6 @@ AUX secondlife-1.13.3.2-llimagej2coj_debug.patch 3795 RMD160 4a0bd6cb16e1b35b445 MD5 3b6706a0439c55c02e0d86acd4f495d1 files/secondlife-1.13.3.2-llimagej2coj_debug.patch 3795 RMD160 4a0bd6cb16e1b35b445b2a61e7d7e372cdcd4450 files/secondlife-1.13.3.2-llimagej2coj_debug.patch 3795 SHA256 d1d16728aa2ebfac50b0563aa57a2f03d8e3dfd12f0fc10c2c2d3e99bcec28ca files/secondlife-1.13.3.2-llimagej2coj_debug.patch 3795 -AUX secondlife-1.13.3.59315-no_fmod.patch 1146 RMD160 6c9a0f3f2c60fc9dcd7bf89e89c878caa4f730f7 SHA1 ed09cfb98608f530df3286e4d0e2b517821dcd6d SHA256 56a9cf153a2dc18c0527e6c2fed0645f57a542a7ab0990fad333542ebeee2a78 -MD5 29bf4466ac67b38cad15439d87d4f888 files/secondlife-1.13.3.59315-no_fmod.patch 1146 -RMD160 6c9a0f3f2c60fc9dcd7bf89e89c878caa4f730f7 files/secondlife-1.13.3.59315-no_fmod.patch 1146 -SHA256 56a9cf153a2dc18c0527e6c2fed0645f57a542a7ab0990fad333542ebeee2a78 files/secondlife-1.13.3.59315-no_fmod.patch 1146 -AUX secondlife-1.13.3.59558-gentoo.patch 8462 RMD160 3d2715f60eda6f71a4c0818d2cd3bfe05a1408b6 SHA1 93355329c312b1bb6400e100d159f56b59e96e4d SHA256 c19dc238b3f6217799e1d4a94d722c93a497654d21812185ab9ab832ebaa55f5 -MD5 3beae9383416e21674415afc3e6dba62 files/secondlife-1.13.3.59558-gentoo.patch 8462 -RMD160 3d2715f60eda6f71a4c0818d2cd3bfe05a1408b6 files/secondlife-1.13.3.59558-gentoo.patch 8462 -SHA256 c19dc238b3f6217799e1d4a94d722c93a497654d21812185ab9ab832ebaa55f5 files/secondlife-1.13.3.59558-gentoo.patch 8462 AUX secondlife-1.14.0.1-gentoo.patch 9631 RMD160 1a81ae51d8ade19f12c8130094210abe3979a91e SHA1 31a2b8c9cbec151bf9d6a56dabc1d488bcb864f3 SHA256 ccaa01b2ec2ae7375877c6f196efa46b00120babaa8b5ee490f11d8ddf20a4a4 MD5 9e8042891190fac8c4812b9519f888df files/secondlife-1.14.0.1-gentoo.patch 9631 RMD160 1a81ae51d8ade19f12c8130094210abe3979a91e files/secondlife-1.14.0.1-gentoo.patch 9631 @@ -22,21 +18,30 @@ AUX secondlife-1.14.0.1-llversion.patch 427 RMD160 d69a83076e4d43cb8f94753892c6b MD5 f8808833fd80bb6221f6b669cf43c726 files/secondlife-1.14.0.1-llversion.patch 427 RMD160 d69a83076e4d43cb8f94753892c6bdb144d2823f files/secondlife-1.14.0.1-llversion.patch 427 SHA256 90d6a6867ff8b62f302c9406aa1d4999dd5349cbf947a1eb8645435ef4bc3a7a files/secondlife-1.14.0.1-llversion.patch 427 -DIST slviewer-artwork-1.14.0.0.zip 20005643 RMD160 6ea313fb227e73c853c25754d2e89d2fc289d22a SHA1 0e9e1906097731cd390cbbb6cec521f078c4fb5f SHA256 793111dfebe03eca7c78cc1bed50d4dfa6daf2b70856bc1cc51abb880a3dbea1 +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 DIST slviewer-artwork-1.14.0.1.zip 20005643 RMD160 cb662db2692bcf7e3594104c6f2cf14b2c61dc66 SHA1 ecb5689d014e917de6fc774ce702023c20f2aaeb SHA256 e35fc5632d16e1a229e2d6bd353ca5ad50018c7397b724579a38b1dcddeca77c -DIST slviewer-src-1.14.0.0.tar.gz 9749469 RMD160 6a8113c1ae2fb5447e8e364363ad91b4422209df SHA1 1b3117e3e3702e35731b4155600ba64918456fad SHA256 c2a98c1e8021aa35119d2b486ba4f3c71ab135dde5730c6af9f803a926011b7e +DIST slviewer-artwork-1.15.0.2.zip 24711017 RMD160 7a43bd0c72d20db701c4a9646dde41eae3cfc151 SHA1 97231fe3c589bc582390843ad997d0e1607b13fd SHA256 4c63d01a4377515a6030fdf1ed8ac11a66df93199c1eaf4087d1e9d9168e242d +DIST slviewer-linux-libs-1.15.0.2.tar.gz 26593326 RMD160 45651188a6e15510fec85f9f15efd9b2eec56481 SHA1 ca6c25d111c77bef8525b3abc4318798c6d8a3dd SHA256 81ed4b90a65690916891d758fa72839c0aeb32bbecfe3af6416b009011bfc65f DIST slviewer-src-1.14.0.1.tar.gz 9750313 RMD160 c58d1b0b8800f9acabb8091935edce62c1742606 SHA1 c858c7c68611b74c8b550537ac1a1c0da10939dd SHA256 18905eab642cda5932f4dd6a792c402723c4fa655695b8b7d0ad1372ccad989e -EBUILD secondlife-1.14.0.0.ebuild 3224 RMD160 6e0144577b5413b915237bc6bd21ea3598f4e0d1 SHA1 6746b3b5d4a042f1b0e595abf330731f55c23fcc SHA256 c218afe4b4e02f4f058812dabf886cfbdd5010161935597e487e4e7fff2ffbaf -MD5 9b06c6dbf39e459f98a418ead441a98d secondlife-1.14.0.0.ebuild 3224 -RMD160 6e0144577b5413b915237bc6bd21ea3598f4e0d1 secondlife-1.14.0.0.ebuild 3224 -SHA256 c218afe4b4e02f4f058812dabf886cfbdd5010161935597e487e4e7fff2ffbaf secondlife-1.14.0.0.ebuild 3224 +DIST slviewer-src-1.15.0.2.tar.gz 5048294 RMD160 2f15ff2a12935b5ac0bf59f90c026466f7037e4f SHA1 10a0f66a46376e669a4dab55d5a3ec0529e09bde SHA256 4904ce2a2e3036aabf73b4f6dabf5d51cad35b722245c44f9d59bf841599acd9 EBUILD secondlife-1.14.0.1.ebuild 3190 RMD160 7e6d25aba74ff88ef6f474c5325eeeae3db1c27a SHA1 d28ba750be8f88bea7309fc803380ba95631ac64 SHA256 bb77fad600dfb61f04af8f518deceb6fd819d36ce5afb1af297078c5aa99c581 MD5 d49c2868bbc2f015797e6c553a4b8786 secondlife-1.14.0.1.ebuild 3190 RMD160 7e6d25aba74ff88ef6f474c5325eeeae3db1c27a secondlife-1.14.0.1.ebuild 3190 SHA256 bb77fad600dfb61f04af8f518deceb6fd819d36ce5afb1af297078c5aa99c581 secondlife-1.14.0.1.ebuild 3190 -MD5 95899a80bae2ff5f68b42ddca0de5f0e files/digest-secondlife-1.14.0.0 542 -RMD160 76a8e4217f3397814c635689773f49add730a3e2 files/digest-secondlife-1.14.0.0 542 -SHA256 ec16b717890866c32e47eb47fac62ab1411856f37897d3b0b1e9cf03839116b6 files/digest-secondlife-1.14.0.0 542 +EBUILD secondlife-1.15.0.2.ebuild 3405 RMD160 591404b029da9f887056a4e5d5c00e4bb464dafa SHA1 87631f1539e19b870a09ced2852acea230aa63d7 SHA256 eaf47c9266f1414e30c77c59b9a6c553f4ad542cfc57489789260094347efb13 +MD5 4334c2742beac7142fbdbd3437f3f36e secondlife-1.15.0.2.ebuild 3405 +RMD160 591404b029da9f887056a4e5d5c00e4bb464dafa secondlife-1.15.0.2.ebuild 3405 +SHA256 eaf47c9266f1414e30c77c59b9a6c553f4ad542cfc57489789260094347efb13 secondlife-1.15.0.2.ebuild 3405 MD5 7472ca696355573accfb942f3a18f0d7 files/digest-secondlife-1.14.0.1 542 RMD160 530da94440cf00685dbb411cd7d2804afc129517 files/digest-secondlife-1.14.0.1 542 SHA256 310216f9e613c4ae30ab57ce827877299b750e5dd38aa5c1b145e3708a0d807f files/digest-secondlife-1.14.0.1 542 +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 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.14.0.0 b/games-simulation/secondlife/files/digest-secondlife-1.14.0.0 deleted file mode 100644 index 426f319..0000000 --- a/games-simulation/secondlife/files/digest-secondlife-1.14.0.0 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 77634e083af7edbe3b993643214d47cd slviewer-artwork-1.14.0.0.zip 20005643 -RMD160 6ea313fb227e73c853c25754d2e89d2fc289d22a slviewer-artwork-1.14.0.0.zip 20005643 -SHA256 793111dfebe03eca7c78cc1bed50d4dfa6daf2b70856bc1cc51abb880a3dbea1 slviewer-artwork-1.14.0.0.zip 20005643 -MD5 ec2838441660683942e3f2883f99937c slviewer-src-1.14.0.0.tar.gz 9749469 -RMD160 6a8113c1ae2fb5447e8e364363ad91b4422209df slviewer-src-1.14.0.0.tar.gz 9749469 -SHA256 c2a98c1e8021aa35119d2b486ba4f3c71ab135dde5730c6af9f803a926011b7e slviewer-src-1.14.0.0.tar.gz 9749469 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.15.0.2 b/games-simulation/secondlife/files/digest-secondlife-1.15.0.2 new file mode 100644 index 0000000..059372d --- /dev/null +++ b/games-simulation/secondlife/files/digest-secondlife-1.15.0.2 @@ -0,0 +1,9 @@ +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/llwindowssdl_16bit_depth.patch b/games-simulation/secondlife/files/llwindowssdl_16bit_depth.patch new file mode 100644 index 0000000..9b90e70 --- /dev/null +++ b/games-simulation/secondlife/files/llwindowssdl_16bit_depth.patch @@ -0,0 +1,35 @@ +Index: llwindowsdl.cpp +=================================================================== +RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llwindow/llwindowsdl.cpp,v +retrieving revision 1.1 +diff -u -r1.1 llwindowsdl.cpp +--- llwindowsdl.cpp 28 Feb 2007 04:43:12 -0000 1.1 ++++ llwindowsdl.cpp 28 Feb 2007 04:52:45 -0000 +@@ -393,6 +393,13 @@ + } + + mWindow = SDL_SetVideoMode(width, height, bits, sdlflags | SDL_FULLSCREEN); ++ if (!mWindow) ++ { ++ llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl; ++ llwarns << "createContext: Trying again with 16 bit depth buffer" << llendl; ++ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); ++ mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); ++ } + + if (mWindow) + { +@@ -435,6 +442,13 @@ + + llinfos << "createContext: creating window " << width << "x" << height << "x" << bits << llendl; + mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); ++ if (!mWindow) ++ { ++ llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl; ++ llwarns << "createContext: Trying again with 16 bit depth buffer" << llendl; ++ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); ++ mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); ++ } + + if (!mWindow) + { diff --git a/games-simulation/secondlife/files/secondlife-1.13.3.59315-no_fmod.patch b/games-simulation/secondlife/files/secondlife-1.13.3.59315-no_fmod.patch deleted file mode 100644 index fdcb331..0000000 --- a/games-simulation/secondlife/files/secondlife-1.13.3.59315-no_fmod.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct ---- linden.orig/indra/SConstruct 2007-02-09 15:20:12.000000000 +0900 -+++ linden/indra/SConstruct 2007-02-10 17:06:14.000000000 +0900 -@@ -180,7 +180,7 @@ - # Linux-only flags - flags += '-DLL_LINUX=1 ' - if build_target == 'client': -- flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_X11=1 ' -+ flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_FMOD=0 -DLL_X11=1 ' - flags += '-DLL_GTK=1 ' - client_external_libs += [ 'gtk-x11-2.0', 'elfio' ] - include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ] -@@ -393,7 +393,7 @@ - ################## - output_bin = 'newview/secondlife-' + arch + '-bin' - -- external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'fmod-3.75', 'db-4.2', 'openjpeg' ] -+ external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'db-4.2', 'openjpeg' ] - external_libs.remove('cares') - - internal_libs = [ 'lscript', 'llwindow', 'llrender', 'llprimitive', diff --git a/games-simulation/secondlife/files/secondlife-1.13.3.59558-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.13.3.59558-gentoo.patch deleted file mode 100644 index 39ca2b5..0000000 --- a/games-simulation/secondlife/files/secondlife-1.13.3.59558-gentoo.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct ---- linden.orig/indra/SConstruct 2007-03-22 15:34:54.000000000 +0900 -+++ linden/indra/SConstruct 2007-03-27 01:45:54.000000000 +0900 -@@ -185,13 +185,19 @@ - if build_target == 'client': - flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_X11=1 ' - flags += '-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 == 'yes': -@@ -207,7 +213,7 @@ - ### Build type-specific flags ### - - debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 ' -- release_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 ' -+ release_opts = flags + '-DNDEBUG -DLL_RELEASE=1 ' - releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 ' - releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 ' - -diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp ---- linden.orig/indra/llcommon/llsdserialize_xml.cpp 2007-03-22 15:34:56.000000000 +0900 -+++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -35,7 +35,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-03-22 15:34:56.000000000 +0900 -+++ linden/indra/llcommon/llsys.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -30,7 +30,7 @@ - #include "llsys.h" - - #include <iostream> --#include <zlib/zlib.h> -+#include <zlib.h> - #include "processor.h" - - #if LL_WINDOWS -diff -Naur linden.orig/indra/llimage/llimagejpeg.h linden/indra/llimage/llimagejpeg.h ---- linden.orig/indra/llimage/llimagejpeg.h 2007-03-22 15:34:56.000000000 +0900 -+++ linden/indra/llimage/llimagejpeg.h 2007-03-22 19:13:51.000000000 +0900 -@@ -33,9 +33,8 @@ - #include "llimage.h" - - extern "C" { --#include "jpeglib/jinclude.h" --#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-03-22 15:34:56.000000000 +0900 -+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -30,7 +30,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-03-22 15:34:58.000000000 +0900 -+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -76,7 +76,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-03-22 15:34:58.000000000 +0900 -+++ linden/indra/llmessage/llhttpassetstorage.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -36,7 +36,7 @@ - #include "llvfile.h" - #include "llvfs.h" - --#include "zlib/zlib.h" -+#include "zlib.h" - - const U32 MAX_RUNNING_REQUESTS = 4; - 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-03-22 15:34:58.000000000 +0900 -+++ linden/indra/llrender/llfont.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -30,11 +30,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-03-22 15:35:00.000000000 +0900 -+++ linden/indra/llxml/llxmlnode.h 2007-03-22 19:13:51.000000000 +0900 -@@ -29,7 +29,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-03-22 15:35:00.000000000 +0900 -+++ linden/indra/llxml/llxmlparser.h 2007-03-22 19:13:51.000000000 +0900 -@@ -29,7 +29,7 @@ - #define LL_LLXMLPARSER_H - - #define XML_STATIC --#include "expat/expat.h" -+#include "expat.h" - - class LLXmlParser - { -diff -Naur linden.orig/indra/newview/llfloaterpostcard.cpp linden/indra/newview/llfloaterpostcard.cpp ---- linden.orig/indra/newview/llfloaterpostcard.cpp 2007-03-22 15:35:12.000000000 +0900 -+++ linden/indra/newview/llfloaterpostcard.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -237,7 +237,7 @@ - { - } - // *TODO define custom uploadFailed here so it's not such a generic message -- void LLSendPostcardResponder::uploadComplete(const LLSD& content) -+ void uploadComplete(const LLSD& content) - { - // we don't care about what the server returns from this post, just clean up the UI - LLUploadDialog::modalUploadFinished(); -diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp ---- linden.orig/indra/newview/lluserauth.cpp 2007-03-22 15:35:09.000000000 +0900 -+++ linden/indra/newview/lluserauth.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -40,7 +40,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-03-22 15:35:11.000000000 +0900 -+++ linden/indra/newview/llviewerobjectlist.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -60,7 +60,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-03-22 15:35:05.000000000 +0900 -+++ linden/indra/newview/llwebbrowserctrl.h 2007-03-22 19:28:32.000000000 +0900 -@@ -91,6 +91,7 @@ - #include "lldynamictexture.h" - #include "llmozlib.h" - -+class LLUICtrlFactory; - class LLViewBorder; - class LLWebBrowserTexture; - -@@ -239,7 +240,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-03-22 15:35:10.000000000 +0900 -+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-03-22 19:13:51.000000000 +0900 -@@ -33,7 +33,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-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.15.0.2-gentoo.patch new file mode 100644 index 0000000..d9bc40c --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.15.0.2-gentoo.patch @@ -0,0 +1,226 @@ +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 new file mode 100644 index 0000000..85a4ddd --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.15.0.2-mozlib.patch @@ -0,0 +1,193 @@ +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.14.0.0.ebuild b/games-simulation/secondlife/secondlife-1.15.0.2.ebuild index d27a352..d8d4391 100644 --- a/games-simulation/secondlife/secondlife-1.14.0.0.ebuild +++ b/games-simulation/secondlife/secondlife-1.15.0.2.ebuild @@ -6,14 +6,15 @@ 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/03/slviewer-src-${PV}.tar.gz - http://secondlife.com/developers/opensource/downloads/2007/03/slviewer-artwork-${PV}.zip" +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" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -#IUSE="fmod xulrunner" IUSE="fmod" +#IUSE="fmod llmozlib" RESTRICT="mirror" RDEPEND=">=x11-libs/gtk+-2 @@ -36,7 +37,7 @@ RDEPEND=">=x11-libs/gtk+-2 dev-libs/elfio >=media-libs/openjpeg-1.1.1 media-fonts/kochi-substitute" -# xulrunner? ( net-libs/xulrunner ) +# llmozlib? ( net-libs/llmozlib-xulrunner ) DEPEND="${RDEPEND} dev-util/scons @@ -44,53 +45,57 @@ DEPEND="${RDEPEND} sys-devel/flex sys-devel/bison" -S="${WORKDIR}/linden" +S="${WORKDIR}/linden/indra" dir="${GAMES_DATADIR}/${PN}" src_unpack() { unpack ${A} - cd "${S}"/indra + cd "${S}" - if ! use fmod || [ "${ARCH}" != "x86" ] ; then - epatch "${FILESDIR}"/${PN}-1.13.3.59315-no_fmod.patch - fi + # opensecondlife.com + epatch "${FILESDIR}"/opensecondlife-svn41.patch - # VWR-100 - epatch "${FILESDIR}"/${PN}-1.13.3.2-llimagej2coj_debug.patch + epatch "${FILESDIR}"/${P}-mozlib.patch + epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/opensecondlife-svn41.patch - epatch "${FILESDIR}"/${PN}-1.13.3.59558-gentoo.patch + cd "${S}"/llwindow/ + epatch "${FILESDIR}"/llwindowssdl_16bit_depth.patch + + sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" "${S}"/SConstruct || die - sed -i -e "s/gcc_bin = .*$/gcc_bin = '$(tc-getCXX)'/" SConstruct || die + # "${S}"/newview/viewer_manifest.py + touch "${S}"/newview/gridargs.dat - # "${S}"/indra/newview/viewer_manifest.py - touch newview/gridargs.dat + rm -rf "${S}"/../libraries/i686-linux + rm -rf "${S}"/newview/app_settings/mozilla-runtime-linux-i686 } src_compile() { - local mozlib - - cd "${S}"/indra - - # if use xulrunner; then - # mozlib="yes" - #else - mozlib="no" - #fi + 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 BUILD=release BTARGET=client DISTCC=no GRID=firstlook MOZLIB=${mozlib} || die + CLIENT_CPPFLAGS="${CXXFLAGS}" TEMP_BUILD_DIR=/ scons ${myopts} || die } src_install() { - cd "${S}"/indra/newview/ + cd "${S}"/newview/ insinto "${dir}" - #doins featuretable.txt featuretable_mac.txt gpu_table.txt gridargs.dat || die - doins featuretable.txt gpu_table.txt .txt gridargs.dat || die - doins -r app_settings character fonts help skins res-sdl || die + 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 @@ -98,7 +103,7 @@ src_install() { newins res/ll_icon.ico secondlife.ico || die insinto "${dir}"/app_settings/ - doins "${S}"/scripts/messages/message_template.msg || die + doins "${WORKDIR}"/linden/scripts/messages/message_template.msg || die exeinto "${dir}" doexe linux_tools/launch_url.sh || die |