rpms/xorg-x11/devel xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch, 1.2, 1.3 xorg-x11.spec, 1.232, 1.233

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9945

Modified Files:
	xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch xorg-x11.spec 
Log Message:
* Mon Oct 10 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-55
- Fix inverted logic in xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch, to
  properly disable DRI on 7000.


xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch:
 radeon.man      |    7 +++++++
 radeon_driver.c |   22 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

Index: xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch	12 Jul 2005 16:37:45 -0000	1.2
+++ xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch	10 Oct 2005 12:01:43 -0000	1.3
@@ -41,7 +41,7 @@
 +	     * for bug #150174
 +	     */
 +	    if (info->ChipFamily == CHIP_FAMILY_RV100) {
-+		if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE )) {
++		if (xf86ReturnOptValBool(info->Options, OPTION_DRI, TRUE )) {
 +		    info->directRenderingEnabled = FALSE;
 +		    xf86DrvMsg(scrnIndex, X_WARNING,
 +			    "Direct Rendering is currently disabled on Radeon VE/7000\n\t"


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- xorg-x11.spec	27 Sep 2005 00:29:09 -0000	1.232
+++ xorg-x11.spec	10 Oct 2005 12:02:00 -0000	1.233
@@ -18,7 +18,7 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 54
+Release: 55
 #Release: 1.FC3.54.0
 #Release: ?.FC4.54.0
 
@@ -3644,6 +3644,10 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Mon Oct 10 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-55
+- Fix inverted logic in xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch, to
+  properly disable DRI on 7000.
+
 * Mon Sep 26 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-54
 - Disable stack-protector by 's/-fstack-protector/-fno-stack-protector' in
   RPM_OPT_FLAGS, as it breaks the X server in bug (#169311)