rpms/xorg-x11-drv-apm/devel abi.patch, NONE, 1.1 xorg-x11-drv-apm.spec, 1.24, 1.25

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-apm.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-apm-1.2.1/src/apm_driver.c.jx xf86-video-apm-1.2.1/src/apm_driver.c
--- xf86-video-apm-1.2.1/src/apm_driver.c.jx	2008-12-21 23:12:28.000000000 -0500
+++ xf86-video-apm-1.2.1/src/apm_driver.c	2009-06-22 17:38:47.000000000 -0400
@@ -262,11 +262,6 @@ apmSetup(pointer module, pointer opts, i
 	setupDone = TRUE;
 	xf86AddDriver(&APM, module, 0);
 
-	LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, 
-			  miscfbSymbols, ramdacSymbols, vbeSymbols,
-			  ddcSymbols, i2cSymbols, shadowSymbols, 
-			  int10Symbols, NULL);
-
 	return (pointer)1;
     }
     else {
@@ -584,7 +579,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
     if (!xf86LoadSubModule(pScrn, "vgahw"))
 	return FALSE;
 
-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
 
     /*
      * Allocate a vgaHWRec
@@ -854,9 +848,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 	       (unsigned long)pApm->LinAddress);
 
     if (xf86LoadSubModule(pScrn, "ddc")) {
-	xf86LoaderReqSymLists(ddcSymbols, NULL);
 	if (xf86LoadSubModule(pScrn, "i2c")) {
-	    xf86LoaderReqSymLists(i2cSymbols, NULL);
 	    pApm->I2C = TRUE;
 	}
     }
@@ -882,7 +874,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
     if (xf86LoadSubModule(pScrn, "int10")) {
 	void	*ptr;
 
-	xf86LoaderReqSymLists(int10Symbols, NULL);
 	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
 	ptr = xf86InitInt10(pEnt->index);
 	if (ptr)
@@ -1197,9 +1188,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 
     if (mod) {
 	if (req) {
-	    xf86LoaderReqSymbols(req, NULL);
 	} else {
-	    xf86LoaderReqSymLists(fbSymbols, NULL);
 	}
     }
 
@@ -1209,7 +1198,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 	    ApmFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(xaaSymbols, NULL);
     }
 
     /* Load ramdac if needed */
@@ -1218,7 +1206,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 	    ApmFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(ramdacSymbols, NULL);
     }
 
     /* Load shadowfb if needed */
@@ -1227,7 +1214,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 	    ApmFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(shadowSymbols, NULL);
     }
 
     pApm->CurrentLayout.displayWidth	= pScrn->virtualX;


Index: xorg-x11-drv-apm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-apm/devel/xorg-x11-drv-apm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-apm.spec	26 Feb 2009 10:37:13 -0000	1.24
+++ xorg-x11-drv-apm.spec	22 Jun 2009 21:40:02 -0000	1.25
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 apm video driver
 Name:      xorg-x11-drv-apm
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   apm.xinf
 
+Patch0: abi.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -27,6 +29,7 @@ X.Org X11 apm video driver.
 %prep
 
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -54,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/apm.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