X Strike Force X.Org X11 SVN commit: r527 - in branches/6.9/debian: . patches/general
Author: dnusinow
Date: 2005-08-14 18:22:35 -0500 (Sun, 14 Aug 2005)
New Revision: 527
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/general/003_linux.cf_and_xfree86.cf.diff
Log:
- Disable gamma DRI driver, as it is broken upstream. This is in
general/003_linux.cf_and_xfree86.cf.diff
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-08-12 23:31:33 UTC (rev 526)
+++ branches/6.9/debian/changelog 2005-08-14 23:22:35 UTC (rev 527)
@@ -27,6 +27,7 @@
- Forward-port the following:
- general/001_kernel_version_in_banner.diff
- general/003_linux.cf_and_xfree86.cf.diff
+ - Disable gamma DRI driver, as it is broken upstream
- general/008_fix_xgetpw_macro.diff
- general/011a_recognize_glibc_2.3.2_locale_names.diff
- general/020_add_sigusr2_signal_handler.diff
Modified: branches/6.9/debian/patches/general/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- branches/6.9/debian/patches/general/003_linux.cf_and_xfree86.cf.diff 2005-08-12 23:31:33 UTC (rev 526)
+++ branches/6.9/debian/patches/general/003_linux.cf_and_xfree86.cf.diff 2005-08-14 23:22:35 UTC (rev 527)
@@ -24,8 +24,8 @@
Index: xc/config/cf/linux.cf
===================================================================
---- xc/config/cf/linux.cf.orig 2005-08-02 23:27:44.000000000 -0400
-+++ xc/config/cf/linux.cf 2005-08-02 23:33:32.000000000 -0400
+--- xc/config/cf/linux.cf.orig 2005-08-14 19:09:44.000000000 -0400
++++ xc/config/cf/linux.cf 2005-08-14 19:09:45.000000000 -0400
@@ -101,12 +101,22 @@
#endif
@@ -388,8 +388,8 @@
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
Index: xc/config/cf/xfree86.cf
===================================================================
---- xc/config/cf/xfree86.cf.orig 2005-08-02 22:07:53.000000000 -0400
-+++ xc/config/cf/xfree86.cf 2005-08-02 23:33:32.000000000 -0400
+--- xc/config/cf/xfree86.cf.orig 2005-08-12 11:39:00.000000000 -0400
++++ xc/config/cf/xfree86.cf 2005-08-14 19:09:45.000000000 -0400
@@ -233,6 +233,11 @@
#define GlideDriver /**/
#endif
@@ -503,8 +503,8 @@
Index: xc/config/cf/xorg.cf
===================================================================
---- xc/config/cf/xorg.cf.orig 2005-08-02 22:07:53.000000000 -0400
-+++ xc/config/cf/xorg.cf 2005-08-02 23:38:01.000000000 -0400
+--- xc/config/cf/xorg.cf.orig 2005-08-12 11:39:00.000000000 -0400
++++ xc/config/cf/xorg.cf 2005-08-14 19:14:24.000000000 -0400
@@ -262,6 +262,11 @@
#define GlideDriver /**/
#endif
@@ -527,7 +527,7 @@
+# else
+# define TdfxDriDriver /**/
+# endif
-+# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 \
++# define DriDrivers i386DRIDrivers mga r128 radeon r200 \
+ TdfxDriDriver
# endif
#endif /* i386Architecture || ia64Architecture */
@@ -543,7 +543,7 @@
+# endif
# ifndef DriDrivers
-# define DriDrivers i915 mga r128 radeon r200 tdfx
-+# define DriDrivers i915 gamma mga r128 radeon r200 TdfxDriDriver
++# define DriDrivers i915 mga r128 radeon r200 TdfxDriDriver
# endif
#endif /*AMD64Arcitecture*/
@@ -558,7 +558,7 @@
+# endif
# ifndef DriDrivers
-# define DriDrivers tdfx mga r128 radeon r200
-+# define DriDrivers gamma TdfxDriDriver mga r128 radeon r200
++# define DriDrivers TdfxDriDriver mga r128 radeon r200
# endif
#endif /* AlphaArchitecture */
Reply to: