xserver-xorg-video-vmware: Changes to 'upstream-unstable'
.gitignore | 83 ++++++++++++++++++++++++++++++++++++-------
ChangeLog | 95 --------------------------------------------------
Makefile.am | 11 +++++
configure.ac | 17 ++++++--
man/.gitignore | 1
src/vmware.c | 11 +++++
src/vmwarecurs.c | 36 ++++++++++--------
vmwarectrl/.gitignore | 2 +
8 files changed, 122 insertions(+), 134 deletions(-)
New commits:
commit 991830e39c34d0a4530a5c5023ec92cf0d7395b0
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 17:53:35 2009 +0100
Bump for 10.16.9 release.
diff --git a/configure.ac b/configure.ac
index dc781ce..4940e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vmware],
- 10.16.8,
+ 10.16.9,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vmware)
diff --git a/src/vmware.c b/src/vmware.c
index a1575dd..bae2d56 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 8
+#define VMWARE_PATCHLEVEL 9
#define VMWARE_DRIVER_VERSION \
(VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + VMWARE_PATCHLEVEL)
#define VMWARE_DRIVER_VERSION_STRING \
commit 5a36fcb6a5899e5cfdf6d65e05e3f999d5d25b2a
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 17:00:45 2009 +0100
VMWAREComposite: Only hide cursor if source picture is backed by drawable.
Should fix https://bugs.freedesktop.org/show_bug.cgi?id=14208 .
diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
index b7c61fa..017af28 100644
--- a/src/vmwarecurs.c
+++ b/src/vmwarecurs.c
@@ -436,24 +436,26 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
PictureScreenPtr ps = GetPictureScreen(pScreen);
BoxRec box;
Bool hidden = FALSE;
-
- VmwareLog(("VMWAREComposite op = %d, pSrc = %p, pMask = %p, pDst = %p,"
- " src = (%d, %d), mask = (%d, %d), dst = (%d, %d), w = %d,"
- " h = %d\n", op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
- xDst, yDst, width, height));
-
- /*
- * We only worry about the source region here, since shadowfb or XAA will
- * take care of the destination region.
- */
- box.x1 = pSrc->pDrawable->x + xSrc;
- box.y1 = pSrc->pDrawable->y + ySrc;
- box.x2 = box.x1 + width;
- box.y2 = box.y1 + height;
- if (BOX_INTERSECT(box, pVMWARE->hwcur.box)) {
- PRE_OP_HIDE_CURSOR();
- hidden = TRUE;
+ if (pSrc->pDrawable) {
+ VmwareLog(("VMWAREComposite op = %d, pSrc = %p, pMask = %p, pDst = %p,"
+ " src = (%d, %d), mask = (%d, %d), dst = (%d, %d), w = %d,"
+ " h = %d\n", op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,
+ xDst, yDst, width, height));
+
+ /*
+ * We only worry about the source region here, since shadowfb or XAA
+ * will take care of the destination region.
+ */
+ box.x1 = pSrc->pDrawable->x + xSrc;
+ box.y1 = pSrc->pDrawable->y + ySrc;
+ box.x2 = box.x1 + width;
+ box.y2 = box.y1 + height;
+
+ if (BOX_INTERSECT(box, pVMWARE->hwcur.box)) {
+ PRE_OP_HIDE_CURSOR();
+ hidden = TRUE;
+ }
}
ps->Composite = pVMWARE->Composite;
commit 4bec18ab8dffd90ab84b986de2136a9d848d3a4a
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 16:41:16 2009 +0100
vmware: Fix crash with xserver >= 1.7.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=24541 .
diff --git a/configure.ac b/configure.ac
index af3deb5..dc781ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,10 @@ PKG_CHECK_EXISTS([xorg-server >= 1.2.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_2_0], 1,
[Has version 1.2.0 or greater of the Xserver])])
+PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
+ [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
+ [Has version 1.7.0 or greater of the Xserver])])
+
# Checks for libraries.
diff --git a/src/vmware.c b/src/vmware.c
index 6004677..a1575dd 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -146,6 +146,13 @@ static PciChipsets VMWAREPciChipsets[] = {
{ -1, -1, RES_UNDEFINED }
};
+#if HAVE_XORG_SERVER_1_7_0
+
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+
+#else
+
static const char *vgahwSymbols[] = {
"vgaHWGetHWRec",
"vgaHWGetIOBase",
@@ -178,6 +185,8 @@ static const char *shadowfbSymbols[] = {
NULL
};
+#endif /* HAVE_XORG_SERVER_1_7_0 */
+
#ifdef XFree86LOADER
static XF86ModuleVersionInfo vmwareVersRec = {
"vmware",
commit 74c830e61bdf700c7e422aaa5b1a0136561295dd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:06 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 9f8913c..00c154d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
INSTALL:
commit e8f5a924226aacc280923aed661b5a821fdaffe8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 49c1d74..9f8913c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
.PHONY: ChangeLog INSTALL
commit edb6fcb49bae735c45d9565f7aa8313396cf3b15
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index ac9caf7..49c1d74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 59b2a41..af3deb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit dcb3d3ed2ba2129b433eee0d18ec86e1e0a6f21f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:23 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e1a5979..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,95 +0,0 @@
-2006-09-03 Philip langdale <plangdale@vmware.com>
-
- * src/vmware.c:
- * src/vmware.h:
- * src/vmwarectrl.c:
- Fix https://bugs.freedesktop.org/show_bug.cgi?id=8094
- Lazily allocate the dynamic modes used for pixel precise guest
- resizing. They will not appear until they are neeed.
-
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/vmware.c:
- * src/vmware.h:
- Unlibcwrap. Bump server version requirement. Bump to 10.13.0.
-
-2006-02-06 Philip Langdale <plangdale@vmware.com>
-
- * configure.ac: Bump version number.
- * src/vmware.c
- * src/vmware.h: (VMWAREScreenInit) Set up the additional
- state required by the VMWARE_CTRL extension.
- A src/vmwarectrl.c
- A src/vmwarectrl.h
- A src/vmwarectrlproto.h: Add implementation of the VMWARE_CTRL
- extension.
-
- This change adds the VMWARE_CTRL extension which allows for
- an X client to request an arbitrary resolution be made
- available in the modeline list. The intent here is not to
- replace XF86VidMode (which, if it would only work, would have
- made VMWARE_CTRL unnecessary) so we are not providing an
- Add/Remove functionality. Rather, a single command "SetRes"
- is provided. This will update one of two special entries in
- the modeline list with the requested resolution (assuming
- it's possible given the fixed framebuffer restriction).
- The client can then use RandR to find and switch to the
- requested resolution. We need two entries because the
- server gets confused when asked to switch to a new
- mode that has the same position in the list as the old
- mode.
-
- vmwarectrl.h and vmwarectrlproto.h follow the standard
- pattern for extension headers and can be dropped into any
- client side project that wishes to call the extension -
- although it is probably of very limited use to non-VMware
- clients.
-
-2006-01-12 Philip Langdale <plangdale@vmware.com>
-
- * configure.ac: Bump version number.
- * src/vmware.c: Implement the DriverFunc so that we
- can adjust the guest 'physical' display size to keep
- DPI constant. Setting the initial display size to
- match the host continues to be an exercise for the user.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..ac9caf7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,9 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index b4e6a17..59b2a41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -94,9 +100,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=vmware
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([
Makefile
src/Makefile
commit a9dc11de80966fe00efb6c061a6df00678f80b1f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 13:06:19 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 3ef83a0..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmware.4
commit 082d1689a8e017d29b108ed3a251141ddf32a35d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:18 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 2f0756a..0b1b138 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,78 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-.deps
-.libs
-stamp-h1
-autom4te.cache
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
+autom4te.cache/
+autoscan.log
+ChangeLog
compile
-depcomp
-configure
-config.status
-config.log
config.guess
-config.sub
config.h
config.h.in
+config.log
+config-ml.in
+config.py
+config.status
+config.status.lineno
+config.sub
+configure
+configure.scan
+depcomp
+.deps/
+INSTALL
+install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
-install-sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for xf86-video-vmware
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
diff --git a/vmwarectrl/.gitignore b/vmwarectrl/.gitignore
new file mode 100644
index 0000000..4ae9de3
--- /dev/null
+++ b/vmwarectrl/.gitignore
@@ -0,0 +1,2 @@
+# Add & Override for this directory and it's subdirectories
+vmwarectrl
Reply to: