--- xserver-xorg-video-ati-6.13.1.orig/ChangeLog +++ xserver-xorg-video-ati-6.13.1/ChangeLog @@ -1,3 +1,9 @@ +commit ad999e633ff41d27eed9d2c6535e163a7181b0bd +Author: Dave Airlie +Date: Wed Jul 7 10:49:22 2010 +1000 + + set version for release + commit 37b348059b1c15d7b381cd3df3db52bd9ee6613e Author: Alex Deucher Date: Wed Jun 30 12:56:48 2010 -0400 --- xserver-xorg-video-ati-6.13.1.orig/autogen.sh +++ xserver-xorg-video-ati-6.13.1/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-radeon.install +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-radeon.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/radeon_drv.so +usr/lib/xorg/modules/multimedia/*.so --- xserver-xorg-video-ati-6.13.1.orig/debian/watch +++ xserver-xorg-video-ati-6.13.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-ati-(.*)\.tar\.gz --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-radeon.postinst.in +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-radeon.postinst.in @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=postinst +THIS_PACKAGE=xserver-xorg-video-radeon + +#INCLUDE_SHELL_LIB# + +case "$1" in + abort-upgrade) + if dpkg --compare-versions "$2" lt-nl 1:6.12.99; then + # failed downgrading to a version without kms + remove_conffile_rollback /etc/modprobe.d/radeon-kms.conf + fi + ;; +esac + +if dpkg --compare-versions "$2" lt 1:6.13.0-1ubuntu3; then + remove_conffile_commit /etc/modprobe.d/radeon-kms.conf +fi + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-radeon.postrm.in +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-radeon.postrm.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=postrm +THIS_PACKAGE=xserver-xorg-video-radeon + +#INCLUDE_SHELL_LIB# + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" lt-nl 1:6.12.99; then + # downgrading to a version without kms + remove_conffile_commit /etc/modprobe.d/radeon-kms.conf + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-ati-6.13.1.orig/debian/README.source +++ xserver-xorg-video-ati-6.13.1/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. --- xserver-xorg-video-ati-6.13.1.orig/debian/rules +++ xserver-xorg-video-ati-6.13.1/debian/rules @@ -0,0 +1,109 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xserver-xorg-driver-ati package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include debian/xsfbs/xsfbs.mk + +CFLAGS = -Wall -g -fvisibility=hidden +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so +confflags += --disable-static + +configure: $(STAMP_DIR)/patch + dh_testdir + autoreconf -vfi + +build/config.status: configure + dh_testdir + test -d build || mkdir build + cd build && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + +.PHONY: build +build: build-stamp +build-stamp: build/config.status + dh_testdir + cd build && $(MAKE) + >$@ + +clean: xsfclean + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf build + rm -f $$(find -name Makefile.in) + rm -f compile config.guess config.sub configure depcomp install-sh + rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs + + dh_clean + +.PHONY: install +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + >$@ + +serverabi-%: install + $(MAKE) -f debian/rules serverabi PACKAGE=xserver-xorg-video-$* + +# Build architecture-dependent files here. +binary-arch: build install serverabi-ati serverabi-radeon + dh_testdir + dh_testroot + + dh_installdocs + dh_installchangelogs + dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4 + dh_installman + dh_link + dh_strip -pxserver-xorg-video-ati --dbg-package=xserver-xorg-video-ati-dbg + dh_strip -pxserver-xorg-video-radeon --dbg-package=xserver-xorg-video-radeon-dbg + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps -- --warnings=6 + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-ati.NEWS +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-ati.NEWS @@ -0,0 +1,18 @@ +xserver-xorg-video-ati (1:6.8.1~git20080302.a4398ac3-1) experimental; urgency=low + + * The 'ati' Xorg driver module does not contain the 'r128' and 'mach64' + submodules anymore. Users of Rage or Mach boards may safely remove + the xserver-xorg-video-ati packages only if they use Driver "r128" or + "mach64" instead of "ati" in their /etc/X11/xorg.conf. + + -- Brice Goglin Sun, 02 Mar 2008 13:22:03 +0100 + +xserver-xorg-video-ati (1:6.7.197-1) unstable; urgency=low + + * The X.Org ATI driver supports RandR 1.2 which enables dynamic + enabling, disabling, resizing, rotating, placing, ... of multiple + outputs at runtime. You might want to update your /etc/X11/xorg.conf + accordingly. See http://wiki.debian.org/XStrikeForce/HowToRandR12 + and http://www.intellinuxgraphics.org/dualhead.html for some help. + + -- Brice Goglin Fri, 21 Dec 2007 08:12:13 +0100 --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-radeon.NEWS +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-radeon.NEWS @@ -0,0 +1,44 @@ +xserver-xorg-video-radeon (1:6.12.192-2) unstable; urgency=low + + * Starting with this version, the radeon driver enables kernel mode setting + (KMS) by default. This comes with a framebuffer driver which enables + native resolution on the console. KMS also allows faster VT switching + and mode changes. + + Enabling KMS may break X.org drivers that are not KMS-ready, for instance + radeonhd or vesa. + + In case of trouble KMS can be disabled with the 'nomodeset' kernel + command line parameter, or by editing /etc/modprobe.d/radeon-kms.conf. + + -- Brice Goglin Sun, 21 Mar 2010 19:46:25 +0100 + +xserver-xorg-video-radeon (1:6.12.2-2) 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 radeon driver to use 3D acceleration + via DRI. In addition, the driver will pay significant performance + penalties for 2D and Xvideo usage when the firmware is absent. This + firmware has been moved to the firmware-linux package in non-free, and + must be installed to use this feature. + + -- David Nusinow Wed, 29 Apr 2009 21:14:53 -0400 + +xserver-xorg-video-ati (1:6.8.1~git20080302.a4398ac3-1) experimental; urgency=low + + * The 'ati' Xorg driver module does not contain the 'r128' and 'mach64' + submodules anymore. Users of Rage or Mach boards may safely remove + the xserver-xorg-video-ati packages only if they use Driver "r128" or + "mach64" instead of "ati" in their /etc/X11/xorg.conf. + + -- Brice Goglin Sun, 02 Mar 2008 13:22:03 +0100 + +xserver-xorg-video-ati (1:6.7.197-1) unstable; urgency=low + + * The X.Org ATI driver supports RandR 1.2 which enables dynamic + enabling, disabling, resizing, rotating, placing, ... of multiple + outputs at runtime. You might want to update your /etc/X11/xorg.conf + accordingly. See http://wiki.debian.org/XStrikeForce/HowToRandR12 + and http://www.intellinuxgraphics.org/dualhead.html for some help. + + -- Brice Goglin Fri, 21 Dec 2007 08:12:13 +0100 --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-ati.links +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-ati.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-ati/script --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-radeon.prerm.in +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-radeon.prerm.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=prerm +THIS_PACKAGE=xserver-xorg-video-radeon + +#INCLUDE_SHELL_LIB# + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" lt-nl 1:6.12.99; then + # downgrading to a version without kms + remove_conffile_lookup $THIS_PACKAGE /etc/modprobe.d/radeon-kms.conf + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-radeon.manpages +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-radeon.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man4/radeon.4 --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-radeon.preinst.in +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-radeon.preinst.in @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=preinst +THIS_PACKAGE=xserver-xorg-video-radeon + +#INCLUDE_SHELL_LIB# + +# We don't want this config file in Ubuntu +if dpkg --compare-versions "$2" lt-nl 1:6.13.0-1ubuntu3; then + remove_conffile_lookup $THIS_PACKAGE /etc/modprobe.d/radeon-kms.conf +fi + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-ati-6.13.1.orig/debian/compat +++ xserver-xorg-video-ati-6.13.1/debian/compat @@ -0,0 +1 @@ +5 --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-radeon.links +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-radeon.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-radeon/script --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-ati.install +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-ati.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/drivers/ati_drv.so --- xserver-xorg-video-ati-6.13.1.orig/debian/gbp.conf +++ xserver-xorg-video-ati-6.13.1/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +debian-branch=ubuntu --- xserver-xorg-video-ati-6.13.1.orig/debian/xserver-xorg-video-ati.manpages +++ xserver-xorg-video-ati-6.13.1/debian/xserver-xorg-video-ati.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man4/ati.4 --- xserver-xorg-video-ati-6.13.1.orig/debian/control +++ xserver-xorg-video-ati-6.13.1/debian/control @@ -0,0 +1,108 @@ +Source: xserver-xorg-video-ati +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Drew Parsons , Brice Goglin , Cyril Brulebois +Build-Depends: + debhelper (>= 5), + pkg-config, + xserver-xorg-dev (>= 2:1.7.6.901), + x11proto-gl-dev, + x11proto-xext-dev, + x11proto-core-dev, + x11proto-video-dev, + libgl1-mesa-dev | libgl-dev, + x11proto-fonts-dev, + x11proto-randr-dev (>= 1.2), + x11proto-render-dev, + libdrm-dev (>= 2.4.17) [!hurd-i386], + x11proto-dri2-dev, + x11proto-xf86dri-dev, + libudev-dev, + dpkg-dev (>= 1.14.17), + automake, + libtool, + xutils-dev, + quilt, +Standards-Version: 3.9.0 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ati +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git + +Package: xserver-xorg-video-ati +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, + xserver-xorg-video-r128, + xserver-xorg-video-mach64, + xserver-xorg-video-radeon +Provides: ${xviddriver:Provides} +Description: X.Org X server -- AMD/ATI display driver wrapper + This package provides the 'ati' driver for the AMD/ATI Mach64, Rage128, + Radeon, FireGL, FireMV, FirePro and FireStream series. This driver is + actually a wrapper that loads one of the 'mach64', 'r128' or 'radeon' + sub-drivers depending on the hardware. + These sub-drivers are brought through package dependencies. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-ati driver module. + +Package: xserver-xorg-video-ati-dbg +Architecture: any +Depends: + ${misc:Depends}, + xserver-xorg-video-ati (= ${binary:Version}), + xserver-xorg-video-mach64-dbg, + xserver-xorg-video-r128-dbg, + xserver-xorg-video-radeon-dbg +Section: debug +Priority: extra +Description: X.Org X server -- AMD/ATI display driver wrapper (debugging symbols) + This package provides the 'ati' driver for the AMD/ATI Mach64, Rage128, + Radeon, FireGL, FireMV, FirePro and FireStream series. This driver is + actually a wrapper that loads one of the 'mach64', 'r128' or 'radeon' + sub-drivers depending on the hardware. + These sub-drivers are brought through package dependencies. + . + This package provides debugging symbols for this X.org X driver wrapper + and brings debugging symbols for sub-drivers through package dependencies. + +Package: xserver-xorg-video-radeon +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends} +Provides: ${xviddriver:Provides} +Replaces: xserver-xorg-video-ati (<= 1:6.8.191-1) +Suggests: firmware-linux +Description: X.Org X server -- AMD/ATI Radeon display driver + This package provides the 'radeon' driver for the AMD/ATI Radeon, FireGL, + FireMV, FirePro and FireStream series. + . + Note that this is not the same as the ATI-provided, binary-only, 'fglrx' + driver, which provides additional 3D functionality for some newer Radeon + cards, but is not supported. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-ati driver module. + +Package: xserver-xorg-video-radeon-dbg +Architecture: any +Depends: + ${misc:Depends}, + xserver-xorg-video-radeon (= ${binary:Version}) +Replaces: xserver-xorg-video-ati-dbg (<= 1:6.8.191-1) +Section: debug +Priority: extra +Description: X.Org X server -- AMD/ATI Radeon display driver (debugging symbols) + This package provides the 'radeon' driver for the AMD/ATI Radeon, FireGL, + FireMV, FirePro and FireStream series. + . + This package provides debugging symbols for this X.org X driver. --- xserver-xorg-video-ati-6.13.1.orig/debian/copyright +++ xserver-xorg-video-ati-6.13.1/debian/copyright @@ -0,0 +1,122 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of Marc Aurele La France not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Marc Aurele La France makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. + +MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +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 2000 Gareth Hughes +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 +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 NONINFRINGEMENT. IN NO EVENT SHALL +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 1999-2000 Precision Insight, Inc., Cedar Park, Texas. +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 +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) --- xserver-xorg-video-ati-6.13.1.orig/debian/changelog +++ xserver-xorg-video-ati-6.13.1/debian/changelog @@ -0,0 +1,1322 @@ +xserver-xorg-video-ati (1:6.13.1-1ubuntu5) maverick; urgency=low + + * debian/patches/101_ref-count-dri2-buffers.patch: + + Replace with version that got applied upstream. Resolves another X crash + in an edge-case (LP #626743). + * Git does not contain src/modes; this is a copy of the X modes code somewhere + between Xserver 1.2 and 1.3 to enable building against Xserver 1.2. This + is also removed upstream, and was never been actually used. + + -- Christopher James Halse Rogers Tue, 07 Sep 2010 21:41:53 +1000 + +xserver-xorg-video-ati (1:6.13.1-1ubuntu4) maverick; urgency=low + + * debian/patches/101_ref-count-dri2-buffers.patch: + + Fix Xserver crash when scheduling a swap on an offscreen Drawable, + most easily triggered by some Wine apps + + -- Christopher James Halse Rogers Thu, 26 Aug 2010 13:03:36 +1000 + +xserver-xorg-video-ati (1:6.13.1-1ubuntu3) maverick; urgency=low + + * debian/rules: + + Drop the upstream ChangeLog from the packages, saving precious CD + space. + * debian/patches/101_ref-count-dri2-buffers.patch: + + Add reference-counting to DRI2 buffers, and take a reference in + ScheduleSwap. Prevents the buffers from being destroyed on client + quit between calling ScheduleSwap and the associated vblank event. + Fixes Xserver segfault when a GL client quits (LP: #617201). + + -- Christopher James Halse Rogers Tue, 24 Aug 2010 16:56:47 +1000 + +xserver-xorg-video-ati (1:6.13.1-1ubuntu2) maverick; urgency=low + + * No-change rebuild against new Xserver 1.9 ABI + + -- Christopher James Halse Rogers Mon, 09 Aug 2010 21:13:25 +1000 + +xserver-xorg-video-ati (1:6.13.1-1ubuntu1) maverick; urgency=low + + * Merge from Debian Unstable. Remainning Ubuntu changes: + + debian/control: + - Add quilt to build-depends for Ubuntu patches + + debian/patches/100_radeon-6.9.0-bgnr-enable.patch: + - Smooth plymouth transition enablement patch + + debian/rules: + - Add xsfbs patchsys + - Drop /etc/modprobe.d/radeon-kms.conf install. + + debian/xserver-xorg-video-ati.{pre,post}inst.in: + - Clean existing /etc/modprobe.d/radeon-kms.conf on install. + At best this does nothing (KMS is the default for our kernel) + and at worst it makes it harder to disable KMS. + * Add debian/gbp.conf pointing to Ubuntu branch to make git-buildpackage + less narky. + * Drop 102-no-xv-rn50.patch and 103_new_pci_ids.patch from previous + Ubuntu releases, they are upstream now. + + -- Robert Hooker Thu, 08 Jul 2010 16:45:59 -0400 + +xserver-xorg-video-ati (1:6.13.1-1) unstable; urgency=low + + * New upstream release. + + Add libudev-dev to build dependencies. + * Bump Standards-Version to 3.9.0, no changes needed. + + -- Brice Goglin Wed, 07 Jul 2010 20:43:53 +0200 + +xserver-xorg-video-ati (1:6.13.0-2ubuntu1) maverick; urgency=low + + * Merge from Debian Unstable. Remaining Ubuntu changes: + + debian/control: + - Add quilt to build-depends for Ubuntu patches + + debian/patches/103_new_pci_ids.patch: + - Add PCI IDs for some new RV7xx a Redwood + + debian/patches/102-no-xv-rn50.patch: + - Upstream backport: disable Xv on rn50 chips which have no 3D engine + or overlay. + + debian/patches/100_radeon-6.9.0-bgnr-enable.patch: + - Smooth plymouth transition enablement patch + + debian/rules: + - Add xsfbs patchsys + - Drop /etc/modprobe.d/radeon-kms.conf install. + + debian/xserver-xorg-video-ati.{pre,post}inst.in: + - Clean existing /etc/modprobe.d/radeon-kms.conf on install. + At best this does nothing (KMS is the default for our kernel) + and at worst it makes it harder to disable KMS. + * Add debian/gbp.conf pointing to Ubuntu branch to make git-buildpackage + less narky. + + -- Christopher James Halse Rogers Mon, 31 May 2010 16:50:56 +1000 + +xserver-xorg-video-ati (1:6.13.0-2) unstable; urgency=medium + + * Update xsfbs, use ${xviddriver:Depends} substvar. + + -- Julien Cristau Fri, 14 May 2010 12:03:33 +0200 + +xserver-xorg-video-ati (1:6.13.0-1ubuntu5) lucid; urgency=low + + * Add 103_new_pci_ids.patch: Add support for newer ATI hardware. Adds + PCI IDs for a number of RV7xx chips and one Redwood. + * Revert recent performance enhancement work included in 6.13.0, as it + appears to regress performance fairly severely in some circumstances + such as using googleearth. + (LP: #564181, #563400) + + 0001-Revert-r600-exa-further-cleanup-use-the-object-struc.patch + + 0002-Revert-r600-cleanup-wasteful-variables.patch + + 0003-Revert-r600-reduce-function-call-overhead.patch + + 0004-Revert-r6xx-EXA-fix-swapped-domains-in-kms-UTS.patch + + 0005-Revert-r6xx-EXA-Xv-add-a-R600SetAccelState-function.patch + + 0006-Revert-r6xx-EXA-always-use-a-temp-surface-for-overla.patch + + 0007-Revert-r6xx-EXA-always-use-the-accel_state-state-in-.patch + + 0008-Revert-r6xx-EXA-Xv-track-src-dst-domains.patch + + -- Bryce Harrington Fri, 16 Apr 2010 15:20:49 -0700 + +xserver-xorg-video-ati (1:6.13.0-1ubuntu3) lucid; urgency=low + + * Drop /etc/modprobe.d/radeon-kms.conf; in the best case it's redundant + because KMS is on by default in the Ubuntu kernel, in the worst case it + breaks our ability to forcibly disable KMS when there's a problem. + + -- Steve Langasek Thu, 15 Apr 2010 03:14:43 -0700 + +xserver-xorg-video-ati (1:6.13.0-1ubuntu2) lucid; urgency=low + + * Add 102-no-xv-rn50.patch: + - Disables Xv on rn50 class GPU's that do not have overlay or + 3D engines. Backport of upstream commit eb5665688 (LP: #542925) + + -- Robert Hooker Mon, 12 Apr 2010 20:48:28 -0400 + +xserver-xorg-video-ati (1:6.13.0-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add quilt to Build-Depends and call patch/unpatch target. + - 100_radeon-6.9.0-bgnr-enable.patch: Turn on option to allow xserver to + skip drawing the root background window for the radeon driver. This + will make the boot up sequence smoother by eliminating one flicker. + - 101_man_no_pm_options_with_kms.patch: Document that several + power management configuration options do not work with KMS + and kernel versions less than 2.6.34. + * Restore ChangeLog and remove autogen.sh + * Remove src/bicubic_table.py on clean + + -- Benjamin Drung Sat, 10 Apr 2010 20:22:14 +0200 + +xserver-xorg-video-ati (1:6.13.0-1) unstable; urgency=low + + [ Brice Goglin ] + * Specify in the NEWS file that KMS may break radeonhd or vesa. + + [ Cyril Brulebois ] + * New upstream release. + * Add myself to Uploaders. + + -- Cyril Brulebois Mon, 05 Apr 2010 19:36:21 +0200 + +xserver-xorg-video-ati (1:6.12.192-2ubuntu2) lucid; urgency=low + + * Add xserver-xorg-video-ati-6.12.192: Document that several + power management configuration options do not work with KMS + and kernel versions less than 2.6.34. + (LP: #552458) + + -- Bryce Harrington Wed, 31 Mar 2010 20:06:49 -0700 + +xserver-xorg-video-ati (1:6.12.192-2ubuntu1) lucid; urgency=low + + * Merge new upstream version from Debian. + - r6xx/r7xx: fix domain handling in accel code. Improves GetImage + performace by a factor of ~10. (LP: #544496 ?) + - radeon: add support for pal on legacy IGP chips (LP: #161893) + - radeon: disable frac fb div with new pll code + - Allocate Xv buffers to GTT. This is nice performance boost for Xv + under KMS. + - XAA: disable render accel. It's been reported broken for a while. + (LP: #513956) + - radeon: avoid using DRI1 init path on DRI2 driver. Improves behavior + with multi-seat + - kms: fix ums naming compat for DisplayPort + * Remaining changes: + - Add quilt to Build-Depends and call patch/unpatch target. + - 100_radeon-6.9.0-bgnr-enable.patch: Turn on option to allow xserver to + skip drawing the root background window for the radeon driver. This + will make the boot up sequence smoother by eliminating one flicker. + * Drop 101_support_hd4290.patch - included upstream + + -- Bryce Harrington Tue, 30 Mar 2010 19:24:28 -0700 + +xserver-xorg-video-ati (1:6.12.192-2) unstable; urgency=low + + * Enable kernel mode setting by default on Linux. + * Bump Standards-Version to 3.8.4, no changes needed. + * Pull from upstream master up to commit 5c256808. + * Stop installing the NEWS file in all binary packages, only + keep the relevant entries in -radeon and -ati NEWS files. + + -- Brice Goglin Mon, 22 Mar 2010 11:12:35 +0100 + +xserver-xorg-video-ati (1:6.12.192-1) experimental; urgency=low + + * New upstream release candidate. + * Update package descriptions. + * Drop x11proto-xinerama-dev from Build-Depends, it is not used anymore. + + -- Brice Goglin Mon, 15 Mar 2010 19:06:31 +0100 + +xserver-xorg-video-ati (1:6.12.191-1ubuntu2) lucid; urgency=low + + * Add 101_support_hd4290.patch: Adds PCI ids for a couple HD 4290 cards + + -- Bryce Harrington Thu, 11 Mar 2010 19:25:09 -0800 + +xserver-xorg-video-ati (1:6.12.191-1ubuntu1) lucid; urgency=low + + * Merge from Debian experimental (LP: #534026). + + Fix tearing (LP: #514845). + * Remaining changes: + - 100_radeon-6.9.0-bgnr-enable.patch: Turn on option to allow xserver to + skip drawing the root background window for the radeon driver. This + will make the boot up sequence smoother by eliminating one flicker. + TESTERS: Watch for corruption or other ill effects during boot up. + * Add quilt to Build-Depends and call patch/unpatch target. + * Add DEP-3 header to 100_radeon-6.9.0-bgnr-enable.patch. + + -- Benjamin Drung Tue, 09 Mar 2010 14:24:44 +0100 + +xserver-xorg-video-ati (1:6.12.191-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Wed, 03 Mar 2010 17:37:19 +0100 + +xserver-xorg-video-ati (1:6.12.99+git20100201.a887818f-1) experimental; urgency=low + + * New upstream release snapshot. + + EXA now enabled by default, closes: #502970. + + Fix display watermark, closes: #540954. + + Add KMS support, closes: #561526, #567999. + * Bump libdrm-dev dependency to 2.4.17 to get libdrm-radeon. + * Build-depend on x11proto-dri2-dev for DRI2 support. + + -- Brice Goglin Mon, 01 Feb 2010 23:54:34 +0100 + +xserver-xorg-video-ati (1:6.12.6-1) unstable; urgency=low + + * New upstream release. + + Fix some word accesses in AtomBios to work on all architectures, + closes: #572311. + + -- Brice Goglin Mon, 15 Mar 2010 18:53:23 +0100 + +xserver-xorg-video-ati (1:6.12.5-1) unstable; urgency=low + + * New upstream release, closes: #572306. + + -- Brice Goglin Wed, 03 Mar 2010 07:29:24 +0100 + +xserver-xorg-video-ati (1:6.12.4-3) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + + [ Brice Goglin ] + * Pull upstream 6.12-branch up to commit 712ac98a. + + Some EXA fixes, closes: #565506. + + -- Brice Goglin Wed, 27 Jan 2010 16:44:30 +0100 + +xserver-xorg-video-ati (1:6.12.4-2) unstable; urgency=low + + [ Julien Cristau ] + * Drop obsolete build-dep on xf86miscproto. + + [ Cyril Brulebois ] + * Add ${misc:Depends} to xserver-xorg-video-*-dbg's Depends. + * Wrap all Depends while I'm at it. + * Upload to unstable. + + -- Cyril Brulebois Fri, 08 Jan 2010 01:16:00 +0100 + +xserver-xorg-video-ati (1:6.12.4-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + + [ Brice Goglin ] + * Properly generate each binary package substvars so as to fix shlibs + dependencies, closes: #558290. + * Build against xserver 1.7. + + -- Brice Goglin Thu, 03 Dec 2009 16:38:29 +0100 + +xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low + + * New upstream release. + + More AGP quirks, closes: #545040. + + -- Brice Goglin Thu, 10 Sep 2009 07:40:14 +0200 + +xserver-xorg-video-ati (1:6.12.99+git20100126.e5933fd7-0ubuntu2) lucid; urgency=low + + * Add 0003-RS600-add-connector-quirk.patch: + - Prevent the driver from listing DVI connectors as HDMI on + RS600_7941 boards (LP: #495168). + + -- Alberto Milone Fri, 19 Feb 2010 12:48:35 +0100 + +xserver-xorg-video-ati (1:6.12.99+git20100126.e5933fd7-0ubuntu1) lucid; urgency=low + + * New upstream git snapshot 20100126 (master) up to commit + e5933fd7, includes: + + [3a30210d] RS4xx: fix 200M freezes on VT switch if CRTC is disabled + (LP: #333377, #494672) + + Speedups for r600 + + Fixes to various dpms / incorrect resolution issues + + Fixes to low memory EXA; fix NoAccel to work with KMS + + -- Bryce Harrington Wed, 27 Jan 2010 17:15:02 -0800 + +xserver-xorg-video-ati (1:6.12.99+git20091125.0061c4db-0ubuntu1) lucid; urgency=low + + * New upstream git snapshot 20091125 (master) up to commit 0061c4db + - Fix PCI chips that report as AGP to force PCI (LP: #475466) + + -- Bryce Harrington Mon, 21 Dec 2009 14:14:55 -0800 + +xserver-xorg-video-ati (1:6.12.99+git20090929.7968e1fb-0ubuntu2) karmic; urgency=low + + * 100_radeon-6.9.0-bgnr-enable.patch: Turn on option to allow xserver to + skip drawing the root background window for the radeon driver. This + will make the boot up sequence smoother by eliminating one flicker. + TESTERS: Watch for corruption or other ill effects during boot up. + * control: Require xserver version with the no-root-background patch + + -- Bryce Harrington Mon, 23 Nov 2009 15:56:45 -0800 + +xserver-xorg-video-ati (1:6.12.99+git20090929.7968e1fb-0ubuntu1) karmic; urgency=low + + * New upstream git snapshot 20090929 (master) up to commit + 7968e1fb, includes: (FFe LP: #420803) + + [718a611f] radeon: fix zaphod + + [917f2d7c] RV280: add agp quirk + + EXA fixes (LP: #408065) + + Many r6xx/7xx fixes + + Many KMS fixes + + [55fbdbae] Fix random screen blanking (LP: #310864) + + [Tormod Volden] + * debian/rules: clean up after (un)patching + + [Bryce Harrington] + * Drop 100_radeoninit3dengine_crash.patch: Included upstream + + -- Bryce Harrington Tue, 13 Oct 2009 14:38:06 -0700 + +xserver-xorg-video-ati (1:6.12.99+git20090825.fc74e119-0ubuntu2) karmic; urgency=low + + * no-change rebuild against new libdrm (LP: #410058) + + -- Tormod Volden Sun, 20 Sep 2009 22:00:13 +0200 + +xserver-xorg-video-ati (1:6.12.99+git20090825.fc74e119-0ubuntu1) karmic; urgency=low + + * Checkout from git 20090825 (master branch) up to commit + fc74e1194c980d978667e02c60a29a761a694bde + + Adds DRI2 / redirected direct rendering + (LP: #96991) + + Fix freeze on opengl games (bzflag, alienarena) (when KMS on) + (LP: #348450) + + Fix intermittent short screen blanking behavior + (LP: #310864) + + Fix faulty wine screen updates with EXA Compositing + (LP: #314205) + + Fix screen corruption issues when switching windows + (LP: #406731) + + Fix SIGSEGV crash in drmCommandNone() + (LP: #352567) + + Fix smeared/tearing of display on reboot + (LP: #367741 + + [Tormod Volden] + * 199_add_git_version_to_log.diff: Log git commit id in RadeonPreInit() + * sed -i s/DRI2BufferPtr/DRI2Buffer2Ptr/ src/radeon_dri2.c + so it compiles against xserver 1.6.2.+ + + [Bryce Harrington] + * Restore patch system and quilt to build-depends + * Drop patches already present upstream + + 107_check_unsupported_composit_ops.patch + + 108_quirk_agpmode_m6_ali.patch: AGPMode quirk. + + 109_quirk_agpmode_m7_intel.patch: AGPMode quirk. + + 110_quirk_agpmode_r420_sis.patch: AGPMode quirk. + + 111_use_xaa_for_lowmem_or_nodri.patch + + -- Bryce Harrington Sat, 29 Aug 2009 12:16:53 -0700 + +xserver-xorg-video-ati (1:6.12.99+git20090629.f39cafc5-0ubuntu6) karmic; urgency=low + + * Add 111_use_xaa_for_lowmem_or_nodri.patch: Default to XAA in low + memory situations or when the DRI is disabled. Fixes very poor Xorg + performance on older graphics hardware. + (LP: #363238) + + -- Bryce Harrington Mon, 17 Aug 2009 09:37:36 -0700 + +xserver-xorg-video-ati (1:6.12.99+git20090629.f39cafc5-0ubuntu5) karmic; urgency=low + + * xsfbs/xsfbs.sh: Switch obsolete --print-installation-architecture to + --print-architecture. + (LP: #403316) + + -- Bryce Harrington Tue, 04 Aug 2009 15:20:44 -0700 + +xserver-xorg-video-ati (1:6.12.99+git20090629.f39cafc5-0ubuntu4) karmic; urgency=low + + * Add 110_quirk_agpmode_r420_sis.patch: AGPMode quirk. Fixes freeze + when starting or using openoffice tools with R420 on a SiS host bridge 655. + (LP: #371296) + + -- Bryce Harrington Fri, 31 Jul 2009 19:13:46 -0700 + +xserver-xorg-video-ati (1:6.12.99+git20090629.f39cafc5-0ubuntu3) karmic; urgency=low + + * Add 109_quirk_agpmode_m7_intel.patch: AGPMode quirk. Fixes high CPU + load on IBM Thinkpad T40 with Mobility M7 LW (Mobility 7500). + (LP: #353996) + + -- Bryce Harrington Fri, 31 Jul 2009 18:31:11 -0700 + +xserver-xorg-video-ati (1:6.12.99+git20090629.f39cafc5-0ubuntu2) karmic; urgency=low + + * Add 108_quirk_agpmode_m6_ali.patch: AGPMode quirk. Fixes freeze when + connecting powersupply on an HP Omnibook 6200 with ALi northbridge and + an ATI M6 LY. + (LP: #146303) + + -- Bryce Harrington Fri, 31 Jul 2009 17:47:08 -0700 + +xserver-xorg-video-ati (1:6.12.99+git20090629.f39cafc5-0ubuntu1) karmic; urgency=low + + [Robert Hooker] + * Merge with debian and update git snapshot to 2009-06-29 commit + f39cafc5c4a93a16ac93756473ebb1f33c7881db on master branch. + * hook: Log git commit id in RadeonPreInit() + + [Bryce Harrington] + * Drop patches 104_use_exa.patch, 105_pre_avivo_vblank_interrupt.patch, + 106_fix_dvi_on_rs690.patch: All changes now included upstream. + * Add cherrypicked patch 107_check_unsupported_composit_ops.patch: + Check if the composite op is supported in R200CheckComposite. + + -- Bryce Harrington Tue, 30 Jun 2009 13:33:13 -0700 + +xserver-xorg-video-ati (1:6.12.2-3) unstable; urgency=low + + * Pull upstream commits from 6.12-branch up to commit b1f005bf: + + Try harder when checking if a card is posted, closes: #524280. + * Add README.source, bump Standards-Version to 3.8.2. + * Remove the unused patching systems and drop quilt from Build-Depends. + * Wrap build-deps in debian/control. + * Wrap extended description to 80 columns. + + -- Brice Goglin Sat, 25 Jul 2009 21:19:26 +0200 + +xserver-xorg-video-ati (1:6.12.2-2) unstable; urgency=low + + [ Brice Goglin ] + * Pull upstream commits from 6.12-branch up to 248b435a. + * xserver-xorg-video-radeon now suggests firmware-linux since + a firmware may be needed to initialize DRI. + * Move -dbg packages to section debug. + + [ David Nusinow ] + * Add a note in NEWS.Debian about firmware-linux + * Remove 01_gen_pci_ids.diff patch as the server just uses a built-in + table to choose drivers now + + -- Brice Goglin Wed, 13 May 2009 09:08:21 +0200 + +xserver-xorg-video-ati (1:6.12.2-1) unstable; urgency=low + + * New upstream release, closes: #523302. + + -- Brice Goglin Thu, 09 Apr 2009 12:16:12 +0200 + +xserver-xorg-video-ati (1:6.12.2-0ubuntu3) karmic; urgency=low + + * Add 106_fix_dvi_on_rs690.patch: Fix DCI output on some rs690 + cards. Filtered from upstream. + (LP: #298094) + + -- Malte S. Stretz Tue, 05 May 2009 17:25:01 +0200 + +xserver-xorg-video-ati (1:6.12.2-0ubuntu2) karmic; urgency=low + + * Add 105_pre_avivo_vblank_interrupt.patch: For pre-avivo hardware, -ati + only blanks crtcs. This cherrypicked patch makes it disable them. + (LP: #364639) + + -- Bryce Harrington Mon, 04 May 2009 16:30:25 -0700 + +xserver-xorg-video-ati (1:6.12.2-0ubuntu1) karmic; urgency=low + + * New upstream release. Lots of bug fixes. Adds r2xx/r3xx textured + video improvements. + * Drop 109_pciids_rs780.patch, 110_pciids_rs880.patch, + 111_fix_dvi_on_macmini.patch, already included in upstream code. + + -- Bryce Harrington Tue, 28 Apr 2009 00:44:17 -0700 + +xserver-xorg-video-ati (1:6.12.1-0ubuntu2) jaunty; urgency=low + + [Bryce Harrington] + * Add 109_pciids_rs780.patch, 110_pciids_rs880.patch: Support for rs780 + and rs880 cards. Cherrypick from upstream. + (LP: #311748) + + [Tormod Volden] + * Add 105_fix_dvi_on_macmini.patch: Fix DVI output on MacMini + Cherrypick from upstream. + (LP: #351245) + + -- Bryce Harrington Tue, 31 Mar 2009 16:27:44 -0700 + +xserver-xorg-video-ati (1:6.12.1-0ubuntu1) jaunty; urgency=low + + * New upstream release. Fixes some fall out from the r6xx/r7xx merge + and fix load detection on avivo chips. + * Add ChangeLog. Missing from upstream tarball. + * Drop 108_ib_ring_fix.patch, already included in upstream code. + + -- Bryce Harrington Wed, 18 Mar 2009 18:35:17 -0700 + +xserver-xorg-video-ati (1:6.12.0-0ubuntu2) jaunty; urgency=low + + * Add 108_ib_ring_fix.patch: Fixes BEGIN_RING without end error + when using Xv overlay instead of opengl for video playback. + Cherrypick from upstream tree. + (fdo bug 20510) + + -- Bryce Harrington Mon, 16 Mar 2009 18:20:56 -0700 + +xserver-xorg-video-ati (1:6.12.0-0ubuntu1) jaunty; urgency=low + + * New upstream release. Mostly just bug fixes since last git snapshot. + This release is the first with official EXA and Ev support on + R6xx/R7xx chips. + * Drop patches now included in upstream version: + - 105_quirk_rv280_865g.patch + - 106_quirk_vaio.patch + - 107_fix_cloning_on_rn50_cards.patch + + -- Bryce Harrington Mon, 16 Mar 2009 12:34:59 -0700 + +xserver-xorg-video-ati (1:6.11.0-1ubuntu5) jaunty; urgency=low + + * Fix 106_quirk_vaio.patch to apply + + -- Bryce Harrington Thu, 05 Mar 2009 14:35:07 -0800 + +xserver-xorg-video-ati (1:6.11.0-1ubuntu4) jaunty; urgency=low + + * Add 107_fix_cloning_on_rn50_cards.patch: Fixes up cloning behavior on + rn50 cards, to solve regression from Hardy where nothing is displayed + on screen at boot. + (LP: #304588) + + -- Bryce Harrington Tue, 03 Mar 2009 18:59:42 -0800 + +xserver-xorg-video-ati (1:6.11.0-1ubuntu3) jaunty; urgency=low + + * Add 106_quirk_vaio.patch: AGPMode quirk. Solves screen corruption + issue for Mobility 9200 on a Sony VaoiPCG. Upstream cherrypick. + (LP: #240455) + + -- Bryce Harrington Mon, 02 Mar 2009 15:33:49 -0800 + +xserver-xorg-video-ati (1:6.11.0-1ubuntu2) jaunty; urgency=low + + * Add 105_quirk_rv280_865g.patch: AGPMode quirk. Solves screen + corruption issue for RV280 on Intel 82865G/PE/P DRAM + Controller/Host-Hub. + (LP: #300304) + + -- Bryce Harrington Fri, 27 Feb 2009 18:23:17 -0800 + +xserver-xorg-video-ati (1:6.11.0-1ubuntu1) jaunty; urgency=low + + * Merge with Debian. Remaining Ubuntu changes: + + 104_use_exa.patch: Switches to EXA acceleration by default. + + -- Bryce Harrington Wed, 18 Feb 2009 18:55:11 -0800 + +xserver-xorg-video-ati (1:6.11.0-1) experimental; urgency=low + + * New upstream release. + + Add more AGPMode quirks, closes: #515326, #515512. + + -- Brice Goglin Thu, 19 Feb 2009 00:13:59 +0100 + +xserver-xorg-video-ati (1:6.10.99.0-1ubuntu1) jaunty; urgency=low + + * Merge with Debian. Remaining Ubuntu changes: + + 104_use_exa.patch: Switches to EXA acceleration by default. + * Add 105_hd3670_support.patch: Fix VT switching issues on HD3670 + (Fixes LP: #324234) + + -- Bryce Harrington Wed, 11 Feb 2009 11:40:29 -0800 + +xserver-xorg-video-ati (1:6.10.99.0-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Mon, 09 Feb 2009 22:51:40 +0100 + +xserver-xorg-video-ati (1:6.10.0-2) experimental; urgency=low + + * Build against xserver 1.6 rc1. + + -- Brice Goglin Thu, 22 Jan 2009 07:42:38 +0100 + +xserver-xorg-video-ati (1:6.10.0-1ubuntu1) jaunty; urgency=low + + * Merge with Debian. Remaining Ubuntu changes: + + Add 104_use_exa.patch: Switches to EXA acceleration by default. + + -- Bryce Harrington Thu, 15 Jan 2009 14:20:13 -0800 + +xserver-xorg-video-ati (1:6.10.0-1) experimental; urgency=low + + * New upstream release. + + Add AGP quirk for Fujitsu-Siemens E8010, closes: #510208. + + -- Brice Goglin Wed, 07 Jan 2009 09:23:15 +0100 + +xserver-xorg-video-ati (1:6.9.0.91-1ubuntu4) jaunty; urgency=low + + * 104_use_exa.patch: Identify new default in the radeon man page. + + -- Bryce Harrington Fri, 02 Jan 2009 15:23:04 -0800 + +xserver-xorg-video-ati (1:6.9.0.91-1ubuntu3) jaunty; urgency=low + + * Update and re-enable 104_use_exa.patch, with logic adjusted to not set + acceleration for R600 cards (which caused but 311867), and to honor XAA + if specified in xorg.conf. + + -- Bryce Harrington Fri, 02 Jan 2009 15:04:42 -0800 + +xserver-xorg-video-ati (1:6.9.0.91-1ubuntu2) jaunty; urgency=low + + * Disable 104_use_exa.patch. On at least two systems, both EXA and XAA + work if specified in xorg.conf, but this patch results in failure to + start X. + (LP: #311867) + + -- Bryce Harrington Fri, 02 Jan 2009 14:37:37 -0800 + +xserver-xorg-video-ati (1:6.9.0.91-1ubuntu1) jaunty; urgency=low + + * Merge from debian experimental, remaining changes: + - Add 104_use_exa.patch: Switches to EXA acceleration by default. + + -- Timo Aaltonen Fri, 02 Jan 2009 13:27:30 +0200 + +xserver-xorg-video-ati (1:6.9.0.91-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Tue, 23 Dec 2008 08:01:02 +0100 + +xserver-xorg-video-ati (1:6.9.0+git20081129.783cdb73-1) experimental; urgency=low + + * Pull upstream snapshot, up to commit 783cdb73. + + Add AGPMode quirk table, closes: #461144, #462590, #467460. + + -- Brice Goglin Sat, 29 Nov 2008 10:52:27 +0100 + +xserver-xorg-video-ati (1:6.9.0+git20081012.c0e6cb6d-1) experimental; urgency=low + + * Pull upstream snapshot, up to commit c0e6cb6d, closes: 500903. + + -- Brice Goglin Sun, 12 Oct 2008 08:57:46 +0200 + +xserver-xorg-video-ati (1:6.9.0+git20081003.f9826a56-0ubuntu6) jaunty; urgency=low + + * Add 104_use_exa.patch: Switches to EXA acceleration by default. + + See https://wiki.ubuntu.com/X/Blueprints/RadeonXaaToExa + + Should close the following bugs (please reopen if not): + LP: #227936, #269357, 68224 110384 132707 + + -- Bryce Harrington Fri, 19 Dec 2008 19:46:27 -0800 + +xserver-xorg-video-ati (1:6.9.0+git20081003.f9826a56-0ubuntu5) jaunty; urgency=low + + * Rebuild against the new xserver + + -- Timo Aaltonen Mon, 15 Dec 2008 10:19:03 +0200 + +xserver-xorg-video-ati (1:6.9.0+git20081003.f9826a56-0ubuntu4) jaunty; urgency=low + + * 100_quirk_system.patch: Add three more quirks for AGPMode issues + (LP: #296617, #141551) + + -- Bryce Harrington Mon, 24 Nov 2008 20:32:11 -0800 + +xserver-xorg-video-ati (1:6.9.0+git20081003.f9826a56-0ubuntu3) jaunty; urgency=low + + * Add 103_dithering_rework.patch: Complete, correct fix for dithering + issues we'd initially worked around in patches 101 and 102. Those + patches also appear to have introduced regressions on certain hardware, + which this rework addresses more elegantly. This patch essentially + includes all of upstream's work up to commit 435cf7da, except that it + drops commit 0975e007 (rename radeon_memory to radeon_legacy_memory) + which is unrelated to the dithering problem. + (Closes LP: #274234, #284346) + + -- Bryce Harrington Tue, 25 Nov 2008 03:38:53 +0000 + +xserver-xorg-video-ati (1:6.9.0+git20081003.f9826a56-0ubuntu2) intrepid; urgency=low + + * 102_rv530_dithering.patch: Expands previous dithering fixup to the RV530 + (LP: #264535) + + -- Bryce Harrington Fri, 03 Oct 2008 19:51:56 -0700 + +xserver-xorg-video-ati (1:6.9.0+git20081003.f9826a56-0ubuntu1) intrepid; urgency=low + + * Pull upstream snapshot, up to commit f9826a56 (LP: #277104) + - Add support for DDC via atom commands for RV410 (LP: #227520?) + - man page updates (fdo #17887) + - Make initial rotation work, by initializing acceleration _before_ + setting the mode + - Fix Xv video corruption by passing base offset into + RADEONDisplayVideo() explicitly (fdo #17254, LP: #267297) + - Fix sync-to-vblank hangs after mode switch with DRM vblank-rework. + - pll adjustments + - Add quirk to fix macbook hardware (fdo #17625) + * Drop 103_rotation_reset.patch - already upstream + + -- Bryce Harrington Fri, 03 Oct 2008 18:56:44 -0700 + +xserver-xorg-video-ati (1:6.9.0+git20080826.a3cc1d7a-2ubuntu4) intrepid; urgency=low + + * 103_rotation_reset.patch: Fixes corruption on screen rotation + (LP: #267266) + + -- Bryce Harrington Thu, 02 Oct 2008 11:55:04 -0700 + +xserver-xorg-video-ati (1:6.9.0+git20080826.a3cc1d7a-2ubuntu3) intrepid; urgency=low + + * 101_rv635_enable_dithering.patch: Enables dithering for RV620, RV635, + RS780, and RV770 chipsets to eliminate gradient banding issue + (fdo #17094) + + -- Bryce Harrington Mon, 22 Sep 2008 12:50:56 -0700 + +xserver-xorg-video-ati (1:6.9.0+git20080826.a3cc1d7a-2ubuntu2) intrepid; urgency=low + + * Rebuild against the new xserver-xorg-dev. + + -- Timo Aaltonen Fri, 12 Sep 2008 01:06:29 +0300 + +xserver-xorg-video-ati (1:6.9.0+git20080826.a3cc1d7a-2ubuntu1) intrepid; urgency=low + + * debian/control: Reduce xorg-server Build-Depends version to 1.4.99 (FTBS) + * 100_quirk_system.patch: Adds a quirk system for setting specific + AGPMode values for particular hardware combinations. See + https://wiki.ubuntu.com/X/Quirks for details about this. + (LP: #248438) + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Bryce Harrington Fri, 05 Sep 2008 18:47:50 -0700 + +xserver-xorg-video-ati (1:6.9.0+git20080826.a3cc1d7a-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Thu, 04 Sep 2008 14:21:38 +0200 + +xserver-xorg-video-ati (1:6.9.0+git20080826.a3cc1d7a-1) experimental; urgency=low + + [ Brice Goglin ] + * Pull upstream snapshot, up to commit a3cc1d7a. + + [ Julien Cristau ] + * Build with -fvisibility=hidden, avoiding symbol name clashes with + radeonhd (closes: #472252). + + -- Brice Goglin Tue, 26 Aug 2008 21:33:42 +0200 + +xserver-xorg-video-ati (1:6.9.0+git20080802.1f3eee36-1) experimental; urgency=low + + * Pull upstream snapshot, up to commit 1f3eee36. + * Don't handle the nostrip build option in debian/rules, dh_strip does that; + allow the parallel=n option. + * Run autoreconf at build-time; build-depend on automake, libtool and + xutils-dev. + + -- Brice Goglin Sat, 02 Aug 2008 22:56:07 +0200 + +xserver-xorg-video-ati (1:6.9.0-2) experimental; urgency=low + + * Build against xserver 1.5 rc5. + + -- Julien Cristau Mon, 14 Jul 2008 01:35:34 +0200 + +xserver-xorg-video-ati (1:6.9.0-1+lenny3) unstable; urgency=low + + * Cherry-pick patches from the upstream git repository: + + Fix VT switching on M6 chips, closes: #435040. + + Remove un-needed dac check for single crtc cards. + + Make sure video offerlay offsets don't exceed the hardware limit + of 128 MB. + + Fix pasto in connector table setup for vga powerbooks + + -- Brice Goglin Tue, 26 Aug 2008 20:49:34 +0200 + +xserver-xorg-video-ati (1:6.9.0-1+lenny2) unstable; urgency=low + + * Cherry-pick patches from the upstream git repository: + + IGP VGA fixes. + + Add PCI ids for FireMV 2400 and HD3850. + + Clamp tex coords (r100/r200) for textured video (closes: #489779). + + Atombios: add support for other endians. + + Add quirk for Falcon NW laptop. + + Fix cursor with multi-head and rotation. + + Make sure cursor offsets are properly aligned when using EXA. + + Atombios: fix typo in mode conversion for panel. + + ATOM: fix for r4xx cards with no VRAM_Usage tables (closes: #467263) + + Fix console switch on R500. + + Add oem quirk for external tmds setup on Dell Inspiron 8600. + + Clean up legacy display watermark setup. + + Clear display priority bits before resetting them. + + Interlaced mode fixups for AVIVO chips. + + Add quirk for oem x300 card (closes: #492457). + + Fix error in driver connector table for powerbook w/ vga. + + R300: NUM_FPU adjustments for VAP_CNTL. + * Fix debian/rules build/patch dependencies. + + -- Brice Goglin Sat, 02 Aug 2008 18:54:49 +0200 + +xserver-xorg-video-ati (1:6.9.0-1+lenny1) unstable; urgency=low + + * Do not export MACH64, MACH32 and R128 pci ids in radeon.ids, + closes: #490990. + + -- Brice Goglin Tue, 15 Jul 2008 23:10:04 +0200 + +xserver-xorg-video-ati (1:6.9.0-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Fri, 27 Jun 2008 07:22:21 +0200 + +xserver-xorg-video-ati (1:6.8.192-1) unstable; urgency=low + + * New upstream release. + + Add some PLL tweaks, closes: #465864. + * Fix typo in long description, thanks Anders Semb Hermansen, + closes: #487628. + + -- Brice Goglin Wed, 25 Jun 2008 07:26:16 +0200 + +xserver-xorg-video-ati (1:6.8.191-3) unstable; urgency=low + + * xserver-xorg-video-radeon replaces earlier -ati packages, closes: #487527. + + -- Brice Goglin Sun, 22 Jun 2008 15:19:12 +0200 + +xserver-xorg-video-ati (1:6.8.191-2) unstable; urgency=low + + * Split the package into into the -ati package containing the ati driver + wrapper, and xserver-xorg-video-radeon containing the actual radeon + sub-driver. + xserver-xorg-video-ati now depends on -r128, -mach64 and -radeon + while -ati-dbg depends on their corresponding -dbg packages. + + -- Brice Goglin Thu, 19 Jun 2008 07:59:57 +0200 + +xserver-xorg-video-ati (1:6.8.191-1) unstable; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Fri, 13 Jun 2008 01:38:55 +0200 + +xserver-xorg-video-ati (1:6.8.1~git20080528.faea0088-1) experimental; urgency=low + + * New upstream snapshot, up to commit faea0088. + + -- Brice Goglin Wed, 28 May 2008 11:54:21 +0200 + +xserver-xorg-video-ati (1:6.8.1~git20080521.04500c84-1) experimental; urgency=low + + * New upstream snapshot, up to commit 04500c84. + + Fix lockup on startup on IGP320M, closes: #480312. + + -- Brice Goglin Wed, 21 May 2008 07:54:45 +0200 + +xserver-xorg-video-ati (1:6.8.1~git20080512.94bf8f01-1) experimental; urgency=low + + * New upstream snapshot, up to commit 94bf8f01. + + Fix some DPMS-related brief blanking, closes: #467105. + * Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings. + + -- Brice Goglin Mon, 12 May 2008 13:41:04 +0200 + +xserver-xorg-video-ati (1:6.8.1~git20080417.c5d62fa0-1) experimental; urgency=low + + * New upstream snapshot, up to commit c5d62fa0. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. + + -- Brice Goglin Mon, 21 Apr 2008 02:40:28 +0200 + +xserver-xorg-video-ati (1:6.8.1~git20080320.5e3b2128-1) experimental; urgency=low + + * New upstream snapshot, up to commit 5e3b2128. + + Driver-side fix of two colour cursors to ARGB conversion on + big endian platforms, needs a recent xserver-xorg-core to be + be complete, closes: #446123. + + -- Brice Goglin Thu, 20 Mar 2008 09:10:18 +0100 + +xserver-xorg-video-ati (1:6.8.1~git20080310.38606b08-1) experimental; urgency=low + + * New upstream snapshap, up to commit 38606b08. + + -- Brice Goglin Mon, 10 Mar 2008 23:48:13 +0100 + +xserver-xorg-video-ati (1:6.8.1~git20080302.a4398ac3-1) experimental; urgency=low + + * New upstream snapshot, after r128 and mach64 got split out. + + Depends on xserver-xorg-video-r128 and xserver-xorg-video-mach64. + + Drop obsolete conflicts/replaces. + + Add a NEWS entry about the need to change Driver ati into mach64/r128. + * Bump Standards-Version: to 3.7.3, no change needed. + * Remove XS- prefix to Vcs-Browser and Vcs-Git fields. + + -- Brice Goglin Sun, 02 Mar 2008 13:20:59 +0100 + +xserver-xorg-video-ati (1:6.8.0-1) unstable; urgency=low + + * New upstream release. + + Bring back to life planar-to-packed conversion for rs4xx, + closes: #448577. + + -- Brice Goglin Tue, 19 Feb 2008 08:24:35 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080203.f65e8dfa-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to f65e8dfa. + + Reverts "Default to 1x again with non-v3 AGP cards", closes: #457767. + + -- Brice Goglin Sun, 03 Feb 2008 10:49:43 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080117.6bd510a2-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 6bd510a2. + + -- Brice Goglin Thu, 17 Jan 2008 10:54:03 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080109.10e7636c-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 10e7636c. + + -- Brice Goglin Wed, 09 Jan 2008 23:43:53 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080102.30cab1db-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 30cab1db. + + -- Brice Goglin Wed, 02 Jan 2008 22:04:12 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080101.f65374f5-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to f65374f5. + + -- Brice Goglin Tue, 01 Jan 2008 11:37:58 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20071223.ad3325f6-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to ad3325f6. + + Add IgnoreLidStatus option to enable lid even when closed, + closes: #457612, #457516. + + Fix PLL input setup on mac cards, closes: #457563. + + -- Brice Goglin Sun, 23 Dec 2007 23:24:43 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20071221.be7f8fd3-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to be7f8fd3. + + New atombios based support for r500 and r600 boards. + + Zaphod mode is back, reimplemented on top of RandR 1.2. + + -- Brice Goglin Fri, 21 Dec 2007 08:39:57 +0100 + +xserver-xorg-video-ati (1:6.7.197-1) unstable; urgency=low + + * New upstream release candidate. + * Upload to unstable since this release candidate is supposed + to be much better than the old 1:6.6.193-3. + * Add a NEWS entry pointing to some RandR 1.2 documentation. + + -- Brice Goglin Fri, 21 Dec 2007 08:11:07 +0100 + +xserver-xorg-video-ati (1:6.7.197~git20071219.ce4fa1ce-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to ce4fa1ce. + + Default to 1x again with non-v3 AGP cards, closes: #444049. + + -- Brice Goglin Wed, 19 Dec 2007 08:44:33 +0100 + +xserver-xorg-video-ati (1:6.7.196-2) experimental; urgency=low + + * New upstream snapshot, containing commits up to 5022d006. + + Fix the washed out color, closes: #440174. + + Update 01_gen_pci_ids.diff to use the new ati_pciids_gen.h. + + -- Brice Goglin Mon, 03 Dec 2007 21:26:02 +0100 + +xserver-xorg-video-ati (1:6.7.196-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Mon, 12 Nov 2007 08:38:43 +0100 + +xserver-xorg-video-ati (1:6.7.195-2) experimental; urgency=low + + * New upstream snapshot, + based on commit ddec5783103045084a66a34d71326cc6e4a3f598 + + Fixes some LVDS issues, closes: #445746. + + -- Brice Goglin Tue, 09 Oct 2007 18:27:22 +0200 + +xserver-xorg-video-ati (1:6.7.195-1) experimental; urgency=low + + * New upstream release candidate. + + -- Julien Cristau Sat, 06 Oct 2007 02:56:56 +0200 + +xserver-xorg-video-ati (1:6.7.194-1) experimental; urgency=low + + * New upstream release candidate. + + Add MacModel "mini" option to support Mac Mini connector table, + closes: #443570. + + Fix crash when Xv window is outside of either crtc, + closes: #441902. + + -- Brice Goglin Mon, 24 Sep 2007 07:59:36 +0200 + +xserver-xorg-video-ati (1:6.7.193-1) experimental; urgency=low + + * New upstream release candidate. + + Fix distortion after lid close/reopen, closes: #435114. + + Stop wrongly detecting the TV-output as connected, closes: #439322. + + Fix outputs after VT switch, closes: #443151. + + -- Brice Goglin Thu, 20 Sep 2007 07:34:02 +0200 + +xserver-xorg-video-ati (1:6.7.192-4) experimental; urgency=low + + * Really build against xserver 2:1.4. + * Pull upstream commits up to 2d78e2b6f36c21812b15eea0f1c7004e748fd5ab. + + -- Brice Goglin Thu, 13 Sep 2007 22:35:56 +0200 + +xserver-xorg-video-ati (1:6.7.192-3) experimental; urgency=low + + * Build against xserver 2:1.4-1. + + -- Brice Goglin Fri, 07 Sep 2007 17:52:57 +0200 + +xserver-xorg-video-ati (1:6.7.192-2) experimental; urgency=low + + * Build against xserver 1.3.99.2. + + -- Brice Goglin Tue, 04 Sep 2007 19:12:45 +0200 + +xserver-xorg-video-ati (1:6.7.192-1) experimental; urgency=low + + * New upstream release candidate. + + UseFBDev option removed, closes: #372920. + + Monitor detection fixed, closes: #413500. + + -- Brice Goglin Mon, 27 Aug 2007 08:26:38 +0200 + +xserver-xorg-video-ati (1:6.7.191-1) experimental; urgency=low + + * New upstream release candidate. + + TV-output support, closes: #332410, #360186, #378594, #435691. + + Bump x11proto-randr-dev build-dependency to >= 1.2 for RandR-1.2 + support. + + -- Brice Goglin Thu, 23 Aug 2007 08:15:03 +0200 + +xserver-xorg-video-ati (1:6.6.193-2) experimental; urgency=low + + * Build against xserver 1.3.99.0. + * Add 01_gen_pci_ids.diff. This patch adds a list of pci id's that the + driver supports so that the server can automatically load it. + * Use ${binary:Version} instead of ${Source-Version}. + + -- Brice Goglin Mon, 20 Aug 2007 19:49:33 +0200 + +xserver-xorg-video-ati (1:6.6.193-1) experimental; urgency=low + + [ Brice Goglin ] + * New upstream release candidate. + + Add references to radeon and r128 manpages in SEE ALSO + in the ati(4) manpage (closes: #386001). + + Fix typo in "specifying" in the radeon(4) manpage + (closes: #432059). + + Fully zero-initialize info->CRT2pScrn->monitor (closes: #422777). + + Avoid crash in MACH64 Xv code (closes: #320828). + + Drop 01_ati_r128_update_chip_identification.diff since + this information is redundant and does not matter anyway + since the driver auto-detects how the card is connected + to the system. + + Drop 02_radeon_manpage.diff, merged upstream. + + [ Julien Cristau ] + * Add upstream URL to debian/copyright. Thanks, Loïc Minier. + + -- Brice Goglin Sat, 4 Aug 2007 15:14:49 +0200 + +xserver-xorg-video-ati (1:6.6.192-1) experimental; urgency=low + + [ Brice Goglin ] + * Build a xserver-xorg-video-ati-dbg package with debugging symbols. + * Fix Provides: xf86-video-driver-atimisc to match Replaces: and + Conflicts: xserver-xorg-video-atimisc. + Thanks to Eric Lavarde (closes: #372312). + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-ati + module in the long description (closes: #425321). + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-ati. + + [ Julien Cristau ] + * New upstream release candidate + * Refresh patch 02_radeon_manpage.diff. + + -- Julien Cristau Mon, 21 May 2007 01:28:33 +0200 + +xserver-xorg-video-ati (1:6.6.191-1) experimental; urgency=low + + [ Brice Goglin ] + * New upstream release candidate. + * autoreconf. + + [ Julien Cristau ] + * Drop Fabio and Branden from Uploaders, with their permission. Hopefully + they'll come back when they have more time! + + -- Julien Cristau Wed, 28 Mar 2007 14:26:43 +0200 + +xserver-xorg-video-ati (1:6.6.3-5) experimental; urgency=low + + * Bump build-dep on libdrm-dev to >= 2.2 to fix FTBFS (closes: #413100). + Thanks, Frank Lichtenheld! + * Add patch 02_radeon_manpage.diff to replace non-ascii character with the + corresponding groff escape sequence in the radeon manpage. + + -- Julien Cristau Fri, 2 Mar 2007 22:44:03 +0100 + +xserver-xorg-video-ati (1:6.6.3-4) experimental; urgency=low + + * Generate server dependencies automatically from the ABI + * Merge changes from upstream pre-release + * Remove obsolete 02_radeon_memmap_fbdev.diff + + -- David Nusinow Wed, 21 Feb 2007 22:54:17 -0500 + +xserver-xorg-video-ati (1:6.6.3-3) UNRELEASED; urgency=low + + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + -- Julien Cristau Tue, 7 Nov 2006 07:30:39 +0100 + +xserver-xorg-video-ati (1:6.6.3-2) unstable; urgency=low + + * Add 02_radeon_memmap_fbdev.diff. This should fix breakage when using + fbdev. Thanks Michel Dänzer. Closes: #369167 + * Don't require libdrm-dev on hurd-i386. Thanks Michael Banck. + Closes: #392876 + + -- David Nusinow Sat, 14 Oct 2006 14:30:22 -0400 + +xserver-xorg-video-ati (1:6.6.3-1) unstable; urgency=low + + * New upstream release + + -- David Nusinow Fri, 13 Oct 2006 14:02:45 -0400 + +xserver-xorg-video-ati (1:6.6.2-2) unstable; urgency=low + + [ Drew Parsons ] + * Include upstream ChangeLog. Closes: #365104. + * Upload to unstable (X11R7.1 transition). + + -- David Nusinow Mon, 18 Sep 2006 19:57:28 -0400 + +xserver-xorg-video-ati (1:6.6.2-1) experimental; urgency=low + + * New upstream version. Happy birthday. + * Use debhelper 5. + * Standards version 3.7.2. + * Add reference to /usr/share/common-licenses/GPL to debian/copyright. + * Use dh_installman to install man pages. + * Exclude .la files from dh_install. + + -- Drew Parsons Thu, 31 Aug 2006 21:36:05 +1000 + +xserver-xorg-video-ati (1:6.6.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:26 +0000 + +xserver-xorg-video-ati (1:6.6.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + + [ David Nusinow ] + * New upstream release + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + + -- David Nusinow Sun, 6 Aug 2006 20:15:19 +0000 + +xserver-xorg-video-ati (1:6.5.8.0-1) unstable; urgency=low + + * New upstream release + * Use dh_install with --list-missing + * Add build-dep on quilt + * Remove obsolete 02_ppc_fix.diff. Now incorporated upstream. + + -- David Nusinow Tue, 25 Apr 2006 22:11:48 -0400 + +xserver-xorg-video-ati (1:6.5.7.3-3) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:26 -0500 + +xserver-xorg-video-ati (1:6.5.7.3-2) experimental; urgency=low + + * Port patches from trunk + + general/043_ati_r128_update_chip_identification.diff + * Apply ppc-fix.patch and incorporate it in to our patch system instead of + just having it sit in the debian directory + + -- David Nusinow Sun, 26 Feb 2006 17:46:59 -0500 + +xserver-xorg-video-ati (1:6.5.7.3-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:35:49 -0500 + +xserver-xorg-driver-ati (1:6.5.7.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Also install Rage Theatre multimedia modules. + + -- Daniel Stone Wed, 4 Jan 2006 17:21:27 +1100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu3) dapper; urgency=low + + * Add missing Build-Depends (x11proto-fonts-dev, x11proto-randr-dev, + x11proto-render-dev, libdrm (>> 1.0.5), x11proto-xf86dri-dev). + + -- Daniel Stone Mon, 5 Dec 2005 14:52:47 +1100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu2) dapper; urgency=low + + * Apply patch from https://bugs.freedesktop.org/attachment.cgi?id=3620 to + fix hard crash on powerpc. The patch is also stored in + debian/ppc-fix.patch. + NOTE: according to benh the patch still needs some extra polishing. + + -- Fabio M. Di Nitto Fri, 25 Nov 2005 11:34:33 +0100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:25:16 +1100 + +xserver-xorg-driver-ati (1:6.5.6.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 18:01:13 +1000 + +xserver-xorg-driver-ati (1:6.5.6-1) breezy; urgency=low + + * First xserver-xorg-driver-ati release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-ati-6.13.1.orig/debian/xsfbs/repack.sh +++ xserver-xorg-video-ati-6.13.1/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0 --- xserver-xorg-video-ati-6.13.1.orig/debian/xsfbs/xsfbs.mk +++ xserver-xorg-video-ati-6.13.1/debian/xsfbs/xsfbs.mk @@ -0,0 +1,285 @@ +#!/usr/bin/make -f + +# Debian X Strike Force Build System (XSFBS): Make portion + +# Copyright 1996 Stephen Early +# Copyright 1997 Mark Eichin +# Copyright 1998-2005, 2007 Branden Robinson +# Copyright 2005 David Nusinow +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# Originally by Stephen Early +# Modified by Mark W. Eichin +# Modified by Adam Heath +# Modified by Branden Robinson +# Modified by Fabio Massimo Di Nitto +# Modified by David Nusinow +# Acknowledgements to Manoj Srivastava. + +# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. +export DH_OPTIONS + +# force quilt to not use ~/.quiltrc and to use debian/patches +QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + +# Set up parameters for the upstream build environment. + +# Determine (source) package name from Debian changelog. +SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Source:' | awk '{print $$2}') + +# Determine package version from Debian changelog. +SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Version:' | awk '{print $$2}') + +# Determine upstream version number. +UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') + +# Determine the source version without the epoch for make-orig-tar-gz +NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') + +# Figure out who's building this package. +BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) + +# Find out if this is an official build; an official build has nothing but +# digits, dots, and/or the codename of a release in the Debian part of the +# version number. Anything else indicates an unofficial build. +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) + +# Set up parameters for the Debian build environment. + +# Determine our architecture. +BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +# Work around some old-time dpkg braindamage. +BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) +# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. +ifdef DEB_HOST_ARCH + ARCH:=$(DEB_HOST_ARCH) +else + # dpkg-cross sets the ARCH environment variable; if set, use it. + ifdef ARCH + ARCH:=$(ARCH) + else + ARCH:=$(BUILD_ARCH) + endif +endif + +# $(STAMP_DIR) houses stamp files for complex targets. +STAMP_DIR:=stampdir + +# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place +# their files. +DEBTREEDIR:=$(CURDIR)/debian/tmp + +# All "important" targets have four lines: +# 1) A target name that is invoked by a package-building tool or the user. +# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. +# 2) A line delcaring 1) as a phony target (".PHONY:"). +# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may +# depend on other targets. +# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the +# "$(STAMP_DIR)/" prefix is omitted. +# +# This indirection is needed so that the "stamp" files that signify when a rule +# is done can be located in a separate "stampdir". Recall that make has no way +# to know when a goal has been met for a phony target (like "build" or +# "install"). +# +# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" +# so that the target will not be run again. Removing the file will make Make +# run the target over. + +# All phony targets should be declared as dependencies of .PHONY, even if they +# do not have "($STAMP_DIR)/"-prefixed counterparts. + +# Define a harmless default rule to keep things from going nuts by accident. +.PHONY: default +default: + +# Set up the $(STAMP_DIR) directory. +.PHONY: stampdir +stampdir_targets+=stampdir +stampdir: $(STAMP_DIR)/stampdir +$(STAMP_DIR)/stampdir: + mkdir $(STAMP_DIR) + >$@ + +# Set up the package build directory as quilt expects to find it. +.PHONY: prepare +stampdir_targets+=prepare +prepare: $(STAMP_DIR)/prepare +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts + >$@ + +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + >$@ + +# Apply all patches to the upstream source. +.PHONY: patch +stampdir_targets+=patch +patch: $(STAMP_DIR)/patch +$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare + if ! [ `which quilt` ]; then \ + echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ + exit 1; \ + fi; \ + if $(QUILT) next >/dev/null 2>&1; then \ + echo -n "Applying patches..."; \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/patch; \ + echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "No patches to apply"; \ + fi; \ + >$@ + +# Revert all patches to the upstream source. +.PHONY: unpatch +unpatch: $(STAMP_DIR)/logdir + rm -f $(STAMP_DIR)/patch + @echo -n "Unapplying patches..."; \ + if $(QUILT) applied >/dev/null 2>/dev/null; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "nothing to do."; \ + fi + +# Clean the generated maintainer scripts. +.PHONY: cleanscripts +cleanscripts: + rm -f $(STAMP_DIR)/genscripts + rm -f debian/*.config \ + debian/*.postinst \ + debian/*.postrm \ + debian/*.preinst \ + debian/*.prerm + +# Clean the package build tree. +.PHONY: xsfclean +xsfclean: cleanscripts unpatch + dh_testdir + rm -rf .pc + rm -rf $(STAMP_DIR) + 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. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: prune-upstream-tree +prune-upstream-tree: + # Ensure we're in the correct directory. + dh_testdir + grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf + +# Verify that there are no offsets or fuzz in the patches we apply. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: patch-audit +patch-audit: prepare unpatch + @echo -n "Auditing patches..."; \ + >$(STAMP_DIR)/log/patch; \ + FUZZY=; \ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + case "$$RESULT" in \ + succeeded) \ + echo "fuzzy patch: $$($(QUILT) top)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ + FUZZY=yes; \ + ;; \ + FAILED) \ + echo "broken patch: $$($(QUILT) next)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ + exit 1; \ + ;; \ + esac; \ + done; \ + if [ -n "$$FUZZY" ]; then \ + echo "there were fuzzy patches; please fix."; \ + exit 1; \ + else \ + echo "done."; \ + fi + +# Generate the maintainer scripts. +.PHONY: genscripts +stampdir_targets+=genscripts +genscripts: $(STAMP_DIR)/genscripts +$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir + for FILE in debian/*.config.in \ + debian/*.postinst.in \ + debian/*.postrm.in \ + debian/*.preinst.in \ + debian/*.prerm.in; do \ + if [ -e "$$FILE" ]; then \ + MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ + sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ + cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ + sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ + sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ + -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ + <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ + rm $$MAINTSCRIPT.tmp; \ + fi; \ + done + # Validate syntax of generated shell scripts. + #sh debian/scripts/validate-posix-sh debian/*.config \ + # debian/*.postinst \ + # debian/*.postrm \ + # debian/*.preinst \ + # debian/*.prerm + >$@ + +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input + +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: install +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' + @exit 1 +else + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars +endif + +# vim:set noet ai sts=8 sw=8 tw=0: --- xserver-xorg-video-ati-6.13.1.orig/debian/xsfbs/xsfbs.sh +++ xserver-xorg-video-ati-6.13.1/debian/xsfbs/xsfbs.sh @@ -0,0 +1,622 @@ +# 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 +# of those functions. By itself, it does not "do" much; the maintainer scripts +# invoke the functions defined here to accomplish package installation and +# 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 +# skip past this library by scanning forward in this file to the string +# "GOBSTOPPER". + +SOURCE_VERSION=@SOURCE_VERSION@ +OFFICIAL_BUILD=@OFFICIAL_BUILD@ + +# Use special abnormal exit codes so that problems with this library are more +# easily tracked down. +SHELL_LIB_INTERNAL_ERROR=86 +SHELL_LIB_THROWN_ERROR=74 +SHELL_LIB_USAGE_ERROR=99 + +# old -> new variable names +if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then + DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" +fi +if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then + DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" +fi + +# initial sanity checks +if [ -z "$THIS_PACKAGE" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of this package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ -z "$THIS_SCRIPT" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of the +"$THIS_PACKAGE" package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then + RECONFIGURE="true" +else + RECONFIGURE= +fi + +if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then + FIRSTINST="yes" +fi + +if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then + UPGRADE="yes" +fi + +trap "message;\ + message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ + message;\ + exit 1" HUP INT QUIT TERM + +reject_nondigits () { + # syntax: reject_nondigits [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters other than decimal digits and barf if any are found + while [ -n "$1" ]; do + # does the operand contain anything but digits? + if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then + # can't use die(), because it wraps message() which wraps this function + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +reject_unlikely_path_chars () { + # syntax: reject_unlikely_path_chars [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters unlikely to be seen in a path and which the shell might + # interpret and barf if any are found + while [ -n "$1" ]; do + # does the operand contain any funny characters? + if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ + "encountered possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the +# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while +# the script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +message () { + # pretty-print messages of arbitrary length + reject_nondigits "$COLUMNS" + echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 +} + +observe () { + # syntax: observe message ... + # + # issue observational message suitable for logging someday when support for + # it exists in dpkg + if [ -n "$DEBUG_XORG_PACKAGE" ]; then + message "$THIS_PACKAGE $THIS_SCRIPT note: $*" + fi +} + +warn () { + # syntax: warn message ... + # + # issue warning message suitable for logging someday when support for + # it exists in dpkg; also send to standard error + message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" +} + +die () { + # syntax: die message ... + # + # exit script with error message + message "$THIS_PACKAGE $THIS_SCRIPT error: $*" + exit $SHELL_LIB_THROWN_ERROR +} + +internal_error () { + # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message + message "internal error: $*" + if [ -n "$OFFICIAL_BUILD" ]; then + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + fi + exit $SHELL_LIB_INTERNAL_ERROR +} + +usage_error () { + message "usage error: $*" + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + exit $SHELL_LIB_USAGE_ERROR +} + +font_update () { + # run $UPDATECMDS in $FONTDIRS + + local dir cmd shortcmd x_font_dir_prefix + + x_font_dir_prefix="/usr/share/fonts/X11" + + if [ -z "$UPDATECMDS" ]; then + usage_error "font_update() called but \$UPDATECMDS not set" + fi + if [ -z "$FONTDIRS" ]; then + usage_error "font_update() called but \$FONTDIRS not set" + fi + + reject_unlikely_path_chars "$UPDATECMDS" + reject_unlikely_path_chars "$FONTDIRS" + + for dir in $FONTDIRS; do + if [ -d "$x_font_dir_prefix/$dir" ]; then + for cmd in $UPDATECMDS; do + if which "$cmd" > /dev/null 2>&1; then + shortcmd=${cmd##*/} + observe "running $shortcmd in $dir font directory" + cmd_opts= + if [ "$shortcmd" = "update-fonts-alias" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-dir" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-scale" ]; then + cmd_opts=--x11r7-layout + fi + $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ + "failed; font directory data may not" \ + "be up to date" + else + warn "$cmd not found; not updating corresponding $dir font" \ + "directory data" + fi + done + else + warn "$dir is not a directory; not updating font directory data" + fi + done +} + +remove_conffile_prepare () { + # syntax: remove_conffile_prepare filename official_md5sum ... + # + # Check a conffile "filename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 2 ]; then + usage_error "remove_conffile_prepare() called with wrong number of" \ + "arguments; expected at least 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + shift + + # does the conffile even exist? + if [ -e "$conffile" ]; then + # calculate its checksum + current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') + # compare it to each supplied checksum + while [ -n "$1" ]; do + if [ "$current_checksum" = "$1" ]; then + # we found a match; move the confffile and stop looking + observe "preparing obsolete conffile $conffile for removal" + mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" + break + fi + shift + done + fi +} + +remove_conffile_lookup () { + # syntax: remove_conffile_lookup package filename + # + # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal + # if it matches the actual file's md5sum. + # + # Call this function when you would call remove_conffile_prepare but only + # want to check against dpkg's status database instead of known checksums. + + local package conffile old_md5sum + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "remove_conffile_lookup() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + package="$1" + conffile="$2" + + if ! [ -e "$conffile" ]; then + return + fi + old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ + awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" + if [ -n "$old_md5sum" ]; then + remove_conffile_prepare "$conffile" "$old_md5sum" + fi +} + +remove_conffile_commit () { + # syntax: remove_conffile_commit filename + # + # Complete the removal of a conffile "filename" that has become obsolete. + # + # Call this function from a postinst script after having used + # remove_conffile_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_commit() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, remove it + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "committing removal of obsolete conffile $conffile" + rm "$conffile.$THIS_PACKAGE-tmp" + fi +} + +remove_conffile_rollback () { + # syntax: remove_conffile_rollback filename + # + # Roll back the removal of a conffile "filename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" is after having used remove_conffile_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_rollback() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, move it + # back + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "rolling back removal of obsolete conffile $conffile" + mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" + fi +} + +replace_conffile_with_symlink_prepare () { + # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ + # official_md5sum ... + # + # Check a conffile "oldfilename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. Otherwise copy it + # to newfilename and let dpkg handle it through conffiles mechanism. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 3 ]; then + usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ + " number of arguments; expected at least 3, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + shift + newconffile="$1" + shift + + remove_conffile_prepare "$_oldconffile" "$@" + # If $oldconffile still exists, then md5sums didn't match. + # Copy it to new one. + if [ -f "$oldconffile" ]; then + cp "$oldconffile" "$newconffile" + fi + +} + +replace_conffile_with_symlink_commit () { + # syntax: replace_conffile_with_symlink_commit oldfilename + # + # Complete the removal of a conffile "oldfilename" that has been + # replaced by a symlink. + # + # Call this function from a postinst script after having used + # replace_conffile_with_symlink_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "replace_conffile_with_symlink_commit() called with wrong" \ + "number of arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + remove_conffile_commit "$conffile" +} + +replace_conffile_with_symlink_rollback () { + # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename + # + # Roll back the replacing of a conffile "oldfilename" with symlink to + # "newfilename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" and verify $2 to ensure the package failed to upgrade + # from a version (or install over a version removed-but-not-purged) prior + # to the one in which the conffile was obsoleted. + # You should have used replace_conffile_with_symlink_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ + "number of arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + newconffile="$2" + + remove_conffile_rollback "$_oldconffile" + if [ -f "$newconffile" ]; then + rm "$newconffile" + fi +} + +run () { + # syntax: run command [ argument ... ] + # + # Run specified command with optional arguments and report its exit status. + # Useful for commands whose exit status may be nonzero, but still acceptable, + # or commands whose failure is not fatal to us. + # + # NOTE: Do *not* use this function with db_get or db_metaget commands; in + # those cases the return value of the debconf command *must* be checked + # before the string returned by debconf is used for anything. + + local retval + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "run() called with wrong number of arguments; expected at" \ + "least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + "$@" || retval=$? + + if [ ${retval:-0} -ne 0 ]; then + observe "command \"$*\" exited with status $retval" + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # Ensure that the symbolic link symlink exists, and points to target. + # + # If symlink does not exist, create it and point it at target. + # + # If symlink exists but is not a symbolic link, back it up. + # + # If symlink exists, is a symbolic link, but points to the wrong location, fix + # it. + # + # If symlink exists, is a symbolic link, and already points to target, do + # nothing. + # + # This function wouldn't be needed if ln had an -I, --idempotent option. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "make_symlink_sane() called with wrong number of arguments;" \ + "expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local symlink target + + symlink="$1" + target="$2" + + if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then + observe "link from $symlink to $target already exists" + else + observe "creating symbolic link from $symlink to $target" + mkdir -p "${target%/*}" "${symlink%/*}" + ln -s -b -S ".dpkg-old" "$target" "$symlink" + fi +} + +migrate_dir_to_symlink () { + # syntax: migrate_dir_to_symlink old_location new_location + # + # Per Debian Policy section 6.5.4, "A directory will never be replaced by a + # symbolic link to a directory or vice versa; instead, the existing state + # (symlink or not) will be left alone and dpkg will follow the symlink if + # there is one." + # + # We have to do it ourselves. + # + # This function moves the contents of old_location, a directory, into + # new_location, a directory, then makes old_location a symbolic link to + # new_location. + # + # old_location need not exist, but if it does, it must be a directory (or a + # symlink to a directory). If it is not, it is backed up. If new_location + # exists already and is not a directory, it is backed up. + # + # This function should be called from a package's preinst so that other + # packages unpacked after this one --- but before this package's postinst runs + # --- are unpacked into new_location even if their payloads contain + # old_location filespecs. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "migrate_dir_to_symlink() called with wrong number of" + "arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local new old + + old="$1" + new="$2" + + # Is old location a symlink? + if [ -L "$old" ]; then + # Does it already point to new location? + if [ "$(readlink "$old")" = "$new" ]; then + # Nothing to do; migration has already been done. + observe "migration of $old to $new already done" + return 0 + else + # Back it up. + warn "backing up symbolic link $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + fi + + # Does old location exist, but is not a directory? + if [ -e "$old" ] && ! [ -d "$old" ]; then + # Back it up. + warn "backing up non-directory $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + + observe "migrating $old to $new" + + # Is new location a symlink? + if [ -L "$new" ]; then + # Does it point the wrong way, i.e., back to where we're migrating from? + if [ "$(readlink "$new")" = "$old" ]; then + # Get rid of it. + observe "removing symbolic link $new which points to $old" + rm "$new" + else + # Back it up. + warn "backing up symbolic link $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + fi + + # Does new location exist, but is not a directory? + if [ -e "$new" ] && ! [ -d "$new" ]; then + warn "backing up non-directory $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + + # Create new directory if it does not yet exist. + if ! [ -e "$new" ]; then + observe "creating $new" + mkdir -p "$new" + fi + + # Copy files in old location to new location. Back up any filenames that + # already exist in the new location with the extension ".dpkg-old". + observe "copying files from $old to $new" + if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then + die "error(s) encountered while copying files from $old to $new" + fi + + # Remove files at old location. + observe "removing $old" + rm -r "$old" + + # Create symlink from old location to new location. + make_symlink_sane "$old" "$new" +} + +# vim:set ai et sw=2 ts=2 tw=80: + +# GOBSTOPPER: The X Strike Force shell library ends here. --- xserver-xorg-video-ati-6.13.1.orig/debian/patches/100_radeon-6.9.0-bgnr-enable.patch +++ xserver-xorg-video-ati-6.13.1/debian/patches/100_radeon-6.9.0-bgnr-enable.patch @@ -0,0 +1,18 @@ +Description: Turn on option to allow xserver to skip drawing the root background + window for the radeon driver. This will make the boot up sequence smoother by + eliminating one flicker. + TESTERS: Watch for corruption or other ill effects during boot up. +Author: Bryce Harrington + +--- xserver-xorg-video-ati-6.12.191.orig/src/radeon_kms.c 2010-03-02 01:24:11.000000000 +0100 ++++ xserver-xorg-video-ati-6.12.191/src/radeon_kms.c 2010-03-07 22:33:18.244660337 +0100 +@@ -375,6 +375,9 @@ + if (pScrn->numEntities != 1) return FALSE; + if (!RADEONGetRec(pScrn)) return FALSE; + ++ /* kms bg root enable */ ++ pScrn->canDoBGNoneRoot = 1; ++ + info = RADEONPTR(pScrn); + info->MMIO = NULL; + info->IsSecondary = FALSE; --- xserver-xorg-video-ati-6.13.1.orig/debian/patches/101_ref-count-dri2-buffers.patch +++ xserver-xorg-video-ati-6.13.1/debian/patches/101_ref-count-dri2-buffers.patch @@ -0,0 +1,202 @@ +commit 6a2c8587a4e05a8be2a2e975a6660942cfe115d6 +Author: Christopher James Halse Rogers +Date: Fri Aug 27 13:14:33 2010 +1000 + + dri2: Reference count DRI2 buffers + + When a client calls ScheduleSwap we set up a kernel callback when the + relevent vblank event occurs. However, it's possible for the client + to go away between calling ScheduleSwap and the vblank event, + resulting in the buffers being destroyed before they're passed to + radeon_dri2_frame_event_handler. + + Add reference-counting to the buffers and take a reference in + radeon_dri2_schedule_swap to ensure the buffers won't be destroyed + before the vblank event is dealt with. + + This parallels the approach taken by the Intel DDX in commit + 0d2392d44aae95d6b571d98f7ec323cf672a687f. + + Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=29065 + + v2: Don't write completion events to the client if it has quit. + v3: Don't try to unref the NULL buffers from a DRI2_WAITMSC event. + Take a ref in schedule_swap earlier, so the offscreen fallback + doesn't incorrectly destroy the buffers. + + Signed-off-by: Christopher James Halse Rogers + Signed-off-by: Dave Airlie + +diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c +index 4ded9dc..ed7fdd6 100644 +--- a/src/radeon_dri2.c ++++ b/src/radeon_dri2.c +@@ -55,6 +55,7 @@ typedef DRI2Buffer2Ptr BufferPtr; + struct dri2_buffer_priv { + PixmapPtr pixmap; + unsigned int attachment; ++ unsigned int refcnt; + }; + + +@@ -244,6 +245,7 @@ radeon_dri2_create_buffer(DrawablePtr drawable, + buffers->flags = 0; /* not tiled */ + privates->pixmap = pixmap; + privates->attachment = attachment; ++ privates->refcnt = 1; + + return buffers; + } +@@ -275,13 +277,26 @@ radeon_dri2_destroy_buffer(DrawablePtr drawable, BufferPtr buffers) + if(buffers) + { + ScreenPtr pScreen = drawable->pScreen; +- struct dri2_buffer_priv *private; ++ struct dri2_buffer_priv *private = buffers->driverPrivate; + +- private = buffers->driverPrivate; +- (*pScreen->DestroyPixmap)(private->pixmap); ++ /* Trying to free an already freed buffer is unlikely to end well */ ++ if (private->refcnt == 0) { ++ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; + +- free(buffers->driverPrivate); +- free(buffers); ++ xf86DrvMsg(scrn->scrnIndex, X_WARNING, ++ "Attempted to destroy previously destroyed buffer.\ ++ This is a programming error\n"); ++ return; ++ } ++ ++ private->refcnt--; ++ if (private->refcnt == 0) ++ { ++ (*pScreen->DestroyPixmap)(private->pixmap); ++ ++ free(buffers->driverPrivate); ++ free(buffers); ++ } + } + } + #endif +@@ -361,6 +376,7 @@ enum DRI2FrameEventType { + typedef struct _DRI2FrameEvent { + XID drawable_id; + ClientPtr client; ++ int client_index; + enum DRI2FrameEventType type; + int frame; + +@@ -371,11 +387,28 @@ typedef struct _DRI2FrameEvent { + DRI2BufferPtr back; + } DRI2FrameEventRec, *DRI2FrameEventPtr; + ++static void ++radeon_dri2_ref_buffer(BufferPtr buffer) ++{ ++ struct dri2_buffer_priv *private = buffer->driverPrivate; ++ private->refcnt++; ++} ++ ++static void ++radeon_dri2_unref_buffer(BufferPtr buffer) ++{ ++ if (buffer) { ++ struct dri2_buffer_priv *private = buffer->driverPrivate; ++ radeon_dri2_destroy_buffer(&(private->pixmap->drawable), buffer); ++ } ++} ++ + void radeon_dri2_frame_event_handler(unsigned int frame, unsigned int tv_sec, + unsigned int tv_usec, void *event_data) + { + DRI2FrameEventPtr event = event_data; + DrawablePtr drawable; ++ ClientPtr client; + ScreenPtr screen; + ScrnInfoPtr scrn; + int status; +@@ -386,6 +419,8 @@ void radeon_dri2_frame_event_handler(unsigned int frame, unsigned int tv_sec, + status = dixLookupDrawable(&drawable, event->drawable_id, serverClient, + M_ANY, DixWriteAccess); + if (status != Success) { ++ radeon_dri2_unref_buffer(event->front); ++ radeon_dri2_unref_buffer(event->back); + free(event); + return; + } +@@ -393,6 +428,17 @@ void radeon_dri2_frame_event_handler(unsigned int frame, unsigned int tv_sec, + screen = drawable->pScreen; + scrn = xf86Screens[screen->myNum]; + ++ /* event->client may have quit between submitting a request ++ * and this callback being triggered. ++ * ++ * Check our saved client pointer against the client in the saved client ++ * slot. This will catch almost all cases where the client that requested ++ * SwapBuffers has gone away, and will guarantee that there is at least a ++ * valid client to write the BufferSwapComplete event to. ++ */ ++ client = event->client == clients[event->client_index] ? ++ event->client : NULL; ++ + switch (event->type) { + case DRI2_FLIP: + case DRI2_SWAP: +@@ -404,11 +450,14 @@ void radeon_dri2_frame_event_handler(unsigned int frame, unsigned int tv_sec, + radeon_dri2_copy_region(drawable, ®ion, event->front, event->back); + swap_type = DRI2_BLIT_COMPLETE; + +- DRI2SwapComplete(event->client, drawable, frame, tv_sec, tv_usec, ++ DRI2SwapComplete(client, drawable, frame, tv_sec, tv_usec, + swap_type, event->event_complete, event->event_data); ++ ++ radeon_dri2_unref_buffer(event->front); ++ radeon_dri2_unref_buffer(event->back); + break; + case DRI2_WAITMSC: +- DRI2WaitMSCComplete(event->client, drawable, frame, tv_sec, tv_usec); ++ DRI2WaitMSCComplete(client, drawable, frame, tv_sec, tv_usec); + break; + default: + /* Unknown type */ +@@ -511,6 +560,7 @@ static int radeon_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, + + wait_info->drawable_id = draw->id; + wait_info->client = client; ++ wait_info->client_index = client->index; + wait_info->type = DRI2_WAITMSC; + + /* Get current count */ +@@ -641,12 +691,20 @@ static int radeon_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, + + swap_info = calloc(1, sizeof(DRI2FrameEventRec)); + ++ /* radeon_dri2_frame_event_handler will get called some unknown time in the ++ * future with these buffers. Take a reference to ensure that they won't ++ * get destroyed before then. ++ */ ++ radeon_dri2_ref_buffer(front); ++ radeon_dri2_ref_buffer(back); ++ + /* Drawable not displayed... just complete the swap */ + if (crtc == -1 || !swap_info) + goto blit_fallback; + + swap_info->drawable_id = draw->id; + swap_info->client = client; ++ swap_info->client_index = client->index; + swap_info->event_complete = func; + swap_info->event_data = data; + swap_info->front = front; +@@ -775,6 +833,10 @@ blit_fallback: + DRI2SwapComplete(client, draw, 0, 0, 0, DRI2_BLIT_COMPLETE, func, data); + if (swap_info) + free(swap_info); ++ ++ radeon_dri2_unref_buffer(front); ++ radeon_dri2_unref_buffer(back); ++ + *target_msc = 0; /* offscreen, so zero out target vblank count */ + return TRUE; + } --- xserver-xorg-video-ati-6.13.1.orig/debian/patches/series +++ xserver-xorg-video-ati-6.13.1/debian/patches/series @@ -0,0 +1,2 @@ +100_radeon-6.9.0-bgnr-enable.patch +101_ref-count-dri2-buffers.patch