rpms/xorg-x11-drv-amd/F-7 amd-build-fixes.patch, NONE, 1.1 lx-downscaling-fix.patch, NONE, 1.1 sources, 1.8, 1.9 xorg-x11-drv-amd.spec, 1.14, 1.15 amd-build-fix.patch, 1.1, NONE amd-visibility.patch, 1.1, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/xorg-x11-drv-amd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8115

Modified Files:
	sources xorg-x11-drv-amd.spec 
Added Files:
	amd-build-fixes.patch lx-downscaling-fix.patch 
Removed Files:
	amd-build-fix.patch amd-visibility.patch 
Log Message:
* Wed Jun 25 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070625
- Udpate to git snapshot
   - Fix downscaling on the LX
   - cairo 1.4.4 and Xorg 1.3 fixes


amd-build-fixes.patch:

--- NEW FILE amd-build-fixes.patch ---
diff --git a/src/amd_gx_accel.c b/src/amd_gx_accel.c
index 98b7fee..e488e60 100644
--- a/src/amd_gx_accel.c
+++ b/src/amd_gx_accel.c
@@ -168,7 +168,7 @@ static const int PDfn_SM[16] = {
 };
 
 #ifdef OPT_ACCEL
-static _X_INLINE CARD32 amd_gx_BppToRasterMode(int bpp)
+static __inline__ CARD32 amd_gx_BppToRasterMode(int bpp)
 {
     switch (bpp) {
     case 16:

lx-downscaling-fix.patch:

--- NEW FILE lx-downscaling-fix.patch ---
diff --git a/src/amd_lx_video.c b/src/amd_lx_video.c
index e1e51aa..a4cd91b 100644
--- a/src/amd_lx_video.c
+++ b/src/amd_lx_video.c
@@ -365,6 +365,7 @@ LXDisplayVideo(ScrnInfoPtr pScrni, int id, short width, short height,
   unsigned long yExtra, uvExtra = 0;
   DF_VIDEO_POSITION vidPos;
   DF_VIDEO_SOURCE_PARAMS vSrcParams;
+  int err;
 
   memset(&vSrcParams, 0, sizeof(vSrcParams));
 
@@ -401,16 +402,14 @@ LXDisplayVideo(ScrnInfoPtr pScrni, int id, short width, short height,
 
   /* Set up scaling */
   df_set_video_filter_coefficients(NULL, 1);
-  
-  if ((drawW >= srcW) && (drawH >= srcH))
-    df_set_video_scale(width, height, drawW, drawH, 
-		       DF_SCALEFLAG_CHANGEX | DF_SCALEFLAG_CHANGEY);
-  else if (drawW < srcW)
-    df_set_video_scale(drawW, height, drawW, drawH,
-		       DF_SCALEFLAG_CHANGEX | DF_SCALEFLAG_CHANGEY);
-  else if (drawH < srcH)
-    df_set_video_scale(width, drawH, drawW, drawH,
-		       DF_SCALEFLAG_CHANGEX | DF_SCALEFLAG_CHANGEY);
+
+  err = df_set_video_scale(width, height, drawW, drawH, 
+                DF_SCALEFLAG_CHANGEX | DF_SCALEFLAG_CHANGEY);
+  if (err != CIM_STATUS_OK) {
+    /* Note the problem, but do nothing for now. */
+    ErrorF("Video scale factor too large: %dx%d -> %dx%d\n",
+           width, height, drawW, drawH);
+  }
   
   /* Figure out clipping */
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/F-7/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Apr 2007 16:35:28 -0000	1.8
+++ sources	25 Jun 2007 19:37:39 -0000	1.9
@@ -1 +1 @@
-0b0d4ace479ec3b42359df6bdc33ba1a  xf86-video-amd-0.0-git20070424.tar.bz2
+330632bf2bfe0c80094dc288788367ab  xf86-video-amd-0.0-git20070625.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-drv-amd/F-7/xorg-x11-drv-amd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-amd.spec	25 Apr 2007 16:35:28 -0000	1.14
+++ xorg-x11-drv-amd.spec	25 Jun 2007 19:37:39 -0000	1.15
@@ -2,13 +2,13 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20070424
+%define gitdate 20070625
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   16.%{gitdate}%{?dist}
-URL:       http://dev.laptop.org/git.do?p=xf86-amd-devel
+Release:   22.%{gitdate}%{?dist}
+URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
 License:   MIT/X11
@@ -35,14 +35,18 @@
 Requires:  xorg-x11-server-Xorg >= 1.1.0
 %endif
 
-Patch: lx-disable-compression.patch
+Patch0: lx-disable-compression.patch
+Patch1: amd-build-fixes.patch
+Patch2: lx-downscaling-fix.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
 
 %prep
-%setup -q -n %{tarball}
-%patch -p1 -b .jx
+%setup -q -n %{tarball}-2.7.6.5
+%patch0 -p1 -b .jx
+%patch1 -p1 -b .build-fix
+%patch2 -p1 -b .lx-downscale-fix
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -51,14 +55,14 @@
 fi
 
 %build
-./autogen.sh --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
+%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
 	     --enable-visibility
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall DESTDIR=$RPM_BUILD_ROOT
 
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 #install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
@@ -74,11 +78,34 @@
 %defattr(-,root,root,-)
 %{driverdir}/amd_drv.so
 %{driverdir}/ztv_drv.so
-#%{_datadir}/hwdata/videoaliases/amd.xinf
-#%dir %{_mandir}/man4x
-%{_mandir}/man4/amd.4*
 
 %changelog
+* Wed Jun 25 2007 Dan Williams <dcbw at redhat.com> 0.0-22.20070625
+- Udpate to git snapshot
+   - Fix downscaling on the LX
+   - cairo 1.4.4 and Xorg 1.3 fixes
+
+* Wed Jun 13 2007 Dan Williams <dcbw at redhat.com> 0.0-21.20070613
+- Udpate to git snapshot
+
+* Mon May 07 2007 Dan Williams <dcbw at redhat.com> 0.0-21.20070504
+- Cleanups and fixes from -Wall
+
+* Fri May 04 2007 Dan Williams <dcbw at redhat.com> 0.0-20.20070504
+- Better OOM handling
+- RandR fixes
+
+* Thu May 03 2007 Dan Williams <dcbw at redhat.com> 0.0-19.20070503
+- Fix QueryImageAttributes handler for GX
+- Get correct prototype for memset/memcpy
+
+* Thu May 03 2007 Dan Williams <dcbw at redhat.com> 0.0-18.20070503
+- VGA port fixes
+- Fixes for Xv color key mode
+
+* Fri Apr 27 2007 Adam Jackson <ajax at redhat.com> 0.0-17.20070427
+- Fix alpha blending.
+
 * Tue Apr 24 2007 Adam Jackson <ajax at redhat.com> 0.0-16.20070424
 - Misc LX fixes.
 


--- amd-build-fix.patch DELETED ---


--- amd-visibility.patch DELETED ---