diff options
author | 2009-05-26 22:49:36 +0000 | |
---|---|---|
committer | 2009-05-26 22:49:36 +0000 | |
commit | 66b43b4f76986f78895fbfb9fcc9edbcc6b73553 (patch) | |
tree | ad0a4f3ef030290f53115e4ea1c64acf9eaa9e69 /games-simulation/secondlife | |
parent | Fix build issues. Per bug #271325. (diff) | |
download | historical-66b43b4f76986f78895fbfb9fcc9edbcc6b73553.tar.gz historical-66b43b4f76986f78895fbfb9fcc9edbcc6b73553.tar.bz2 historical-66b43b4f76986f78895fbfb9fcc9edbcc6b73553.zip |
New package: Second Life viewer
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'games-simulation/secondlife')
9 files changed, 230 insertions, 0 deletions
diff --git a/games-simulation/secondlife/ChangeLog b/games-simulation/secondlife/ChangeLog new file mode 100644 index 000000000000..42876c0556d1 --- /dev/null +++ b/games-simulation/secondlife/ChangeLog @@ -0,0 +1,15 @@ +# ChangeLog for games-simulation/secondlife +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/ChangeLog,v 1.1 2009/05/26 22:49:36 lavajoe Exp $ + +*secondlife-1.23.2_rc2 (26 May 2009) + + 26 May 2009; Joe Peterson <lavajoe@gentoo.org> + +secondlife-1.23.2_rc2.ebuild, + +files/secondlife-1.23.2_rc2-fix-memset-error.patch, + +files/secondlife-1.23.2_rc2-fix-printf-format-error.patch, + +files/secondlife-1.23.2_rc2-fix-uninitialized-gdkcolor.patch, + +files/secondlife-disable-ndof.patch, + +files/secondlife-fix-cmake-include-path.patch, +metadata.xml: + New package: Second Life viewer + diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest new file mode 100644 index 000000000000..2d49cbfadda4 --- /dev/null +++ b/games-simulation/secondlife/Manifest @@ -0,0 +1,13 @@ +AUX secondlife-1.23.2_rc2-fix-memset-error.patch 477 RMD160 04884855bfdb1cf1c5500942c8ff2ff4dfa78ab3 SHA1 63db029995464160a2e0fb8e56b4eeea6f9e63a7 SHA256 3046b715b667a39fcf9f66fabe9b131d0839e48aa40b9a814889db5b73e35f83 +AUX secondlife-1.23.2_rc2-fix-printf-format-error.patch 546 RMD160 a89790fcb463a3b65b251da90731088f7dca4529 SHA1 b2abbce7bfec0e38515ea7f575dd5156724eb6d2 SHA256 1ad359259c6187ae65b23f18f5990afc6234b2e620194fa3a44baf9433f0c987 +AUX secondlife-1.23.2_rc2-fix-uninitialized-gdkcolor.patch 416 RMD160 f24518fcb869b082618f73d344745da620e19eb2 SHA1 5eb11f83f5593515c738fceb1799983a61bb61bd SHA256 1e0183f61dbfaa97067bf10657b6e587119dde597c898cb2ec5a7e89c8d49b96 +AUX secondlife-disable-ndof.patch 302 RMD160 e4f7947c8362d914808d4eb7fef90c7044883280 SHA1 8b76332cf5093b9c77d443986cde01aae3db6bc6 SHA256 e532e9618afc28e543f79c0ec4195b16f2c945d7184abb7d121a42275c6e58b7 +AUX secondlife-fix-cmake-include-path.patch 444 RMD160 0cb80fe8aecb0d88027c844577158054884018f1 SHA1 472a39c127324d7801284d9c362b6fc916ca4fe9 SHA256 9934aea45e6a8303ea9a059855e4cbfdcb60570adea43967d483003310ae2b05 +DIST glh_linear-linux-20080613.tar.bz2 8822 RMD160 28461838d90c03b666fd9f3b44e795ae3272b661 SHA1 37b1dc99797a643dc1cf5892fad7f48980a94f40 SHA256 1582ca663eb5eb5cb6bb24c09f8de4e91c17cab3e488bdb35c1d6113a520a143 +DIST slviewer-artwork-viewer-1.23.2-r120719.zip 10127954 RMD160 8555d1494236790c68c0397e95e6e12e8b4d75d7 SHA1 8a7d3549bede62823bc6cbebc3cfb3bdcf4565d3 SHA256 4995d37c86fca63b2bce5711b55fcc83dda68c050edd81f6b0343b0b0cee42b6 +DIST slviewer-linux-libs-viewer-1.23.2-r120719.tar.gz 548524 RMD160 a77f849c643c56276ee024e7f9754593e62f6699 SHA1 a44b94249465e106c7d8326d32a00402881e7740 SHA256 b0035eeb201577fe6ba65b16be2ca22473548cd002c0325e59112aa483163bf6 +DIST slviewer-src-viewer-1.23.2-r120719.tar.gz 8059168 RMD160 d161beb02a64910600d9f7d00acd327cc4223704 SHA1 51a6caa21a17311ea80b9c1a9ab65cdae931fb5d SHA256 2285a5c5fb56227805aa2276b88e30a53e445257a86c62f7713442efc8dcd1e9 +DIST xmlrpc-epi-0.54.tar.gz 491572 RMD160 4f51c47f1e84a21b0041e770d9362c8be371c242 SHA1 e547f2399c008a818b43161c1df593a0490c7567 SHA256 bd685ec51a477a28735188c10313d9f9ca35a7725a740ad49ccdcf62d9ca0e3f +EBUILD secondlife-1.23.2_rc2.ebuild 5057 RMD160 6f8960b22d3f815300390163cfd572a8f41ca6d6 SHA1 0dcbc0834ef28649d3852fc380573cf0b25b2cc3 SHA256 e03549df4e82338a19ca6023b72a26ec531a34ec7290e7e43ce74587cd909772 +MISC ChangeLog 670 RMD160 99ed9c78b54ea85d694f3b4a5a28c98de09b6e1e SHA1 c85bd71eac752881e099fc62342a603e1459ebd0 SHA256 134d12fae7a08d7484492161abb20b34d6950c632d9f7f8f82662cf025b0e249 +MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055 diff --git a/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-memset-error.patch b/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-memset-error.patch new file mode 100644 index 000000000000..edff470da052 --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-memset-error.patch @@ -0,0 +1,12 @@ +--- linden/indra/llmessage/lltemplatemessagereader.cpp~ 2009-05-20 15:26:15.000000000 -0600 ++++ linden/indra/llmessage/lltemplatemessagereader.cpp 2009-05-25 21:56:50.000000000 -0600 +@@ -676,8 +676,7 @@ + + // default to 0s. + U32 size = mvci.getSize(); +- std::vector<U8> data(size); +- memset(&(data[0]), 0, size); ++ std::vector<U8> data(size, 0); + cur_data_block->addData(mvci.getName(), &(data[0]), + size, mvci.getType()); + } diff --git a/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-printf-format-error.patch b/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-printf-format-error.patch new file mode 100644 index 000000000000..c99b5302b3da --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-printf-format-error.patch @@ -0,0 +1,11 @@ +--- linden/indra/newview/llappviewerlinux.cpp~ 2009-05-20 15:26:19.000000000 -0600 ++++ linden/indra/newview/llappviewerlinux.cpp 2009-05-25 23:24:31.000000000 -0600 +@@ -188,7 +188,7 @@ + for (i = 0; i < size; i++) + { + // the format of the StraceFile is very specific, to allow (kludgy) machine-parsing +- fprintf(StraceFile, "%-3d ", i); ++ fprintf(StraceFile, "%-3ld ", (long) i); + fprintf(StraceFile, "%-32s\t", "unknown"); + fprintf(StraceFile, "%p ", stackarray[i]); + fprintf(StraceFile, "%s\n", strings[i]); diff --git a/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-uninitialized-gdkcolor.patch b/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-uninitialized-gdkcolor.patch new file mode 100644 index 000000000000..e51edaeea883 --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-1.23.2_rc2-fix-uninitialized-gdkcolor.patch @@ -0,0 +1,10 @@ +--- linden/indra/llwindow/llwindowsdl.cpp~ 2009-05-20 15:26:16.000000000 -0600 ++++ linden/indra/llwindow/llwindowsdl.cpp 2009-05-25 21:42:55.000000000 -0600 +@@ -2195,6 +2195,7 @@ + orig_color.red = guint16(65535 * *r); + orig_color.green= guint16(65535 * *g); + orig_color.blue = guint16(65535 * *b); ++ orig_color.pixel = 0; + color = orig_color; + + gtk_color_selection_set_previous_color (colorsel, &color); diff --git a/games-simulation/secondlife/files/secondlife-disable-ndof.patch b/games-simulation/secondlife/files/secondlife-disable-ndof.patch new file mode 100644 index 000000000000..5c9506d71555 --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-disable-ndof.patch @@ -0,0 +1,10 @@ +--- linden/indra/newview/CMakeLists.txt~ 2009-05-20 15:26:16.000000000 -0600 ++++ linden/indra/newview/CMakeLists.txt 2009-05-25 22:12:33.000000000 -0600 +@@ -30,7 +30,6 @@ + include(LScript) + include(Linking) + include(Mozlib) +-include(NDOF) + include(GooglePerfTools) + include(TemplateCheck) + include(UI) diff --git a/games-simulation/secondlife/files/secondlife-fix-cmake-include-path.patch b/games-simulation/secondlife/files/secondlife-fix-cmake-include-path.patch new file mode 100644 index 000000000000..bf7d9d2ec83a --- /dev/null +++ b/games-simulation/secondlife/files/secondlife-fix-cmake-include-path.patch @@ -0,0 +1,10 @@ +--- linden/indra/cmake/FindXmlRpcEpi.cmake~ 2009-05-20 15:26:14.000000000 -0600 ++++ linden/indra/cmake/FindXmlRpcEpi.cmake 2009-05-25 15:04:07.000000000 -0600 +@@ -22,6 +22,7 @@ + + IF (XMLRPCEPI_LIBRARY AND XMLRPCEPI_INCLUDE_DIR) + SET(XMLRPCEPI_LIBRARIES ${XMLRPCEPI_LIBRARY}) ++ INCLUDE_DIRECTORIES(${XMLRPCEPI_INCLUDE_DIR}) + SET(XMLRPCEPI_FOUND "YES") + ELSE (XMLRPCEPI_LIBRARY AND XMLRPCEPI_INCLUDE_DIR) + SET(XMLRPCEPI_FOUND "NO") diff --git a/games-simulation/secondlife/metadata.xml b/games-simulation/secondlife/metadata.xml new file mode 100644 index 000000000000..fa0705095167 --- /dev/null +++ b/games-simulation/secondlife/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> + <email>lavajoe@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/games-simulation/secondlife/secondlife-1.23.2_rc2.ebuild b/games-simulation/secondlife/secondlife-1.23.2_rc2.ebuild new file mode 100644 index 000000000000..45919bd0e70d --- /dev/null +++ b/games-simulation/secondlife/secondlife-1.23.2_rc2.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/secondlife-1.23.2_rc2.ebuild,v 1.1 2009/05/26 22:49:36 lavajoe Exp $ + +inherit eutils multilib games versionator + +SECONDLIFE_REVISION=120719 +SECONDLIFE_RELEASE_DIR=2009/05 +SECONDLIFE_MAJOR_VER=$(get_version_component_range 1-2) +SECONDLIFE_MINOR_VER=$(get_version_component_range 3) +SECONDLIFE_MINOR_VER=${SECONDLIFE_MINOR_VER/rc/} +MY_P="slviewer-src-viewer-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}-r${SECONDLIFE_REVISION}" + +DESCRIPTION="The Second Life (an online, 3D virtual world) viewer" +HOMEPAGE="http://secondlife.com/" +SRC_URI="http://secondlife.com/developers/opensource/downloads/${SECONDLIFE_RELEASE_DIR}/${MY_P}.tar.gz http://secondlife.com/developers/opensource/downloads/${SECONDLIFE_RELEASE_DIR}/slviewer-artwork-viewer-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}-r${SECONDLIFE_REVISION}.zip http://secondlife.com/developers/opensource/downloads/${SECONDLIFE_RELEASE_DIR}/slviewer-linux-libs-viewer-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}-r${SECONDLIFE_REVISION}.tar.gz mirror://sourceforge/xmlrpc-epi/xmlrpc-epi-0.54.tar.gz http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080613.tar.bz2" + +LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception Epinions" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="sys-libs/glibc + sys-apps/dbus + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + >=x11-libs/gtk+-2.0 + x11-libs/libXinerama + dev-libs/libgcrypt + dev-libs/libgpg-error + dev-libs/openssl + dev-libs/apr + dev-libs/apr-util + dev-libs/boost + dev-libs/elfio + dev-libs/expat + dev-util/cmake + media-libs/freetype + media-libs/libogg + media-libs/libsdl + media-libs/libvorbis + media-libs/gstreamer + media-plugins/gst-plugins-meta + media-libs/fmod + media-libs/jpeg + media-libs/openjpeg + net-libs/gnutls + net-misc/curl + net-dns/c-ares + sys-libs/zlib + virtual/libstdc++ + virtual/glu + virtual/opengl + media-libs/openal + media-libs/freealut" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/linden" + +use amd64 && ARCH_LIBS_DIR="x86_64-linux" +use x86 && ARCH_LIBS_DIR="i686-linux" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Fix cmake include path (so it can find xmlrpc includes) + epatch "${FILESDIR}/${PN}-fix-cmake-include-path.patch" + + # Disable NDOF (joystick) that will not compile + epatch "${FILESDIR}/${PN}-disable-ndof.patch" + + # Fix uninitialized GdkColor + epatch "${FILESDIR}/${P}-fix-uninitialized-gdkcolor.patch" + + # Fix memset used with constant zero length parameter error + epatch "${FILESDIR}/${P}-fix-memset-error.patch" + + # Fix printf format type error + epatch "${FILESDIR}/${P}-fix-printf-format-error.patch" + + # Move extra glh include file into place. + # NOTE: This is hackish, since it had to be downloaded from the SL site + # separately as part of the batch used when *not* building the + # viewer standalone (this ebuild *does* build it standalone). + mv ../indra/llwindow/glh indra/llwindow || die + rm -r ../indra || die + + # Add local paths to the xmlrpc-epi cmake files. + # NOTE: This lib is downloaded separately, since it is + # not available in Gentoo. + sed -i -e"s:/usr/local/include:${S}/libraries/${ARCH_LIBS_DIR}/include /usr/local/include:" indra/cmake/FindXmlRpcEpi.cmake || die + sed -i -e"s:/usr/lib:${S}/libraries/${ARCH_LIBS_DIR}/lib_release_client /usr/lib:" indra/cmake/FindXmlRpcEpi.cmake || die + + # Make 3rd party package area for xmlrpc-epi + mkdir -p libraries/${ARCH_LIBS_DIR}/include || die + mkdir libraries/${ARCH_LIBS_DIR}/lib_release_client || die +} + +src_compile() { + # First, build xmlrpc-epi + cd "${WORKDIR}/xmlrpc-epi-"* + + econf + emake || die + + # Copy relevant files from xmlrpc-epi to 3rd party package area + rm src/.libs/libxmlrpc-epi.la || die + cp src/libxmlrpc-epi.la src/.libs || die + mkdir "${S}"/libraries/${ARCH_LIBS_DIR}/include/xmlrpc-epi || die + cp -dR src/*.h "${S}"/libraries/${ARCH_LIBS_DIR}/include/xmlrpc-epi || die + cp -dR src/.libs/libxmlrpc* "${S}"/libraries/${ARCH_LIBS_DIR}/lib_release_client || die + + # Now build the Second Life viewer + cd "${S}/indra" + + ./develop.py --standalone configure || die + ./develop.py --standalone build || die +} + +src_install() { + cd "${S}"/indra/viewer-*/newview/packaged || die + + dodoc README-*.txt licenses.txt || die + rm README-*.txt licenses.txt || die + + dodir /usr/lib/${PN} || die + cp -dR "${S}"/libraries/${ARCH_LIBS_DIR}/lib_release_client/libxml* "${D}"/usr/lib/${PN} || die + #cp -dR bin secondlife *.sh "${D}"/usr/lib/${PN} || die + #rm -r bin secondlife *.sh || die + cp -dR * "${D}"/usr/lib/${PN} || die + chmod o-x "${D}"/usr/lib/${PN}/bin/* "${D}"/usr/lib/${PN}/secondlife "${D}"/usr/lib/${PN}/*.sh || die + chgrp games "${D}"/usr/lib/${PN}/bin/* "${D}"/usr/lib/${PN}/secondlife "${D}"/usr/lib/${PN}/*.sh || die + + games_make_wrapper secondlife "./secondlife --set VersionChannelName Gentoo" /usr/lib/${PN} /usr/lib/${PN} + make_desktop_entry secondlife "Second Life" /usr/share/${PN}/secondlife_icon.png + + prepgamesdirs +} |