rpms/xorg-x11-drv-rendition/devel rendition-4.2.2-abi.patch, NONE, 1.1 xorg-x11-drv-rendition.spec, 1.28, 1.29

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7486

Modified Files:
	xorg-x11-drv-rendition.spec 
Added Files:
	rendition-4.2.2-abi.patch 
Log Message:
* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 4.2.2-4
- rendition-4.2.2-abi.patch: Fix for RAC removal and etc.


rendition-4.2.2-abi.patch:
 rendition.c |    4 ++--
 rendition.h |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE rendition-4.2.2-abi.patch ---
diff --git a/src/rendition.c b/src/rendition.c
index db62f8e..7a9e18b 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -538,7 +538,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index);
     pRendition->pcitag= pciTag(pRendition->PciInfo->bus,
                pRendition->PciInfo->device, pRendition->PciInfo->func);
-#endif
 
     /*
      * XXX This could be refined if some VGA memory resources are not
@@ -549,11 +548,12 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     if (xf86RegisterResources(pRendition->pEnt->index, NULL, ResExclusive))
          return FALSE;
 
+
     /* Operations for which memory access is required. */
     pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR;
     /* Operations for which I/O access is required. (XXX Check this) */
     pScreenInfo->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-    
+#endif
     /* determine depth, bpp, etc. */
     if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb))
         return FALSE;
diff --git a/src/rendition.h b/src/rendition.h
index 2b43cba..ba0a22e 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,11 +37,13 @@
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 /* Needed by Resources Access Control (RAC) */
 #include "xf86RAC.h"
 
 /* Several predefined resource lists */
 #include "xf86Resources.h"
+#endif
 
 /* Needed by the Shadow Framebuffer */
 #include "shadowfb.h"


Index: xorg-x11-drv-rendition.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-rendition.spec	7 Aug 2009 15:02:10 -0000	1.28
+++ xorg-x11-drv-rendition.spec	18 Aug 2009 15:22:02 -0000	1.29
@@ -2,17 +2,18 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 rendition video driver
-Name:      xorg-x11-drv-rendition
-Version:   4.2.2
-Release:   3%{?dist}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    Xorg X11 rendition video driver
+Name:	    xorg-x11-drv-rendition
+Version:    4.2.2
+Release:    4%{?dist}
+URL:	    http://www.x.org
+License:    MIT
+Group:	    User Interface/X Hardware Support
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:    rendition.xinf
+Patch0:	    rendition-4.2.2-abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -26,6 +27,7 @@ X.Org X11 rendition video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/rendition.4*
 
 %changelog
+* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 4.2.2-4
+- rendition-4.2.2-abi.patch: Fix for RAC removal and etc.
+
 * Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 4.2.2-3
 - Un-ship the microcode, it doesn't actually get loaded.