Fix up GLX support wrt #308465, version bump

Package-Manager: portage-2.1.8.3/cvs/Linux ia64

6 files changed, 206 insertions, 40 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 814e7cb1b1f2..4d1d716ca349 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.53 2010/05/12 18:36:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.54 2010/05/29 15:22:42 armin76 Exp $
+
+*tigervnc-1.0.1_p20100529-r1 (29 May 2010)
+*tigervnc-1.0.1_p20100529 (29 May 2010)
+
+  29 May 2010; Raúl Porcel <armin76@gentoo.org> -tigervnc-1.0.0-r2.ebuild,
+  tigervnc-1.0.0-r4.ebuild, tigervnc-1.0.1_pre20100306-r1.ebuild,
+  +tigervnc-1.0.1_p20100529.ebuild, +tigervnc-1.0.1_p20100529-r1.ebuild:
+  Fix up GLX support wrt #308465, version bump
 
   12 May 2010; Brent Baude <ranger@gentoo.org>
   tigervnc-1.0.1_pre20100306-r1.ebuild:
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 2febe7e00788..11578d0084b2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -2,11 +2,14 @@ AUX tigervnc.confd 346 RMD160 07a4541c0d9ef5611afafa8db75d2caf2e7ab051 SHA1 a3b0
 AUX tigervnc.initd 1585 RMD160 2fb536e85fa490df5450bf6e9f0296beb17921b1 SHA1 389d095ce1c18b323208ac059992cbd539d5a6b4 SHA256 a705a1aacdc3149a52b222fb990c654a5b5b5133d24be675ab327ec9a0c6f0e6
 AUX vncviewer.png 4958 RMD160 24ca257dac5de8d97672d943ee47f310af4fe837 SHA1 2f12a12a0f105c6f2ecc9aa306c63719f07b0062 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e
 DIST tigervnc-1.0.0.tar.bz2 2720182 RMD160 759bff85653bf68a29c2a336553bbfadada12223 SHA1 9017f31fe75d0bc49cc9d9f9f6b9f336bf306bd6 SHA256 75c54bf1f976182dd64c2cab5051fcf392091d74636014c2b74ce5b712efbfda
+DIST tigervnc-1.0.1_p20100529.tar.bz2 2455999 RMD160 e27b6b58ba408ff6d514fa651723c048061f3f07 SHA1 1cdf47a8073de7e039742527af895a3f40d45471 SHA256 65cd5bc091370615f6797a72c92f3d014c6e70220c59f314df1234c48c1768f4
 DIST tigervnc-1.0.1_pre20100306.tar.bz2 2475525 RMD160 13fbbd008fbb3b9570f6025f5dac5d1e1fc09341 SHA1 68b193fb76a9fd0e67a8894ad79074a4fd3facc5 SHA256 723e5642c8ab3b7fb321c256d2ad8632cae2680609d05a52dc35e393f493eb4e
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
-EBUILD tigervnc-1.0.0-r2.ebuild 4603 RMD160 d678ec4e14039db7da27d1bfba361fd9f5bc6cd5 SHA1 c80e52260edb2668b45b58be2277c9cb26535c1f SHA256 8a71ebf7917af132e2c08172d98d6a05a2c89fc22f8aff6e89511f4ee7ecaa19
-EBUILD tigervnc-1.0.0-r4.ebuild 4629 RMD160 f2a30e0f7a6cdcaa7e4398f6a40db4c9db5ae1b9 SHA1 2fc38a1e167d092fa0825089ba1f9a220c508fcb SHA256 1e7ecf6acabb3c0777bbabe7f5cac25d7c80e0572befee4de4517cbb5e06e937
-EBUILD tigervnc-1.0.1_pre20100306-r1.ebuild 4679 RMD160 a78523bb5ab4692052c1a6cf56b665466a67ad44 SHA1 481c262eabe50e77b457bb185ef16bfe560d39b6 SHA256 4c7ba7bc17153b93787fe998ecc677b206ff36183b98fa3d5c4126ea39d5344d
-MISC ChangeLog 6581 RMD160 d4258cf2fbb937d1307450aeaf95d68c54eea746 SHA1 26b32995e413995a4b84c1600d552bc6b6e89b3e SHA256 24940191a1829f402832d3b5f204e5346768786edcd1ecd775ddbb9f45325dad
+DIST xorg-server-1.8.1.tar.bz2 5200978 RMD160 27bd6d1e565e241412f1fb8e18b5b9b194b94356 SHA1 cba0d3b3d28696609a1f9b110d4d129cd066e133 SHA256 bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d
+EBUILD tigervnc-1.0.0-r4.ebuild 4644 RMD160 6a6ba8b8a8e02ab34e2e171e5cb9ebd9b195e9c3 SHA1 d1688c0ea1513c839c972906ddc84c177e568084 SHA256 93b98b0229f83f56eb60de4c16fc28de5c5080f9c7f0f219f80e672dfb9ff906
+EBUILD tigervnc-1.0.1_p20100529-r1.ebuild 4432 RMD160 20dc1e04be0e50acc90707fd02f0fd2c1a9228d4 SHA1 44752a0b85da609567059aa3b65837d1788013c7 SHA256 de6d6f8e9a69064b5eebb173c9ef94a64d06fa7e13cd3270be2219bb3c51be37
+EBUILD tigervnc-1.0.1_p20100529.ebuild 4428 RMD160 a3b44be8e195f287c2163871ded60abe881a6b0a SHA1 cba3e21fa24cd58e9d86be2b51c72768bdc1c7b7 SHA256 01e51ed81ec57f226744da8978b4077dd1a5baa26b1fb749e8295ac08e1d23f3
+EBUILD tigervnc-1.0.1_pre20100306-r1.ebuild 4429 RMD160 7c71fe3c3153bcf5f9aa04c41c838e9d2285c591 SHA1 7cd895ab458ca2378c0df5a65bb554280e6fbbee SHA256 ae87e5c3c9b4ab6d28fd946dba365c49b56ac56a806d796699e88abcdf4dc1a5
+MISC ChangeLog 6929 RMD160 ffde2ed79c4b52c36918a54cfe2cd59d77077064 SHA1 508d081a8b70e842e67e86a0fc9605789c44e4b8 SHA256 6c53cb9e41a9287e3123edf0ecea06cb863c94077078ce193f2ca38cf6d6be10
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
diff --git a/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild b/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild
index dd9c1e0679eb..da0c16b33cb8 100644
--- a/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild,v 1.8 2010/03/14 10:57:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.0-r4.ebuild,v 1.9 2010/05/29 15:22:42 armin76 Exp $
 
 EAPI="1"
 
@@ -141,10 +141,10 @@ src_compile() {
 			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
 			--enable-install-libxf86config \
 			--enable-dri2 \
-			--enable-glx \
 			--disable-config-dbus \
 			--disable-config-hal \
 			$(use_enable opengl glx) \
+			$(use_enable nptl glx-tls) \
 			|| die "econf server failed"
 		emake || die "emake server failed"
 	fi
diff --git a/net-misc/tigervnc/tigervnc-1.0.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r1.ebuild
index e3cd4567e301..2def387dc6c8 100644
--- a/net-misc/tigervnc/tigervnc-1.0.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.0-r2.ebuild,v 1.10 2010/01/24 18:08:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r1.ebuild,v 1.1 2010/05/29 15:22:42 armin76 Exp $
 
 EAPI="1"
 
 inherit eutils toolchain-funcs multilib autotools
 
-XSERVER_VERSION="1.6.5"
-#kPATCH="${P/_p*/}-patches-0.3"
-PATCH="${PN}-0.0.90-patches-0.3"
+XSERVER_VERSION="1.8.1"
 OPENGL_DIR="xorg-x11"
 
 DESCRIPTION="Remote desktop viewer display system"
@@ -17,13 +15,10 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
 	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
 
-#	mirror://gentoo/${PATCH}.tar.bz2
-#	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="+opengl server +xorgmodule"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nptl +opengl server +xorgmodule"
 
 RDEPEND="sys-libs/zlib
 	media-libs/freetype
@@ -50,6 +45,7 @@ RDEPEND="sys-libs/zlib
 	!net-misc/tightvnc
 	!net-misc/xf4vnc"
 DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
 	x86? ( dev-lang/nasm )
 	>=x11-proto/inputproto-1.5
 	>=x11-proto/xextproto-7.0.3
@@ -93,7 +89,7 @@ pkg_setup() {
 	else
 		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
 		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set --impl-headers ${OPENGL_DIR}
+		eselect opengl set ${OPENGL_DIR}
 	fi
 }
 
@@ -111,28 +107,24 @@ src_unpack() {
 
 	if use server ; then
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-#	else
-#		rm -f "${WORKDIR}"/patch/*tigervnc-server*
 	fi
 
-#	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-
-	cd unix
 	eautoreconf
+	cd unix
+
 	if use server ; then
-		epatch xserver16.patch
+		epatch xserver18.patch
 		cd xserver
 		eautoreconf
 	fi
 }
 
 src_compile() {
-	cd unix
-	econf || die "econf failed"
+	econf --without-included-zlib --with-system-jpeg || die "econf failed"
 	emake || die "emake failed"
 
 	if use server ; then
-		cd xserver
+		cd unix/xserver
 		econf \
 			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
 			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
@@ -141,10 +133,10 @@ src_compile() {
 			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
 			--enable-install-libxf86config \
 			--enable-dri2 \
-			--enable-glx \
 			--disable-config-dbus \
 			--disable-config-hal \
 			$(use_enable opengl glx) \
+			$(use_enable nptl glx-tls) \
 			|| die "econf server failed"
 		emake || die "emake server failed"
 	fi
diff --git a/net-misc/tigervnc/tigervnc-1.0.1_p20100529.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_p20100529.ebuild
new file mode 100644
index 000000000000..f0f0d455ceea
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.0.1_p20100529.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_p20100529.ebuild,v 1.1 2010/05/29 15:22:42 armin76 Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.7.6"
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nptl +opengl server +xorgmodule"
+
+RDEPEND="sys-libs/zlib
+	media-libs/freetype
+	x11-libs/libSM
+	x11-libs/libXtst
+	app-admin/eselect-opengl
+	server? (
+		x11-libs/libXi
+		x11-libs/libXfont
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-libs/pixman
+		x11-apps/xauth
+		x11-apps/xsetroot
+		media-fonts/font-adobe-100dpi
+		media-fonts/font-adobe-75dpi
+		media-fonts/font-alias
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
+	)
+	!net-misc/vnc
+	!net-misc/tightvnc
+	!net-misc/xf4vnc"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-1.5
+	>=x11-proto/xextproto-7.0.3
+	>=x11-proto/xproto-7.0.13
+	server?	(
+		x11-proto/bigreqsproto
+		x11-proto/compositeproto
+		x11-proto/damageproto
+		x11-proto/dri2proto
+		x11-proto/fixesproto
+		x11-proto/fontsproto
+		>=x11-proto/randrproto-1.2.99
+		x11-proto/resourceproto
+		x11-proto/scrnsaverproto
+		x11-proto/trapproto
+		x11-proto/videoproto
+		x11-proto/xcmiscproto
+		x11-proto/xineramaproto
+		x11-proto/xf86bigfontproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86driproto
+		x11-proto/xf86miscproto
+		x11-proto/xf86vidmodeproto
+		opengl? ( >=x11-proto/glproto-1.4.10 )
+		>=media-libs/mesa-7.1
+		>=x11-proto/renderproto-0.9.3
+		x11-libs/libpciaccess
+		>=x11-libs/xtrans-1.2.2
+	)"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	if ! use server ; then
+		echo
+		einfo "The 'server' USE flag will build tigervnc's server."
+		einfo "If '-server' is chosen only the client is built to save space."
+		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
+		ebeep
+		epause 5
+	else
+		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+		OLD_IMPLEM="$(eselect opengl show)"
+		eselect opengl set ${OPENGL_DIR}
+	fi
+}
+
+switch_opengl_implem() {
+	# Switch to the xorg implementation.
+	# Use new opengl-update that will not reset user selected
+	# OpenGL interface ...
+	echo
+	eselect opengl set ${OLD_IMPLEM}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
+	fi
+
+	eautoreconf
+	cd unix
+	if use server ; then
+		epatch xserver17.patch
+		cd xserver
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	econf --without-included-zlib --with-system-jpeg || die "econf failed"
+	emake || die "emake failed"
+
+	if use server ; then
+		cd unix/xserver
+		econf \
+			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+			--disable-static --disable-xinerama \
+			--disable-composite \
+			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+			--enable-install-libxf86config \
+			--enable-dri2 \
+			--disable-config-dbus \
+			--disable-config-hal \
+			$(use_enable opengl glx) \
+			$(use_enable nptl glx-tls) \
+			|| die "econf server failed"
+		emake || die "emake server failed"
+	fi
+}
+
+src_install() {
+	cd unix
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newman vncviewer/vncviewer.man vncviewer.1
+	dodoc README
+
+	doicon "${FILESDIR}"/vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		cd xserver/hw/vnc
+		emake DESTDIR="${D}" install || die "emake install failed"
+		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
+	else
+		cd "${D}"
+		for f in vncserver vncpasswd x0vncserver vncconfig; do
+			rm usr/bin/$f
+			rm usr/share/man/man1/$f.1
+		done
+	fi
+}
+
+pkg_postinst() {
+	use server && switch_opengl_implem
+}
diff --git a/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild
index 259c830f1cbd..bf87f356f8ed 100644
--- a/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild,v 1.5 2010/05/12 18:36:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild,v 1.6 2010/05/29 15:22:42 armin76 Exp $
 
 EAPI="1"
 
 inherit eutils toolchain-funcs multilib autotools
 
 XSERVER_VERSION="1.7.6"
-#kPATCH="${P/_p*/}-patches-0.3"
-PATCH="${PN}-0.0.90-patches-0.3"
 OPENGL_DIR="xorg-x11"
 
 DESCRIPTION="Remote desktop viewer display system"
@@ -17,13 +15,10 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
 	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
 
-#	mirror://gentoo/${PATCH}.tar.bz2
-#	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86"
-IUSE="+opengl server +xorgmodule"
+IUSE="nptl +opengl server +xorgmodule"
 
 RDEPEND="sys-libs/zlib
 	media-libs/freetype
@@ -112,12 +107,8 @@ src_unpack() {
 
 	if use server ; then
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-#	else
-#		rm -f "${WORKDIR}"/patch/*tigervnc-server*
 	fi
 
-#	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-
 	eautoreconf
 	cd unix
 	if use server ; then
@@ -128,7 +119,6 @@ src_unpack() {
 }
 
 src_compile() {
-#	cd unix
 	econf --without-included-zlib --with-system-jpeg || die "econf failed"
 	emake || die "emake failed"
 
@@ -142,10 +132,10 @@ src_compile() {
 			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
 			--enable-install-libxf86config \
 			--enable-dri2 \
-			--enable-glx \
 			--disable-config-dbus \
 			--disable-config-hal \
 			$(use_enable opengl glx) \
+			$(use_enable nptl glx-tls) \
 			|| die "econf server failed"
 		emake || die "emake server failed"
 	fi