rpms/xorg-x11-drv-ati/F-7 radeon-6.6.3-renderaccel-buglet.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.50, 1.51

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11128

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.6.3-renderaccel-buglet.patch 
Log Message:
* Tue Jun 19 2007 Adam Jackson <ajax at redhat.com> 6.6.3-4
- radeon-6.6.3-renderaccel-buglet.patch: Fix OpenOffice font corruption
  when RenderAccel is disabled. (#244675)


radeon-6.6.3-renderaccel-buglet.patch:

--- NEW FILE radeon-6.6.3-renderaccel-buglet.patch ---
--- xf86-video-ati-6.6.3/src/radeon_render.c.jx	2006-10-03 11:00:42.000000000 -0400
+++ xf86-video-ati-6.6.3/src/radeon_render.c	2007-06-18 11:27:55.000000000 -0400
@@ -396,7 +396,7 @@
     if (flags & XAA_RENDER_REPEAT)
 	return FALSE;
 
-    if ((width > 2048) || (height > 2048))
+    if ((width > 2047) || (height > 2047))
 	return FALSE;
 
     txformat = RadeonGetTextureFormat(format);
@@ -424,7 +424,7 @@
 	txformat |= ATILog2(width) << RADEON_TXFORMAT_WIDTH_SHIFT;
 	txformat |= ATILog2(height) << RADEON_TXFORMAT_HEIGHT_SHIFT;
     } else {
-	tex_size = ((height - 1) << 16) | (width - 1);
+	tex_size = (height << 16) | width;
 	txformat |= RADEON_TXFORMAT_NON_POWER2;
     }
 


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-7/xorg-x11-drv-ati.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xorg-x11-drv-ati.spec	15 Feb 2007 22:38:14 -0000	1.50
+++ xorg-x11-drv-ati.spec	19 Jun 2007 15:44:23 -0000	1.51
@@ -2,14 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-#%define cvsdate cvs20060404
-
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.3
-Release:   2%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,6 +20,7 @@
 # Radeon patches (0-99)
 Patch0:	    radeon-6.6.1-dotclock-filter.patch
 Patch1:	    radeon-6.6.1-use-mtdriver.patch
+Patch2:     radeon-6.6.3-renderaccel-buglet.patch
 
 # Rage 128 patches (100-199)
 Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
@@ -37,12 +36,12 @@
 
 ExcludeArch: s390 s390x
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.1.1-24
+BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 BuildRequires: mesa-libGL-devel >= 6.4-4
 BuildRequires: libdrm-devel >= 2.0-1
 
-Requires:  xorg-x11-server-Xorg >= 1.1.1-24
+Requires:  hwdata
+Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
 %description 
 X.Org X11 ati video driver.
@@ -52,6 +51,7 @@
 
 %patch0 -p1 -b .dotclock-filter
 %patch1 -p1 -b .mtdriver
+%patch2 -p1 -b .renderaccel
 %patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
 %patch300 -p1 -b .prefer
 
@@ -78,8 +78,6 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/ati_drv.so
 %{driverdir}/atimisc_drv.so
 %{driverdir}/r128_drv.so
@@ -87,16 +85,22 @@
 %{_datadir}/hwdata/videoaliases/ati.xinf
 %{_datadir}/hwdata/videoaliases/r128.xinf
 %{_datadir}/hwdata/videoaliases/radeon.xinf
-%dir %{moduledir}/multimedia
 %{moduledir}/multimedia/theatre200_drv.so
 %{moduledir}/multimedia/theatre_detect_drv.so
 %{moduledir}/multimedia/theatre_drv.so
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/ati.4*
 %{_mandir}/man4/r128.4*
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Jun 19 2007 Adam Jackson <ajax at redhat.com> 6.6.3-4
+- radeon-6.6.3-renderaccel-buglet.patch: Fix OpenOffice font corruption
+  when RenderAccel is disabled. (#244675)
+
+* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 6.6.3-3
+- Update Requires and BuildRequires.  Disown the module directories.  Add
+  Requires: hwdata.
+
 * Thu Feb 15 2007 Adam Jackson <ajax at redhat.com> 6.6.3-2
 - ExclusiveArch -> ExcludeArch