ChangeLog | 136 ++++++++++---- Makefile.am | 2 configure.ac | 11 + debian/NEWS | 10 + debian/README.source | 73 +++++++ debian/changelog | 33 +++ debian/control | 6 debian/patches/01_gen_pci_ids.diff | 18 - debian/patches/series | 1 debian/xserver-xorg-video-r128.install | 1 debian/xsfbs/xsfbs.mk | 21 -- debian/xsfbs/xsfbs.sh | 311 --------------------------------- src/r128_driver.c | 21 ++ src/r128_probe.c | 4 14 files changed, 256 insertions(+), 392 deletions(-)
New commits: commit 7de8ebe14408c8413f3817432727b14870d16252 Author: Cyril Brulebois <k...@debian.org> Date: Sun Dec 6 02:31:26 2009 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 81876f3..af9df2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -xserver-xorg-video-r128 (6.8.1-2) UNRELEASED; urgency=low +xserver-xorg-video-r128 (6.8.1-2) experimental; urgency=low + [ Timo Aaltonen ] * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. - -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:09 +0200 + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois <k...@debian.org> Sun, 06 Dec 2009 02:31:22 +0100 xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low commit c7d049e6bdce9083580f108ffe24844cbf871829 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Sat Dec 5 02:09:28 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index bb65a5b..81876f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xserver-xorg-video-r128 (6.8.1-2) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. - -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 18:00:47 +0200 + -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:09 +0200 xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 45dd147..787b586 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons <dpars...@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 a5d707c6253f16e7f2c09848c82ec7284343b692 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Mon Nov 30 18:01:41 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index fc80102..bb65a5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-r128 (6.8.1-2) UNRELEASED; urgency=low + + * Bump Standards-Version to 3.8.3. + + -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 18:00:47 +0200 + xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low [ Brice Goglin ] diff --git a/debian/control b/debian/control index 4d75ced..45dd147 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-r128 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-r128.git commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 f5ec887f93d1c3cbc8a72d1f2d2c11a574eee091 Author: Brice Goglin <bgog...@debian.org> Date: Thu Jul 30 10:08:35 2009 +0200 Prepare changelog for upload diff --git a/debian/NEWS b/debian/NEWS index 4a746b2..199c654 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) experimental; urgency=low +xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low * The standard linux kernels in Debian as of version 2.6.29-1 do not contain the firmware necessary to allow the r128 driver to use 3D @@ -6,7 +6,7 @@ xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) experimental; urgency=low firmware-linux package in non-free, and must be installed to use this feature. - -- David Nusinow <dnusi...@debian.org> Wed, 29 Apr 2009 21:21:04 -0400 + -- Brice Goglin <bgog...@debian.org> Thu, 30 Jul 2009 10:12:54 +0200 xserver-xorg-video-r128 (1:6.8.1~git20080301.d855d208-1) experimental; urgency=low diff --git a/debian/changelog b/debian/changelog index e3f673c..fc80102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-r128 (6.8.1-1) UNRELEASED; urgency=low +xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low [ Brice Goglin ] * New upstream release. @@ -12,7 +12,7 @@ xserver-xorg-video-r128 (6.8.1-1) UNRELEASED; urgency=low * Remove 01_gen_pci_ids.diff. The server uses a built-in table now to choose drivers. - -- Brice Goglin <bgog...@debian.org> Thu, 30 Jul 2009 10:07:48 +0200 + -- Brice Goglin <bgog...@debian.org> Thu, 30 Jul 2009 10:08:31 +0200 xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-2) unstable; urgency=low commit 8c3422c40f5d4bb6470858601f82c95443091d94 Author: Brice Goglin <bgog...@debian.org> Date: Thu Jul 30 10:08:26 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 364a67e..da0a08f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,61 @@ +commit 39dac77d3f2b5d69f13dc3aff17a4a245462fcc0 +Author: Dave Airlie <airl...@redhat.com> +Date: Thu Jul 30 12:04:28 2009 +1000 + + r128: bump for release 6.8.1 + +commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e +Author: Dave Airlie <airl...@redhat.com> +Date: Tue Jul 28 15:22:41 2009 +1000 + + r128: change to using ABI version check + +commit e3568b4e5d404076c0f02c1b64af35c8e6d5745f +Author: Dave Airlie <airl...@redhat.com> +Date: Tue Jul 28 13:32:32 2009 +1000 + + r128: update for resources/RAC API removal + +commit 38d301388cfa1f228a6fa0cddf5b7ad6258154d2 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jul 15 15:44:01 2009 -0400 + + Use XORG_CHANGELOG macro to create ChangeLog. #22611 + + Adding the macro in configure.ac and use it in Makefile.am + Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 + Global maintenance on all modules + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 178e6f509bb8b351cfa01425ada7331781843954 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Jul 16 11:51:08 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.hutte...@who-t.net> + +commit 5d8a8df3aca2f14366946e48df9b674d7254ce04 +Author: Matthieu Herrb <matthieu.he...@laas.fr> +Date: Sat Jun 13 19:20:24 2009 +0200 + + Don't de-reference a NULL pointer in R128FreeScreen in the error path. + + If R128PreInit() failed, R128FreeRec() was already called and info + will be NULL. + +commit 771c707eb2bba21b6013327bb62859c37be08673 +Author: John Nielsen <li...@jnielsen.net> +Date: Fri Apr 17 16:16:57 2009 -0400 + + R128: fix zaphod dualhead after libpciaccess switch + + fixes bug 21251 + commit 08d56c886c6f5cb848e4f5079a66da781ef6da21 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri Jan 30 20:58:51 2009 -0800 @@ -167,7 +225,7 @@ Date: Mon Feb 25 07:10:48 2008 +1000 fixup check for EXA composite pointed out by Alan Swanson commit 85e470e64f629de72e361c77770e2e29998d1bf4 -Merge: 27ddb39... 1b84c76... +Merge: 27ddb39 1b84c76 Author: Alex Deucher <a...@samba.(none)> Date: Sun Feb 24 05:37:22 2008 -0500 @@ -855,7 +913,7 @@ Date: Mon Jan 14 16:11:09 2008 -0500 Fixes bug 14001 commit 729da30c80d6545b75c8faea44754634f477cc09 -Merge: 000741e... 625a885... +Merge: 000741e 625a885 Author: Alex Deucher <a...@samba.(none)> Date: Mon Jan 14 10:05:01 2008 -0500 @@ -1048,7 +1106,7 @@ Date: Wed Jan 2 19:48:28 2008 -0500 RADEON: various avivo tv-out related clean-ups commit ce34090c758ac91171cb6adb9b8a36e4adbf99cf -Merge: 2180f04... 30cab1d... +Merge: 2180f04 30cab1d Author: Alex Deucher <a...@samba.(none)> Date: Wed Jan 2 16:41:36 2008 -0500 @@ -1255,7 +1313,7 @@ Date: Fri Dec 21 09:45:55 2007 +1000 set ddc line correctly post-merge commit 3c31b96afa20913ad947e68fe0c3a662e5eafbdd -Merge: eb99c3c... f5e8c18... +Merge: eb99c3c f5e8c18 Author: Dave Airlie <airl...@linux.ie> Date: Fri Dec 21 09:36:22 2007 +1000 @@ -1296,7 +1354,7 @@ Date: Wed Dec 19 19:15:19 2007 -0500 The correct thing to do is filter by the mode's effective memory bandwidth. commit c1b0b69cc50516c3b7e881b0eb46cb3cd2e9dce6 -Merge: 0e66348... ce4fa1c... +Merge: 0e66348 ce4fa1c Author: Alex Deucher <a...@botch2.(none)> Date: Wed Dec 19 11:54:50 2007 -0500 @@ -1371,14 +1429,14 @@ Date: Mon Dec 17 20:20:04 2007 -0500 RADEON: fix typo from merge commit 19b9d3708852b7efe2b05249c8359dadb924dd94 -Merge: cf685f3... 29706ca... +Merge: cf685f3 29706ca Author: Alex Deucher <a...@samba.(none)> Date: Mon Dec 17 20:07:32 2007 -0500 Merge branch 'atombios-support' of git+ssh://ag...@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support commit cf685f37ec874f0aacd09e7c4eb0402c6daec1b0 -Merge: 2a134af... 44d07c4... +Merge: 2a134af 44d07c4 Author: Alex Deucher <a...@samba.(none)> Date: Mon Dec 17 20:07:07 2007 -0500 @@ -1527,7 +1585,7 @@ Date: Thu Dec 13 18:45:09 2007 -0500 - Unify the PLL calculation between legacy and avivo chips commit f5ac34983411e4c4f41ab1817dce582830f398fd -Merge: f2b2e08... 6ccf5b3... +Merge: f2b2e08 6ccf5b3 Author: Alex Deucher <a...@samba.(none)> Date: Wed Dec 12 22:37:44 2007 -0500 @@ -1580,7 +1638,7 @@ Date: Tue Dec 11 14:04:58 2007 -0500 RADEON: handle HMDI properly (untested) and fix some merge leftovers commit 3c22ad977c25d5ca2811821fcac6bb8ecd79994a -Merge: c9a0cee... f3d2ec3... +Merge: c9a0cee f3d2ec3 Author: Alex Deucher <a...@botch2.(none)> Date: Tue Dec 11 13:11:15 2007 -0500 @@ -1636,7 +1694,7 @@ Date: Mon Dec 10 15:25:56 2007 +1000 add support for building against legacy servers similiar to Intel codepaths commit 9c278cb7fa7f18d13bde053fd75221cfba9da377 -Merge: 6451ea2... cc167b9... +Merge: 6451ea2 cc167b9 Author: Dave Airlie <airl...@linux.ie> Date: Mon Dec 10 15:18:03 2007 +1000 @@ -1650,7 +1708,7 @@ Date: Mon Dec 10 15:18:03 2007 +1000 src/radeon_output.c commit 6451ea2dcc4fac762442f699935864f4a8d445f7 -Merge: 0d89556... 5896ca4... +Merge: 0d89556 5896ca4 Author: Dave Airlie <airl...@linux.ie> Date: Mon Dec 10 15:08:42 2007 +1000 @@ -1710,7 +1768,7 @@ Date: Thu Dec 6 19:23:06 2007 +1100 powerpc: build fixes from last merge commit dbe3d2608ecc9896db9c23b3a347b50748c51e13 -Merge: 48e31cd... 21ed435... +Merge: 48e31cd 21ed435 Author: Dave Airlie <airl...@redhat.com> Date: Thu Dec 6 14:22:03 2007 +1000 @@ -1811,7 +1869,7 @@ Date: Fri Nov 30 20:11:42 2007 -0500 mode or vesafb etc. after running the driver. commit af0196f7bf0d1d5d211391149c18935d64ed2b06 -Merge: d9858a2... 0175b79... +Merge: d9858a2 0175b79 Author: Alex Deucher <a...@botch2.(none)> Date: Fri Nov 30 16:40:28 2007 -0500 @@ -1843,7 +1901,7 @@ Date: Fri Nov 30 15:37:42 2007 -0500 for now. commit e1945f1f25a34310bd58ce128c8ff27ecc985618 -Merge: b368b0f... df7777b... +Merge: b368b0f df7777b Author: Alex Deucher <a...@botch2.(none)> Date: Fri Nov 30 14:30:55 2007 -0500 @@ -2064,7 +2122,7 @@ Date: Wed Nov 21 17:03:39 2007 -0500 Thanks to AMD for the information commit a12390c832abe423def60e39cd5a9118e5910339 -Merge: d531792... e74dca1... +Merge: d531792 e74dca1 Author: Alex Deucher <a...@botch2.(none)> Date: Wed Nov 21 02:24:48 2007 -0500 @@ -2117,7 +2175,7 @@ Date: Wed Nov 21 00:05:42 2007 -0500 RADEON: store devices ids from bios for each driver output commit 3975da2ea8cb628f7f66c3f26c5dfa181cd1c532 -Merge: e283aa3... 295ce27... +Merge: e283aa3 295ce27 Author: Alex Deucher <a...@botch2.(none)> Date: Tue Nov 20 23:52:29 2007 -0500 @@ -2217,7 +2275,7 @@ Date: Tue Nov 20 13:37:00 2007 +1000 atombios: add all r5xx and r6xx pci ids commit 5d023e2c3c2ab44ea57ffadc9607025d602c376c -Merge: 0d1e0c7... c887260... +Merge: 0d1e0c7 c887260 Author: Dave Airlie <airl...@redhat.com> Date: Tue Nov 20 13:02:43 2007 +1000 @@ -2242,7 +2300,7 @@ Date: Tue Nov 20 08:15:58 2007 +1000 r5xx: cleanups after last merge commit fe2f7a09050fb7a345a1f52239f8f3c4f1053891 -Merge: 744c8cb... 49055d8... +Merge: 744c8cb 49055d8 Author: Dave Airlie <airl...@redhat.com> Date: Tue Nov 20 08:04:32 2007 +1000 @@ -2254,7 +2312,7 @@ Date: Tue Nov 20 08:04:32 2007 +1000 src/radeon_output.c commit 744c8cb6c293fcaa687566f52901644e699baace -Merge: e258fbe... e530af7... +Merge: e258fbe e530af7 Author: Dave Airlie <airl...@redhat.com> Date: Tue Nov 20 07:56:33 2007 +1000 @@ -2267,14 +2325,14 @@ Date: Mon Nov 19 16:35:05 2007 +1000 makes 2-headed cursor work commit e530af79adf51b3e95a0eca676c915a34dcbf4a7 -Merge: 69e197f... 52aba8d... +Merge: 69e197f 52aba8d Author: Alex Deucher <a...@botch2.(none)> Date: Mon Nov 19 00:59:30 2007 -0500 Merge branch 'agd-atom' of /home/alex/git/airlied/xf86-video-ati2 into agd-atom commit 69e197f2c8002aacf2587754c8d3bd63c88f85b1 -Merge: 5e8940f... 862dcab... +Merge: 5e8940f 862dcab Author: Alex Deucher <a...@botch2.(none)> Date: Mon Nov 19 00:57:34 2007 -0500 @@ -2305,7 +2363,7 @@ Date: Mon Nov 19 00:39:19 2007 -0500 Don't assign a gpio for TV commit 52aba8d73189ba959f19c0437499d5e7a8829827 -Merge: 862dcab... 5e8940f... +Merge: 862dcab 5e8940f Author: Dave Airlie <airl...@redhat.com> Date: Mon Nov 19 15:30:46 2007 +1000 @@ -2342,7 +2400,7 @@ Date: Sun Nov 18 23:43:06 2007 -0500 fix typo in loop commit 384cd8f52c89d089c6559e2eedbae45641fcd14e -Merge: f3f0e4e... 234b607... +Merge: f3f0e4e 234b607 Author: Dave Airlie <airl...@redhat.com> Date: Mon Nov 19 14:02:55 2007 +1000 @@ -2411,7 +2469,7 @@ Date: Sat Nov 17 00:34:56 2007 -0500 WIP: more new ATOM integration work commit 67db114d97abed7a607467e5d67c7b4ffa2c347e -Merge: 7d06a87... ea15346... +Merge: 7d06a87 ea15346 Author: Alex Deucher <a...@botch2.(none)> Date: Fri Nov 16 14:29:53 2007 -0500 @@ -2474,7 +2532,7 @@ Date: Fri Nov 16 14:48:36 2007 +1000 Add copyright headers commit 3cfcd2164b400bd0d1cb4ede8eeb01abba9d75c8 -Merge: efac14e... 718bfd3... +Merge: efac14e 718bfd3 Author: Alex Deucher <a...@botch2.(none)> Date: Thu Nov 15 23:25:39 2007 -0500 @@ -2995,7 +3053,7 @@ Date: Thu Oct 4 11:32:48 2007 +0200 Surprisingly easy, thanks to George's pci-rework changes. commit 7addf41885ec5658f531624a9c24ea5bd7d22d19 -Merge: 3a958ba... 78c6bd3... +Merge: 3a958ba 78c6bd3 Author: Michel Dänzer <mic...@tungstengraphics.com> Date: Thu Oct 4 11:06:08 2007 +0200 @@ -3454,7 +3512,7 @@ Date: Tue Aug 28 15:37:11 2007 +0300 It still uses the old probe method though, this is due to the ati wrapper. commit 7b38d9a1209f87255e5bb0aefe46a363ce4fb6ef -Merge: 2e3d43a... 673f799... +Merge: 2e3d43a 673f799 Author: George Sapountzis <gs...@yahoo.gr> Date: Tue Aug 28 16:01:12 2007 +0300 @@ -3718,14 +3776,14 @@ Date: Thu Aug 23 19:56:21 2007 +1000 updated release numbering for randr 1.2 commit 81a8093f2ffdce59d4e8a44f65f3d5c771fd6425 -Merge: c08e6ec... 53a67e3... +Merge: c08e6ec 53a67e3 Author: Dave Airlie <airl...@redhat.com> Date: Thu Aug 23 19:51:47 2007 +1000 Merge remote branch 'origin/randr-1.2' commit c08e6ec9e7ac06caee53689b0ec50ef6a7a0ba37 -Merge: 5793e87... a0d0fcd... +Merge: 5793e87 a0d0fcd Author: Dave Airlie <airl...@clockmaker.usersys.redhat.com> Date: Thu Aug 23 19:42:19 2007 +1000 @@ -4598,7 +4656,7 @@ Date: Wed May 30 17:49:01 2007 +1000 we hang when moving the cursor into the second CRTC. commit 7fc02657c4d740941fbda5a8823cf45de3eca3f8 -Merge: 800bf53... 4c61c0e... +Merge: 800bf53 4c61c0e Author: Dave Airlie <airl...@nx6125b.(none)> Date: Wed May 30 17:27:22 2007 +1000 @@ -4653,7 +4711,7 @@ Date: Tue May 29 07:23:24 2007 +1000 rs480: only has single dac commit c52322354fe64725733842b3356798c50e7735d5 -Merge: dd6a966... 975da59... +Merge: dd6a966 975da59 Author: Dave Airlie <airl...@nx6125b.(none)> Date: Tue May 29 07:21:48 2007 +1000 @@ -5135,7 +5193,7 @@ Date: Tue May 8 19:27:48 2007 +0200 remove some old mergedfb cruft commit 76670f665ebec7cdf40a04bf9379cb3ad4417507 -Merge: 83f81ed... a3ee422... +Merge: 83f81ed a3ee422 Author: Alex Deucher <a...@t41p.hsd1.va.comcast.net> Date: Tue May 8 18:41:25 2007 +0200 @@ -5586,7 +5644,7 @@ Date: Sun Feb 25 23:29:09 2007 +1100 fix typo commit 3cfe94d5438961b869766dacbcd13fde8b770ca2 -Merge: 31c018c... 3b43788... +Merge: 31c018c 3b43788 Author: Dave Airlie <airl...@linux.ie> Date: Sun Feb 25 23:27:19 2007 +1100 @@ -5779,7 +5837,7 @@ Date: Sun Feb 4 11:28:54 2007 +0200 case because pATI->PCIInfo is now set after ATIProcessOptions() is called. commit 9d77aabdff919360f0c9333105436c31f1f5749a -Merge: ff8ea19... 57822be... +Merge: ff8ea19 57822be Author: George Sapountzis <gs...@yahoo.gr> Date: Mon Feb 5 19:16:51 2007 +0200 @@ -6952,7 +7010,7 @@ Date: Mon Sep 25 11:35:32 2006 +1000 radeon: cleanup some bits from superpatch commit 9827afaa40720a58e2fc029c0bf92ad2fe223d11 -Merge: 10b4b46... ad8259c... +Merge: 10b4b46 ad8259c Author: Dave Airlie <airl...@linux.ie> Date: Mon Sep 25 11:25:17 2006 +1000 @@ -7097,7 +7155,7 @@ Date: Fri Sep 22 06:35:34 2006 +1000 radeon: add enable display function commit 4a54886d510f26b29d27e5c9a73647554291b1a6 -Merge: 70264d6... 9fa176c... +Merge: 70264d6 9fa176c Author: Dave Airlie <airl...@linux.ie> Date: Fri Sep 22 06:00:04 2006 +1000 @@ -7713,7 +7771,7 @@ Date: Thu Jun 15 15:35:05 2006 +0200 Fix some more cosmetic warnings. commit ec93e08b24f7c0e583970d08bfe18ad142e6b047 -Merge: 051c49d... 6ca9862... +Merge: 051c49d 6ca9862 Author: Michel Dänzer <mic...@tungstengraphics.com> Date: Thu Jun 15 15:03:27 2006 +0200 @@ -7732,7 +7790,7 @@ Date: Thu Jun 15 21:24:16 2006 +1000 remove all printf specifier warnings on Linux commit 051c49d0f002c72d1d8f15f6df264d8b093d4e95 -Merge: a840afc... dfac819... +Merge: a840afc dfac819 Author: Michel Dänzer <mic...@tungstengraphics.com> Date: Thu Jun 15 13:10:44 2006 +0200 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org