rpms/xorg-x11-drv-ark/devel abi.patch, NONE, 1.1 xorg-x11-drv-ark.spec, 1.21, 1.22

[Adam Jackson]

Author: ajax

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

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


abi.patch:

--- NEW FILE abi.patch ---
diff -up xf86-video-ark-0.7.1/src/ark_driver.c.jx xf86-video-ark-0.7.1/src/ark_driver.c
--- xf86-video-ark-0.7.1/src/ark_driver.c.jx	2008-12-22 00:24:33.000000000 -0500
+++ xf86-video-ark-0.7.1/src/ark_driver.c	2009-06-22 17:43:06.000000000 -0400
@@ -167,7 +167,6 @@ pointer ARKSetup(pointer module, pointer
 	if (!setupDone) {
 		setupDone = TRUE;
 		xf86AddDriver(&ARK, module, 0);
-		LoaderRefSymLists(fbSymbols, vgaHWSymbols, xaaSymbols, NULL);
 		return (pointer) 1;
 	} else {
 		if (errmaj)
@@ -277,7 +276,6 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn
 	if (!xf86LoadSubModule(pScrn, "vgahw"))
 		return FALSE;
 
-	xf86LoaderReqSymLists(vgaHWSymbols, NULL);
 
 	if (!vgaHWGetHWRec(pScrn))
 		return FALSE;
@@ -499,14 +497,12 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn
 	    return FALSE;
 	}
 
-	xf86LoaderReqSymLists(fbSymbols, NULL);
 
 	if (!pARK->NoAccel) {
 		if (!xf86LoadSubModule(pScrn, "xaa")) {
 			ARKFreeRec(pScrn);
 			return FALSE;
 		}
-		xf86LoaderReqSymLists(xaaSymbols, NULL);
 	}
 
 	return TRUE;


Index: xorg-x11-drv-ark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ark/devel/xorg-x11-drv-ark.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xorg-x11-drv-ark.spec	26 Feb 2009 10:38:10 -0000	1.21
+++ xorg-x11-drv-ark.spec	22 Jun 2009 21:43:50 -0000	1.22
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ark video driver
 Name:      xorg-x11-drv-ark
 Version:   0.7.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:   ark.xinf
+Patch0: abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -26,6 +27,7 @@ X.Org X11 ark video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -51,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hwdata/videoaliases/ark.xinf
 
 %changelog
+* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 0.7.1-3
+- Fix ABI for new server
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild