Update to CVS as of 20050822. This should make amd64 and sparc work. Update included mesa to 6.3.2. Stop forcing glx on, it's on by default. Add --disable-static so we don't build .a files for server modules. Add fix-xnest.patch to fix breakage in the Xnest linking, caused by the configure.ac reworking a couple of days ago.

(Portage version: 2.0.51.22-r2)

4 files changed, 172 insertions, 1 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 192a45dbe541..c9f3ccfb92f4 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,16 @@
 # 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.31 2005/08/21 22:00:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.32 2005/08/22 17:49:11 spyderous Exp $
+
+*xorg-server-0.99.1-r5 (22 Aug 2005)
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/fix-xnest.patch, +xorg-server-0.99.1-r5.ebuild:
+  Update to CVS as of 20050822. This should make amd64 and sparc work. Update
+  included mesa to 6.3.2. Stop forcing glx on, it's on by default. Add
+  --disable-static so we don't build .a files for server modules. Add
+  fix-xnest.patch to fix breakage in the Xnest linking, caused by the
+  configure.ac reworking a couple of days ago.
 
   21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-0.99.1-r4.ebuild:
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r5 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r5
new file mode 100644
index 000000000000..be530009b32f
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r5
@@ -0,0 +1,3 @@
+MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
+MD5 0df27701df0924d17ddf41185efa8ce1 MesaLib-6.3.2.tar.bz2 3012145
+MD5 8ba2c37f4c4316c74f74c3e09d135830 xorg-server-0.99.1-update-to-CVS-HEAD-20050822.patch.gz 285541
diff --git a/x11-base/xorg-server/files/fix-xnest.patch b/x11-base/xorg-server/files/fix-xnest.patch
new file mode 100644
index 000000000000..8f91030cb4f0
--- /dev/null
+++ b/x11-base/xorg-server/files/fix-xnest.patch
@@ -0,0 +1,18 @@
+Index: xorg/configure.ac
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
+retrieving revision 1.61
+diff -u -b -B -r1.61 configure.ac
+--- xorg/configure.ac	22 Aug 2005 09:15:20 -0000	1.61
++++ xorg/configure.ac	22 Aug 2005 16:21:26 -0000
+@@ -538,8 +538,9 @@
+ dnl Xnest DDX
+ 
+ AC_MSG_CHECKING([whether to build Xnest DDX])
++PKG_CHECK_MODULES(XNESTMODULES, [xfont xext x11], [have_xnest=yes], [have_xnest=no])
+ if test "x$XNEST" = xauto; then
+-	PKG_CHECK_MODULES(XNESTMODULES, [xfont xext x11], [XNEST=yes], [XNEST=no])
++	XNEST="$have_xnest"
+ fi
+ AC_MSG_RESULT([$XNEST])
+ AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild
new file mode 100644
index 000000000000..5c281f1965ec
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild
@@ -0,0 +1,140 @@
+# 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-r5.ebuild,v 1.1 2005/08/22 17:49:11 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+SNAPSHOT="yes"
+
+inherit flag-o-matic x-modular
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.3.2"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+CVS_UPDATE_DATE="20050822"
+
+PATCHES="${WORKDIR}/${P}-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch
+	${FILESDIR}/fix-xnest.patch"
+
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+	http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch.gz"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+#IUSE="dri ipv6 minimal xprint"
+IUSE="dri 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
+	>=media-libs/mesa-6
+	>=x11-base/opengl-update-2.2.3"
+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/xineramaproto-1.1-r1
+	x11-proto/fontsproto
+	x11-proto/kbproto
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	x11-proto/glproto
+	dri? ( x11-proto/xf86driproto
+		x11-libs/libdrm )"
+#	xprint? ( x11-proto/printproto )
+
+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
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable !minimal dmx)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable dri)
+		--disable-xprint
+		--with-mesa-source=${WORKDIR}/${MESA_P}
+		--enable-xorg
+		--enable-xtrap
+		--enable-xevie
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--disable-static"
+#		$(use_enable xprint)
+
+	# X won't start if -fomit-frame-pointer isn't filtered
+	filter-flags -fomit-frame-pointer
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	dosym Xorg /usr/bin/X
+	fperms 4711 /usr/bin/Xorg
+}
+
+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/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}
+}