xserver-xorg-video-vmware: Changes to 'debian-experimental'
.cvsignore | 19 -
ChangeLog | 195 ++++++++++++++++
README | 553 ------------------------------------------------
configure.ac | 7
debian/README.source | 73 ++++++
debian/changelog | 31 ++
debian/control | 4
debian/xsfbs/repack.sh | 32 ++
debian/xsfbs/xsfbs.mk | 21 -
debian/xsfbs/xsfbs.sh | 311 --------------------------
man/.cvsignore | 2
man/vmware.man | 2
src/.cvsignore | 6
src/Makefile.am | 3
src/vmware.c | 89 ++++++-
src/vmware.h | 33 ++
src/vmwarectrl.c | 87 ++++++-
src/vmwarecurs.c | 1
src/vmwaremodes.c | 123 ++++++++++
vmwarectrl/vmwarectrl.c | 6
20 files changed, 655 insertions(+), 943 deletions(-)
New commits:
commit 2d767b57e579b359c6d217445252b614fa34af51
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 00:43:20 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 9e46805..b6e3fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-vmware (1:10.16.8-1) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:10.16.8-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:14 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 06 Dec 2009 00:43:15 +0100
xserver-xorg-video-vmware (1:10.16.7-1) unstable; urgency=low
commit 34218f674dd0f705d6f9d3bcc7e3bbecd65f1301
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:33 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index e60b7ac..9e46805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-vmware (1:10.16.8-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 11:00:01 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:14 +0200
xserver-xorg-video-vmware (1:10.16.7-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8e7269d..0401469 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.or
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-randr-dev,
commit f9a02c65f72560eecfa0b9d6a86a84bd075d4938
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 11:02:01 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 4afc316..e60b7ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-vmware (1:10.16.8-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 11:00:01 +0200
diff --git a/debian/control b/debian/control
index 4ca0923..8e7269d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.2
+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 7a8acc6265ad5b54d7528a74a6ee82768366dce5
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 11:00:46 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index b609632..2c0fc55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+commit 6c8fc7b280295b823675285ed78b0fb2365bcf07
+Author: Philip Langdale <philipl@fido2.homeip.net>
+Date: Tue Sep 8 22:21:33 2009 -0700
+
+ Bump fo 10.16.8 Release
+
+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>
+
+commit cce33db3f95c6f3c8537c782063b6ca9ad68f332
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:42 2009 +1000
+
+ vmware: change to using ABI version check
+
+commit 0fddce5511b761206bb5f59dcd17652f15bda5ef
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 14:11:59 2009 +1000
+
+ vmware: fix resource removal properly
+
+commit 4605e8d3a99ddcd75314051bd00b51d8ecee06a1
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:41 2009 +1000
+
+ vmware: update for resources/RAC API removal
+
commit 382c25f53870da0db0ee74f343c20c312e6b03af
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Jul 20 18:03:47 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index e3b5a1e..4afc316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:10.16.8-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 11:00:01 +0200
+
xserver-xorg-video-vmware (1:10.16.7-1) unstable; urgency=low
* New upstream release.
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
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 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
- # If we've stopped using this function, fixing it might enable us to re-enable
- # it again and catch more errors.
- case "$1" in
- /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
- /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
- /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
- /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
- /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
- /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
- /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
- /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
- /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
- /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
- /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
- /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
- /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
- /usr/bin/X11) echo ../X11R6/bin ;;
- /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
- /usr/include/X11) echo ../X11R6/include/X11 ;;
- /usr/lib/X11) echo ../X11R6/lib/X11 ;;
- *) internal_error "maplink() called with unknown path \"$1\"" ;;
- esac
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:21:34 2009 +0200
xsfbs.sh: remove unused analyze_path
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
esac
}
-analyze_path () {
- # given a supplied set of pathnames, break each one up by directory and do an
- # ls -dl on each component, cumulatively; i.e.
- # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
- # Thanks to Randolph Chung for this clever hack.
-
- local f g
-
- while [ -n "$1" ]; do
- reject_whitespace "$1"
- g=
- message "Analyzing $1:"
- for f in $(echo "$1" | tr / \ ); do
- if [ -e /$g$f ]; then
- ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
- g=$g$f/
- else
- message "/$g$f: nonexistent; directory contents of /$g:"
- ls -l /$g
- break
- fi
- done
- shift
- done
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:20:11 2009 +0200
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 781826f..4461b1a 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,115 +303,6 @@ EOF
fi
}
-check_symlink () {
- # syntax: check_symlink symlink
- #
- # See if specified symlink points where it is supposed to. Return 0 if it
- # does, and 1 if it does not.
- #
- # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
-
- local symlink
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "check_symlink() called with wrong number of arguments;" \
- "expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- symlink="$1"
-
- if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
- return 0
- else
- return 1
- fi
-}
-
-check_symlinks_and_warn () {
- # syntax: check_symlinks_and_warn symlink ...
- #
- # For each argument, check for symlink sanity, and warn if it isn't sane.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install".
-
- local errmsg symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_warn() called with wrong number of" \
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- observe "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink"); removing"
- rm "$symlink"
- fi
- elif [ -e "$symlink" ]; then
- errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="$errmsg be installed until this"
- if [ -f "$symlink" ]; then
- errmsg="$errmsg file"
- elif [ -d "$symlink" ]; then
- errmsg="$errmsg directory"
- else
- errmsg="$errmsg thing"
- fi
- errmsg="$errmsg is removed"
- die "$errmsg"
- fi
- shift
- done
-}
-
-check_symlinks_and_bomb () {
- # syntax: check_symlinks_and_bomb symlink ...
- #
- # For each argument, check for symlink sanity, and bomb if it isn't sane.
- #
- # Call this function from a postinst script.
-
- local problem symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_bomb() called with wrong number of"
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- problem=
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- problem=yes
- warn "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink")"
- fi
- elif [ -e "$symlink" ]; then
- problem=yes
- warn "$symlink is not a symbolic link"
- else
- problem=yes
- warn "$symlink symbolic link does not exist"
- fi
- if [ -n "$problem" ]; then
- analyze_path "$symlink" "$(readlink "$symlink")"
- find_culprits "$symlink"
- die "bad symbolic links on system"
- fi
- shift
- done
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit 20043de576caed60782f641a957eb747cefe60bb
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 00:52:40 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 293963d..e3b5a1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-vmware (1:10.16.7-1) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:10.16.7-1) unstable; urgency=low
* New upstream release.
* Add README.source, bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 00:51:03 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 00:52:36 +0200
xserver-xorg-video-vmware (1:10.16.6-1) unstable; urgency=low
commit 3dbfcf4ed06eeb8cffc3131f84492f2910201509
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 00:51:30 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 262108a..b609632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+commit 382c25f53870da0db0ee74f343c20c312e6b03af
+Author: Philip Langdale <philipl@fido2.homeip.net>
+Date: Mon Jul 20 18:03:47 2009 -0700
+
+ Bump for 10.16.7 Release.
+
+commit c2d9678431a40f6a15dc7f50690507cdda8d11e2
+Author: Micah Dowty <micah@vmware.com>
+Date: Mon Jun 1 10:47:51 2009 -0700
+
+ An imperfect fix for Xinerama state changes without a mode change
+
+ This patch improves behaviour for Xinerama state changes (via the
+ VMWARE_CTRL) extension that don't have an accompanying mode change.
+ This will be the case if a new Xinerama monitor layout has a bounding
+ box with an identical size to that of the previous layout.
+
+ Prior to this patch, the behaviour was pretty bad. If you sent two
+ Xinerama states with the same bounding box, the second state would
+ be set as pending but no actual mode change would occur, because
+ the X server would already be in the right video mode. This means
+ that the pending mode stays pending.
+
+ If another Xinerama state comes in after this, we would hit our
+ "Aborting due to existing pending state" error, and the new state
+ would be discarded. This means we'd drop the mode switch on the
+ floor, plus we'd lie to the client and say it worked.
+
+ One example of the user-visible symptoms from this: The user has
+ four monitors of the same size. We'll call them A through D.
+ The VM goes into full-screen mode, and they set it to use screens
+ ABC. Now they switch to BCD. These have the same bounding box size,
+ so no mode change occurs and a topology is still pending. Now they
+ switch to monitors BC. This mode switch is dropped, so the guest
+ is still in the ABC topology and the mode is too wide for BC.
+
+ This patch is an incomplete fix. If we're setting a new topology
+ with the same bounding box, we'll flush the Xinerama state
+ immediately since we know the mode switch will never occur. This
+ means we don't get stuck with xineramaNextState set when it
+ shouldn't be, and we don't have the problem with dropping
+ subsequent mode changes. We also do set the new Xinerama state,
+ so apps that query it will see the updated state immediately.
+
+ But the fix isn't perfect- as far as I can tell, there's no way
+ to notify applications that the monitor layout changed without
+ a mode switch. So even though we've set the new topology, most
+ apps won't notice. There are ways we could hack around this,
+ but none of them are pretty.
+
+commit d10841493c4707f23f928d7580bc5bddb51d22a6
+Author: Bob Long <blong@vmware.com>
+Date: Fri May 22 15:48:55 2009 -0700
+
+ Fix black screen after resume from hibernate.
+
+ The root cause for the black screen and system lock up is
+ caused by not recovering the SVGA ID register after hibernation.
+ Incorrect ID register value will invalidate the FIFO memory start
+ register, and driver will not retrieve correct FIFO memory start
+ address and the busy read of svga FIFO sync register will lock up
+ the whole system.
+
+ Currently SVGA Xorg driver does not have a kernel module to handle
+ the power management event, but Xorg will call driver provided
+ LeaveVT before shutting down system and call EnterVT after resuming
+ system from hibernation, so these two callback functions are good
+ entry points to save and restore the ID register value. This patch
+ saves the ID register value in LeaveVT and restores the value to
+ SVGA ID register in EnterVT.
+
commit b4ea3052f843c2d1c285252cbf1bed2f4857f96c
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Tue May 12 16:48:43 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index 06f52a7..293963d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-vmware (1:10.16.6-2) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:10.16.7-1) UNRELEASED; urgency=low
+ * New upstream release.
* Add README.source, bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 00:49:27 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 00:51:03 +0200
xserver-xorg-video-vmware (1:10.16.6-1) unstable; urgency=low
commit 542f5777ce89c68bb39fe3bab3f828003dec2692
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jul 30 00:50:42 2009 +0200
Bump Standards-Version to 3.8.2 now that we have README.source
diff --git a/debian/changelog b/debian/changelog
index 77bb04f..06f52a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:10.16.6-2) UNRELEASED; urgency=low
+
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Thu, 30 Jul 2009 00:49:27 +0200
+
xserver-xorg-video-vmware (1:10.16.6-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index ef83d71..4ca0923 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
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 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 */
commit 382c25f53870da0db0ee74f343c20c312e6b03af
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Jul 20 18:03:47 2009 -0700
Bump for 10.16.7 Release.
diff --git a/configure.ac b/configure.ac
index 6afb1fb..eb5142e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-vmware],
- 10.16.6,
+ 10.16.7,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-vmware)
diff --git a/src/vmware.c b/src/vmware.c
index 5275441..2d1eabd 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -83,7 +83,7 @@ char rcsId_vmware[] =
#define VMWARE_DRIVER_NAME "vmware"
#define VMWARE_MAJOR_VERSION 10
#define VMWARE_MINOR_VERSION 16
-#define VMWARE_PATCHLEVEL 6
+#define VMWARE_PATCHLEVEL 7
#define VMWARE_DRIVER_VERSION \
(VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + VMWARE_PATCHLEVEL)
#define VMWARE_DRIVER_VERSION_STRING \
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
Reply to: