xserver-xorg-video-savage: Changes to 'debian-experimental'
ChangeLog | 189 ++++++++++++++++++
README | 20 +
configure.ac | 10
debian/README.source | 73 +++++++
debian/changelog | 35 +++
debian/control | 4
debian/patches/01_gen_pci_ids.diff | 39 ---
debian/patches/series | 1
debian/xserver-xorg-video-savage.install | 1
debian/xsfbs/xsfbs.mk | 21 --
debian/xsfbs/xsfbs.sh | 311 -------------------------------
man/savage.man | 35 +++
src/savage_accel.c | 26 ++
src/savage_dri.c | 42 ++++
src/savage_driver.c | 238 +++--------------------
src/savage_driver.h | 6
src/savage_exa.c | 128 +++++++++---
src/savage_hwmc.c | 1
src/savage_video.c | 196 +++++++++++++++----
19 files changed, 715 insertions(+), 661 deletions(-)
New commits:
commit e0e5e50e205e057ef1c3e2974836ac6f9c4df1c3
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 01:54:22 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 1c55dce..3371c33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.3.1-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:10 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 06 Dec 2009 01:54:17 +0100
xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low
commit 8ad8c98bab6031973f4d04dd0fb1c8620bd46c58
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:30 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 8c8d8f7..1c55dce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-savage (1:2.3.1-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 10:12:09 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:10 +0200
xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8d5e0ab..e87ccba 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-xext-dev,
x11proto-gl-dev,
commit de9a3b3e267d045736fd941eed8831d8f4fbca84
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 10:13:01 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index bbd0ad1..8c8d8f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 10:12:09 +0200
diff --git a/debian/control b/debian/control
index 37edece..8d5e0ab 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,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-savage
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
commit c630a872cb929e498f5f831cff15f2b1c8a590c4
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 10:12:35 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 76d0280..3d9bfcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+commit 36ab23a95fd8d46a1206a941278df8845d5765ba
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:29 2009 +1000
+
+ savage: bump for release 2.3.1
+
+commit ad0b7ba4618c09c1a9d5a6da6b12f42980b7450c
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 18:40:18 2009 +1000
+
+ savage: move abi check down for RAC
+
+commit 21f6bf3e492d328b8c7003ffb0c9deec0113fb05
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:41 2009 +1000
+
+ savage: change to using ABI version check
+
+commit 3c0b164ffe9e1f582cee43f89a94fc0a2899bed8
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:36 2009 +1000
+
+ savage: update for resources/RAC API removal
+
+commit 96d19b654e934fc3f85f9b45f1dee224cb40b389
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:54:48 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 75ce40850ea2ce2ed7122cf62856dcf8022187d2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:39:22 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 173b4d7..bbd0ad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 10:12:09 +0200
+
xserver-xorg-video-savage (1:2.3.0-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 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 36ab23a95fd8d46a1206a941278df8845d5765ba
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:29 2009 +1000
savage: bump for release 2.3.1
diff --git a/configure.ac b/configure.ac
index b0af452..b2f22f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-savage],
- 2.3.0,
+ 2.3.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-savage)
commit ad0b7ba4618c09c1a9d5a6da6b12f42980b7450c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 18:40:18 2009 +1000
savage: move abi check down for RAC
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 1566b47..c909783 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -42,9 +42,6 @@
#include <unistd.h>
#include <errno.h>
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-#include "xf86RAC.h"
-#endif
#include "shadowfb.h"
#include "globals.h"
@@ -63,6 +60,10 @@
#include "savage_bci.h"
#include "savage_streams.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+#include "xf86RAC.h"
+#endif
+
#define TRANSPARENCY_KEY 0xff;
#ifdef XF86DRI
commit 21f6bf3e492d328b8c7003ffb0c9deec0113fb05
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
savage: change to using ABI version check
diff --git a/src/savage_driver.c b/src/savage_driver.c
index e49c8c2..1566b47 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -42,7 +42,7 @@
#include <unistd.h>
#include <errno.h>
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#endif
#include "shadowfb.h"
diff --git a/src/savage_driver.h b/src/savage_driver.h
index 34dfced..9c0ba58 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -51,7 +51,7 @@
#include "compiler.h"
#include "vgaHW.h"
#include "xf86.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
#include "xf86Pci.h"
commit 3c0b164ffe9e1f582cee43f89a94fc0a2899bed8
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:36 2009 +1000
savage: update for resources/RAC API removal
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 3ce0d73..e49c8c2 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -42,7 +42,9 @@
#include <unistd.h>
#include <errno.h>
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
+#endif
#include "shadowfb.h"
#include "globals.h"
@@ -680,7 +682,7 @@ static Bool SavagePciProbe(DriverPtr drv, int entity_num,
}
pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
- RES_SHARED_VGA, NULL, NULL, NULL, NULL);
+ NULL, NULL, NULL, NULL, NULL);
if (pScrn != NULL) {
EntityInfoPtr pEnt;
SavagePtr psav;
@@ -1393,20 +1395,24 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
}
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
if (pEnt->resources) {
xfree(pEnt);
SavageFreeRec(pScrn);
return FALSE;
}
+#endif
psav->EntityIndex = pEnt->index;
if (xf86LoadSubModule(pScrn, "vbe")) {
psav->pVbe = VBEInit(NULL, pEnt->index);
}
+#ifndef XSERVER_LIBPCIACCESS
xf86RegisterResources(pEnt->index, NULL, ResNone);
xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+#endif
from = X_DEFAULT;
if (pEnt->device->chipset && *pEnt->device->chipset) {
diff --git a/src/savage_driver.h b/src/savage_driver.h
index c47b472..34dfced 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -51,7 +51,9 @@
#include "compiler.h"
#include "vgaHW.h"
#include "xf86.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#endif
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xf86_OSproc.h"
diff --git a/src/savage_hwmc.c b/src/savage_hwmc.c
index 43c9dfd..abfe805 100644
--- a/src/savage_hwmc.c
+++ b/src/savage_hwmc.c
@@ -28,7 +28,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
commit 2347c3e039bbbbffdb93739616279f7a4d44a2a6
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 22:21:39 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 8d23efb..173b4d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-savage (1:2.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.2.
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
choose a driver during autoconfiguration.
- -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 22:26:31 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 22:28:54 +0200
xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low
commit 1579cd7cb9872b96630bcffc590eea344dd0b7b1
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 22:28:15 2009 +0200
Remove 01_gen_pci_ids.diff
diff --git a/debian/changelog b/debian/changelog
index bec1672..8d23efb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xserver-xorg-video-savage (1:2.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.2.
+ * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+ choose a driver during autoconfiguration.
- -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 22:17:50 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 22:26:31 +0200
xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index d1d3811..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: xserver-xorg-video-savage/src/savage.ids
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver-xorg-video-savage/src/savage.ids 2007-08-31 18:03:03.000000000 -0400
-@@ -0,0 +1,23 @@
-+53338A22
-+53338A20
-+53338A21
-+53339102
-+53338C10
-+53338C11
-+53338C12
-+53338C13
-+53338A25
-+53338A26
-+53338D01
-+53338D02
-+53338C22
-+53338C24
-+53338C26
-+53338C2A
-+53338C2B
-+53338C2C
-+53338C2D
-+53338C2E
-+53338C2F
-+53338D03
-+53338D04
-Index: xserver-xorg-video-savage/src/Makefile.am
-===================================================================
---- xserver-xorg-video-savage.orig/src/Makefile.am 2007-08-31 18:03:21.000000000 -0400
-+++ xserver-xorg-video-savage/src/Makefile.am 2007-08-31 18:04:03.000000000 -0400
-@@ -56,3 +56,6 @@
- savage_dri.h \
- savage_dripriv.h
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = savage.ids
diff --git a/debian/patches/series b/debian/patches/series
index dc070a7..d7eb8d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_gen_pci_ids.diff
03_request_16bit_depth.diff
diff --git a/debian/xserver-xorg-video-savage.install b/debian/xserver-xorg-video-savage.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-savage.install
+++ b/debian/xserver-xorg-video-savage.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*
commit ccb3c05dc4bc9afcd1b47538180420fd88c5fba4
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 22:18:24 2009 +0200
Adding README.source means we can bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index 80d24f2..bec1672 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-savage (1:2.3.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 22:10:34 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 22:17:50 +0200
xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7edc777..37edece 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,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-savage
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
commit ee675ff795ad0e494749c34fcfd20b5e6e378637
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 22:11:49 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 2af1d53..76d0280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,147 @@
+commit 75ce40850ea2ce2ed7122cf62856dcf8022187d2
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 11:39:22 2009 -0400
+
+ savage 2.3.0
+
+commit a75f0eaba6cb907a6ca9e506858d41f9c6f66b8b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 15:16:22 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit f2742755352d49a1ff4cbf9a1a5050a0a50e9e6b
+Author: Alex Villacís Lasso <a_villacis@palosanto.com>
+Date: Sun Apr 12 16:07:06 2009 -0500
+
+ Do not use XAAGetCopyROP outside of XAA-specific code
+
+ The DRI code attempts to use XAAGetCopyROP without checking whether XAA or EXA is in effect. This results in the server crashing with an undefined-symbol error when enabling EXA, then starting glxgears under GNOME/Metacity and attempting to drag the glxgears window.
+
+ The EXA code happens to have a functional duplicate of the required code under the name SavageGetCopyROP(). This patch moves the code to savage_accel.c where it is now shared between EXA and the DRI code.
+
+ It is disturbing that this has not been caught before.
+
+commit a5ad3e8f509ca07c429a43810cc3e2f80e70a1dc
+Author: Alex Villacís Lasso <alex@karlalex.palosanto.com>
+Date: Sat Apr 11 19:12:31 2009 -0500
+
+ Implement use of Mastered Image Transfer through AGP for UploadToScreen EXA acceleration.
+
+ Under some conditions (documented in this patch), the UploadToScreen implementation can make use of the AGP scratch buffer used for XVideo as a convenient source for Mastered Image Transfer. The previous implementation is still available as a fallback for when AGP acceleration is not possible. This requires the AGP scratch buffer to be persistent, so the XVideo code is also made aware of an existing DRM mapping for the scratch buffer.
+
+commit 0f4369c95b6ef948743c9b244709e454b8b8ef7f
+Author: Alex Villacís Lasso <alex@karlalex.palosanto.com>
+Date: Sat Mar 14 21:34:48 2009 -0500
+
+ Fix crash by null pointer access when DRI is not available.
+
+commit 343b2f312b1e555f9d03a499ddbe4c9b33b3a6e5
+Author: Chris Ball <cjb@laptop.org>
+Date: Fri Feb 27 10:55:58 2009 -0500
+
+ Revert EXA 3 build fix.
+
+ The EXA developers have backed out this ABI bump.
+
+ Signed-off-by: Chris Ball <cjb@laptop.org>
+
+commit 08692dd381dc6e98d484d5bffabcbd04ebf83df6
+Author: Chris Ball <cjb@laptop.org>
+Date: Tue Feb 24 12:54:13 2009 -0500
+
+ configure: use AC_DEFINE instead of shell substitution
+
+ (This is just cosmetic.)
+
+ Signed-off-by: Chris Ball <cjb@laptop.org>
+
+commit 26f9e78d9b4f93f34792a31583cb5e8700c5ed52
+Author: Chris Ball <cjb@laptop.org>
+Date: Tue Feb 24 11:54:06 2009 -0500
+
+ Build fix: EXA now requires -DEXA_DRIVER_KNOWN_MAJOR=3
+
+ This driver doesn't use {Prepare,Finish}Access, so this is safe.
+
+ Signed-off-by: Chris Ball <cjb@laptop.org>
Reply to: