(#fd.o 3990) Add 0.99.1-r5-check-for-glproto.patch. Pass --with-xkb-path=/usr/lib/X11/xkb in attempt to get VT switching closer to working. Update CVS patch to 20050822-1, which makes xprint almost work.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 41 insertions, 7 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index c9f3ccfb92f4..dd77c36b6830 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.32 2005/08/22 17:49:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.33 2005/08/23 01:04:45 spyderous Exp $
+
+  23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/0.99.1-r5-check-for-glproto.patch, xorg-server-0.99.1-r5.ebuild:
+  (#fd.o 3990) Add 0.99.1-r5-check-for-glproto.patch. Pass
+  --with-xkb-path=/usr/lib/X11/xkb in attempt to get VT switching closer to
+  working. Update CVS patch to 20050822-1, which makes xprint almost work.
 
 *xorg-server-0.99.1-r5 (22 Aug 2005)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 81f3ff33241e..fef32c74a219 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,9 +1,10 @@
-MD5 f73ac7221592ce9d9241d1e6a857b584 xorg-server-0.99.1-r5.ebuild 3604
-MD5 c60598ab71f1fd25e46e0660f4e43931 ChangeLog 6212
+MD5 a1aa5c945f39820c9b056e6f3a56ad9d xorg-server-0.99.1-r5.ebuild 3685
+MD5 b4f1105c1e3f8f89375f708c190ae941 ChangeLog 6552
 MD5 c260994b130937c580724129501918cc xorg-server-0.99.1-r4.ebuild 3644
-MD5 c7841c65b2daa6ca9aa3018c2d26c558 files/digest-xorg-server-0.99.1-r5 239
+MD5 09038114af03ae42879f9729972ce96e files/digest-xorg-server-0.99.1-r5 241
 MD5 1fa8d5da48c29537eeca2a0b63fd31a2 files/fix-xnest.patch 682
 MD5 cda95e8d1c7c9540a7619dbe007c125d files/fix-xf86misc-typo.patch 615
 MD5 b74f0fa343d7769d89aec580ae334f4d files/check-for-glproto.patch 876
+MD5 bef863b379ee69c1339b0e01e4d51284 files/0.99.1-r5-check-for-glproto.patch 859
 MD5 15b113cf1db95c72eb12426c0f2bf9ae files/xorg-server-0.99.1-x86_64-1.patch 452
 MD5 c701b68bb6d7f5d733fc97598b9c60e6 files/digest-xorg-server-0.99.1-r4 237
diff --git a/x11-base/xorg-server/files/0.99.1-r5-check-for-glproto.patch b/x11-base/xorg-server/files/0.99.1-r5-check-for-glproto.patch
new file mode 100644
index 000000000000..9703ea5461ac
--- /dev/null
+++ b/x11-base/xorg-server/files/0.99.1-r5-check-for-glproto.patch
@@ -0,0 +1,25 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=3990
+
+diff -urN xorg-server-0.99.1.orig/configure.ac xorg-server-0.99.1/configure.ac
+--- xorg-server-0.99.1.orig/configure.ac	2005-08-22 16:26:40.000000000 -0700
++++ xorg-server-0.99.1/configure.ac	2005-08-22 16:38:06.000000000 -0700
+@@ -340,6 +340,9 @@
+ 	PKG_CHECK_MODULES([LIBDRM], [libdrm])
+ 	AC_SUBST(DRIPROTO_CFLAGS)
+ 	AC_SUBST(LIBDRM_CFLAGS)
++	if test "$GLX" = yes; then
++		PKG_CHECK_MODULES([GL],[glproto])
++	fi
+ fi
+ 
+ AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
+@@ -520,6 +523,9 @@
+ 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
+ 	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $OS_LIB $MIEXT_SHADOW_LIB"
+ 	AC_SUBST([XDMX_LIBS])
++	if test "$GLX" = yes; then
++		PKG_CHECK_MODULES([GL],[glproto])
++	fi
+ fi
+ 
+ 
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
index be530009b32f..24109cd88e29 100644
--- 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
@@ -1,3 +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
+MD5 056f141b4a85bf6426e061ab480c405a xorg-server-0.99.1-update-to-CVS-HEAD-20050822-1.patch.gz 286756
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
index 5c281f1965ec..7a428887c748 100644
--- a/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild,v 1.2 2005/08/23 01:04:45 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -15,9 +15,10 @@ MESA_PV="6.3.2"
 MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
-CVS_UPDATE_DATE="20050822"
+CVS_UPDATE_DATE="20050822-1"
 
 PATCHES="${WORKDIR}/${P}-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch
+	${FILESDIR}/${PVR}-check-for-glproto.patch
 	${FILESDIR}/fix-xnest.patch"
 
 SRC_URI="${SRC_URI}
@@ -88,6 +89,7 @@ pkg_setup() {
 		--enable-xevie
 		--sysconfdir=/etc/X11
 		--localstatedir=/var
+		--with-xkb-path=/usr/lib/X11/xkb
 		--disable-static"
 #		$(use_enable xprint)