xserver-xorg-video-mach64: Changes to 'debian-experimental'
COPYING | 109 ++++++++++
ChangeLog | 148 ++++++++++----
Makefile.am | 4
README | 13 -
configure.ac | 20 +
debian/README.source | 73 +++++++
debian/changelog | 28 ++
debian/control | 5
debian/copyright | 122 +++++-------
debian/patches/01_gen_pci_ids.diff | 18 -
debian/patches/series | 1
debian/xserver-xorg-video-mach64.install | 1
debian/xsfbs/repack.sh | 32 +++
debian/xsfbs/xsfbs.mk | 21 --
debian/xsfbs/xsfbs.sh | 311 -------------------------------
src/Makefile.am | 2
src/atibus.c | 3
src/atimach64.c | 5
src/atimach64render.c | 6
src/atipreinit.c | 18 +
src/atistruct.h | 8
21 files changed, 462 insertions(+), 486 deletions(-)
New commits:
commit 15c5b1b06e5484911cdcf2fda3031e2be7876624
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 02:54:34 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 5ad2683..be25a7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-xserver-xorg-video-mach64 (6.8.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-mach64 (6.8.2-2) experimental; urgency=low
+ [ Timo Aaltonen ]
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:08 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 06 Dec 2009 02:54:30 +0100
xserver-xorg-video-mach64 (6.8.2-1) unstable; urgency=low
commit 2b660f574a6e55c17fd1a129c5ebbeeea7e4e89e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:27 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 8b94594..5ad2683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-mach64 (6.8.2-2) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:42:42 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:08 +0200
xserver-xorg-video-mach64 (6.8.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 68bcae7..d69cbc3 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),
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-gl-dev,
x11proto-xext-dev,
x11proto-core-dev,
commit beff8c0cc58c77355cdbab58ad0eef119e24d58c
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 16:44:27 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index e63557e..8b94594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mach64 (6.8.2-2) UNRELEASED; urgency=low
+
+ * Bump Standards-Version to 3.8.3.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:42:42 +0200
+
xserver-xorg-video-mach64 (6.8.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 3621ec8..68bcae7 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,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-mach64
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mach64.git
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 ae5ac9d3cab04e087368c1c11ff70f0254a7d8eb
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 01:17:08 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9daf644..e63557e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mach64 (6.8.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-mach64 (6.8.2-1) unstable; urgency=low
* New upstream release.
* Move -dbg package to section debug.
@@ -7,7 +7,7 @@ xserver-xorg-video-mach64 (6.8.2-1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
* Update debian/copyright from upstream COPYING.
- -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:16:29 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:17:03 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
commit 15cd3b0758cb1e410865153a2cf561d5224c6247
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 01:16:58 2009 +0200
Update debian/copyright from upstream COPYING
diff --git a/debian/changelog b/debian/changelog
index c4f2864..9daf644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xserver-xorg-video-mach64 (6.8.2-1) UNRELEASED; urgency=low
* Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to
choose drivers.
* Add README.source, bump Standards-Version to 3.8.2.
+ * Update debian/copyright from upstream COPYING.
- -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:14:02 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:16:29 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 5b3245c..cf43978 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,36 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
+*************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
+ Precision Insight, Inc., Cedar Park, Texas, and
+ VA Linux Systems Inc., Fremont, California.
+
+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 on 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 (including the
+next paragraph) 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
+NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
+SYSTEMS AND/OR THEIR SUPPLIERS 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.
+
+*************************************************************************
Copyright 2000 Gareth Hughes
All Rights Reserved.
@@ -42,17 +72,28 @@ GARETH HUGHES 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.
-(c) 2004 Adam Jackson. Standard MIT license applies.
+*************************************************************************
+
+Copyright 2006, 2007 George Sapountzis
+All Rights Reserved.
-Copyright 1999-2000 Precision Insight, Inc., Cedar Park, Texas.
+Based on the mach64 DRI and DRM drivers:
+Copyright 2000 Gareth Hughes
+Copyright 2002-2003 Leif Delgass
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:
+Based on the ati hw/kdrive driver:
+Copyright 2003 Eric Anholt, Anders Carlsson
+
+Based on the via hw/xfree86 driver:
+Copyright 2006 Thomas Hellstrom. 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 (including the next
paragraph) shall be included in all copies or substantial portions of the
@@ -60,63 +101,8 @@ 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 NON-INFRINGEMENT. IN NO EVENT SHALL
-PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
-
-Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
-Precision Insight, Inc., Cedar Park, Texas, and
-VA Linux Systems Inc., Fremont, California.
-
-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 on 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 (including the
-next paragraph) 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
-NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
-SYSTEMS AND/OR THEIR SUPPLIERS 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.
-
-Copyright 2003 Alex Deucher.
-
-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 on 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 (including the
-next paragraph) 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
-NON-INFRINGEMENT. IN NO EVENT SHALL ALEX DEUCHER, OR ANY OTHER
-CONTRIBUTORS 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.
-
-Created by Bogdan D. bogdand@users.sourceforge.net
-License: GPL (see /usr/share/common-licenses/GPL)
+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.
commit adc5b130ccb4473a9fc41790e1d5200fca568243
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 01:14:38 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 858e94b..24ac0cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+commit 2013b64cf19fce32edb052ee6d8529d3ce69d409
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:28 2009 +1000
+
+ mach64: bump for release 6.8.2
+
+commit 4f08e83e50059df494f5f53cd05eb8809d18656e
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ mach64: change to using ABI version check
+
+commit 64960253ea5dcfb01d92b5b684790f16be5b73be
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:31 2009 +1000
+
+ mach64: update for resources/RAC API removal
+
+commit 965614f27d42106e859000264a6eb89d9fcba67e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:43:33 2009 +1000
+
+ Update to xextproto 7.1 support.
+
+ DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
+ need to include dpmsconst.h if xextproto 7.1 is available.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9caef14defaf892d957875f6d774003a036bad45
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 11 22:06:40 2009 -0700
+
+ Fill in COPYING file, add SubmittingPatches URL to README
+
+commit d9d787167795862909738892195fcdc751c413ed
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun May 10 16:56:02 2009 -0700
+
+ Doublecheck pictFormat is a supported format
+
+ Fixes these warnings from parfait source checker:
+
+ Error: Read buffer overflow at src/atimach64render.c:601
+ in function 'Mach64PrepareTexture' [Symbolic analysis]
+ In array dereference of Mach64TexFormats[i] with index 'i'
+ Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6
+ Error: Read buffer overflow at src/atimach64render.c:712
+ in function 'Mach64PrepareComposite' [Symbolic analysis]
+ In array dereference of Mach64TexFormats[i] with index 'i'
+ Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
commit 99db87ed49d7eca8de2ff1f7d53b580637ebb916
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Apr 29 17:32:47 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index 80b58b8..c4f2864 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mach64 (6.8.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-mach64 (6.8.2-1) UNRELEASED; urgency=low
* New upstream release.
* Move -dbg package to section debug.
@@ -6,7 +6,7 @@ xserver-xorg-video-mach64 (6.8.1-1) UNRELEASED; urgency=low
choose drivers.
* Add README.source, bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:10:19 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:14:02 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
commit 020917b745b41957436132fec7c243b7f5516516
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:28 2009 +1000
mach64: bump for release 6.8.2
diff --git a/configure.ac b/configure.ac
index 68e2a5f..2e6bc91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-mach64],
- 6.8.1,
+ 6.8.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-mach64)
commit 58da6804a3f4775d2c14fae89d0fe7c1224af0cb
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
mach64: change to using ABI version check
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 6c742fd..34b851c 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -52,7 +52,7 @@
#include "atixv.h"
#include "vbe.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#endif
diff --git a/src/atistruct.h b/src/atistruct.h
index ac76b1f..5225256 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -59,7 +59,7 @@
#endif
#include "xf86Cursor.h"
#include "xf86Pci.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
commit 605ab90b346a436c1d06fe2e279a82a140b97f9c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:31 2009 +1000
mach64: update for resources/RAC API removal
diff --git a/src/atibus.c b/src/atibus.c
index 69a3089..7b6cb48 100644
--- a/src/atibus.c
+++ b/src/atibus.c
@@ -59,6 +59,7 @@ ATIClaimResources
)
{
+#ifndef XSERVER_LIBPCIACCESS
#ifndef AVOID_CPIO
resRange Resources[2] = {{0, 0, 0}, _END};
@@ -101,7 +102,7 @@ ATIClaimResources
}
#endif /* AVOID_CPIO */
-
+#endif
}
/*
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 2b84a6c..6c742fd 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -52,7 +52,9 @@
#include "atixv.h"
#include "vbe.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
+#endif
/*
* FreeScreen handles the clean-up.
@@ -507,7 +509,9 @@ ATIPreInit
ATIPtr pATI;
GDevPtr pGDev;
EntityInfoPtr pEntity;
+#ifndef XSERVER_LIBPCIACCESS
resPtr pResources;
+#endif
pciVideoPtr pVideo;
DisplayModePtr pMode;
CARD32 IOValue;
@@ -548,7 +552,9 @@ ATIPreInit
/* Register resources */
pEntity = xf86GetEntityInfo(pScreenInfo->entityList[0]);
pGDev = pEntity->device;
+#ifndef XSERVER_LIBPCIACCESS
pResources = pEntity->resources;
+#endif
pATI->iEntity = pEntity->index;
pATI->Chip = pEntity->chipset;
@@ -556,6 +562,7 @@ ATIPreInit
xfree(pEntity);
+#ifndef XSERVER_LIBPCIACCESS
if (!pResources)
pResources = xf86RegisterResources(pATI->iEntity, NULL, ResShared);
if (pResources)
@@ -565,7 +572,7 @@ ATIPreInit
xf86FreeResList(pResources);
return FALSE;
}
-
+#endif
ConfiguredMonitor = NULL;
(void)memset(BIOS, 0, SizeOf(BIOS));
@@ -753,6 +760,7 @@ ATIPreInit
#endif /* AVOID_CPIO */
+#ifndef XSERVER_LIBPCIACCESS
#ifdef AVOID_CPIO
pScreenInfo->racMemFlags =
@@ -765,7 +773,7 @@ ATIPreInit
pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR;
#endif /* AVOID_CPIO */
-
+#endif
/* Finish private area initialisation */
pATI->nFIFOEntries = 16; /* For now */
@@ -1056,6 +1064,7 @@ ATIPreInit
xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, "%s.\n", Buffer);
}
+#ifndef XSERVER_LIBPCIACCESS
#ifndef AVOID_CPIO
if (pATI->CPIO_VGAWonder)
@@ -1064,6 +1073,7 @@ ATIPreInit
pATI->CPIO_VGAWonder);
#endif /* AVOID_CPIO */
+#endif
xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED,
"ATI Mach64 adapter detected.\n");
@@ -1174,6 +1184,7 @@ ATIPreInit
Reply to: