- fix for symbol list removal.

This commit is contained in:
Adam Jackson 2009-08-07 20:26:30 +00:00
parent 04dbc0185f
commit 26f910bbce
2 changed files with 44 additions and 1 deletions

38
abi2.patch Normal file
View File

@ -0,0 +1,38 @@
diff -up xf86-video-vmware-10.16.7/src/vmware.c.jx xf86-video-vmware-10.16.7/src/vmware.c
--- xf86-video-vmware-10.16.7/src/vmware.c.jx 2009-08-07 16:31:33.000000000 -0400
+++ xf86-video-vmware-10.16.7/src/vmware.c 2009-08-07 16:32:10.000000000 -0400
@@ -640,8 +640,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
return FALSE;
}
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
if (!vgaHWGetHWRec(pScrn)) {
return FALSE;
}
@@ -959,7 +957,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
VMWAREFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
/* Need ramdac for hwcursor */
if (pVMWARE->hwCursor) {
@@ -967,7 +964,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
VMWAREFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
return TRUE;
@@ -2051,9 +2047,6 @@ vmwareSetup(pointer module, pointer opts
setupDone = TRUE;
xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
- LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
- shadowfbSymbols, NULL);
-
return (pointer)1;
}
if (errmaj) {

View File

@ -5,7 +5,7 @@
Summary: Xorg X11 vmware video driver
Name: xorg-x11-drv-vmware
Version: 10.16.7
Release: 1%{?dist}
Release: 2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Source1: vmware.xinf
Patch0: abi.patch
Patch1: abi2.patch
ExclusiveArch: %{ix86} x86_64 ia64
@ -31,6 +32,7 @@ X.Org X11 vmware video driver.
%prep
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .abi
%patch1 -p1 -b .abi2
%build
%if 0%{?gitdate}
@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/vmware.4*
%changelog
* Fri Aug 07 2009 Adam Jackson <ajax@redhat.com> 10.16.7-2
- fix for symbol list removal.
* Tue Aug 04 2009 Dave Airlie <airlied@redhat.com> 10.16.7-1
- vmware 10.16.7 + new abi patch