Rev bump to make sure people get working GL setup.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 129 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index a8735a7d1a48..7c601e8c9de6 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.7 2005/08/10 07:00:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.8 2005/08/10 21:37:59 spyderous Exp $
+
+*xorg-server-0.99.1-r1 (10 Aug 2005)
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.1-r1.ebuild:
+  Rev bump to make sure people get working GL setup.
 
   10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-0.99.1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 94f945812adb..b6cc7630b6ff 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,4 +1,6 @@
-MD5 8ec6bf25fe15c9656c15095419fa798c ChangeLog 1293
+MD5 3456f15537275c2aa475020f09cdc706 xorg-server-0.99.1-r1.ebuild 2891
+MD5 96c91f6f9229d886b7196478b5e5931e ChangeLog 1473
 MD5 c0a77bd0dcd1c32a59067a8ddf824ba3 xorg-server-0.99.1.ebuild 2888
 MD5 139d1af499d5fd30cbb118284544e3f6 files/xorg-composite.patch 2397
 MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1 137
+MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1-r1 137
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r1 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r1
new file mode 100644
index 000000000000..b4cf4fc553af
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r1
@@ -0,0 +1,2 @@
+MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
+MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild
new file mode 100644
index 000000000000..7c52db51595c
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r1.ebuild,v 1.1 2005/08/10 21:37:59 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+SNAPSHOT="yes"
+
+inherit x-modular
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.3.1.1"
+MESA_P="${MESA_PN}-${MESA_PV}"
+
+PATCHES="${FILESDIR}/xorg-composite.patch"
+
+SRC_URI="${SRC_URI}
+	glx? ( http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz )"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~sparc ~x86"
+IUSE="glx dri xinerama ipv6 minimal"
+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
+	glx? ( >=media-libs/mesa-6
+		>=x11-base/opengl-update-2.2.2 )"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/fixesproto
+	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
+	x11-proto/recordproto
+	x11-proto/resourceproto
+	x11-proto/dmxproto
+	x11-proto/videoproto
+	x11-proto/scrnsaverproto
+	x11-proto/evieext
+	x11-proto/trapproto
+	x11-proto/panoramixproto
+	x11-proto/fontsproto
+	x11-proto/kbproto
+	glx? ( x11-proto/glproto )
+	dri? ( x11-proto/xf86driproto
+		x11-libs/libdrm )"
+
+if use glx; then
+	confopts="${confopts} --with-mesa-source=${WORKDIR}/${MESA_P}"
+fi
+
+# 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
+CONFIGURE_OPTIONS="
+	$(use_enable xinerama)
+	$(use_enable ipv6)
+	$(use_enable !minimal dmx)
+	$(use_enable !minimal xvfb)
+	$(use_enable !minimal xnest)
+	$(use_enable glx)
+	$(use_enable dri)
+	--enable-xorg
+	--enable-composite
+	--enable-xtrap
+	--enable-xevie
+	--sysconfdir=/etc/X11
+	--localstatedir=/var
+	${confopts}"
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+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/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
+		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
+		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
+}