rpms/xorg-x11-drv-ast/devel abi.patch, NONE, 1.1 xorg-x11-drv-ast.spec, 1.14, 1.15
Adam Jackson
ajax at fedoraproject.org
Mon Jun 22 21:46:55 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-ast/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29258
Modified Files:
xorg-x11-drv-ast.spec
Added Files:
abi.patch
Log Message:
* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 0.87.0-3
- Fix ABI for new server
abi.patch:
--- NEW FILE abi.patch ---
diff -up xf86-video-ast-0.87.0/src/ast_driver.c.jx xf86-video-ast-0.87.0/src/ast_driver.c
--- xf86-video-ast-0.87.0/src/ast_driver.c.jx 2008-12-21 23:18:28.000000000 -0500
+++ xf86-video-ast-0.87.0/src/ast_driver.c 2009-06-22 17:45:31.000000000 -0400
@@ -281,10 +281,6 @@ astSetup(pointer module, pointer opts, i
* Tell the loader about symbols from other modules that this module
* might refer to.
*/
- LoaderRefSymLists(vgahwSymbols,
- fbSymbols, xaaSymbols, ramdacSymbols,
- vbeSymbols, vbeOptionalSymbols,
- ddcSymbols, int10Symbols, NULL);
/*
* The return value must be non-NULL on success even though there
@@ -443,12 +439,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
/* The vgahw module should be loaded here when needed */
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
/* The fb module should be loaded here when needed */
if (!xf86LoadSubModule(pScrn, "fb"))
return FALSE;
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Allocate a vgaHWRec */
if (!vgaHWGetHWRec(pScrn))
@@ -707,7 +701,6 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
ASTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
pAST->noAccel = FALSE;
@@ -741,7 +734,6 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
ASTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
pAST->noHWC = FALSE;
pAST->HWCInfo.HWC_NUM = DEFAULT_HWC_NUM;
@@ -1225,7 +1217,6 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
}
if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
MonInfo1 = vbeDoEDID(pVbe, NULL);
MonInfo = MonInfo1;
Index: xorg-x11-drv-ast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ast/devel/xorg-x11-drv-ast.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xorg-x11-drv-ast.spec 26 Feb 2009 10:39:09 -0000 1.14
+++ xorg-x11-drv-ast.spec 22 Jun 2009 21:46:25 -0000 1.15
@@ -5,7 +5,7 @@
Summary: Xorg X11 ast video driver
Name: xorg-x11-drv-ast
Version: 0.87.0
-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: ast.xinf
+Patch0: abi.patch
ExcludeArch: s390 s390x
@@ -26,6 +27,7 @@ X.Org X11 ast video driver.
%prep
%setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
%build
%configure --disable-static --disable-dri
@@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/hwdata/videoaliases/ast.xinf
%changelog
+* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 0.87.0-3
+- Fix ABI for new server
+
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.87.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list