summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-08-22 17:49:11 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-08-22 17:49:11 +0000
commit519de34b0f8892fc91a7e336a411595ea6f24b5d (patch)
tree167ae590f970e1ee21380541f456fd950aa50e06 /x11-base/xorg-server/files
parentDon't build .a files for drivers; Don't install libtool archives for server m... (diff)
downloadgentoo-2-519de34b0f8892fc91a7e336a411595ea6f24b5d.tar.gz
gentoo-2-519de34b0f8892fc91a7e336a411595ea6f24b5d.tar.bz2
gentoo-2-519de34b0f8892fc91a7e336a411595ea6f24b5d.zip
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)
Diffstat (limited to 'x11-base/xorg-server/files')
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-0.99.1-r53
-rw-r--r--x11-base/xorg-server/files/fix-xnest.patch18
2 files changed, 21 insertions, 0 deletions
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])