diff options
author | Matsuu Takuto <matsuu@gentoo.org> | 2007-07-02 23:57:32 +0000 |
---|---|---|
committer | Matsuu Takuto <matsuu@gentoo.org> | 2007-07-02 23:57:32 +0000 |
commit | 665568faaec620eb5842102ac63e6c7f7ef548db (patch) | |
tree | 0bad7f37b5f1d14f92f885769d3b7c936c29629b | |
parent | parallel make issue fixed. (diff) | |
download | secondlife-665568faaec620eb5842102ac63e6c7f7ef548db.tar.gz secondlife-665568faaec620eb5842102ac63e6c7f7ef548db.tar.bz2 secondlife-665568faaec620eb5842102ac63e6c7f7ef548db.zip |
Version bumped.
svn path=/secondlife/; revision=16
-rw-r--r-- | games-simulation/secondlife-bin/Manifest | 16 | ||||
-rw-r--r-- | games-simulation/secondlife-bin/files/digest-secondlife-bin-1.16.0.5 | 3 | ||||
-rw-r--r-- | games-simulation/secondlife-bin/files/digest-secondlife-bin-1.17.2.0 | 3 | ||||
-rw-r--r-- | games-simulation/secondlife-bin/secondlife-bin-1.17.2.0.ebuild (renamed from games-simulation/secondlife-bin/secondlife-bin-1.16.0.5.ebuild) | 2 | ||||
-rw-r--r-- | games-simulation/secondlife/Manifest | 28 | ||||
-rw-r--r-- | games-simulation/secondlife/files/digest-secondlife-1.16.0.5 | 9 | ||||
-rw-r--r-- | games-simulation/secondlife/files/digest-secondlife-1.17.2.0 | 9 | ||||
-rw-r--r-- | games-simulation/secondlife/files/secondlife-1.17.2.0-gentoo.patch | 185 | ||||
-rw-r--r-- | games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch | 12 | ||||
-rw-r--r-- | games-simulation/secondlife/secondlife-1.17.2.0.ebuild (renamed from games-simulation/secondlife/secondlife-1.16.0.5.ebuild) | 49 |
10 files changed, 270 insertions, 46 deletions
diff --git a/games-simulation/secondlife-bin/Manifest b/games-simulation/secondlife-bin/Manifest index ab61a17..59512a6 100644 --- a/games-simulation/secondlife-bin/Manifest +++ b/games-simulation/secondlife-bin/Manifest @@ -1,16 +1,16 @@ -DIST SecondLife_i686_1_16_0_5.tar.bz2 50251067 RMD160 23001ee6e83be395015b4ec4bed0820468369f4c SHA1 ff725d7a395c139ef4a57d42bf07159196898886 SHA256 7de558121d764c22513b19be03e96ed5f0b49033515f29cd6431a54cc9b913a2 DIST SecondLife_i686_1_17_0_12.tar.bz2 50746305 RMD160 c7efcaec3d407917146c9e48e190ad5ac70838f3 SHA1 79b2683348faea73a3f1ab9f2f3af6de40de9267 SHA256 b8eca83b257f5f9f9fa4a168a938ed88777c4734681558d95d2d12f53f267c04 -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 +DIST SecondLife_i686_1_17_2_0.tar.bz2 50798766 RMD160 c37b5ae5630428a88aebe5fb7ad75033ef8102ef SHA1 e1903541aeb65bf71368d5baa5af7aa2f5747b01 SHA256 1592b1eea978abce5a1796d46bb24d63bb114897165b16ee771a206729212269 EBUILD secondlife-bin-1.17.0.12.ebuild 2209 RMD160 40da5264782b519cfbc27ecc9dd82f9d73157ca4 SHA1 a0c39ed56ac427c9651a8ce316120156fa50ddec SHA256 58275a0f04a26d152e35a25ef5d3ca2d6bbdabcf86a52862d53b4954e24274dc MD5 6ea67e69f779967ec54abed6af95f2af secondlife-bin-1.17.0.12.ebuild 2209 RMD160 40da5264782b519cfbc27ecc9dd82f9d73157ca4 secondlife-bin-1.17.0.12.ebuild 2209 SHA256 58275a0f04a26d152e35a25ef5d3ca2d6bbdabcf86a52862d53b4954e24274dc secondlife-bin-1.17.0.12.ebuild 2209 -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 +EBUILD secondlife-bin-1.17.2.0.ebuild 2209 RMD160 40da5264782b519cfbc27ecc9dd82f9d73157ca4 SHA1 a0c39ed56ac427c9651a8ce316120156fa50ddec SHA256 58275a0f04a26d152e35a25ef5d3ca2d6bbdabcf86a52862d53b4954e24274dc +MD5 6ea67e69f779967ec54abed6af95f2af secondlife-bin-1.17.2.0.ebuild 2209 +RMD160 40da5264782b519cfbc27ecc9dd82f9d73157ca4 secondlife-bin-1.17.2.0.ebuild 2209 +SHA256 58275a0f04a26d152e35a25ef5d3ca2d6bbdabcf86a52862d53b4954e24274dc secondlife-bin-1.17.2.0.ebuild 2209 MD5 a7e2c5cf829b42f412fc9754d8e41fe5 files/digest-secondlife-bin-1.17.0.12 286 RMD160 962ee61fa2056dd486a76abff3909aa975244443 files/digest-secondlife-bin-1.17.0.12 286 SHA256 bceda315f6399d0190ccce2f07eb3723e13caa5b298b3f9b38397458cdb596c5 files/digest-secondlife-bin-1.17.0.12 286 +MD5 99e75c946473700efd8bf39ebac6fa55 files/digest-secondlife-bin-1.17.2.0 283 +RMD160 3d69f2963f25ae04414b57ab1b652a5ec3c648e3 files/digest-secondlife-bin-1.17.2.0 283 +SHA256 93c61d88835b5b72f92e06255e2a3e70e6791c7e28d59b8fbef0cb291b548763 files/digest-secondlife-bin-1.17.2.0 283 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 deleted file mode 100644 index 2387b76..0000000 --- a/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.16.0.5 +++ /dev/null @@ -1,3 +0,0 @@ -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/files/digest-secondlife-bin-1.17.2.0 b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.17.2.0 new file mode 100644 index 0000000..53b3e4e --- /dev/null +++ b/games-simulation/secondlife-bin/files/digest-secondlife-bin-1.17.2.0 @@ -0,0 +1,3 @@ +MD5 9d45a14d3f58d8f06a80225b82c3adc1 SecondLife_i686_1_17_2_0.tar.bz2 50798766 +RMD160 c37b5ae5630428a88aebe5fb7ad75033ef8102ef SecondLife_i686_1_17_2_0.tar.bz2 50798766 +SHA256 1592b1eea978abce5a1796d46bb24d63bb114897165b16ee771a206729212269 SecondLife_i686_1_17_2_0.tar.bz2 50798766 diff --git a/games-simulation/secondlife-bin/secondlife-bin-1.16.0.5.ebuild b/games-simulation/secondlife-bin/secondlife-bin-1.17.2.0.ebuild index cba9670..b74f45d 100644 --- a/games-simulation/secondlife-bin/secondlife-bin-1.16.0.5.ebuild +++ b/games-simulation/secondlife-bin/secondlife-bin-1.17.2.0.ebuild @@ -8,7 +8,7 @@ MY_P="SecondLife_i686_${PV//./_}" DESCRIPTION="A 3D MMORPG virtual world entirely built and owned by its residents" HOMEPAGE="http://secondlife.com/" -SRC_URI="http://secondlife.com/downloads/viewer/${MY_P}.tar.bz2" +SRC_URI="http://s3.amazonaws.com/download-secondlife-com/${MY_P}.tar.bz2" LICENSE="as-is" SLOT="0" diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest index ec94d6c..4df3d97 100644 --- a/games-simulation/secondlife/Manifest +++ b/games-simulation/secondlife/Manifest @@ -10,23 +10,31 @@ AUX secondlife-1.15.1.3-gentoo.patch 7590 RMD160 b446228bd65cfa6997027bae094a07d 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.16.0.5.zip 24682087 RMD160 4451964fefb7c6d27b1723a66f6e1ca0d2c13507 SHA1 9f234f9e4a35b3a7413137de6552a3387f92c822 SHA256 59736b77b9e0ce15f73241e1b8fe0da71ccadc82f85bee8ffe6f544010fd56ca +AUX secondlife-1.17.2.0-gentoo.patch 6692 RMD160 fab54cbac85219d1eaf599cecc1c30d79357154e SHA1 125b6b4a5414e53966f68956527795ab4332d631 SHA256 88fcccc7e2073058c93e699365aa914ab82dbddea9105ee90a6153684b92646f +MD5 3e73ab73cba78c61480c66cef07c94ec files/secondlife-1.17.2.0-gentoo.patch 6692 +RMD160 fab54cbac85219d1eaf599cecc1c30d79357154e files/secondlife-1.17.2.0-gentoo.patch 6692 +SHA256 88fcccc7e2073058c93e699365aa914ab82dbddea9105ee90a6153684b92646f files/secondlife-1.17.2.0-gentoo.patch 6692 +AUX secondlife-1.17.2.0-size_t.patch 462 RMD160 07db64e519f9a4fffbd03fcc6ce975470fed4f52 SHA1 f2e38d9ca34b234c940fa2fd5abcfe1f22d7084a SHA256 b1fb3ef3d60e803cca87ed660f0ea02cbb6b98bc75170fa0de7008f7eab7f96e +MD5 514085daf53b44790b50f9bb4de4c53d files/secondlife-1.17.2.0-size_t.patch 462 +RMD160 07db64e519f9a4fffbd03fcc6ce975470fed4f52 files/secondlife-1.17.2.0-size_t.patch 462 +SHA256 b1fb3ef3d60e803cca87ed660f0ea02cbb6b98bc75170fa0de7008f7eab7f96e files/secondlife-1.17.2.0-size_t.patch 462 DIST slviewer-artwork-1.17.0.12.zip 24682087 RMD160 bc0e789608bb7dbde69ed6123ec017c685aa3cd5 SHA1 efcf7825bf76e0af8c572c543487221aa98508fa SHA256 7b7d31a71884d5b116dba57e84ebcea057333ac577edb3fc9d0593c4f886583a -DIST slviewer-linux-libs-1.16.0.5.tar.gz 26780131 RMD160 ad559681ad92171211fb446e716f32f00c33e216 SHA1 996cb284db0ee4d310d144552f3f3a1590453baf SHA256 025938ba1fafa75b67cde1b6d8b523e4927154b52c7436c0fc12a8e4f25fa99a +DIST slviewer-artwork-1.17.2.0.zip 24684316 RMD160 f95474667f1286c66e846f0c8326cfee63d1d20a SHA1 4d3a282f1c2c44f8eda7f9a2712cd595d2ef5816 SHA256 32d348a3d294ced0a32607d506b452fd24784529bcf89225a53cb36ae03eb147 DIST slviewer-linux-libs-1.17.0.12.tar.gz 27190078 RMD160 8f2ec0d491a9a1a23e2d4fc63db02a03130b85c8 SHA1 cbe5ba08c41a87764eb06e441fd90520899e4f85 SHA256 b5f2d1a7424b474d8ce3773ac3bf1a5b71e96586017fb653b3364529bff51d61 -DIST slviewer-src-1.16.0.5.tar.gz 5081284 RMD160 80b7554836fdaf3ec16de728c7004b5e87c0aac2 SHA1 357913ed82e7622c955223a6d38ec3b23f1f974f SHA256 e2899f31c54ef11bf747fed9a5433fa5bfdc31110f8cfc78134f06aea4f488ca +DIST slviewer-linux-libs-1.17.2.0.tar.gz 28127089 RMD160 6b9de0070f5a950e81e38f56d9c424384dcb9a8c SHA1 823c2441ac418200f2c595eb55fdc1fb6c8344af SHA256 4103ba31f6946c098e08e74c934fbb4e4621e1e644572b9f6655da4e5e0c421f DIST slviewer-src-1.17.0.12.tar.gz 5171734 RMD160 cb67ad617f0504ad1550a7d0f7578e975365026e SHA1 b0b9ed7e50d100feb25d92dfde7bd00daf7f2bea SHA256 a213ce3b1d027734273ebe434b9cbf4be3e29b3f712d2545fa2e0248b3d5985d -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 +DIST slviewer-src-1.17.2.0.tar.gz 5198005 RMD160 6e5772744811c089e21716b579e707fa1322c149 SHA1 7094cb0adb4550c3e798878fb083bdf5e650689f SHA256 dc5302fc37bec25dca9b47324f8fea6e56aa2b3da3fc30e3a0d4c56719fa0de4 EBUILD secondlife-1.17.0.12.ebuild 3478 RMD160 f925775806194dbdd5eb1564820c553f90ae9cb3 SHA1 f6ef60c0674af02235e8b6e803fab97180d8aafa SHA256 0d9952447dc222f8e7e79c0bfb4e6c238423c894d663d606e7bb7ac9e7b95686 MD5 fa3fe5dc83a3acf737e1346a9b28d0ef secondlife-1.17.0.12.ebuild 3478 RMD160 f925775806194dbdd5eb1564820c553f90ae9cb3 secondlife-1.17.0.12.ebuild 3478 SHA256 0d9952447dc222f8e7e79c0bfb4e6c238423c894d663d606e7bb7ac9e7b95686 secondlife-1.17.0.12.ebuild 3478 -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 +EBUILD secondlife-1.17.2.0.ebuild 3750 RMD160 c3a7a9617c0850537cf78b27f8b181f3a58eb89b SHA1 05548e09006ebc9c7257ea35432fcb8a3e78186b SHA256 56c7f15675a9ec65597af97ebe3a23451d8c0aa642b76cc35cac3a5e0fd52a9b +MD5 e88f47061f13d8384ea4816bf2273611 secondlife-1.17.2.0.ebuild 3750 +RMD160 c3a7a9617c0850537cf78b27f8b181f3a58eb89b secondlife-1.17.2.0.ebuild 3750 +SHA256 56c7f15675a9ec65597af97ebe3a23451d8c0aa642b76cc35cac3a5e0fd52a9b secondlife-1.17.2.0.ebuild 3750 MD5 1c9d76ff25774ead39c892bbeb23a4d6 files/digest-secondlife-1.17.0.12 843 RMD160 b1f442cc3a4bc70da1cf8bd5ded947596f39c252 files/digest-secondlife-1.17.0.12 843 SHA256 decc96dee26f85e9d16c5e13f72aaec2a8ec00005489e402df8d861a5c293381 files/digest-secondlife-1.17.0.12 843 +MD5 5222f46d8a05dae2d2661045fb0ec5a0 files/digest-secondlife-1.17.2.0 834 +RMD160 c115b7863483c4e29d0788e9802cd0d6b30a8755 files/digest-secondlife-1.17.2.0 834 +SHA256 37bccb337ca1b663d96c704eb47ec7543251a9389da4eb66ef89c59f0be7da0d files/digest-secondlife-1.17.2.0 834 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.16.0.5 b/games-simulation/secondlife/files/digest-secondlife-1.16.0.5 deleted file mode 100644 index d8ebb2e..0000000 --- a/games-simulation/secondlife/files/digest-secondlife-1.16.0.5 +++ /dev/null @@ -1,9 +0,0 @@ -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/digest-secondlife-1.17.2.0 b/games-simulation/secondlife/files/digest-secondlife-1.17.2.0 new file mode 100644 index 0000000..4da1c32 --- /dev/null +++ b/games-simulation/secondlife/files/digest-secondlife-1.17.2.0 @@ -0,0 +1,9 @@ +MD5 942ca9d4da3338a1bb28742a5d04a54c slviewer-artwork-1.17.2.0.zip 24684316 +RMD160 f95474667f1286c66e846f0c8326cfee63d1d20a slviewer-artwork-1.17.2.0.zip 24684316 +SHA256 32d348a3d294ced0a32607d506b452fd24784529bcf89225a53cb36ae03eb147 slviewer-artwork-1.17.2.0.zip 24684316 +MD5 19f99960fba9856c2da20f05fe263d4c slviewer-linux-libs-1.17.2.0.tar.gz 28127089 +RMD160 6b9de0070f5a950e81e38f56d9c424384dcb9a8c slviewer-linux-libs-1.17.2.0.tar.gz 28127089 +SHA256 4103ba31f6946c098e08e74c934fbb4e4621e1e644572b9f6655da4e5e0c421f slviewer-linux-libs-1.17.2.0.tar.gz 28127089 +MD5 768dc0b7ff5e2dd2751f363fd6b568b3 slviewer-src-1.17.2.0.tar.gz 5198005 +RMD160 6e5772744811c089e21716b579e707fa1322c149 slviewer-src-1.17.2.0.tar.gz 5198005 +SHA256 dc5302fc37bec25dca9b47324f8fea6e56aa2b3da3fc30e3a0d4c56719fa0de4 slviewer-src-1.17.2.0.tar.gz 5198005 diff --git a/games-simulation/secondlife/files/secondlife-1.17.2.0-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.17.2.0-gentoo.patch new file mode 100644 index 0000000..3422c71 --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.17.2.0-gentoo.patch @@ -0,0 +1,185 @@ +diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct +--- linden.orig/indra/SConstruct 2007-06-26 08:48:21.000000000 +0900 ++++ linden/indra/SConstruct 2007-07-03 00:12:22.000000000 +0900 +@@ -133,7 +133,7 @@ + if standalone and platform != 'linux': + print >> sys.stderr, 'Warning: standalone builds have only been tested on Linux' + +-standalone_pkgs = 'cairo glib-2.0 gtk+-2.0 sdl vorbis vorbisenc vorbisfile' ++standalone_pkgs = 'cairo glib-2.0 gtk+-2.0 sdl vorbis vorbisenc vorbisfile freetype2' + + def pkgconfig(opt, pkgs=None): + return os.popen('pkg-config %s %s' % +@@ -267,7 +267,7 @@ + for d in incdirs] + + if elfio: +- client_external_libs += [ 'elfio' ] ++ client_external_libs += [ 'ELFIO' ] + else: + cppflags += '-DLL_ELFBIN=0 ' + +diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp +--- linden.orig/indra/llcommon/llsdserialize_xml.cpp 2007-06-26 08:48:22.000000000 +0900 ++++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-06-27 14:54:31.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-06-26 08:48:22.000000000 +0900 ++++ linden/indra/llcommon/llsys.cpp 2007-06-27 14:54:31.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-06-26 08:48:23.000000000 +0900 ++++ linden/indra/llimage/llimagejpeg.h 2007-06-27 14:54:31.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-06-26 08:48:23.000000000 +0900 ++++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-06-27 14:54:31.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-06-26 08:48:24.000000000 +0900 ++++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-06-27 14:54:31.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-06-26 08:48:24.000000000 +0900 ++++ linden/indra/llmessage/llhttpassetstorage.cpp 2007-06-27 14:54:31.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-06-26 08:48:25.000000000 +0900 ++++ linden/indra/llrender/llfont.cpp 2007-06-27 14:54:31.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-06-26 08:48:26.000000000 +0900 ++++ linden/indra/llxml/llxmlnode.h 2007-06-27 14:54:31.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-06-26 08:48:26.000000000 +0900 ++++ linden/indra/llxml/llxmlparser.h 2007-06-27 14:54:31.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-06-26 08:48:31.000000000 +0900 ++++ linden/indra/newview/lluserauth.cpp 2007-06-27 14:54:31.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-06-26 08:48:33.000000000 +0900 ++++ linden/indra/newview/llviewerobjectlist.cpp 2007-06-27 14:54:31.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-06-26 08:48:30.000000000 +0900 ++++ linden/indra/newview/llwebbrowserctrl.h 2007-06-27 14:54:31.000000000 +0900 +@@ -92,6 +92,7 @@ + #include "lldynamictexture.h" + #include "llmozlib.h" + ++class LLUICtrlFactory; + class LLViewBorder; + class LLWebBrowserTexture; + +diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp +--- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-06-26 08:48:32.000000000 +0900 ++++ linden/indra/newview/llxmlrpctransaction.cpp 2007-06-27 14:54:31.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.17.2.0-size_t.patch b/games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch new file mode 100644 index 0000000..06ca2f6 --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.17.2.0-size_t.patch @@ -0,0 +1,12 @@ +diff -Naur linden.orig/indra/newview/viewer.cpp linden/indra/newview/viewer.cpp +--- linden.orig/indra/newview/viewer.cpp 2007-06-26 08:48:31.000000000 +0900 ++++ linden/indra/newview/viewer.cpp 2007-07-02 23:57:04.000000000 +0900 +@@ -2368,7 +2368,7 @@ + size_t btpos; + for (btpos = 0; btpos < btsize; ++btpos) + { +- fprintf(StraceFile, "%d:\t", btpos); ++ fprintf(StraceFile, "%zd:\t", btpos); + int symidx; + for (symidx = 0; symidx < nSymNo; ++symidx) + { diff --git a/games-simulation/secondlife/secondlife-1.16.0.5.ebuild b/games-simulation/secondlife/secondlife-1.17.2.0.ebuild index 885dcc7..6a8b56e 100644 --- a/games-simulation/secondlife/secondlife-1.16.0.5.ebuild +++ b/games-simulation/secondlife/secondlife-1.17.2.0.ebuild @@ -6,13 +6,13 @@ 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" +SRC_URI="http://secondlife.com/developers/opensource/downloads/2007/06/slviewer-src-${PV}.tar.gz + http://secondlife.com/developers/opensource/downloads/2007/06/slviewer-artwork-${PV}.zip + http://secondlife.com/developers/opensource/downloads/2007/06/slviewer-linux-libs-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="fmod" #IUSE="fmod llmozlib" RESTRICT="mirror" @@ -36,7 +36,8 @@ RDEPEND=">=x11-libs/gtk+-2 >=dev-libs/xmlrpc-epi-0.51 dev-libs/elfio >=media-libs/openjpeg-1.1.1 - media-fonts/kochi-substitute" + media-fonts/kochi-substitute + dev-libs/google-perftools" # llmozlib? ( net-libs/llmozlib-xulrunner ) DEPEND="${RDEPEND} @@ -60,13 +61,8 @@ src_unpack() { cd "${S}" - # opensecondlife.com - epatch "${FILESDIR}"/opensecondlife-svn41.patch - - epatch "${FILESDIR}"/${PN}-1.15.1.3-gentoo.patch - - cd "${S}"/llwindow/ - epatch "${FILESDIR}"/llwindowssdl_16bit_depth.patch + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-size_t.patch sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" "${S}"/SConstruct || die @@ -75,7 +71,8 @@ src_unpack() { } src_compile() { - local myopts="BUILD=release BTARGET=client DISTCC=no" + local myarch + local myopts="BUILD=release BTARGET=client DISTCC=no STANDALONE=yes" # if use llmozlib ; then # myopts="${myopts} MOZLIB=yes" @@ -83,13 +80,34 @@ src_compile() { myopts="${myopts} MOZLIB=no" # fi + # if use elfio ; then + myopts="${myopts} ELFIO=yes" + # else + # myopts="${myopts} ELFIO=no" + # fi + + case ${ARCH} in + x86) + myopts="${myopts} ARCH=i686" + ;; + amd64) + myopts="${myopts} ARCH=x86_64" + ;; + ppc|ppc64) + myopts="${myopts} ARCH=powerpc" + ;; + *) + myopts="${myopts} ARCH=i686" + ;; + esac + 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 + CLIENT_CPPFLAGS="${CXXFLAGS}" TEMP_BUILD_DIR= scons ${myopts} || die } src_install() { @@ -115,7 +133,8 @@ src_install() { exeinto "${dir}"/bin/ newexe secondlife-*-bin do-not-directly-run-secondlife-bin || die - keepdir "${dir}"/lib + exeinto "${dir}"/lib + doexe ../lib_release_client/*-linux/* || die dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf /usr/share/games/secondlife/unicode.ttf |