xserver-xorg-video-vmware: Changes to 'debian-experimental'
COPYING | 52 ++++++++++++---
ChangeLog | 153 +++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 44 ++++++------
debian/changelog | 7 ++
debian/control | 3
man/Makefile.am | 22 +-----
src/vmwarectrl.c | 2
src/vmwaremodule.c | 3
src/vmwarexinerama.c | 2
vmwarectrl/libvmwarectrl.c | 2
10 files changed, 233 insertions(+), 57 deletions(-)
New commits:
commit e06176464606a142a211c71bea14792660fb25c4
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Nov 1 15:42:07 2010 -0400
Add libxext-dev to the build deps.
diff --git a/debian/control b/debian/control
index 119b52f..7b647f9 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
libtool,
xutils-dev (>= 1:7.5+4),
libdrm-dev,
+ libxext-dev
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vmware
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vmware.git
commit 49bd38e2cf1a0e392b006ad5bd44dab409b43129
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Nov 1 15:36:47 2010 -0400
Bump xutils-dev requirement for new util-macros.
diff --git a/debian/changelog b/debian/changelog
index 85df3d6..26e2a5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-vmware (1:11.0.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump xutils-dev requirement for new util-macros.
-- Robert Hooker <sarvatt@ubuntu.com> Mon, 01 Nov 2010 15:34:43 -0400
diff --git a/debian/control b/debian/control
index be5e567..119b52f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
dpkg-dev (>= 1.14.17),
automake,
libtool,
- xutils-dev (>= 1:7.5),
+ xutils-dev (>= 1:7.5+4),
libdrm-dev,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vmware
commit c6580d49a094f6ebd5863ba2e26ffae06934cab3
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Nov 1 15:36:16 2010 -0400
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index a693fd6..4143185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,156 @@
+commit 456b74e8778ab0c44e8a70aa45f447ff5c562be3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Aug 10 11:02:05 2010 -0400
+
+ xf86-video-vmware 11.0.2
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit c29d24b2ca598011b84387006f03a9360910707f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jul 23 21:02:33 2010 -0400
+
+ config: add AM_PROG_CC_C_O for per-target compilation flags
+
+ The use of per-target compilation flags with C sources requires
+ that the macro AM_PROG_CC_C_O be called from configure.ac
+
+ If the C compiler does not accept the -c and -o options simultaneously,
+ define NO_MINUS_C_MINUS_O. This macro actually tests both the compiler
+ found by AC_PROG_CC, and, if different, the first cc in the path.
+ The test fails if one fails. This macro was created for GNU Make
+ to choose the default C compilation rule.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit dfbef04f1ff9430a01ca0ca682be32a8606e9e13
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit 0dbd97fe7d411549aa343c25dab9c70087532727
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:07:00 2010 -0400
+
+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit dfaa0b6391ebc32f4e81d8add053eabea44d0881
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:37:42 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit dd0bb4ac5730331070eac2c39880718eeff3760b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f07d572611ba072c5952fea526e7178202d36685
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 79956ca804b4ca6227f878cf794edafefa00d25a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 21:44:58 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit cee7a37a38f83cd5300a19f17493e43eb532e619
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 20:24:42 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8adb672ac3f754d02e377745c16f64151b50522a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 19:41:31 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d867b84e425cdf66542eebaabd8adb95b8121960
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 18:45:19 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 190a6b7e032e37e33dda42482038b8fd1fd9d8af
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 16:15:30 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+commit e647511e4b9b924b0617171c56b3bb485674b3ff
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Jul 13 11:57:15 2010 +0100
+
+ Don't crash the server on Xorg -configure
+
+commit 0bd99bb142093c0072147ec3bb665864b4cadef5
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:18:11 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f307f77a34f3a6777f74458819f6a3519c2c3f2b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 13 13:10:55 2010 -0400
+
+ COPYING: replace stub file with actual Copyright notices.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 423d8a069a2d86068a8f22926a73bc965670315d
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Mon Mar 29 10:19:04 2010 +0200
+
+ Fix some issues pointed out by compiler warnings.
+
+ * vmware_chain_module() doesn't return any values.
+ * Remove an unused local variable.
+
commit cc77a36048863640fb1fa9f82b5b0dbf41326872
Author: Jakob Bornecrantz <jakob@vmware.com>
Date: Thu Mar 18 15:30:36 2010 +0100
diff --git a/debian/changelog b/debian/changelog
index ba92610..85df3d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:11.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Mon, 01 Nov 2010 15:34:43 -0400
+
xserver-xorg-video-vmware (1:11.0.1-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
commit 456b74e8778ab0c44e8a70aa45f447ff5c562be3
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 11:02:05 2010 -0400
xf86-video-vmware 11.0.2
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 388f99f..f88d376 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- [11.0.1],
+ [11.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
commit c29d24b2ca598011b84387006f03a9360910707f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jul 23 21:02:33 2010 -0400
config: add AM_PROG_CC_C_O for per-target compilation flags
The use of per-target compilation flags with C sources requires
that the macro AM_PROG_CC_C_O be called from configure.ac
If the C compiler does not accept the -c and -o options simultaneously,
define NO_MINUS_C_MINUS_O. This macro actually tests both the compiler
found by AC_PROG_CC, and, if different, the first cc in the path.
The test fails if one fails. This macro was created for GNU Make
to choose the default C compilation rule.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index a01b244..388f99f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,9 @@ XORG_DEFAULT_OPTIONS
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+# Checks for programs.
+AM_PROG_CC_C_O
+
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
commit dfbef04f1ff9430a01ca0ca682be32a8606e9e13
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index 78c8e9f..a01b244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
[11.0.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vmware])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,26 +40,27 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(DRM, [libdrm])
@@ -79,7 +80,6 @@ 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.
save_CFLAGS="$CFLAGS"
commit 0dbd97fe7d411549aa343c25dab9c70087532727
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f9d10eb..78c8e9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,8 +100,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=vmware
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit dfaa0b6391ebc32f4e81d8add053eabea44d0881
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:42 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 6afd678..f9d10eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
commit dd0bb4ac5730331070eac2c39880718eeff3760b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:23 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 48db6ce..6afd678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-vmware],
[xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit f07d572611ba072c5952fea526e7178202d36685
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index bfe56e7..48db6ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- 11.0.1,
+ [11.0.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-vmware)
+ [xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit 79956ca804b4ca6227f878cf794edafefa00d25a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:58 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index aa4be37..bfe56e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,6 @@ fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=vmware
commit cee7a37a38f83cd5300a19f17493e43eb532e619
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 18b9e7f..aa4be37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,8 +82,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
# Checks for libraries.
-# Checks for header files.
-AC_HEADER_STDC
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
commit 8adb672ac3f754d02e377745c16f64151b50522a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:31 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f93d405..18b9e7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
commit d867b84e425cdf66542eebaabd8adb95b8121960
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:19 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 43f53d2..f93d405 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
11.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit 190a6b7e032e37e33dda42482038b8fd1fd9d8af
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:30 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
diff --git a/configure.ac b/configure.ac
index 5b696b5..43f53d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..b3688ce 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit e647511e4b9b924b0617171c56b3bb485674b3ff
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 13 11:57:15 2010 +0100
Don't crash the server on Xorg -configure
diff --git a/src/vmwaremodule.c b/src/vmwaremodule.c
index 3d7f666..9cc180a 100644
--- a/src/vmwaremodule.c
+++ b/src/vmwaremodule.c
@@ -172,7 +172,8 @@ vmware_chain_module(pointer opts)
matched = vmwlegacy_devices;
}
- for (i = 0; i < vmware_devices; i++) {
+ /* Xorg -configure returns 1 from xf86MatchDevice with NULL gdevs */
+ for (i = 0; gdevs && i < vmware_devices; i++) {
gdev = gdevs[i];
gdev->driver = driver_name;
}
commit 0bd99bb142093c0072147ec3bb665864b4cadef5
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:18:11 2010 -0300
Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/vmwarectrl.c b/src/vmwarectrl.c
index d9ceaa4..d0aace5 100644
--- a/src/vmwarectrl.c
+++ b/src/vmwarectrl.c
@@ -37,8 +37,6 @@
#include "config.h"
#endif
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "dixstruct.h"
#include "extnsionst.h"
#include <X11/X.h>
diff --git a/src/vmwarexinerama.c b/src/vmwarexinerama.c
index 204bade..8b82eea 100644
--- a/src/vmwarexinerama.c
+++ b/src/vmwarexinerama.c
@@ -36,8 +36,6 @@
#include "config.h"
#endif
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "dixstruct.h"
#include "extnsionst.h"
#include <X11/X.h>
diff --git a/vmwarectrl/libvmwarectrl.c b/vmwarectrl/libvmwarectrl.c
index 4e3173c..179537b 100644
--- a/vmwarectrl/libvmwarectrl.c
+++ b/vmwarectrl/libvmwarectrl.c
@@ -32,8 +32,6 @@
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include "libvmwarectrl.h"
#include "vmwarectrlproto.h"
commit f307f77a34f3a6777f74458819f6a3519c2c3f2b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 13:10:55 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..fce144d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,48 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 2006 by VMware, Inc.
+Copyright 2007 by VMware, Inc.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER 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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+Copyright 2010 VMware, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit 423d8a069a2d86068a8f22926a73bc965670315d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Mar 29 10:19:04 2010 +0200
Fix some issues pointed out by compiler warnings.
* vmware_chain_module() doesn't return any values.
* Remove an unused local variable.
diff --git a/src/vmwaremodule.c b/src/vmwaremodule.c
index d6fcddb..3d7f666 100644
--- a/src/vmwaremodule.c
+++ b/src/vmwaremodule.c
@@ -143,7 +143,7 @@ err:
return FALSE;
}
-static Bool
+static void
vmware_chain_module(pointer opts)
{
int vmwlegacy_devices;
@@ -205,7 +205,6 @@ static pointer
vmware_setup(pointer module, pointer opts, int *errmaj, int *errmin)
{
static Bool setupDone = 0;
- int ret;
/* This module should be loaded only once, but check to be sure. */
if (!setupDone) {
Reply to: