rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.903-remove_resources_RAC.patch, NONE, 1.1 xorg-x11-drv-openchrome.spec, 1.48, 1.49

[Xavier Bachelot]

Author: xavierb

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

Modified Files:
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.903-remove_resources_RAC.patch 
Log Message:
resources/RAC removal

openchrome-0.2.903-remove_resources_RAC.patch:
 via_driver.c |   31 +++++++++++++++++++------------
 via_driver.h |    4 ++++
 via_video.c  |    4 ++++
 via_xvmc.c   |    4 ++++
 4 files changed, 31 insertions(+), 12 deletions(-)

--- NEW FILE openchrome-0.2.903-remove_resources_RAC.patch ---
Index: src/via_video.c
===================================================================
--- src/via_video.c	(revision 780)
+++ src/via_video.c	(working copy)
@@ -32,7 +32,11 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
+
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
Index: src/via_driver.c
===================================================================
--- src/via_driver.c	(revision 780)
+++ src/via_driver.c	(working copy)
@@ -29,7 +29,10 @@
 #include "config.h"
 #endif
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
+#endif
+
 #include "shadowfb.h"
 
 #include "globals.h"
@@ -182,18 +185,18 @@
 
 /* Mapping a PCI device ID to a chipset family identifier. */
 static PciChipsets VIAPciChipsets[] = {
-    {VIA_CLE266,   PCI_CHIP_CLE3122,   RES_SHARED_VGA},
-    {VIA_KM400,    PCI_CHIP_VT3205,    RES_SHARED_VGA},
-    {VIA_K8M800,   PCI_CHIP_VT3204,    RES_SHARED_VGA},
-    {VIA_PM800,    PCI_CHIP_VT3259,    RES_SHARED_VGA},
-    {VIA_VM800,    PCI_CHIP_VT3314,    RES_SHARED_VGA},
-    {VIA_K8M890,   PCI_CHIP_VT3336,    RES_SHARED_VGA},
-    {VIA_P4M900,   PCI_CHIP_VT3364,    RES_SHARED_VGA},
-    {VIA_CX700,    PCI_CHIP_VT3324,    RES_SHARED_VGA},
-    {VIA_P4M890,   PCI_CHIP_VT3327,    RES_SHARED_VGA},
-    {VIA_VX800,    PCI_CHIP_VT3353,    RES_SHARED_VGA},
-    {VIA_VX855,    PCI_CHIP_VT3409,    RES_SHARED_VGA},
-    {-1,           -1,                 RES_UNDEFINED}
+    {VIA_CLE266,   PCI_CHIP_CLE3122,   NULL},
+    {VIA_KM400,    PCI_CHIP_VT3205,    NULL},
+    {VIA_K8M800,   PCI_CHIP_VT3204,    NULL},
+    {VIA_PM800,    PCI_CHIP_VT3259,    NULL},
+    {VIA_VM800,    PCI_CHIP_VT3314,    NULL},
+    {VIA_K8M890,   PCI_CHIP_VT3336,    NULL},
+    {VIA_P4M900,   PCI_CHIP_VT3364,    NULL},
+    {VIA_CX700,    PCI_CHIP_VT3324,    NULL},
+    {VIA_P4M890,   PCI_CHIP_VT3327,    NULL},
+    {VIA_VX800,    PCI_CHIP_VT3353,    NULL},
+    {VIA_VX855,    PCI_CHIP_VT3409,    NULL},
+    {-1,           -1,                 NULL}
 };
 
 int gVIAEntityIndex = -1;
@@ -791,11 +794,13 @@
 
     pVia->IsSecondary = FALSE;
     pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources) {
         xfree(pEnt);
         VIAFreeRec(pScrn);
         return FALSE;
     }
+#endif
 
     pVia->EntityIndex = pEnt->index;
 
@@ -914,7 +919,9 @@
         pScrn->rgbBits = 6;
 
     pVia->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
     xf86RegisterResources(pEnt->index, NULL, ResNone);
+#endif
 
 #if 0
     xf86SetOperatingState(RES_SHARED_VGA, pEnt->index, ResUnusedOpr);
Index: src/via_driver.h
===================================================================
--- src/via_driver.h	(revision 780)
+++ src/via_driver.h	(working copy)
@@ -36,7 +36,11 @@
 
 #include "vgaHW.h"
 #include "xf86.h"
+
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
+
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xf86_OSproc.h"
Index: src/via_xvmc.c
===================================================================
--- src/via_xvmc.c	(revision 780)
+++ src/via_xvmc.c	(working copy)
@@ -27,7 +27,11 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
+
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-drv-openchrome.spec	31 Jul 2009 10:44:21 -0000	1.48
+++ xorg-x11-drv-openchrome.spec	25 Aug 2009 19:35:56 -0000	1.49
@@ -10,7 +10,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.903
-Release:	14%{?dist}
+Release:	15%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -25,6 +25,7 @@ Patch99:         openchrome-0.2.903-late
 # Fedora specific patches :
 #Patch100:       openchrome-0.2.903-disable_hwcursor.patch
 # Experimental patches (branch backport, etc...): 
+Patch200:       openchrome-0.2.903-remove_resources_RAC.patch
 Patch208:       openchrome-vt1625.patch
 
 ExclusiveArch:	%{ix86} x86_64
@@ -66,6 +67,7 @@ X.Org X11 openchrome video driver XvMC d
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch99 -p0 -b .latest
+%patch200 -p0 -b .remove_res_RAC
 %patch208 -p0 -b .vt1625
 
 
@@ -124,6 +126,9 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-15
+- Add patch for resources/RAC API removal in xserver (RHBZ#516765).
+
 * Thu Jul 30 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-14
 - Update to latest snapshot (svn 766) for bugfixes.
 - Drop upstreamed patches.