rpms/xorg-x11-drv-vmware/devel .cvsignore, 1.12, 1.13 abi.patch, 1.1, 1.2 sources, 1.12, 1.13 xorg-x11-drv-vmware.spec, 1.24, 1.25
Dave Airlie
airlied at fedoraproject.org
Tue Aug 4 05:43:44 UTC 2009
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1570
Modified Files:
.cvsignore abi.patch sources xorg-x11-drv-vmware.spec
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 10.16.7-1
- vmware 10.16.7 + new abi patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 20 Mar 2008 02:05:13 -0000 1.12
+++ .cvsignore 4 Aug 2009 05:43:44 -0000 1.13
@@ -1 +1 @@
-xf86-video-vmware-10.16.0.tar.bz2
+xf86-video-vmware-10.16.7.tar.bz2
abi.patch:
vmware.c | 6 ++++++
vmware.h | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
Index: abi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/abi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abi.patch 23 Jun 2009 00:46:35 -0000 1.1
+++ abi.patch 4 Aug 2009 05:43:44 -0000 1.2
@@ -1,78 +1,50 @@
-diff -up xf86-video-vmware-10.16.0/src/vmware.c.abi xf86-video-vmware-10.16.0/src/vmware.c
---- xf86-video-vmware-10.16.0/src/vmware.c.abi 2009-06-23 10:44:26.000000000 +1000
-+++ xf86-video-vmware-10.16.0/src/vmware.c 2009-06-23 10:44:46.000000000 +1000
-@@ -140,38 +140,6 @@ static PciChipsets VMWAREPciChipsets[] =
- { -1, -1, RES_UNDEFINED }
+diff --git a/src/vmware.c b/src/vmware.c
+index 2d1eabd..879c206 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -18,7 +18,9 @@ char rcsId_vmware[] =
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
++#endif
+
+ #include "compiler.h" /* inb/outb */
+
+@@ -109,11 +111,15 @@ static SymTabRec VMWAREChipsets[] = {
+ { -1, NULL }
+ };
+
++#ifndef XSERVER_LIBPCIACCESS
+ static resRange vmwareLegacyRes[] = {
+ { ResExcIoBlock, SVGA_LEGACY_BASE_PORT,
+ SVGA_LEGACY_BASE_PORT + SVGA_NUM_PORTS*sizeof(uint32)},
+ _VGA_EXCLUSIVE, _END
};
++#else
++#define vmwareLegacyRes NULL
++#endif
+
+ #if XSERVER_LIBPCIACCESS
+
+diff --git a/src/vmware.h b/src/vmware.h
+index a3502dd..31560b5 100644
+--- a/src/vmware.h
++++ b/src/vmware.h
+@@ -19,12 +19,14 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
++
+
+ #include <X11/extensions/panoramiXproto.h>
+
+ #ifdef XSERVER_LIBPCIACCESS
+ #include <pciaccess.h>
++#else
++#include "xf86Resources.h"
+ #endif
--static const char *vgahwSymbols[] = {
-- "vgaHWGetHWRec",
-- "vgaHWGetIOBase",
-- "vgaHWGetIndex",
-- "vgaHWInit",
-- "vgaHWProtect",
-- "vgaHWRestore",
-- "vgaHWSave",
-- "vgaHWSaveScreen",
-- "vgaHWUnlock",
-- NULL
--};
--
--static const char *fbSymbols[] = {
-- "fbCreateDefColormap",
-- "fbPictureInit",
-- "fbScreenInit",
-- NULL
--};
--
--static const char *ramdacSymbols[] = {
-- "xf86CreateCursorInfoRec",
-- "xf86DestroyCursorInfoRec",
-- "xf86InitCursor",
-- NULL
--};
--
--static const char *shadowfbSymbols[] = {
-- "ShadowFBInit2",
-- NULL
--};
--
- #ifdef XFree86LOADER
- static XF86ModuleVersionInfo vmwareVersRec = {
- "vmware",
-@@ -634,8 +602,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
- return FALSE;
- }
-
-- xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
- if (!vgaHWGetHWRec(pScrn)) {
- return FALSE;
- }
-@@ -971,15 +937,12 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
--
- /* Need ramdac for hwcursor */
- if (pVMWARE->hwCursor) {
- if (!xf86LoadSubModule(pScrn, "ramdac")) {
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(ramdacSymbols, NULL);
- }
-
- /* Initialise VMWARE_CTRL extension. */
-@@ -1892,10 +1855,6 @@ vmwareSetup(pointer module, pointer opts
- if (!setupDone) {
- setupDone = TRUE;
- xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
--
-- LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
-- shadowfbSymbols, NULL);
--
- return (pointer)1;
- }
- if (errmaj) {
+ #include "compiler.h" /* inb/outb */
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 20 Mar 2008 02:05:13 -0000 1.12
+++ sources 4 Aug 2009 05:43:44 -0000 1.13
@@ -1 +1 @@
-2768dd5c5c3867ac6fc390ae15dc85bd xf86-video-vmware-10.16.0.tar.bz2
+5cddf28a23c21db6d7b8cdba7541391d xf86-video-vmware-10.16.7.tar.bz2
Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/devel/xorg-x11-drv-vmware.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-vmware.spec 27 Jul 2009 08:35:11 -0000 1.24
+++ xorg-x11-drv-vmware.spec 4 Aug 2009 05:43:44 -0000 1.25
@@ -4,8 +4,8 @@
Summary: Xorg X11 vmware video driver
Name: xorg-x11-drv-vmware
-Version: 10.16.0
-Release: 5%{?dist}.1
+Version: 10.16.7
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/vmware.4*
%changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 10.16.7-1
+- vmware 10.16.7 + new abi patch
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.16.0-5.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list