Added >=net-dns/c-ares-1.15 support.

svn path=/secondlife/; revision=51

4 files changed, 239 insertions, 2 deletions

diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest
index aaa47c6..16ec3af 100644
--- a/games-simulation/secondlife/Manifest
+++ b/games-simulation/secondlife/Manifest
@@ -1,3 +1,4 @@
+AUX VWR-3480.patch 1167 RMD160 6a03c6217f58ef93883a1051c249739a383dd838 SHA1 60c41ce545436f9bb05e208d26cf93b5d6a33efa SHA256 aee57a7bdfd039daa776b20476b1cd8836979301f16e07842d6f1b1f1e63ab74
 AUX secondlife-1.17.2.0-size_t.patch 462 RMD160 07db64e519f9a4fffbd03fcc6ce975470fed4f52 SHA1 f2e38d9ca34b234c940fa2fd5abcfe1f22d7084a SHA256 b1fb3ef3d60e803cca87ed660f0ea02cbb6b98bc75170fa0de7008f7eab7f96e
 AUX secondlife-1.18.5.3-gentoo.patch 3479 RMD160 6a6a245b955ea528a838889f6058536354371eb3 SHA1 a547768f2605d593e6415c240ef4d0d66d7b7a41 SHA256 c958409f8c97b9e8aff24fb1e0d25318c54e6d73eab064cb6da9da047dba1ab6
 AUX secondlife-1.19.1.4-gentoo.patch 2873 RMD160 4b65726e8f79529e97b893b63fbb35df07f7b855 SHA1 ca0547cd518f5f10039af643ba4706194c254b16 SHA256 ed66ff5858dc14458fa1a518e033f5b44e0206658ee3aed0c7c59003ac58cf9a
@@ -8,6 +9,7 @@ DIST slviewer-linux-libs-Branch_1-19-1-Viewer-r84244.tar.gz 34922331 RMD160 7958
 DIST slviewer-src-1.18.5.3.tar.gz 5529567 RMD160 66d2f20bbb94d69dfa8294e3cfa5495d13299457 SHA1 fb7bd6959bc59305677e10d8f0c958ccf82b4e60 SHA256 6030f5d78fa8f38f7e58c89aae45b1b6e10ed364979fafa4a3ec83b0cfc0ffd7
 DIST slviewer-src-Branch_1-19-1-Viewer-r84244.tar.gz 5810319 RMD160 a4946a30edd65b72d619329c9c855e8739c22816 SHA1 551730f5d426bcb8b0faa01cbc8aeaab71b494f5 SHA256 88260d1efd0ba7583efcbaeac768b0e9e3c99031304aaa6b9c1df3c81488307c
 EBUILD secondlife-1.18.5.3.ebuild 4848 RMD160 405c062ed0a85aa4298264dac872274e6a69db2e SHA1 4b671cdb4e591686a5e8ce806ec8f3617b7b29e9 SHA256 e7b35a1e4f8097bb874d698d164928341694f19cc62b81ce78aa223f4fe3e935
-EBUILD secondlife-1.19.1.4.ebuild 4855 RMD160 8278d974a324acc271fc2b4534ab00c66ee698bb SHA1 30d97ec331e7a0496d3f7622693ba02f1efb5f7a SHA256 7a2f2a92f499f1272114dde468ca96450c8ee183c9a36aefcbc9eeba526f5c8f
+EBUILD secondlife-1.19.1.4-r1.ebuild 4898 RMD160 5c9fa376b3371b56104b7eb44f6ef73c5567b8f9 SHA1 62aebb465f20204b3ac3b0c55324d18978d26d4a SHA256 e66e148ab4ce1ef0845d82234442eb721752a7cd07018e5f71635b4f1404771e
+EBUILD secondlife-1.19.1.4.ebuild 4861 RMD160 3dbbf028a1a13b4763b0c21d593870e80131fe83 SHA1 e09e13e86bfe56529583499dc710f64d18ecd6b6 SHA256 a60d6a8a704f9d929df2547269e8caf9b0f733b48096d28890ae3a7358162891
 MISC ChangeLog 397 RMD160 63706792a2ef7f9f6415e659f853b285deae8b2f SHA1 17e67ab90c2e9e9498546dea1e697fff4757555c SHA256 cfd4bfd6466fb3e1db42817b34283356390a43f1e54f0b8217847a6d78a15dc6
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/games-simulation/secondlife/files/VWR-3480.patch b/games-simulation/secondlife/files/VWR-3480.patch
new file mode 100644
index 0000000..d6dfcbf
--- /dev/null
+++ b/games-simulation/secondlife/files/VWR-3480.patch
@@ -0,0 +1,30 @@
+diff -Naur linden.orig/indra/llcommon/llares.cpp linden/indra/llcommon/llares.cpp
+--- linden.orig/indra/llcommon/llares.cpp	2008-04-08 11:37:54.000000000 +0900
++++ linden/indra/llcommon/llares.cpp	2008-05-19 08:35:30.000000000 +0900
+@@ -120,7 +120,7 @@
+ 		ares_cancel(chan_);
+ }
+ 
+-static void host_callback(void *arg, int status, struct hostent *ent)
++static void host_callback(void *arg, int status, int timeouts, struct hostent *ent)
+ {
+ 	LLPointer<LLAres::HostResponder> *resp =
+ 		(LLPointer<LLAres::HostResponder> *) arg;
+@@ -388,7 +388,7 @@
+ 			<< LLAres::strerror(code) << llendl;
+ }
+ 
+-static void nameinfo_callback(void *arg, int status, char *node, char *service)
++static void nameinfo_callback(void *arg, int status, int timeouts, char *node, char *service)
+ {
+ 	LLPointer<LLAres::NameInfoResponder> *resp =
+ 		(LLPointer<LLAres::NameInfoResponder> *) arg;
+@@ -415,7 +415,7 @@
+ 					 new LLPointer<NameInfoResponder>(resp));
+ }
+ 
+-static void search_callback(void *arg, int status, unsigned char *abuf,
++static void search_callback(void *arg, int status, int timeouts, unsigned char *abuf,
+ 							int alen)
+ {
+ 	LLPointer<LLAres::QueryResponder> *resp =
diff --git a/games-simulation/secondlife/secondlife-1.19.1.4-r1.ebuild b/games-simulation/secondlife/secondlife-1.19.1.4-r1.ebuild
new file mode 100644
index 0000000..981aaa2
--- /dev/null
+++ b/games-simulation/secondlife/secondlife-1.19.1.4-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games toolchain-funcs
+
+MY_PV="Branch_1-19-1-Viewer-r84244"
+MY_DATE="2008/04"
+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/${MY_DATE}/slviewer-src-${MY_PV}.tar.gz
+	http://secondlife.com/developers/opensource/downloads/${MY_DATE}/slviewer-artwork-${MY_PV}.zip
+	http://secondlife.com/developers/opensource/downloads/${MY_DATE}/slviewer-linux-libs-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug elfio fmod gstreamer kdu llmozlib2"
+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-r1
+	elfio? ( dev-libs/elfio )
+	>=media-libs/openjpeg-1.1.1
+	media-fonts/kochi-substitute
+	>=net-dns/c-ares-1.5
+	x11-libs/pango
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10 )
+	debug? ( dev-libs/google-perftools )"
+#	llmozlib2? ( net-libs/llmozlib2 )
+
+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 llmozlib2 ; then
+			ewarn "llmozlib2 USE flag is only available on x86."
+		fi
+	fi
+}
+
+src_unpack() {
+	# unpack font files
+	unpack slviewer-linux-libs-${MY_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 llmozlib2 ; then
+		rm -rf linden/indra/newview/app_settings
+	fi
+
+	unpack slviewer-src-${MY_PV}.tar.gz
+	unpack slviewer-artwork-${MY_PV}.zip
+
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/VWR-3480.patch
+
+	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
+}
+
+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 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"
+		else
+			myopts="${myopts} FMOD=no"
+		fi
+
+		if use kdu ; then
+			myopts="${myopts} OPENSOURCE=no"
+		else
+			myopts="${myopts} OPENSOURCE=yes"
+		fi
+
+		if use llmozlib2 ; then
+			myopts="${myopts} MOZLIB2=yes"
+		else
+			myopts="${myopts} MOZLIB2=no"
+		fi
+	else
+		myopts="${myopts} FMOD=no MOZLIB2=no OPENSOURCE=yes"
+	fi
+
+	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_*_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.19.1.4.ebuild b/games-simulation/secondlife/secondlife-1.19.1.4.ebuild
index c51ba0a..2964836 100644
--- a/games-simulation/secondlife/secondlife-1.19.1.4.ebuild
+++ b/games-simulation/secondlife/secondlife-1.19.1.4.ebuild
@@ -38,7 +38,7 @@ RDEPEND=">=x11-libs/gtk+-2
 	elfio? ( dev-libs/elfio )
 	>=media-libs/openjpeg-1.1.1
 	media-fonts/kochi-substitute
-	net-dns/c-ares
+	<net-dns/c-ares-1.15
 	x11-libs/pango
 	gstreamer? ( >=media-libs/gst-plugins-base-0.10 )
 	debug? ( dev-libs/google-perftools )"