rpms/xorg-x11-drv-chips/devel abi.patch, NONE, 1.1 xorg-x11-drv-chips.spec, 1.20, 1.21

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-chips.spec 
Added Files:
	abi.patch 
Log Message:
* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 1.2.1-3
- Fix ABI for new server


abi.patch:

--- NEW FILE abi.patch ---
diff -up xf86-video-chips-1.2.1/src/ct_driver.c.jx xf86-video-chips-1.2.1/src/ct_driver.c
--- xf86-video-chips-1.2.1/src/ct_driver.c.jx	2008-12-21 23:25:35.000000000 -0500
+++ xf86-video-chips-1.2.1/src/ct_driver.c	2009-06-22 17:48:46.000000000 -0400
@@ -824,9 +824,6 @@ chipsSetup(pointer module, pointer opts,
 	 * Tell the loader about symbols from other modules that this module
 	 * might refer to.
 	 */
-	LoaderRefSymLists(vgahwSymbols, miscfbSymbols, fbSymbols, xaaSymbols,
-			  ramdacSymbols, ddcSymbols, i2cSymbols,
-			  shadowSymbols, vbeSymbols, NULL);
 
 	/*
 	 * The return value must be non-NULL on success even though there
@@ -1182,7 +1179,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
     /* The vgahw module should be loaded here when needed */
     if (!xf86LoadSubModule(pScrn, "vgahw"))
 	return FALSE;
-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
 
     /* Allocate the ChipsRec driverPrivate */
     if (!CHIPSGetRec(pScrn)) {
@@ -1225,7 +1221,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 #if 0
     if (xf86LoadSubModule(pScrn, "int10")) {
  	xf86Int10InfoPtr pInt;
-	xf86LoaderReqSymLists(int10Symbols, NULL);
 #if 1
 	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
 	pInt = xf86InitInt10(cPtr->pEnt->index);
@@ -1235,7 +1230,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 #endif
 
     if (xf86LoadSubModule(pScrn, "vbe")) {
-	xf86LoaderReqSymLists(vbeSymbols, NULL);
 	cPtr->pVbe =  VBEInit(NULL,cPtr->pEnt->index);
     }
     
@@ -1407,7 +1401,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 	    CHIPSFreeRec(pScrn);
 	    return FALSE;
 	}	
-	xf86LoaderReqSymbols("xf1bppScreenInit", NULL);
 	break;
 #endif
 #ifdef HAVE_XF4BPP
@@ -1418,7 +1411,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 	    CHIPSFreeRec(pScrn);
 	    return FALSE;
 	}	
-	xf86LoaderReqSymbols("xf4bppScreenInit", NULL);
 	break;
 #endif
     case 16:
@@ -1429,7 +1421,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 	        CHIPSFreeRec(pScrn);
 		return FALSE;
 	    }	
-	    xf86LoaderReqSymbols("cfb8_16bppScreenInit", NULL);
 	    break;
 	}
     default:
@@ -1439,7 +1430,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 	    CHIPSFreeRec(pScrn);
 	    return FALSE;
 	}	
-	xf86LoaderReqSymLists(fbSymbols, NULL);
 	break;
     }
     
@@ -1450,7 +1440,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 	    CHIPSFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(xaaSymbols, NULL);
     }
 
     if (cPtr->Flags & ChipsShadowFB) {
@@ -1460,7 +1449,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 	    CHIPSFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(shadowSymbols, NULL);
     }
     
     if (cPtr->Accel.UseHWCursor) {
@@ -1470,7 +1458,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flag
 	    CHIPSFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(ramdacSymbols, NULL);
     }
 
     if (cPtr->Flags & ChipsLinearSupport) 
@@ -2029,7 +2016,6 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int 
 	Bool ddc_done = FALSE;
 	xf86MonPtr pMon;
 	
-	xf86LoaderReqSymLists(ddcSymbols, NULL);
 
 	if (cPtr->pVbe) {
 	    if ((pMon 
@@ -2041,7 +2027,6 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int 
 
 	if (!ddc_done)
 	    if (xf86LoadSubModule(pScrn, "i2c")) {
-		xf86LoaderReqSymLists(i2cSymbols,NULL);
 	    
 		if (chips_i2cInit(pScrn)) {
 		    if ((pMon = xf86PrintEDID(xf86DoEDID_DDC2(pScrn->scrnIndex,
@@ -3003,7 +2988,6 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, i
     }
     
     if (xf86LoadSubModule(pScrn, "ddc")) {
-	xf86LoaderReqSymLists(ddcSymbols, NULL);
 	if (cPtr->pVbe)
 	    xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(cPtr->pVbe, NULL)));
     }
@@ -3776,7 +3760,6 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int
 		       "Memory clock option not supported for this chipset\n");
     
     if (xf86LoadSubModule(pScrn, "ddc")) {
-	xf86LoaderReqSymLists(ddcSymbols, NULL);
 	if (cPtr->pVbe)
 	    xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(cPtr->pVbe, NULL)));
     }


Index: xorg-x11-drv-chips.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-chips/devel/xorg-x11-drv-chips.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xorg-x11-drv-chips.spec	26 Feb 2009 10:42:50 -0000	1.20
+++ xorg-x11-drv-chips.spec	22 Jun 2009 21:49:31 -0000	1.21
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 chips video driver
 Name:      xorg-x11-drv-chips
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   chips.xinf
+Patch0:	abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -26,6 +27,7 @@ X.Org X11 chips video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -53,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/chips.4*
 
 %changelog
+* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 1.2.1-3
+- Fix ABI for new server
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild