diff options
| -rw-r--r-- | games-simulation/secondlife/Manifest | 54 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/digest-secondlife-1.18.3.5_rc (renamed from games-simulation/secondlife/files/digest-secondlife-1.18.3.5) | 6 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/digest-secondlife-1.18.4.0 | 9 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/secondlife-1.18.3.5_rc-gentoo.patch (renamed from games-simulation/secondlife/files/secondlife-1.18.3.5-gentoo.patch) | 34 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/secondlife-1.18.4.0-gentoo.patch | 146 | ||||
| -rw-r--r-- | games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch | 29 | ||||
| -rw-r--r-- | games-simulation/secondlife/secondlife-1.18.3.5.ebuild | 193 | ||||
| -rw-r--r-- | games-simulation/secondlife/secondlife-1.18.3.5_rc.ebuild (renamed from games-simulation/secondlife/secondlife-1.18.4.0.ebuild) | 33 | ||||
| -rw-r--r-- | games-simulation/secondlife/secondlife-1.18.4.1_rc.ebuild | 2 |
9 files changed, 86 insertions, 420 deletions
diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest index a0b7101..4f201b4 100644 --- a/games-simulation/secondlife/Manifest +++ b/games-simulation/secondlife/Manifest @@ -6,46 +6,37 @@ AUX secondlife-1.18.1.2-gentoo.patch 4288 RMD160 cc8bc29b2d4ce513dcac4d9713ba2a6 MD5 fc232481ddbfd4b3cb4924d7dc3bb5c6 files/secondlife-1.18.1.2-gentoo.patch 4288 RMD160 cc8bc29b2d4ce513dcac4d9713ba2a6edbf2fb69 files/secondlife-1.18.1.2-gentoo.patch 4288 SHA256 1ccfbb9b310dc75a630e9c9cf9e9c3a8cc1ee07f225e68bb0c3fe60905731a44 files/secondlife-1.18.1.2-gentoo.patch 4288 -AUX secondlife-1.18.3.5-gentoo.patch 3947 RMD160 d9ca2d64707d87ef69e1bf8aec5310cd593aeb00 SHA1 46dffbb5c459ad6f6bfe2e39d841833787f0ca93 SHA256 5bb4f4abf0f514658db15fe1c4578a143d62b89393721b69931912ce27283638 -MD5 cde143ea26e8a0c40976e33142735475 files/secondlife-1.18.3.5-gentoo.patch 3947 -RMD160 d9ca2d64707d87ef69e1bf8aec5310cd593aeb00 files/secondlife-1.18.3.5-gentoo.patch 3947 -SHA256 5bb4f4abf0f514658db15fe1c4578a143d62b89393721b69931912ce27283638 files/secondlife-1.18.3.5-gentoo.patch 3947 -AUX secondlife-1.18.4.0-gentoo.patch 5539 RMD160 b8310f564e85840df2da65795e8db5513a136765 SHA1 2317b944ada889cf6bdc580e3490b8fe5391cade SHA256 f32eabea2f209e66761e5c0f18fa6b607acd4d59cd54fdb0a05c1bdcdefd4b50 -MD5 334fe0012829e9345524ce9d21413ee5 files/secondlife-1.18.4.0-gentoo.patch 5539 -RMD160 b8310f564e85840df2da65795e8db5513a136765 files/secondlife-1.18.4.0-gentoo.patch 5539 -SHA256 f32eabea2f209e66761e5c0f18fa6b607acd4d59cd54fdb0a05c1bdcdefd4b50 files/secondlife-1.18.4.0-gentoo.patch 5539 -AUX secondlife-1.18.4.1_rc-gentoo.patch 6267 RMD160 fa1adc237822deda305d3da61f36fe34a512bf59 SHA1 593dc215682f5dd6d95309b2643a48403ea27042 SHA256 918c8d60f3e872f58258db9afdbba3794dd2d85571bbeeab614fbe10884c8d2a -MD5 65812b1276c5a46abcd585b6146bad2b files/secondlife-1.18.4.1_rc-gentoo.patch 6267 -RMD160 fa1adc237822deda305d3da61f36fe34a512bf59 files/secondlife-1.18.4.1_rc-gentoo.patch 6267 -SHA256 918c8d60f3e872f58258db9afdbba3794dd2d85571bbeeab614fbe10884c8d2a files/secondlife-1.18.4.1_rc-gentoo.patch 6267 +AUX secondlife-1.18.3.5_rc-gentoo.patch 3962 RMD160 096754a016292ea7bf85bcb814f88d7f778590d7 SHA1 6d73c5c9a5fe3c0820e44ebabe6757dc4d60e0c1 SHA256 5b8d773959c33e638706b88d3478a018fcef57efc3151bbac806724aabb4ec52 +MD5 203efa73faa482f2683e755e77e7b798 files/secondlife-1.18.3.5_rc-gentoo.patch 3962 +RMD160 096754a016292ea7bf85bcb814f88d7f778590d7 files/secondlife-1.18.3.5_rc-gentoo.patch 3962 +SHA256 5b8d773959c33e638706b88d3478a018fcef57efc3151bbac806724aabb4ec52 files/secondlife-1.18.3.5_rc-gentoo.patch 3962 +AUX secondlife-1.18.4.1_rc-gentoo.patch 6602 RMD160 e2f7221d6ef452630ff352c0a045f47e464b8d61 SHA1 31e32e946c251df2d7360650dc3d37a5fd932538 SHA256 82ff8b167f005c2c4c952a278505dea2732b51837a12bbe30d0bec4d39d9e47e +MD5 1844ef274fa2fda5438fbef1b2a74797 files/secondlife-1.18.4.1_rc-gentoo.patch 6602 +RMD160 e2f7221d6ef452630ff352c0a045f47e464b8d61 files/secondlife-1.18.4.1_rc-gentoo.patch 6602 +SHA256 82ff8b167f005c2c4c952a278505dea2732b51837a12bbe30d0bec4d39d9e47e files/secondlife-1.18.4.1_rc-gentoo.patch 6602 +DIST gtk-20071105.tar.bz2 32328 RMD160 df04128daabce1c77ab6b8401244be30182a9396 SHA1 6847d7d3942d7ae5f4d3fab047b7ccd78e9e02fc SHA256 ea40778eadee645272164dd619318291064155dc05a38361e56880a18d528511 +DIST ime-20070909.patch 92248 RMD160 b1d4992f9bf3b2780c193627af2fe6b7cc7ee690 SHA1 036c7ada1a42580733f2e01ac21a3bda2106d7b4 SHA256 14a9570e9b45f509b0700f07abbe1e8f6774cc270fcc79496cd0d0b1e5efc0da DIST slviewer-artwork-1.18.2.0.zip 24702596 RMD160 aafc1966cb5c1ee7fbfda935efe29f37dbeef749 SHA1 d5ab2cfe7e1a1e7b0ef40f0e7e3095553757f7b0 SHA256 327fe454b2f6a596aa9d6446a827323f4800c62bcc7623010a2e880e23124ad7 DIST slviewer-artwork-RC-1.18.3.5.zip 24659237 RMD160 019766a92a70f6a306300ca855f4dae2e9c9e268 SHA1 d865a7804c172dfd10cc1e561aa29e154462fc7a SHA256 829f66f523b2edae0054786d037bb16ba3d7f8fbecdd54a33d495ec54e28e4f1 -DIST slviewer-artwork-RC-1.18.4.0.zip 24602698 RMD160 5bbc5cfeeea74359251d071c0b22bee1c076d43d SHA1 65338cceff9f1a762ed1df334bfdede40bc74834 SHA256 edca90798fde3f1472641be2b7a82f922773d7a5d7ef0e1de1d341994b6bac65 DIST slviewer-artwork-RC-1.18.4.1.zip 24602698 RMD160 9953e98943535cc15c66c6483e44b96c659e8f8b SHA1 4e0e245b17bbb72ccd2c5edac2e41887ac43d2ae SHA256 7ba892e4e594650275a151960ff826ff9e6d692acae40f9b10533130df4f07b5 DIST slviewer-linux-libs-1.18.2.0.tar.gz 30598341 RMD160 9d64503ffab4d20ca6c79d88169a309d0b19431d SHA1 90b37a4b6754e0d860f4706e68664cd685078f34 SHA256 bc47e71d543ca1c152fd0c2771a028e353357d04b1cb80380976ca4bc40617cb DIST slviewer-linux-libs-RC-1.18.3.5.tar.gz 30624812 RMD160 b54f41ab6b9532af305c74ca6a1769ea92211053 SHA1 71a35a549fa8006a9050deec9f1c01e8faae13f2 SHA256 a93add097ca50a9a55836b236e24fd40fd90448ff55edddc1f45b6b2a55e7f7f -DIST slviewer-linux-libs-RC-1.18.4.0.tar.gz 31170227 RMD160 1e51dc2114e30d94f217ef56c8a04b11631ec46a SHA1 bd326a4ef35bded6c6fa1c79ab8fc2d421853693 SHA256 b3ec656453586c40c308eef9506a78284a792f883ad50df1b778aa313d3f9aa8 DIST slviewer-linux-libs-RC-1.18.4.1.tar.gz 31164613 RMD160 74dcc0f302ed7ce77e4fb8072eab8f770e6f1a6b SHA1 f94ea8aa50c608392f1eb732dbb435882f4e65ad SHA256 239a209e7fb9da313ffef43af28c12d4aa57aaf1f67477556756e40f1bc1a7fb DIST slviewer-src-1.18.2.0.tar.gz 5403670 RMD160 370a5a6822f93095d81e109d6c3eb918a70817b8 SHA1 1693566a0f39b5d6d94b417de746b6d19899f72e SHA256 3b0f39315f6dade48d8020326dc2c51466bcade4d753a8c0b266586ac93f271d DIST slviewer-src-RC-1.18.3.5.tar.gz 5421257 RMD160 83507a8ebe5dcf14fc80fea21e9f157a570b87cb SHA1 f58a288438eaccd7545f4a73f5e3982730b9552c SHA256 125063329f543d244697dd38f2e5d54b85f1e61eaa90c89adaa34e3ae544eeb7 -DIST slviewer-src-RC-1.18.4.0.tar.gz 5597690 RMD160 0fbd4e8e30382199846667fde6805b7f24caf077 SHA1 72af9028efada48d5897f0cb8666c1693769595b SHA256 912be161c0e7e06b49796e5dcd6e303ff2cdd95e31f7fc8d9c2e81b7afb74a03 DIST slviewer-src-RC-1.18.4.1.tar.gz 5476437 RMD160 b6dc635a65db397c5a2ab774bcc87a508452b1b9 SHA1 b85e2085cb65f77eae1cf94ac3f24a520b98e7ea SHA256 f065c16eebe80f8833a9066437758a8e1e7b5f3696c9a0196d7b489b3dc82ccf EBUILD secondlife-1.18.2.0.ebuild 4165 RMD160 87d0dc42f99db1b8a2cc1b42f3e58c1082e2cc01 SHA1 b849b097fa57f51906a3c69cc80f51b877928b6f SHA256 d062cccf35b79d659086b0205a1073400e30f667292ec9a72dbf29234eb842c2 MD5 152f5039522f5d0a613cb966219deeb1 secondlife-1.18.2.0.ebuild 4165 RMD160 87d0dc42f99db1b8a2cc1b42f3e58c1082e2cc01 secondlife-1.18.2.0.ebuild 4165 SHA256 d062cccf35b79d659086b0205a1073400e30f667292ec9a72dbf29234eb842c2 secondlife-1.18.2.0.ebuild 4165 -EBUILD secondlife-1.18.3.5.ebuild 4841 RMD160 251d1ac7cd053252b0538b6adb05f69d8675a696 SHA1 4e54bf441df6b4237fd7fe534bd5067efa476b72 SHA256 4d775105be62ae895f8a0dd0b2d459f623ebb4f5654a2eee1d4a779236d053d1 -MD5 0f7500d8bbbf18818aa22fd495dc55fa secondlife-1.18.3.5.ebuild 4841 -RMD160 251d1ac7cd053252b0538b6adb05f69d8675a696 secondlife-1.18.3.5.ebuild 4841 -SHA256 4d775105be62ae895f8a0dd0b2d459f623ebb4f5654a2eee1d4a779236d053d1 secondlife-1.18.3.5.ebuild 4841 -EBUILD secondlife-1.18.4.0.ebuild 4851 RMD160 6a98b88dfa6770ffed732b9ad935b66a7bdf97ab SHA1 0814cd3b80829cbc8ddae41983c2f453bad0a713 SHA256 7c302918b9ecd32a8c201858312f5325b09978ab3f182ec34de1d23934256cf9 -MD5 3ffaaeb732d05493cd4ae0b9ee0e51b8 secondlife-1.18.4.0.ebuild 4851 -RMD160 6a98b88dfa6770ffed732b9ad935b66a7bdf97ab secondlife-1.18.4.0.ebuild 4851 -SHA256 7c302918b9ecd32a8c201858312f5325b09978ab3f182ec34de1d23934256cf9 secondlife-1.18.4.0.ebuild 4851 -EBUILD secondlife-1.18.4.1_rc.ebuild 4939 RMD160 2f84483e5639007e05f07cfcadc38cad9537f79a SHA1 a85cf217f20c124569e599878a5ea34b97369146 SHA256 62df8a70071fa78bde8ebe70d1f3f5b9305986726c5745f6185def898e7b7f78 -MD5 4f1cc24f510c4c5535df9e4f094965c4 secondlife-1.18.4.1_rc.ebuild 4939 -RMD160 2f84483e5639007e05f07cfcadc38cad9537f79a secondlife-1.18.4.1_rc.ebuild 4939 -SHA256 62df8a70071fa78bde8ebe70d1f3f5b9305986726c5745f6185def898e7b7f78 secondlife-1.18.4.1_rc.ebuild 4939 +EBUILD secondlife-1.18.3.5_rc.ebuild 5231 RMD160 992bafd8ed1c71ed864cf488aabde48c9249fc19 SHA1 8db0e4980fd7b6e518be345196307232a64f7a32 SHA256 e6ec15eb6140f2f53f2d36b094ccb39cf24c9327d3a8cfa267e7a3e90defe325 +MD5 50322de0175720f78539f55e0bca6219 secondlife-1.18.3.5_rc.ebuild 5231 +RMD160 992bafd8ed1c71ed864cf488aabde48c9249fc19 secondlife-1.18.3.5_rc.ebuild 5231 +SHA256 e6ec15eb6140f2f53f2d36b094ccb39cf24c9327d3a8cfa267e7a3e90defe325 secondlife-1.18.3.5_rc.ebuild 5231 +EBUILD secondlife-1.18.4.1_rc.ebuild 4946 RMD160 8c4e6904796dab7bcdab8f83ad90e2a06c673859 SHA1 b289fae50d9be186fa72d91dada1c3032b2574e9 SHA256 1ebad99fff1d27afcca451e769fcbe06349fc4246f37f83126e56a5495ec0387 +MD5 7721cd4852370ec893717a6e9fd12991 secondlife-1.18.4.1_rc.ebuild 4946 +RMD160 8c4e6904796dab7bcdab8f83ad90e2a06c673859 secondlife-1.18.4.1_rc.ebuild 4946 +SHA256 1ebad99fff1d27afcca451e769fcbe06349fc4246f37f83126e56a5495ec0387 secondlife-1.18.4.1_rc.ebuild 4946 MISC ChangeLog 397 RMD160 63706792a2ef7f9f6415e659f853b285deae8b2f SHA1 17e67ab90c2e9e9498546dea1e697fff4757555c SHA256 cfd4bfd6466fb3e1db42817b34283356390a43f1e54f0b8217847a6d78a15dc6 MD5 f098b81a2533118dabb62f9f470dbad1 ChangeLog 397 RMD160 63706792a2ef7f9f6415e659f853b285deae8b2f ChangeLog 397 @@ -57,12 +48,9 @@ SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17 metadata MD5 4f8e9b7258e784156a53542a0756e4ea files/digest-secondlife-1.18.2.0 834 RMD160 00932f2efe50c5fa743573aa52da7cc8dd7997bb files/digest-secondlife-1.18.2.0 834 SHA256 0391c9464ac4602ab2ea7d01230cb769725edc04f9cc7af9e71ec3c5161f3060 files/digest-secondlife-1.18.2.0 834 -MD5 636af5db2df13181095cfe0c56b50946 files/digest-secondlife-1.18.3.5 861 -RMD160 3200252ac195c96500812aaff55fbbbecb6ac87f files/digest-secondlife-1.18.3.5 861 -SHA256 08c8afa966f886f35d92249481550ce59f25f5dd072e03f6ffab792a12aa4703 files/digest-secondlife-1.18.3.5 861 -MD5 9fa270cda38c7277bfd8386a0ac36ffd files/digest-secondlife-1.18.4.0 861 -RMD160 00500df5ee09f76a03ec2e0c3be688370cfee8db files/digest-secondlife-1.18.4.0 861 -SHA256 5495f75ac7bc14669aa6fe297e3ca5227d125ca71b11746c945c9298a81498bd files/digest-secondlife-1.18.4.0 861 +MD5 0a4d8ef5fcf95a90f4804e16d1d2b23e files/digest-secondlife-1.18.3.5_rc 1331 +RMD160 9252c043b1c969c2f8b7edd6e2df9b6ddf95221d files/digest-secondlife-1.18.3.5_rc 1331 +SHA256 b95b56e4926fc3411f3aa4db096a408d5d394b202340ee0245355a3168c0604b files/digest-secondlife-1.18.3.5_rc 1331 MD5 365617498f0938fb151de278b90c3c1b files/digest-secondlife-1.18.4.1_rc 861 RMD160 25dc2d677a37632656762bce0447ffe725941987 files/digest-secondlife-1.18.4.1_rc 861 SHA256 e5b94da65c4b571a207077d48c6bc711ec8b94421f90d45f955f5b36015d38b1 files/digest-secondlife-1.18.4.1_rc 861 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.18.3.5 b/games-simulation/secondlife/files/digest-secondlife-1.18.3.5_rc index aa51764..612cc24 100644 --- a/games-simulation/secondlife/files/digest-secondlife-1.18.3.5 +++ b/games-simulation/secondlife/files/digest-secondlife-1.18.3.5_rc @@ -1,3 +1,9 @@ +MD5 a73c1e69e7b4b33d3f050126554bad28 gtk-20071105.tar.bz2 32328 +RMD160 df04128daabce1c77ab6b8401244be30182a9396 gtk-20071105.tar.bz2 32328 +SHA256 ea40778eadee645272164dd619318291064155dc05a38361e56880a18d528511 gtk-20071105.tar.bz2 32328 +MD5 d8d219896503120960b199375b7212d7 ime-20070909.patch 92248 +RMD160 b1d4992f9bf3b2780c193627af2fe6b7cc7ee690 ime-20070909.patch 92248 +SHA256 14a9570e9b45f509b0700f07abbe1e8f6774cc270fcc79496cd0d0b1e5efc0da ime-20070909.patch 92248 MD5 a5e99446ddf1265ef3470634292c42bf slviewer-artwork-RC-1.18.3.5.zip 24659237 RMD160 019766a92a70f6a306300ca855f4dae2e9c9e268 slviewer-artwork-RC-1.18.3.5.zip 24659237 SHA256 829f66f523b2edae0054786d037bb16ba3d7f8fbecdd54a33d495ec54e28e4f1 slviewer-artwork-RC-1.18.3.5.zip 24659237 diff --git a/games-simulation/secondlife/files/digest-secondlife-1.18.4.0 b/games-simulation/secondlife/files/digest-secondlife-1.18.4.0 deleted file mode 100644 index 47cd8ac..0000000 --- a/games-simulation/secondlife/files/digest-secondlife-1.18.4.0 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 6cec0e059e4f25e1c3577e7532da0a24 slviewer-artwork-RC-1.18.4.0.zip 24602698 -RMD160 5bbc5cfeeea74359251d071c0b22bee1c076d43d slviewer-artwork-RC-1.18.4.0.zip 24602698 -SHA256 edca90798fde3f1472641be2b7a82f922773d7a5d7ef0e1de1d341994b6bac65 slviewer-artwork-RC-1.18.4.0.zip 24602698 -MD5 8e4a40e487f15485588d1a23295273c4 slviewer-linux-libs-RC-1.18.4.0.tar.gz 31170227 -RMD160 1e51dc2114e30d94f217ef56c8a04b11631ec46a slviewer-linux-libs-RC-1.18.4.0.tar.gz 31170227 -SHA256 b3ec656453586c40c308eef9506a78284a792f883ad50df1b778aa313d3f9aa8 slviewer-linux-libs-RC-1.18.4.0.tar.gz 31170227 -MD5 537880994c0fce24b888c806ede1d366 slviewer-src-RC-1.18.4.0.tar.gz 5597690 -RMD160 0fbd4e8e30382199846667fde6805b7f24caf077 slviewer-src-RC-1.18.4.0.tar.gz 5597690 -SHA256 912be161c0e7e06b49796e5dcd6e303ff2cdd95e31f7fc8d9c2e81b7afb74a03 slviewer-src-RC-1.18.4.0.tar.gz 5597690 diff --git a/games-simulation/secondlife/files/secondlife-1.18.3.5-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.18.3.5_rc-gentoo.patch index 373c432..aa7f3ae 100644 --- a/games-simulation/secondlife/files/secondlife-1.18.3.5-gentoo.patch +++ b/games-simulation/secondlife/files/secondlife-1.18.3.5_rc-gentoo.patch @@ -1,6 +1,6 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct ---- linden.orig/indra/SConstruct 2007-09-15 05:53:52.000000000 +0900 -+++ linden/indra/SConstruct 2007-09-16 01:36:13.000000000 +0900 +--- linden.orig/indra/SConstruct 2007-11-07 00:57:16.000000000 +0900 ++++ linden/indra/SConstruct 2007-11-07 00:59:15.000000000 +0900 @@ -111,7 +111,7 @@ channel = optenv['CHANNEL'] standalone = optenv['STANDALONE'] @@ -15,10 +15,10 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct 'glib-2.0', 'gmodule-2.0', + 'gthread-2.0', + 'gstreamer-0.10', 'gtk+-2.0', - 'libpng', - 'pango', -@@ -154,6 +155,9 @@ + 'gtkglext-1.0', +@@ -155,6 +156,9 @@ 'libssl', ] @@ -28,7 +28,7 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct def pkgconfig(opt, pkgs=None): if pkgs is None: pkgs = standalone_pkgs + standalone_net_pkgs -@@ -610,7 +614,7 @@ +@@ -611,7 +615,7 @@ net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ] net_external_libs += [ 'cares', 'expat' ] @@ -37,7 +37,7 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct if build_target == 'client': if platform == 'linux': -@@ -753,7 +757,7 @@ +@@ -754,7 +758,7 @@ internal_libs + external_libs) # Rpcserver @@ -47,8 +47,8 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct 'llmath', 'llcommon'] create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver', diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp ---- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-09-15 05:53:53.000000000 +0900 -+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-09-16 01:33:57.000000000 +0900 +--- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-09-21 04:33:27.000000000 +0900 ++++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-11-07 00:57:55.000000000 +0900 @@ -31,7 +31,7 @@ // this is defined so that we get static linking. @@ -59,8 +59,8 @@ diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej #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-09-15 05:53:53.000000000 +0900 -+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-09-16 01:33:57.000000000 +0900 +--- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-09-21 04:33:27.000000000 +0900 ++++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-11-07 00:57:55.000000000 +0900 @@ -77,7 +77,7 @@ #include <sstream> @@ -71,8 +71,8 @@ diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmess #include "llbuffer.h" diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp ---- linden.orig/indra/newview/lluserauth.cpp 2007-09-15 05:53:58.000000000 +0900 -+++ linden/indra/newview/lluserauth.cpp 2007-09-16 01:33:57.000000000 +0900 +--- linden.orig/indra/newview/lluserauth.cpp 2007-09-21 04:33:33.000000000 +0900 ++++ linden/indra/newview/lluserauth.cpp 2007-11-07 00:57:55.000000000 +0900 @@ -42,7 +42,7 @@ // NOTE: MUST include these after otherincludes since queue gets redefined!?!! @@ -83,8 +83,8 @@ diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/llusera diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp ---- linden.orig/indra/newview/llvoiceclient.cpp 2007-09-15 05:53:59.000000000 +0900 -+++ linden/indra/newview/llvoiceclient.cpp 2007-09-16 01:33:57.000000000 +0900 +--- linden.orig/indra/newview/llvoiceclient.cpp 2007-09-21 04:33:33.000000000 +0900 ++++ linden/indra/newview/llvoiceclient.cpp 2007-11-07 00:57:55.000000000 +0900 @@ -36,7 +36,7 @@ #include "llvoavatar.h" #include "llbufferstream.h" @@ -95,8 +95,8 @@ diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvo #include "llviewerregion.h" #include "llviewernetwork.h" // for gUserServerChoice diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp ---- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-09-15 05:53:59.000000000 +0900 -+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-09-16 01:33:57.000000000 +0900 +--- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-09-21 04:33:33.000000000 +0900 ++++ linden/indra/newview/llxmlrpctransaction.cpp 2007-11-07 00:57:55.000000000 +0900 @@ -34,7 +34,7 @@ // Have to include these last to avoid queue redefinition! diff --git a/games-simulation/secondlife/files/secondlife-1.18.4.0-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.18.4.0-gentoo.patch deleted file mode 100644 index 422e834..0000000 --- a/games-simulation/secondlife/files/secondlife-1.18.4.0-gentoo.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct ---- linden.orig/indra/SConstruct 2007-10-20 08:45:51.000000000 +0900 -+++ linden/indra/SConstruct 2007-10-22 01:56:46.000000000 +0900 -@@ -112,7 +112,7 @@ - channel = optenv['CHANNEL'] - standalone = optenv['STANDALONE'] - opensource = standalone or optenv['OPENSOURCE'] --enable_fmod = not opensource and optenv['FMOD'] -+enable_fmod = optenv['FMOD'] - elfio = optenv['ELFIO'] - - targets = [ target_param ] -@@ -135,6 +135,7 @@ - 'gdk-pixbuf-2.0', - 'glib-2.0', - 'gmodule-2.0', -+ 'gthread-2.0', - 'gtk+-2.0', - 'libpng', - 'pango', -@@ -155,6 +156,9 @@ - 'libssl', - ] - -+if enable_gstreamer: -+ standalone_pkgs += [ 'gstreamer-0.10' ] -+ - def pkgconfig(opt, pkgs=None): - if pkgs is None: - pkgs = standalone_pkgs + standalone_net_pkgs -@@ -602,7 +606,7 @@ - net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ] - net_external_libs += [ 'cares', 'expat' ] - -- common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ] -+ common_external_libs = net_external_libs + [ 'xmlrpc', 'z' ] - - if build_target == 'client': - if platform == 'linux': -@@ -742,7 +746,7 @@ - internal_libs + external_libs) - - # Rpcserver -- external_libs = common_external_libs + ['xmlrpc-epi', 'mysqlclient'] -+ external_libs = common_external_libs + ['xmlrpc', 'mysqlclient'] - internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs', - 'llmath', 'llcommon'] - create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver', -diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp ---- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-10-20 08:45:55.000000000 +0900 -+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-10-22 01:57:53.000000000 +0900 -@@ -33,7 +33,7 @@ - #include "llimagej2coj.h" - - // this is defined so that we get static linking. --#include "openjpeg/openjpeg.h" -+#include "openjpeg.h" - - #include "lltimer.h" - #include "llmemory.h" -diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp ---- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-10-20 08:45:58.000000000 +0900 -+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-10-22 01:56:46.000000000 +0900 -@@ -80,7 +80,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/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp ---- linden.orig/indra/llwindow/llgl.cpp 2007-10-20 08:46:00.000000000 +0900 -+++ linden/indra/llwindow/llgl.cpp 2007-10-22 08:56:36.000000000 +0900 -@@ -64,7 +64,7 @@ - # include "GL/glxext.h" - // Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol - // is considered 'legacy' but works on more machines. --# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p)) -+# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddress((const GLubyte*)(p)) - #endif // LL_LINUX && !LL_MESA_HEADLESS - - -diff -Naur linden.orig/indra/newview/llfloaterhtml.cpp linden/indra/newview/llfloaterhtml.cpp ---- linden.orig/indra/newview/llfloaterhtml.cpp 2007-10-20 08:46:29.000000000 +0900 -+++ linden/indra/newview/llfloaterhtml.cpp 2007-10-22 08:40:54.000000000 +0900 -@@ -228,7 +228,9 @@ - // static - void LLFloaterHtml::onCommitUrlEdit(LLUICtrl* ctrl, void* user_data) - { -+#if LL_LIBXUL_ENABLED - LLFloaterHtml* self = (LLFloaterHtml*)user_data; -+#endif - - LLLineEditor* editor = (LLLineEditor*)ctrl; - std::string url = editor->getText(); -diff -Naur linden.orig/indra/newview/llurldispatcher.cpp linden/indra/newview/llurldispatcher.cpp ---- linden.orig/indra/newview/llurldispatcher.cpp 2007-10-20 08:46:31.000000000 +0900 -+++ linden/indra/newview/llurldispatcher.cpp 2007-10-23 01:28:02.000000000 +0900 -@@ -151,7 +151,9 @@ - { - if (matchPrefix(url, SLURL_SL_HELP_PREFIX)) - { -+#if LL_LIBXUL_ENABLED - gViewerHtmlHelp.show(); -+#endif // LL_LIBXUL_ENABLED - return true; - } - return false; -diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp ---- linden.orig/indra/newview/lluserauth.cpp 2007-10-20 08:46:30.000000000 +0900 -+++ linden/indra/newview/lluserauth.cpp 2007-10-22 01:56:46.000000000 +0900 -@@ -45,7 +45,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/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp ---- linden.orig/indra/newview/llvoiceclient.cpp 2007-10-20 08:46:31.000000000 +0900 -+++ linden/indra/newview/llvoiceclient.cpp 2007-10-22 01:56:46.000000000 +0900 -@@ -39,7 +39,7 @@ - #include "llvoavatar.h" - #include "llbufferstream.h" - #include "llfile.h" --#include "expat/expat.h" -+#include "expat.h" - #include "llcallbacklist.h" - #include "llviewerregion.h" - #include "llviewernetwork.h" // for gUserServerChoice -diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp ---- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-10-20 08:46:31.000000000 +0900 -+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-10-22 01:56:46.000000000 +0900 -@@ -37,7 +37,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.18.4.1_rc-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch index 833d53e..8478988 100644 --- a/games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch +++ b/games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch @@ -1,6 +1,6 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct --- linden.orig/indra/SConstruct 2007-10-30 06:12:46.000000000 +0900 -+++ linden/indra/SConstruct 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/SConstruct 2007-11-05 01:14:51.000000000 +0900 @@ -112,7 +112,7 @@ channel = optenv['CHANNEL'] standalone = optenv['STANDALONE'] @@ -28,6 +28,15 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct def pkgconfig(opt, pkgs=None): if pkgs is None: pkgs = standalone_pkgs + standalone_net_pkgs +@@ -243,7 +247,7 @@ + ############## + + # Generic GCC flags +- cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions ' ++ cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions ' + cxxflags = '' + cppflags = '-D_FORTIFY_SOURCE=2 ' + if standalone: @@ -602,7 +606,7 @@ net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ] net_external_libs += [ 'cares', 'expat' ] @@ -48,7 +57,7 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver', diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp --- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-10-30 06:12:46.000000000 +0900 -+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -33,7 +33,7 @@ #include "llimagej2coj.h" @@ -60,7 +69,7 @@ diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej #include "llmemory.h" diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquaternion.cpp --- linden.orig/indra/llmath/llquaternion.cpp 2007-10-30 06:12:46.000000000 +0900 -+++ linden/indra/llmath/llquaternion.cpp 2007-11-03 09:47:50.000000000 +0900 ++++ linden/indra/llmath/llquaternion.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -698,22 +698,22 @@ { default: @@ -92,7 +101,7 @@ diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquate return p; diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp --- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-10-30 06:12:46.000000000 +0900 -+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -80,7 +80,7 @@ #include <sstream> @@ -104,7 +113,7 @@ diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmess #include "llbuffer.h" diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp --- linden.orig/indra/llwindow/llgl.cpp 2007-10-30 06:12:47.000000000 +0900 -+++ linden/indra/llwindow/llgl.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/llwindow/llgl.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -64,7 +64,7 @@ # include "GL/glxext.h" // Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol @@ -116,7 +125,7 @@ diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp diff -Naur linden.orig/indra/newview/llfloaterhtml.cpp linden/indra/newview/llfloaterhtml.cpp --- linden.orig/indra/newview/llfloaterhtml.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/llfloaterhtml.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/llfloaterhtml.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -228,7 +228,9 @@ // static void LLFloaterHtml::onCommitUrlEdit(LLUICtrl* ctrl, void* user_data) @@ -129,7 +138,7 @@ diff -Naur linden.orig/indra/newview/llfloaterhtml.cpp linden/indra/newview/llfl std::string url = editor->getText(); diff -Naur linden.orig/indra/newview/llurldispatcher.cpp linden/indra/newview/llurldispatcher.cpp --- linden.orig/indra/newview/llurldispatcher.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/llurldispatcher.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/llurldispatcher.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -151,7 +151,9 @@ { if (matchPrefix(url, SLURL_SL_HELP_PREFIX)) @@ -142,7 +151,7 @@ diff -Naur linden.orig/indra/newview/llurldispatcher.cpp linden/indra/newview/ll return false; diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp --- linden.orig/indra/newview/lluserauth.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/lluserauth.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/lluserauth.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -45,7 +45,7 @@ // NOTE: MUST include these after otherincludes since queue gets redefined!?!! @@ -154,7 +163,7 @@ diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/llusera diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp --- linden.orig/indra/newview/llvoiceclient.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/llvoiceclient.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/llvoiceclient.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -39,7 +39,7 @@ #include "llvoavatar.h" #include "llbufferstream.h" @@ -166,7 +175,7 @@ diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvo #include "llviewernetwork.h" // for gUserServerChoice diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp --- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/llxmlrpctransaction.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -37,7 +37,7 @@ // Have to include these last to avoid queue redefinition! diff --git a/games-simulation/secondlife/secondlife-1.18.3.5.ebuild b/games-simulation/secondlife/secondlife-1.18.3.5.ebuild deleted file mode 100644 index e445302..0000000 --- a/games-simulation/secondlife/secondlife-1.18.3.5.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit games toolchain-funcs - -DESCRIPTION="A 3D MMORPG virtual world entirely built and owned by its residents" -HOMEPAGE="http://secondlife.com/" -SRC_URI="http://secondlife.com/developers/opensource/downloads/2007/09/slviewer-src-RC-${PV}.tar.gz - http://secondlife.com/developers/opensource/downloads/2007/09/slviewer-artwork-RC-${PV}.zip - http://secondlife.com/developers/opensource/downloads/2007/09/slviewer-linux-libs-RC-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug elfio fmod gstreamer" -#IUSE="debug elfio fmod gstreamer kdu mozlib" -RESTRICT="mirror" - -RDEPEND=">=x11-libs/gtk+-2 - =dev-libs/apr-1* - =dev-libs/apr-util-1* - dev-libs/boost - >=net-misc/curl-7.15.4 - dev-libs/openssl - media-libs/freetype - media-libs/jpeg - media-libs/libsdl - media-libs/mesa - media-libs/libogg - media-libs/libvorbis - fmod? ( x86? ( =media-libs/fmod-3.75* ) ) - =sys-libs/db-4.2* - dev-libs/expat - sys-libs/zlib - >=dev-libs/xmlrpc-epi-0.51 - elfio? ( dev-libs/elfio ) - >=media-libs/openjpeg-1.1.1 - media-fonts/kochi-substitute - gstreamer? ( >=media-libs/gstreamer-0.10 ) - debug? ( dev-libs/google-perftools )" -# mozlib? ( net-libs/llmozlib-xulrunner ) - -DEPEND="${RDEPEND} - >=dev-util/scons-0.97 - dev-util/pkgconfig - sys-devel/flex - sys-devel/bison" - -S="${WORKDIR}/linden/indra" - -dir="${GAMES_DATADIR}/${PN}" - -pkg_config() { - if [ "${ARCH}" != "x86" ] ; then - if use fmod ; then - ewarn "fmod USE flag is only available on x86." - fi -# if use kdu ; then -# ewarn "kdu USE flag is only available on x86." -# fi -# if use mozlib ; then -# ewarn "mozlib USE flag is only available on x86." -# fi - fi -} - -src_unpack() { - # unpack font files - unpack slviewer-linux-libs-RC-${PV}.tar.gz - -# if use kdu ; then -# find linden/libraries -type f -a ! -name '*kdu*' | xargs rm -f || die -# else - rm -rf linden/libraries -# fi - -# if ! use mozlib ; then - rm -rf linden/indra/newview/app_settings -# fi - - unpack slviewer-src-RC-${PV}.tar.gz - unpack slviewer-artwork-RC-${PV}.zip - - cd "${S}" - - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${PN}-1.17.2.0-size_t.patch - - sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" "${S}"/SConstruct || die - - # "${S}"/newview/viewer_manifest.py - #touch "${S}"/newview/gridargs.dat - echo '-settings settings_default.xml -channel "Second Life default"' > "${S}"/newview/gridargs.dat -} - -src_compile() { - local myarch - local myopts="BUILD=release BTARGET=client DISTCC=no" - - if use debug ; then - myopts="${myopts} BUILD=debug" - else - myopts="${myopts} BUILD=release" - fi - - if use elfio ; then - myopts="${myopts} ELFIO=yes" - else - myopts="${myopts} ELFIO=no" - fi - - if use gstreamer ; then - myopts="${myopts} GSTREAMER=yes" - else - myopts="${myopts} GSTREAMER=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 [ "${ARCH}" == "x86" ] ; then - if use fmod; then - myopts="${myopts} FMOD=yes OPENSOURCE=no" - else - myopts="${myopts} FMOD=no OPENSOURCE=yes" - fi - -# if use mozlib ; then -# myopts="${myopts} MOZLIB=yes STANDALONE=no" -# else - myopts="${myopts} MOZLIB=no STANDALONE=yes" -# fi - else - myopts="${myopts} FMOD=no MOZLIB=no STANDALONE=yes OPENSOURCE=yes" - fi - - CLIENT_CPPFLAGS="${CXXFLAGS}" TEMP_BUILD_DIR= scons ${myopts} || die -} - -src_install() { - cd "${S}"/newview/ - - insinto "${dir}" - doins gpu_table.txt gridargs.dat secondlife-i686.supp featuretable_linux.txt || die - doins -r app_settings character fonts skins res-sdl || die - - doins lsl_guide.html releasenotes.txt || die - newins licenses-linux.txt licenses.txt || die - newins linux_tools/client-readme.txt README-linux.txt || die - newins res/ll_icon.ico secondlife.ico || die - - insinto "${dir}"/app_settings/ - doins "${WORKDIR}"/linden/scripts/messages/message_template.msg || die - doins "${WORKDIR}"/linden/etc/message.xml || die - - exeinto "${dir}" - doexe linux_tools/launch_url.sh || die - newexe linux_tools/wrapper.sh secondlife || die - newexe ../linux_crash_logger/linux-crash-logger-*-bin* linux-crash-logger.bin || die - - exeinto "${dir}"/bin/ - newexe secondlife-*-bin do-not-directly-run-secondlife-bin || die - - exeinto "${dir}"/lib - doexe ../lib_release_client/*-linux/lib* || die - - dosym /usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf /usr/share/games/secondlife/unicode.ttf - - games_make_wrapper secondlife ./secondlife "${dir}" - newicon res/ll_icon.ico secondlife.ico || die - make_desktop_entry secondlife "Second Life" secondlife.ico - - dodoc releasenotes.txt - newdoc licenses-linux.txt licenses.txt - newdoc linux_tools/client-readme.txt README-linux.txt - - dohtml lsl_guide.html - - prepgamesdirs -} diff --git a/games-simulation/secondlife/secondlife-1.18.4.0.ebuild b/games-simulation/secondlife/secondlife-1.18.3.5_rc.ebuild index 3f50b03..30c5bfe 100644 --- a/games-simulation/secondlife/secondlife-1.18.4.0.ebuild +++ b/games-simulation/secondlife/secondlife-1.18.3.5_rc.ebuild @@ -4,11 +4,15 @@ inherit games toolchain-funcs +MY_PV="${PV/*_rc/RC-${PV/_rc}}" +GTK_PATCH="gtk-20071105" 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/10/slviewer-src-RC-${PV}.tar.gz - http://secondlife.com/developers/opensource/downloads/2007/10/slviewer-artwork-RC-${PV}.zip - http://secondlife.com/developers/opensource/downloads/2007/10/slviewer-linux-libs-RC-${PV}.tar.gz" +SRC_URI="http://secondlife.com/developers/opensource/downloads/2007/10/slviewer-src-${MY_PV}.tar.gz + http://secondlife.com/developers/opensource/downloads/2007/10/slviewer-artwork-${MY_PV}.zip + http://secondlife.com/developers/opensource/downloads/2007/10/slviewer-linux-libs-${MY_PV}.tar.gz + http://alissa-sabre.cocolog-nifty.com/files/${GTK_PATCH}.tar.bz2 + http://jira.secondlife.com/secure/attachment/11891/ime-20070909.patch" LICENSE="GPL-2" SLOT="0" @@ -18,6 +22,7 @@ IUSE="debug elfio fmod gstreamer" RESTRICT="mirror" RDEPEND=">=x11-libs/gtk+-2 + x11-libs/gtkglext =dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/boost @@ -37,7 +42,6 @@ RDEPEND=">=x11-libs/gtk+-2 elfio? ( dev-libs/elfio ) >=media-libs/openjpeg-1.1.1 media-fonts/kochi-substitute - net-dns/c-ares gstreamer? ( >=media-libs/gstreamer-0.10 ) debug? ( dev-libs/google-perftools )" # mozlib? ( net-libs/llmozlib-xulrunner ) @@ -68,7 +72,7 @@ pkg_config() { src_unpack() { # unpack font files - unpack slviewer-linux-libs-RC-${PV}.tar.gz + unpack slviewer-linux-libs-${MY_PV}.tar.gz # if use kdu ; then # find linden/libraries -type f -a ! -name '*kdu*' | xargs rm -f || die @@ -80,15 +84,22 @@ src_unpack() { rm -rf linden/indra/newview/app_settings # fi - unpack slviewer-src-RC-${PV}.tar.gz - unpack slviewer-artwork-RC-${PV}.zip + unpack slviewer-src-${MY_PV}.tar.gz + unpack slviewer-artwork-${MY_PV}.zip + unpack ${GTK_PATCH}.tar.bz2 cd "${S}" - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${PN}-1.17.2.0-size_t.patch + epatch "${DISTDIR}/ime-20070909.patch" + epatch "${WORKDIR}/${GTK_PATCH/gtk-}/${GTK_PATCH}.patch" + epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${PN}-1.17.2.0-size_t.patch" - sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" "${S}"/SConstruct || die + sed -i \ + -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" \ + -e "/_cflags =/s|-O2|${CFLAGS}|" \ + -e "/_cxxflags =/s|-O2|${CXXFLAGS}|" \ + "${S}"/SConstruct || die # "${S}"/newview/viewer_manifest.py #touch "${S}"/newview/gridargs.dat @@ -148,7 +159,7 @@ src_compile() { myopts="${myopts} FMOD=no MOZLIB=no STANDALONE=yes OPENSOURCE=yes" fi - CLIENT_CPPFLAGS="${CXXFLAGS}" TEMP_BUILD_DIR= scons ${myopts} || die + TEMP_BUILD_DIR= scons ${myopts} || die } src_install() { diff --git a/games-simulation/secondlife/secondlife-1.18.4.1_rc.ebuild b/games-simulation/secondlife/secondlife-1.18.4.1_rc.ebuild index 9720dd7..326324d 100644 --- a/games-simulation/secondlife/secondlife-1.18.4.1_rc.ebuild +++ b/games-simulation/secondlife/secondlife-1.18.4.1_rc.ebuild @@ -39,7 +39,7 @@ RDEPEND=">=x11-libs/gtk+-2 >=media-libs/openjpeg-1.1.1 media-fonts/kochi-substitute net-dns/c-ares - gstreamer? ( >=media-libs/gstreamer-0.10 ) + gstreamer? ( >=media-libs/gst-plugins-base-0.10 ) debug? ( dev-libs/google-perftools )" # mozlib? ( net-libs/llmozlib-xulrunner ) |