xserver-xorg-video-s3: Changes to 'debian-experimental'
ChangeLog | 93 +++++++++
Makefile.am | 2
README | 20 ++
configure.ac | 7
debian/README.source | 73 +++++++
debian/changelog | 32 +++
debian/control | 5
debian/patches/01_gen_pci_ids.diff | 19 -
debian/patches/series | 1
debian/rules | 4
debian/xserver-xorg-video-s3.install | 2
debian/xsfbs/xsfbs.mk | 21 --
debian/xsfbs/xsfbs.sh | 311 --------------------------------
man/Makefile.am | 58 ++++++
man/s3.man | 240 +++++++++++++++++++++++++
src/Makefile.am | 3
src/s3.h | 21 +-
src/s3_bios.c | 33 ++-
src/s3_driver.c | 334 ++++++++++++++---------------------
src/s3_shadow.c | 273 ++++++++++++++++++++++++++++
src/s3_video.c | 22 +-
21 files changed, 998 insertions(+), 576 deletions(-)
New commits:
commit 1ea3c97d591836724d24e328e538fd0f44580375
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 02:01:02 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index f70a375..cc23c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-s3 (1:0.6.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-s3 (1:0.6.3-1) experimental; urgency=low
[ Brice Goglin ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
@@ -10,7 +10,10 @@ xserver-xorg-video-s3 (1:0.6.3-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:10 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 06 Dec 2009 02:00:55 +0100
xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
commit 01d707e8f3acb0caaa6b776ff79031c523ea3e3e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:29 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 5735ee9..f70a375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ xserver-xorg-video-s3 (1:0.6.3-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 10:04:06 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:10 +0200
xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5b9b4ea..6817091 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit 114761ef59c5eebe6a9707b88d7f6f83051cb44b
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 10:06:03 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 5c0d6a8..5735ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-s3 (1:0.6.3-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 10:04:06 +0200
diff --git a/debian/control b/debian/control
index 66dc692..5b9b4ea 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-s3
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3.git
commit 72206bffbc3554c7fdb1c8e3907eb24f01c1980e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 10:05:30 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 6bd18cd..72a1a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+commit d096fd94d8064a08895d34f978830240bfdc9616
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:29 2009 +1000
+
+ s3: bump for release 0.6.3
+
+commit 3e974443b5b2906d1b82b7c27c83062715f925e9
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:41 2009 +1000
+
+ s3: change to using ABI version check
+
+commit f047dffb193ffc52a358bfb0a3ae595acf4726b2
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 10:49:36 2009 +1000
+
+ s3: fixup resources under pci access
+
+commit b8d3e448a8debbc2c77dee8e590a564a010ede59
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 10:48:48 2009 +1000
+
+ s3: remove unneeded include
+
+commit c5c69f9de5d11fd2cadc4ccf00bcf2e8cf65f2eb
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 10:03:14 2009 +1000
+
+ s3: switch to using config pci entity instead of active
+
+commit c41a1188ce53b8975e6d5c34c54a77a3f3c291bc
+Author: Adam Hoka <ahoka@NetBSD.org>
+Date: Sun Jul 5 22:01:46 2009 +0200
+
+ Handle libpciaccess errors more gently and report any problems
+ encountered in Xorg.log (server crash versus log entry).
+
+ This fixes PR 22510. Report and fix by Adam Hoka <ahoka@NetBSD.org>,
+ many thanks.
+
+ Reviewed-by: Matthieu Herrb <herrb@laas.fr>
+ Signed-off-by: Marc Balmer <marc@msys.ch>
+
commit aa955eda7b6fddd12b163ee66367ecc998f82ae0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:33:54 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index ae131b2..5c0d6a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-s3 (1:0.6.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-s3 (1:0.6.3-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
choose a driver during autoconfiguration.
+ Disable patch system and remove quilt from build-deps.
- -- Brice Goglin <bgoglin@debian.org> Wed, 29 Jul 2009 01:53:17 +0200
+ [ Timo Aaltonen ]
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 10:04:06 +0200
xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
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 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 d096fd94d8064a08895d34f978830240bfdc9616
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:29 2009 +1000
s3: bump for release 0.6.3
diff --git a/configure.ac b/configure.ac
index c2cc3df..0eecc87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-s3],
- 0.6.2,
+ 0.6.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-s3)
commit f01f31c25d6d1ff99d3c8bbaf8d4e3c7e76c09db
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jul 29 01:53:52 2009 +0200
Remove 01_gen_pci_ids.diff.
The X server now uses an internal table to choose a driver during
autoconfiguration.
Disable patch system and remove quilt from build-deps.
diff --git a/debian/changelog b/debian/changelog
index 1dd3c25..ae131b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-s3 (1:0.6.2-2) UNRELEASED; urgency=low
+
+ * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+ choose a driver during autoconfiguration.
+ + Disable patch system and remove quilt from build-deps.
+
+ -- Brice Goglin <bgoglin@debian.org> Wed, 29 Jul 2009 01:53:17 +0200
+
xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
diff --git a/debian/control b/debian/control
index c054ce4..66dc692 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
x11proto-randr-dev,
x11proto-render-dev,
x11proto-xext-dev,
- quilt,
dpkg-dev (>= 1.14.17),
automake,
libtool,
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index a0575c8..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- /dev/null
-+++ xserver-xorg-video-s3/src/s3.ids
-@@ -0,0 +1,7 @@
-+533388D0
-+533388D1
-+533388F0
-+53338811
-+53338812
-+53338814
-+53338901
---- xserver-xorg-video-s3.orig/src/Makefile.am
-+++ xserver-xorg-video-s3/src/Makefile.am
-@@ -50,3 +50,6 @@
-
- libs3_accel_pio_la_SOURCES = s3_accel.c
- libs3_accel_pio_la_CFLAGS = $(AM_CFLAGS)
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = s3.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 070c6ec..dac14a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-configure: $(STAMP_DIR)/patch
+configure:
autoreconf -vfi
obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
@@ -48,7 +48,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
commit 3e974443b5b2906d1b82b7c27c83062715f925e9
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
s3: change to using ABI version check
diff --git a/src/s3_driver.c b/src/s3_driver.c
index a1adb6b..29e343d 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -45,7 +45,7 @@
#include "xf86PciInfo.h"
#include "xf86fbman.h"
#include "xf86cmap.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit f047dffb193ffc52a358bfb0a3ae595acf4726b2
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 10:49:36 2009 +1000
s3: fixup resources under pci access
diff --git a/src/s3_driver.c b/src/s3_driver.c
index a751cee..a1adb6b 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -43,10 +43,12 @@
#include "xf86_OSproc.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
-#include "xf86Resources.h"
#include "xf86fbman.h"
#include "xf86cmap.h"
+#ifndef XSERVER_LIBPCIACCESS
+#include "xf86Resources.h"
#include "xf86RAC.h"
+#endif
#include "compiler.h"
#include "xaa.h"
#include "mipointer.h"
@@ -421,11 +423,13 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
}
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
if (pEnt->resources) {
xfree(pEnt);
S3FreeRec(pScrn);
return FALSE;
}
+#endif
if (xf86LoadSubModule(pScrn, "int10")) {
pS3->pInt10 = xf86InitInt10(pEnt->index);
@@ -446,10 +450,10 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
pS3->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
- xf86RegisterResources(pEnt->index, NULL, ResNone);
+#ifndef XSERVER_LIBPCIACCESS
/* don't disable PIO funcs */
xf86SetOperatingState(resVgaMemShared, pEnt->index, ResDisableOpr);
-
+#endif
if (pEnt->device->chipset && *pEnt->device->chipset) {
pScrn->chipset = pEnt->device->chipset;
pS3->Chipset = xf86StringToToken(S3Chipsets, pScrn->chipset);
@@ -935,9 +939,11 @@ static Bool S3ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
xf86DPMSInit(pScreen, S3DisplayPowerManagementSet, 0);
+#ifndef XSERVER_LIBPCIACCESS
/* XXX Check if I/O and Mem flags need to be the same. */
pScrn->racIoFlags = pScrn->racMemFlags = RAC_COLORMAP
| RAC_FB | RAC_VIEWPORT | RAC_CURSOR;
+#endif
if (pS3->SlowEDODRAM)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
commit b8d3e448a8debbc2c77dee8e590a564a010ede59
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 10:48:48 2009 +1000
s3: remove unneeded include
diff --git a/src/s3_shadow.c b/src/s3_shadow.c
index 1273765..f4fbbb3 100644
--- a/src/s3_shadow.c
+++ b/src/s3_shadow.c
@@ -34,7 +34,6 @@ in this Software without prior written authorization from the XFree86 Project.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
commit c5c69f9de5d11fd2cadc4ccf00bcf2e8cf65f2eb
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 10:03:14 2009 +1000
s3: switch to using config pci entity instead of active
diff --git a/src/s3_driver.c b/src/s3_driver.c
index d5b01bf..a751cee 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -277,7 +277,9 @@ static Bool S3Probe(DriverPtr drv, int flags)
if (flags & PROBE_DETECT)
foundScreen = TRUE;
else for (i=0; i<numUsed; i++) {
- ScrnInfoPtr pScrn = xf86AllocateScreen(drv, 0);
+ ScrnInfoPtr pScrn = NULL;
+ pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i], S3PciChipsets,
+ NULL, NULL, NULL, NULL, NULL);
pScrn->driverVersion = VERSION_MAJOR;
pScrn->driverName = DRIVER_NAME;
@@ -292,9 +294,6 @@ static Bool S3Probe(DriverPtr drv, int flags)
pScrn->FreeScreen = S3FreeScreen;
foundScreen = TRUE;
-
- xf86ConfigActivePciEntity(pScrn, usedChips[i], S3PciChipsets,
- NULL, NULL, NULL, NULL, NULL);
}
xfree(usedChips);
commit 03319cf8cfb94c2e20c8c26546105b450d73441e
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:42:15 2009 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 345c35b..1dd3c25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-s3 (1:0.6.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
* New upstream release.
+ Fix 24bits support (for Virtual PC 2007), closes: #470408.
* Install the s3.4 manpage, closes: #374059.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:41:42 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:42:04 +0200
xserver-xorg-video-s3 (1:0.6.1-2) unstable; urgency=low
commit d4a6b26c545261efc6e8bffa32cec163d822f10b
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:41:50 2009 +0200
Install the s3.4 manpage
diff --git a/debian/changelog b/debian/changelog
index 79395d1..345c35b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xserver-xorg-video-s3 (1:0.6.2-1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
* New upstream release.
+ Fix 24bits support (for Virtual PC 2007), closes: #470408.
+ * Install the s3.4 manpage, closes: #374059.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:39:35 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:41:42 +0200
xserver-xorg-video-s3 (1:0.6.1-2) unstable; urgency=low
diff --git a/debian/xserver-xorg-video-s3.install b/debian/xserver-xorg-video-s3.install
index daf7bfe..614cfb4 100644
--- a/debian/xserver-xorg-video-s3.install
+++ b/debian/xserver-xorg-video-s3.install
@@ -1 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
+usr/share/man/man4/*
commit c06dce7282a93f639c544570b1bb3f7c5e44a020
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:27:41 2009 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index f22a413..79395d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xserver-xorg-video-s3 (1:0.6.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-s3 (1:0.6.2-1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
+ * New upstream release.
+ + Fix 24bits support (for Virtual PC 2007), closes: #470408.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:24:36 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:39:35 +0200
xserver-xorg-video-s3 (1:0.6.1-2) unstable; urgency=low
commit 3c22f7b1d9826f1cd50e3e5bdb7691e4696b32d0
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:25:58 2009 +0200
Don't try to install usr/share/xserver-xorg/pci/* anymore
diff --git a/debian/xserver-xorg-video-s3.install b/debian/xserver-xorg-video-s3.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-s3.install
+++ b/debian/xserver-xorg-video-s3.install
@@ -1,2 +1 @@
usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*
commit 075119cef82e731f8d1498c53141d7e383b8ef61
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:25:06 2009 +0200
Adding README.source means we can bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index 3e813c6..f22a413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-s3 (1:0.6.1-3) UNRELEASED; urgency=low
+
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:24:36 +0200
+
xserver-xorg-video-s3 (1:0.6.1-2) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/control b/debian/control
index 2d74b55..c054ce4 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
Reply to: