Add a xorg-server snapshot from upstream. This snapshot compiles against Mesa

6.5 and has AIGLX enabled.
(Portage version: 2.1_pre7-r5)

4 files changed, 210 insertions, 11 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 09231b736f3f..3fca9de123f7 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.100 2006/03/31 20:16:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.101 2006/04/12 03:41:37 joshuabaergen Exp $
+
+*xorg-server-1.0.99.2 (12 Apr 2006)
+
+  12 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.0.99.2.ebuild:
+  Add a xorg-server snapshot from upstream.  This snapshot compiles against Mesa
+  6.5 and has AIGLX enabled.
 
   31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   xorg-server-1.0.2-r3.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index dab928417f89..97952d8ed8de 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6876e200a225d616c76eb4396267c6c1 ChangeLog 20673
 RMD160 876a1b5205a8cfd1baaf16e1a150f1779ef83c9d ChangeLog 20673
 SHA256 1c14bb97403da461a80fc619e9f0f0c9b8c5ef0d665400c71bfcd7ac1339a4b1 ChangeLog 20673
@@ -13,6 +10,9 @@ SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 files/1.
 MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r3 771
 RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r3 771
 SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r3 771
+MD5 2c19dfdb77621385755288fe88c4e0d8 files/digest-xorg-server-1.0.99.2 509
+RMD160 20bdd7703966bd67540349089d6853b62e2405e5 files/digest-xorg-server-1.0.99.2 509
+SHA256 29dee5a695cc7d935fe1f2cccaf449f3255f8ba6e9d17a490ee234da128f2351 files/digest-xorg-server-1.0.99.2 509
 MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
@@ -37,10 +37,9 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 f831e7e1ab71a0c6c60874777dd0fd32 xorg-server-1.0.2-r3.ebuild 5559
 RMD160 b1d34b43c1a06f4dbc2fbfe796278a506ed40dfb xorg-server-1.0.2-r3.ebuild 5559
 SHA256 e23394ec656136f0dfb4e1ed326f72a89e7f2d8ec7c70ba48c3d40ef59e738bb xorg-server-1.0.2-r3.ebuild 5559
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELY4qAiZjviIA2XgRAhWQAJ92V1oTCbLe6+2EaOKAUGwZaggljwCaA//q
-DxUDPx0JgXumWYCpd7Ktk3k=
-=EEGl
------END PGP SIGNATURE-----
+MD5 521f9b9e8bf9b53b90177ab5d3a74075 xorg-server-1.0.2.ebuild 4259
+RMD160 0b1e793c1c5c70ff4f18c27fa65edcf0de024c1a xorg-server-1.0.2.ebuild 4259
+SHA256 c62f4b1d346b486d989380942d3bd2cd6b9a9cef4ed7ffce61a00c19fb13a243 xorg-server-1.0.2.ebuild 4259
+MD5 88a90d0911aee951e374d0bc596054e3 xorg-server-1.0.99.2.ebuild 5339
+RMD160 d6cccd8afda2fa4b98bce5a14608ccdf0d5b42ae xorg-server-1.0.99.2.ebuild 5339
+SHA256 a5e8285e87d33bb2c123ed28109b5467e259ce6be1a72a7c67c5b3d7a5f65d32 xorg-server-1.0.99.2.ebuild 5339
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.2 b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.2
new file mode 100644
index 000000000000..8a6504ed850f
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.2
@@ -0,0 +1,6 @@
+MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
+RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
+SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
+MD5 e19e7e7e923c6a549c0d114c3f5c498c xorg-server-1.0.99.2.tar.bz2 6348876
+RMD160 2d0ed05cf9c209aefdcf67ecc5ffe35c65cf985f xorg-server-1.0.99.2.tar.bz2 6348876
+SHA256 297daddaaf6ea8b4be78a4ae0582810e46a4d4fd56038364e0628cb4900e66f6 xorg-server-1.0.99.2.tar.bz2 6348876
diff --git a/x11-base/xorg-server/xorg-server-1.0.99.2.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.2.ebuild
new file mode 100644
index 000000000000..383690f0c247
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.0.99.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.2.ebuild,v 1.1 2006/04/12 03:41:38 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+#SNAPSHOT="yes"
+
+inherit flag-o-matic x-modular multilib
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.5"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+PATCHES="${FILESDIR}/${PN}-1.0.2-Sbus.patch
+	${FILESDIR}/1.0.2-try-to-fix-xorgcfg.patch
+	${FILESDIR}/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch"
+
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+	http://xorg.freedesktop.org/snapshots/individual/xserver/${P}.tar.bz2"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="dri ipv6 minimal xprint"
+RDEPEND="x11-libs/libXfont
+	x11-libs/xtrans
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXi
+	media-libs/freetype
+	>=media-libs/mesa-6.5
+	media-fonts/font-adobe-75dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-misc/xbitmaps
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/iceauth
+	x11-apps/rgb
+	x11-apps/xauth
+	x11-apps/xinit
+	app-admin/eselect-opengl
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	!minimal? ( x11-libs/libdmx
+		x11-libs/libXtst
+		x11-libs/libXres )
+	x11-libs/libxkbui
+	x11-libs/liblbxutil"
+	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
+	# Xaw is dmx- and xorgcfg-dependent
+	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
+	# Xxf86misc and Xxf86vm are xorgcfg-dependent
+	# liblbxutil is lbx- dependent
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+	x11-proto/renderproto
+	>=x11-proto/fixesproto-4
+	x11-proto/damageproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86rushproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86bigfontproto
+	>=x11-proto/compositeproto-0.3
+	x11-proto/recordproto
+	x11-proto/resourceproto
+	x11-proto/videoproto
+	x11-proto/scrnsaverproto
+	x11-proto/evieext
+	x11-proto/trapproto
+	>=x11-proto/xineramaproto-1.1-r1
+	x11-proto/fontsproto
+	>=x11-proto/kbproto-1.0-r1
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	>=x11-proto/glproto-1.4.1_pre20051013
+	!minimal? ( x11-proto/dmxproto )
+	dri? ( x11-proto/xf86driproto
+		>=x11-libs/libdrm-2 )
+	xprint? ( x11-proto/printproto
+		x11-apps/mkfontdir
+		x11-apps/mkfontscale )"
+LICENSE="${LICENSE} MIT"
+
+pkg_setup() {
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+
+	# --enable-xorg needed because darwin defaults off
+	# --enable-install-setuid needed because sparcs default off
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable !minimal dmx)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable dri)
+		$(use_enable xprint)
+		--with-mesa-source=${WORKDIR}/${MESA_P}
+		--enable-xorg
+		--enable-aiglx
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1"
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	use xprint && xprint_src_install
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
+			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+xprint_src_install() {
+	# RH-style init script, we provide a wrapper
+	exeinto /usr/$(get_libdir)/misc
+	# Actually a shell script, someone messed up
+	newexe ${S}/Xprint/etc/init.d/xprint.cpp xprint
+	sed -e 's/XCOMM/#/' -i ${D}/usr/$(get_libdir)/misc/xprint
+	# Install the wrapper
+	newinitd ${FILESDIR}/xprint.init xprint
+	# Install profile scripts
+	insinto /etc/profile.d
+	doins ${S}/Xprint/etc/profile.d/xprint*
+	insinto /etc/X11/xinit/xinitrc.d
+	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
+		92xprint-xpserverlist.sh
+	# Patch profile scripts
+	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
+		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
+		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
+	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
+	dodoc ${D}/etc/profile.d/xprint*
+	rm -f ${D}/etc/profile.d/xprint*
+}