xserver-xorg-video-vmware: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
configure.ac | 2 +-
man/.cvsignore | 2 --
src/.cvsignore | 6 ------
src/vmware.c | 8 +++++++-
src/vmware.h | 4 +++-
6 files changed, 11 insertions(+), 30 deletions(-)
New commits:
commit 6c8fc7b280295b823675285ed78b0fb2365bcf07
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Tue Sep 8 22:21:33 2009 -0700
Bump fo 10.16.8 Release
diff --git a/configure.ac b/configure.ac
index eb5142e..b4e6a17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vmware],
- 10.16.7,
+ 10.16.8,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vmware)
diff --git a/src/vmware.c b/src/vmware.c
index 879c206..6004677 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -85,7 +85,7 @@ char rcsId_vmware[] =
#define VMWARE_DRIVER_NAME "vmware"
#define VMWARE_MAJOR_VERSION 10
#define VMWARE_MINOR_VERSION 16
-#define VMWARE_PATCHLEVEL 7
+#define VMWARE_PATCHLEVEL 8
#define VMWARE_DRIVER_VERSION \
(VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + VMWARE_PATCHLEVEL)
#define VMWARE_DRIVER_VERSION_STRING \
commit e3e3d8d2488bd289660943e9038bdbe29e11cf77
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 7 11:12:13 2009 -0400
xf86-video-vmware: Remove unused .cvsignore file #23776
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
commit cce33db3f95c6f3c8537c782063b6ca9ad68f332
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:42 2009 +1000
vmware: change to using ABI version check
diff --git a/src/vmware.c b/src/vmware.c
index 9ea9fff..879c206 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -18,7 +18,7 @@ char rcsId_vmware[] =
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
commit 0fddce5511b761206bb5f59dcd17652f15bda5ef
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 14:11:59 2009 +1000
vmware: fix resource removal properly
diff --git a/src/vmware.c b/src/vmware.c
index b1a9070..9ea9fff 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -118,7 +118,7 @@ static resRange vmwareLegacyRes[] = {
_VGA_EXCLUSIVE, _END
};
#else
-static int vmwareLegacyRes = 0;
+#define vmwareLegacyRes NULL
#endif
#if XSERVER_LIBPCIACCESS
commit 4605e8d3a99ddcd75314051bd00b51d8ecee06a1
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:41 2009 +1000
vmware: update for resources/RAC API removal
diff --git a/src/vmware.c b/src/vmware.c
index 2d1eabd..b1a9070 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -18,7 +18,9 @@ char rcsId_vmware[] =
#include "xf86.h"
#include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#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
+static int vmwareLegacyRes = 0;
+#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
#include "compiler.h" /* inb/outb */
Reply to: