From ccde15904c60f25d21e0a8b095fc1e27f1ff5d96 Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Tue, 10 Jul 2007 12:29:04 +0000 Subject: Added USE flags, Fixed VWR-1598. svn path=/secondlife/; revision=19 --- games-simulation/secondlife/Manifest | 12 ++++++--- .../files/slviewer-1.17.3.0-libresolv.patch | 29 ++++++++++++++++++++++ .../secondlife/secondlife-1.17.3.0.ebuild | 29 ++++++++++++++-------- 3 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 games-simulation/secondlife/files/slviewer-1.17.3.0-libresolv.patch diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest index 70597b7..e75175b 100644 --- a/games-simulation/secondlife/Manifest +++ b/games-simulation/secondlife/Manifest @@ -22,6 +22,10 @@ AUX secondlife-1.17.3.0-gcc4.patch 510 RMD160 798e96765ad4d358d9f152893cdff607c6 MD5 d9972db418d5fae045c5c4e68b7b9dbe files/secondlife-1.17.3.0-gcc4.patch 510 RMD160 798e96765ad4d358d9f152893cdff607c6604ec9 files/secondlife-1.17.3.0-gcc4.patch 510 SHA256 3559de958ad2c7706e81c5e6ffb91d15d7d9d7a82d61f8851ac15e5c821f387d files/secondlife-1.17.3.0-gcc4.patch 510 +AUX slviewer-1.17.3.0-libresolv.patch 1206 RMD160 f7f54cee6797b8109f4b9c64164491ed85538b5e SHA1 85d53019e2fdd62928b3b3b3d6e99023cbd443bf SHA256 f6f653a57f5c7e4adbad54c8632cbe6b56ed784aaa3d0f5b4c5f70b860b9448f +MD5 d16ff2c87ed527e4680ea1ff1e811fb3 files/slviewer-1.17.3.0-libresolv.patch 1206 +RMD160 f7f54cee6797b8109f4b9c64164491ed85538b5e files/slviewer-1.17.3.0-libresolv.patch 1206 +SHA256 f6f653a57f5c7e4adbad54c8632cbe6b56ed784aaa3d0f5b4c5f70b860b9448f files/slviewer-1.17.3.0-libresolv.patch 1206 DIST slviewer-artwork-1.17.0.12.zip 24682087 RMD160 bc0e789608bb7dbde69ed6123ec017c685aa3cd5 SHA1 efcf7825bf76e0af8c572c543487221aa98508fa SHA256 7b7d31a71884d5b116dba57e84ebcea057333ac577edb3fc9d0593c4f886583a DIST slviewer-artwork-1.17.2.0.zip 24684316 RMD160 f95474667f1286c66e846f0c8326cfee63d1d20a SHA1 4d3a282f1c2c44f8eda7f9a2712cd595d2ef5816 SHA256 32d348a3d294ced0a32607d506b452fd24784529bcf89225a53cb36ae03eb147 DIST slviewer-artwork-1.17.3.0.zip 24679565 RMD160 55bee38147f53bd8560b94869518e51a1585a897 SHA1 c32e2aff4945a6ae6b1b3ec065f1c483c76c00ed SHA256 1b57a57b788c73ddc76fcf24a84a51a1169ea89fae0f8ecaf34b5794c55776a7 @@ -39,10 +43,10 @@ EBUILD secondlife-1.17.2.0.ebuild 3795 RMD160 8016dd582d48e979f8b343f4b1bb0b79ad MD5 fffe24bc0b4c0b0c371374fa5213ff36 secondlife-1.17.2.0.ebuild 3795 RMD160 8016dd582d48e979f8b343f4b1bb0b79adcd7020 secondlife-1.17.2.0.ebuild 3795 SHA256 9eeca698c887e27d1f7ea0a3b19d99a96660ebb39fd54d791773b37eb8f8bc0e secondlife-1.17.2.0.ebuild 3795 -EBUILD secondlife-1.17.3.0.ebuild 3853 RMD160 22fc7b0c8ffc9da7f90cedd0f3c178cc3932fa69 SHA1 ad32964a8ef7455d81479bb334d19a999d685fd5 SHA256 961538032e4e423f9002553a518dc6dbfffda8f760a633b7d8ce25caca579438 -MD5 4be5261dbf6b8774547474df05120dd2 secondlife-1.17.3.0.ebuild 3853 -RMD160 22fc7b0c8ffc9da7f90cedd0f3c178cc3932fa69 secondlife-1.17.3.0.ebuild 3853 -SHA256 961538032e4e423f9002553a518dc6dbfffda8f760a633b7d8ce25caca579438 secondlife-1.17.3.0.ebuild 3853 +EBUILD secondlife-1.17.3.0.ebuild 4058 RMD160 01bc0a7ee4d2e7911bc5749f7fb901d69d05416f SHA1 1639de5ae74a02a873d454a131056c753fff9898 SHA256 71893aa1d119152cf33951d4db73cc3daa2d4195f9a40cdb475dc7db0c963a7a +MD5 7cf3e1b46a8576b224a5724ba0733503 secondlife-1.17.3.0.ebuild 4058 +RMD160 01bc0a7ee4d2e7911bc5749f7fb901d69d05416f secondlife-1.17.3.0.ebuild 4058 +SHA256 71893aa1d119152cf33951d4db73cc3daa2d4195f9a40cdb475dc7db0c963a7a secondlife-1.17.3.0.ebuild 4058 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 diff --git a/games-simulation/secondlife/files/slviewer-1.17.3.0-libresolv.patch b/games-simulation/secondlife/files/slviewer-1.17.3.0-libresolv.patch new file mode 100644 index 0000000..4980bb8 --- /dev/null +++ b/games-simulation/secondlife/files/slviewer-1.17.3.0-libresolv.patch @@ -0,0 +1,29 @@ +diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' -x 'i386-*' linden.orig/indra/newview/llsrv.cpp linden.patched/indra/newview/llsrv.cpp +--- linden.orig/indra/newview/llsrv.cpp 2007-07-06 13:43:29.000000000 -0500 ++++ linden.patched/indra/newview/llsrv.cpp 2007-07-07 17:55:10.000000000 -0500 +@@ -73,6 +73,7 @@ + + #include + ++#define HOMEGROWN_RESPONSE_PARSER + #ifdef HOMEGROWN_RESPONSE_PARSER + + // We ought to be using libresolv's ns_initparse and ns_parserr to +diff -urN -x '*.orig' -x '*.rej' -x '*~' -x '.*' -x 'i386-*' linden.orig/indra/SConstruct linden.patched/indra/SConstruct +--- linden.orig/indra/SConstruct 2007-07-07 17:43:13.000000000 -0500 ++++ linden.patched/indra/SConstruct 2007-07-07 17:55:44.000000000 -0500 +@@ -196,13 +196,7 @@ + """ + + '../libraries/' + system_str + '/include' ) + +- if platform == 'linux' and build_target == 'client': +- if arch == 'x86_64' and os.path.exists('/usr/lib64'): +- client_external_libs = [File('/usr/lib64/libresolv.a')] +- else: +- client_external_libs = ['llresolv6'] +- else: +- client_external_libs = ['resolv'] ++ client_external_libs = ['resolv'] + + system_link_flags = '' + diff --git a/games-simulation/secondlife/secondlife-1.17.3.0.ebuild b/games-simulation/secondlife/secondlife-1.17.3.0.ebuild index b6c9080..c30f022 100644 --- a/games-simulation/secondlife/secondlife-1.17.3.0.ebuild +++ b/games-simulation/secondlife/secondlife-1.17.3.0.ebuild @@ -13,8 +13,8 @@ SRC_URI="http://secondlife.com/developers/opensource/downloads/2007/07/slviewer- LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="fmod" -#IUSE="fmod llmozlib" +IUSE="debug elfio fmod" +#IUSE="debug elfio fmod llmozlib" RESTRICT="mirror" RDEPEND=">=x11-libs/gtk+-2 @@ -34,10 +34,10 @@ RDEPEND=">=x11-libs/gtk+-2 dev-libs/expat sys-libs/zlib >=dev-libs/xmlrpc-epi-0.51 - dev-libs/elfio + elfio? ( dev-libs/elfio ) >=media-libs/openjpeg-1.1.1 media-fonts/kochi-substitute - dev-libs/google-perftools" + debug? ( dev-libs/google-perftools )" # llmozlib? ( net-libs/llmozlib-xulrunner ) DEPEND="${RDEPEND} @@ -65,6 +65,9 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-1.17.2.0-size_t.patch epatch "${FILESDIR}"/${P}-gcc4.patch + # VWR-1598 + epatch "${FILESDIR}"/slviewer-${PV}-libresolv.patch + sed -i -e "s|gcc_bin = .*$|gcc_bin = '$(tc-getCXX)'|" "${S}"/SConstruct || die # "${S}"/newview/viewer_manifest.py @@ -75,18 +78,24 @@ src_compile() { local myarch local myopts="BUILD=release BTARGET=client DISTCC=no STANDALONE=yes" + 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 llmozlib ; then # myopts="${myopts} MOZLIB=yes" # else 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" -- cgit v1.2.3-65-gdbad