--- xserver-xorg-video-savage-2.3.6.orig/xserver-xorg-video-savage_2.3.6-0ubuntu2.debdiff +++ xserver-xorg-video-savage-2.3.6/xserver-xorg-video-savage_2.3.6-0ubuntu2.debdiff @@ -0,0 +1,142 @@ +diff -u xserver-xorg-video-savage-2.3.6/debian/changelog xserver-xorg-video-savage-2.3.6/debian/changelog +--- xserver-xorg-video-savage-2.3.6/debian/changelog ++++ xserver-xorg-video-savage-2.3.6/debian/changelog +@@ -1,3 +1,12 @@ ++xserver-xorg-video-savage (1:2.3.6-0ubuntu2) saucy; urgency=low ++ ++ * Fix EXA and use it by default (LP: 1083032) ++ - 110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch ++ - 120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch ++ - 130-Really-fix-up-default-accel-arch-when-built-with-no-.patch ++ ++ -- Tormod Volden Tue, 07 May 2013 22:47:50 +0200 ++ + xserver-xorg-video-savage (1:2.3.6-0ubuntu1) quantal-proposed; urgency=low + + * Merge from unreleased debian git, remaining changes: +diff -u xserver-xorg-video-savage-2.3.6/debian/patches/series xserver-xorg-video-savage-2.3.6/debian/patches/series +--- xserver-xorg-video-savage-2.3.6/debian/patches/series ++++ xserver-xorg-video-savage-2.3.6/debian/patches/series +@@ -2,0 +3,3 @@ ++110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch ++120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch ++130-Really-fix-up-default-accel-arch-when-built-with-no-.patch +only in patch2: +unchanged: +--- xserver-xorg-video-savage-2.3.6.orig/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch ++++ xserver-xorg-video-savage-2.3.6/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch +@@ -0,0 +1,35 @@ ++From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001 ++From: Dave Airlie ++Date: Sat, 22 Dec 2012 20:00:00 +1000 ++Subject: [PATCH] savage: fix default accel arch when built with no XAA ++ ++Signed-off-by: Dave Airlie ++--- ++ src/savage_driver.c | 4 ++++ ++ 1 file changed, 4 insertions(+) ++ ++diff --git a/src/savage_driver.c b/src/savage_driver.c ++index 026bf5c..5b49e60 100644 ++--- a/src/savage_driver.c +++++ b/src/savage_driver.c ++@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) ++ from = X_DEFAULT; ++ char *strptr; ++ if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { +++#ifdef HAVE_XAA_H ++ if(!xf86NameCmp(strptr,"XAA")) { ++ from = X_CONFIG; ++ psav->useEXA = FALSE; ++@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) ++ from = X_CONFIG; ++ psav->useEXA = TRUE; ++ } +++#else +++ psav->useEXA = TRUE; +++#endif ++ } ++ xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", ++ psav->useEXA ? "EXA" : "XAA"); ++-- ++1.7.10.4 ++ +only in patch2: +unchanged: +--- xserver-xorg-video-savage-2.3.6.orig/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch ++++ xserver-xorg-video-savage-2.3.6/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch +@@ -0,0 +1,43 @@ ++From ef43c3af8b3a354ea2cb3abf5cfa8f098c5006d1 Mon Sep 17 00:00:00 2001 ++From: Tormod Volden ++Date: Thu, 9 May 2013 12:36:33 +0000 ++Subject: [PATCH] Really fix up default accel arch when built with no XAA ++ ++After ca9718a887ecbc59b76869af673791ab591b849b it would ++still default to XAA unless AccelMethod option was used. ++ ++Signed-off-by: Tormod Volden ++--- ++ src/savage_driver.c | 6 +++--- ++ 1 file changed, 3 insertions(+), 3 deletions(-) ++ ++diff --git a/src/savage_driver.c b/src/savage_driver.c ++index 5b49e60..20c7094 100644 ++--- a/src/savage_driver.c +++++ b/src/savage_driver.c ++@@ -1266,8 +1266,8 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) ++ if(!psav->NoAccel) { ++ from = X_DEFAULT; ++ char *strptr; ++- if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { ++ #ifdef HAVE_XAA_H +++ if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { ++ if(!xf86NameCmp(strptr,"XAA")) { ++ from = X_CONFIG; ++ psav->useEXA = FALSE; ++@@ -1275,10 +1275,10 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) ++ from = X_CONFIG; ++ psav->useEXA = TRUE; ++ } +++ } ++ #else ++- psav->useEXA = TRUE; +++ psav->useEXA = TRUE; ++ #endif ++- } ++ xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", ++ psav->useEXA ? "EXA" : "XAA"); ++ } ++-- ++1.7.9.5 ++ +only in patch2: +unchanged: +--- xserver-xorg-video-savage-2.3.6.orig/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch ++++ xserver-xorg-video-savage-2.3.6/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch +@@ -0,0 +1,26 @@ ++From ad4db1cead50e4991c10c85628371d922a2b9d8f Mon Sep 17 00:00:00 2001 ++From: Tormod Volden ++Date: Tue, 7 May 2013 22:41:31 +0200 ++Subject: [PATCH] exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr ++ ++Signed-off-by: Tormod Volden ++--- ++ src/savage_exa.c | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/src/savage_exa.c b/src/savage_exa.c ++index 33c08c7..fd70c0c 100644 ++--- a/src/savage_exa.c +++++ b/src/savage_exa.c ++@@ -567,7 +567,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int ++ Bool ++ SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch) ++ { ++- unsigned char *src = pSrc->devPrivate.ptr; +++ unsigned char *src = (unsigned char *) exaGetPixmapFirstPixel(pSrc); ++ int src_pitch = exaGetPixmapPitch(pSrc); ++ int bpp = pSrc->drawable.bitsPerPixel; ++ ++-- ++1.7.10.4 ++ --- xserver-xorg-video-savage-2.3.6.orig/autogen.sh +++ xserver-xorg-video-savage-2.3.6/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-savage-2.3.6.orig/debian/watch +++ xserver-xorg-video-savage-2.3.6/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-savage +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-savage-(.*)\.tar\.gz --- xserver-xorg-video-savage-2.3.6.orig/debian/rules +++ xserver-xorg-video-savage-2.3.6/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ --- xserver-xorg-video-savage-2.3.6.orig/debian/changelog +++ xserver-xorg-video-savage-2.3.6/debian/changelog @@ -0,0 +1,500 @@ +xserver-xorg-video-savage (1:2.3.6-0ubuntu3) saucy; urgency=low + + * Rebuild to pick up new Xserver dependencies. + + -- Maarten Lankhorst Wed, 22 May 2013 16:43:57 +0200 + +xserver-xorg-video-savage (1:2.3.6-0ubuntu2) saucy; urgency=low + + * Fix EXA and use it by default (LP: 1083032) + - 110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch + - 120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch + - 130-Really-fix-up-default-accel-arch-when-built-with-no-.patch + + -- Tormod Volden Tue, 07 May 2013 22:47:50 +0200 + +xserver-xorg-video-savage (1:2.3.6-0ubuntu1) quantal-proposed; urgency=low + + * Merge from unreleased debian git, remaining changes: + - 100_bustype_pci_by_default.diff (LP: 33617, 37218) + + -- Timo Aaltonen Thu, 02 Aug 2012 00:30:45 +0300 + +xserver-xorg-video-savage (1:2.3.6-1) UNRELEASED; urgency=low + + * New upstream release + + -- Maarten Lankhorst Wed, 18 Jul 2012 13:42:19 +0200 + +xserver-xorg-video-savage (1:2.3.4-1ubuntu1) UNRELEASED; urgency=low + + * Merge from Debian Testing. Remaining Ubuntu changes: + - 100_bustype_pci_by_default.diff (LP: 33617, 37218) + + -- Maarten Lankhorst Fri, 08 Jun 2012 15:13:45 +0200 + +xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low + + * New upstream release + + Fix for new vgahw ABI (closes: #671800) + + -- Julien Cristau Tue, 08 May 2012 11:44:31 +0200 + +xserver-xorg-video-savage (1:2.3.3-1ubuntu1) precise; urgency=low + + * Merge from Debian Testing. Remaining Ubuntu changes: + - 100_bustype_pci_by_default.diff (LP: 33617, 37218) + + -- Christopher James Halse Rogers Fri, 16 Dec 2011 12:10:26 +1100 + +xserver-xorg-video-savage (1:2.3.3-1) unstable; urgency=low + + [ Tormod Volden ] + * New upstream release + * Bump Standards-Version to 3.9.2 (no changes needed) + + -- Julien Cristau Sun, 23 Oct 2011 17:15:11 +0200 + +xserver-xorg-video-savage (1:2.3.2-3ubuntu2) natty; urgency=low + + * Rebuild to pick up new Xserver dependencies + + -- Christopher James Halse Rogers Wed, 09 Mar 2011 14:51:44 +1100 + +xserver-xorg-video-savage (1:2.3.2-3ubuntu1) natty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 100_bustype_pci_by_default.diff (LP: 33617, 37218) + + -- Tormod Volden Tue, 22 Feb 2011 08:12:33 +0100 + +xserver-xorg-video-savage (1:2.3.2-3) unstable; urgency=low + + * Merge from upstream up to aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef + - aff8f96... Use proper casts on framebuffer addresses + - 6b22be0... savage: Fix initialization typo in SAVAGEDRIMoveBuffers + - 9872b5f... savage: Fix building with TRACEON defined + - b018d34... savage: Setup tiled surface registers in SavageEnterVT + - f3cd294... savage: Factor out a SAVAGEDRISetupTiledSurfaceRegs function + - 055ca25... savage: Cast all handles before printing them + - 3f18b33... savage: Fix ambiguity in SavageLoadPaletteSavage4 + - 6f8aa9c... savage: Drop unused variables and functions + - df80590... savage: More (intermediate) casts to silence warnings + - 35d9734... savage: Replace deprecated x(c)alloc/xfree with m/calloc/free + - 0cbb6d2... savage: Add casts to silence build warnings + * Add myself as uploader + + -- Tormod Volden Mon, 21 Feb 2011 23:43:12 +0100 + +xserver-xorg-video-savage (1:2.3.2-2) unstable; urgency=low + + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + * Remove xsfbs accordingly. + * Update Uploaders list. Thanks, David & Brice! + * Remove long obsolete Replaces/Conflicts. + * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:55:01 +0100 + +xserver-xorg-video-savage (1:2.3.2-1) experimental; urgency=low + + * New upstream release. + * Bump xutils-dev build-dep for new macros. + + -- Cyril Brulebois Sun, 05 Dec 2010 18:33:38 +0100 + +xserver-xorg-video-savage (1:2.3.1-3) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Sat, 16 Oct 2010 20:59:43 +0200 + +xserver-xorg-video-savage (1:2.3.1-2ubuntu5) natty; urgency=low + + * debian/control: Bump build-depends on xserver-xorg-dev to really, + really build against Xserver 1.10 + + -- Christopher James Halse Rogers Tue, 01 Feb 2011 22:27:21 +1100 + +xserver-xorg-video-savage (1:2.3.1-2ubuntu4) natty; urgency=low + + * Rebuild against Xserver 1.10 + + -- Bryce Harrington Mon, 31 Jan 2011 18:38:53 -0800 + +xserver-xorg-video-savage (1:2.3.1-2ubuntu3) natty; urgency=low + + * 101_fix_use_of_privates.diff: From upstream, fixes crashes due to + use of uninitialized privates. LP: #635362 + + -- Tormod Volden Thu, 16 Dec 2010 00:14:17 +0100 + +xserver-xorg-video-savage (1:2.3.1-2ubuntu2) maverick; urgency=low + + * No-change rebuild against Xserver 1.9 ABI + + -- Christopher James Halse Rogers Mon, 09 Aug 2010 13:40:59 +1000 + +xserver-xorg-video-savage (1:2.3.1-2ubuntu1) maverick; urgency=low + + * Merge from Debian unstable. remaining changes: + - 10_bustype_pci_by_default.diff (LP: 33617, 37218) + * Rebuild against Xserver 1.8 + + -- Christopher James Halse Rogers Thu, 10 Jun 2010 10:25:26 +1000 + +xserver-xorg-video-savage (1:2.3.1-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + + -- Cyril Brulebois Tue, 04 May 2010 00:12:21 +0200 + +xserver-xorg-video-savage (1:2.3.1-1ubuntu1) lucid; urgency=low + + * Merge from Debian experimental, remaining changes: + - 10_bustype_pci_by_default.diff (LP: 33617, 37218) + + -- Timo Aaltonen Mon, 07 Dec 2009 22:51:08 +0200 + +xserver-xorg-video-savage (1:2.3.1-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 01:54:17 +0100 + +xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.8.2. + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + -- Brice Goglin Sun, 19 Jul 2009 22:28:54 +0200 + +xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low + + * Merge bugfix from 1:2.2.1-2.lenny1 stable update. + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 11:25:40 +0100 + +xserver-xorg-video-savage (1:2.2.1-4ubuntu2) jaunty; urgency=low + + * Cherry-pick 0fae48235841f05d7e52e61a2450835fdb8892b3 + Do not add panel modes when there is no panel. + Fixes startup failure in some cases (LP: #294899) + + -- Tormod Volden Fri, 20 Mar 2009 19:56:24 +0100 + +xserver-xorg-video-savage (1:2.2.1-4ubuntu1) jaunty; urgency=low + + * Add debian/patches/10_bustype_pci_by_default.diff: + Use BusType PCI by default (LP: #33617, #37218) + + -- Tormod Volden Wed, 18 Mar 2009 18:51:22 +0100 + +xserver-xorg-video-savage (1:2.2.1-4) experimental; urgency=low + + * Build against xserver 1.6 rc1. + * Allow parallel builds. + * Run autoreconf on build; add build-deps on automake, libtool and + xutils-dev. + + -- Brice Goglin Tue, 03 Feb 2009 23:07:21 +0100 + +xserver-xorg-video-savage (1:2.2.1-3) experimental; urgency=low + + * Drop patch 02_temporary_revert_pciaccess. + * Build against xserver 1.5. + + -- Julien Cristau Mon, 08 Sep 2008 19:32:12 +0100 + +xserver-xorg-video-savage (1:2.2.1-2.lenny1) stable; urgency=low + + * Cherry-pick from upstream: Do not add panel modes when there is no panel + (closes: #520547). Thanks, Tormod Volden! + + -- Julien Cristau Fri, 20 Mar 2009 21:35:43 +0100 + +xserver-xorg-video-savage (1:2.2.1-2) unstable; urgency=low + + * Reenable 02_temporary_revert_pciaccess.diff and append all recent + pci-rework changes, closes: #483989. + + -- Brice Goglin Fri, 05 Sep 2008 19:37:51 +0200 + +xserver-xorg-video-savage (1:2.2.1-1) unstable; urgency=low + + [ David Nusinow ] + * Add 03_request_16bit_depth.diff + We set the default depth for savage chips to 16bpp in the xserver + debconfage. This patch has the driver request that depth from the + server during init. If the user doesn't override this depth, it should be + used by the server, thus allowing us to drop this special case from the + debconfage. + + [ Brice Goglin ] + * New upstream release. + * Disable 02_temporary_revert_pciaccess.diff for now since upstream + fixed some related code. + * Remove XS- prefix to Vcs-* fields in debian/rules. + * Bump Standards-Version to 3.7.3, no change needed. + * 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. + + Build-depend on dpkg-dev >= 1.14.17. + + -- Brice Goglin Thu, 22 May 2008 21:07:26 +0200 + +xserver-xorg-video-savage (1:2.1.3-5) unstable; urgency=low + + * Add 02_temporary_revert_pciaccess.diff to temporary revert + all the pci-rework code which does not seem to work even + when disabled, closes: #451074, #451219. + + -- Brice Goglin Thu, 15 Nov 2007 08:19:08 +0100 + +xserver-xorg-video-savage (1:2.1.3-4) unstable; urgency=low + + * Pull upstream up to 9c959f53ca8376aa136a9d434c3383cdb20487c2 + + Fix crash in SavageSwitchMode(), closes: #440839. + * Add upstream URL to debian/copyright. + * Add myself to Uploaders. + + -- Brice Goglin Sun, 11 Nov 2007 15:23:29 +0100 + +xserver-xorg-video-savage (1:2.1.3-3) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:43:47 -0400 + +xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low + + [ Brice Goglin ] + * Drop the obsolete src/savage_image.c from the .diff.gz, + thanks Tormod Volden, closes: #438975. + + [ David Nusinow ] + * Build against X server 1.4 and build-dep on it as well + * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this + driver supports so that the server can automatically load it + * Exclude savage_drv.la from dh_install + + -- David Nusinow Thu, 13 Sep 2007 20:40:23 -0400 + +xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low + + * New upstream release. + * Fix implicit declaration of usleep() in savage_driver.c. + + -- Julien Cristau Fri, 17 Aug 2007 04:14:31 +0200 + +xserver-xorg-video-savage (1:2.1.2-6) unstable; urgency=low + + [ Brice Goglin ] + * Pull more upstream fixes, up to b706ffe07fc61281d2dea406f828418f42e3da85 + + Fix segfault in SavageDoAdjustFrame() on server 1.3, closes: #423485. + + Fix console corruption due to invalid shadow status, closes: #428089. + + Drop 01_savage_driver_disable_randr_on_rotation.diff, integrated + uptream. + + [ Julien Cristau ] + * Add myself to Uploaders, and remove Branden with his permission. + + -- Julien Cristau Wed, 18 Jul 2007 03:06:12 +0200 + +xserver-xorg-video-savage (1:2.1.2-5) unstable; urgency=low + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-savage. + + [ Brice Goglin ] + * Pull fixes from upstream up-to 4b2a0ad8f15e7b11f7c8251fb032b9df4f07ce96 + + Drop 02_fix_respawn_crash_regression.diff, applied upstream + + Fix a markup error in savage.4 manpage, thanks Nate Bargmann + (closes: #401643). + * Don't build-dep on libdrm-dev on hurd-i386, thanks to Michael Banck + (closes: #392873). + * Install the upstream changelog. + * 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-savage + module in the long description. + * Remove Fabio from uploaders with his permission. He's always welcome back. + + -- Julien Cristau Sat, 05 May 2007 18:18:59 +0200 + +xserver-xorg-video-savage (1:2.1.2-4) experimental; urgency=low + + * Pull fixes from upstream + * Generate server dependencies automatically from the ABI + + -- David Nusinow Wed, 21 Feb 2007 22:54:33 -0500 + +xserver-xorg-video-savage (1:2.1.2-3) unstable; urgency=medium + + * SavageMamMem -> SavageMapMem in the previous patch. Thanks Mikael + Petersson for reporting the bug, and Jon K Hellan for noticing the fix. + Closes: #405061, #405021 + + -- David Nusinow Sat, 30 Dec 2006 19:07:13 -0500 + +xserver-xorg-video-savage (1:2.1.2-2) unstable; urgency=low + + [ Julien Cristau ] + * 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. + * Add patch by Mikko Rapeli to fix a crash when the + last client exits and the server is respawned, closes: #397084. Thanks, + Mikko! + + [ David Nusinow ] + * Remove duplicate libdrm-dev build-dep + + -- David Nusinow Fri, 29 Dec 2006 19:45:29 -0500 + +xserver-xorg-video-savage (1:2.1.2-1) unstable; urgency=low + + * New upstream release + + Fixes DRI lock handling. Closes: #389794 + + -- David Nusinow Sat, 30 Sep 2006 14:31:03 -0400 + +xserver-xorg-video-savage (1:2.1.1-4) unstable; urgency=low + + * Add build-depends on quilt. Thanks lamont. (closes: #388640) + * Standards version bump to 3.7.2.0. No change needed. + + -- David Nusinow Thu, 21 Sep 2006 22:15:30 -0400 + +xserver-xorg-video-savage (1:2.1.1-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:57:49 -0400 + +xserver-xorg-video-savage (1:2.1.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:39 +0000 + +xserver-xorg-video-savage (1:2.1.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ 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. + * Bump debhelper compat to 5 + + -- David Nusinow Tue, 15 Aug 2006 23:28:46 +0000 + +xserver-xorg-video-savage (1:2.0.2.3-4) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:53 -0500 + +xserver-xorg-video-savage (1:2.0.2.3-3) experimental; urgency=low + + * Rename .install file so that files actually get installed to the package. + Thanks Peter Eisentraut. (closes: #354848) + + -- David Nusinow Sat, 11 Mar 2006 18:37:06 -0500 + +xserver-xorg-video-savage (1:2.0.2.3-2) experimental; urgency=low + + * Port patches from trunk + + general/099f_savage_driver_disable_randr_on_rotation.diff + + -- David Nusinow Sun, 26 Feb 2006 18:51:40 -0500 + +xserver-xorg-video-savage (1:2.0.2.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:39:54 -0500 + +xserver-xorg-driver-savage (1:2.0.2.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 20:02:00 +1100 + +xserver-xorg-driver-savage (1:2.0.2.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:10:51 +1100 + +xserver-xorg-driver-savage (1:2.0.2.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Bump Build-Depends on libdrm-dev to >> 2.0. + + -- Daniel Stone Mon, 12 Dec 2005 13:25:58 +1100 + +xserver-xorg-driver-savage (1:2.0.2-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev, libdrm (>> 1.0.5), + x11proto-xf86dri-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:57:29 +1100 + +xserver-xorg-driver-savage (1:2.0.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:35:08 +1100 + +xserver-xorg-driver-savage (1:2.0.1.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 18:36:23 +1000 + +xserver-xorg-driver-savage (1:2.0.1-1) breezy; urgency=low + + * First xserver-xorg-driver-savage release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-savage-2.3.6.orig/debian/copyright +++ xserver-xorg-video-savage-2.3.6/debian/copyright @@ -0,0 +1,117 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. +Copyright (c) 2003-2006, X.Org Foundation + +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 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, +FITESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER(S) OR AUTHOR(S) 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. + +Except as contained in this notice, the name of the copyright holder(s) +and author(s) shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Software without prior written +authorization from the copyright holder(s) and author(s). + +Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. +Copyright 2001-2003 S3 Graphics, Inc. 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, sub license, +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 +VIA, S3 GRAPHICS, 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 2004 Felix Kuehling +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, sub license, +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 +VIA, S3 GRAPHICS, 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 (C) 1994-2000 The XFree86 Project, Inc. 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 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, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT 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. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the XFree86 Project. + +Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. +Copyright 2001-2003 S3 Graphics, Inc. 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, sub license, +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 +VIA, S3 GRAPHICS, 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. --- xserver-xorg-video-savage-2.3.6.orig/debian/README.source +++ xserver-xorg-video-savage-2.3.6/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +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. --- xserver-xorg-video-savage-2.3.6.orig/debian/compat +++ xserver-xorg-video-savage-2.3.6/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-savage-2.3.6.orig/debian/control +++ xserver-xorg-video-savage-2.3.6/debian/control @@ -0,0 +1,45 @@ +Source: xserver-xorg-video-savage +Section: x11 +Priority: optional +Maintainer: Ubuntu X-SWAT +XSBC-Orig-Maintainer: Debian X Strike Force +Uploaders: + Cyril Brulebois , + Tormod Volden +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + pkg-config, + xserver-xorg-dev (>= 2:1.9.99.901+git20110131), + x11proto-video-dev, + x11proto-xext-dev, + x11proto-gl-dev, + libgl1-mesa-dev | libgl-dev, + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + x11proto-render-dev, + libdrm-dev (>> 2.0) [!hurd-i386], + x11proto-xf86dri-dev, + quilt, + xutils-dev (>= 1:7.5+4), +Standards-Version: 3.9.2 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git + +Package: xserver-xorg-video-savage +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- Savage display driver + This package provides the driver for the S3/VIA Savage/ProSavage/Twister family + of chipsets. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-savage driver module. --- xserver-xorg-video-savage-2.3.6.orig/debian/xserver-xorg-video-savage.links +++ xserver-xorg-video-savage-2.3.6/debian/xserver-xorg-video-savage.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-savage/script --- xserver-xorg-video-savage-2.3.6.orig/debian/xserver-xorg-video-savage.install +++ xserver-xorg-video-savage-2.3.6/debian/xserver-xorg-video-savage.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/series +++ xserver-xorg-video-savage-2.3.6/debian/patches/series @@ -0,0 +1,5 @@ +03_request_16bit_depth.diff +100_bustype_pci_by_default.diff +110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch +120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch +130-Really-fix-up-default-accel-arch-when-built-with-no-.patch --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/100_bustype_pci_by_default.diff +++ xserver-xorg-video-savage-2.3.6/debian/patches/100_bustype_pci_by_default.diff @@ -0,0 +1,37 @@ +Index: xserver-xorg-video-savage-2.3.0/man/savage.man +=================================================================== +--- xserver-xorg-video-savage-2.3.0.orig/man/savage.man 2009-05-28 21:16:34.000000000 +0200 ++++ xserver-xorg-video-savage-2.3.0/man/savage.man 2009-09-14 23:28:42.000000000 +0200 +@@ -241,9 +241,9 @@ + .BI "Option \*qBusType\*q \*q" string \*q + The bus type that will be used to access the graphics card. + .br +-PCI \-\- PCI bus (default on PCI cards) ++PCI \-\- PCI bus (default) + .br +-AGP \-\- AGP bus (default on AGP cards) ++AGP \-\- AGP bus + .br + \*qAGP\*q only works if you have an AGP card. If you choose \*qPCI\*q + on an AGP card the AGP bus speed is not set and no AGP aperture is +Index: xserver-xorg-video-savage-2.3.0/src/savage_driver.c +=================================================================== +--- xserver-xorg-video-savage-2.3.0.orig/src/savage_driver.c 2009-09-14 23:28:18.000000000 +0200 ++++ xserver-xorg-video-savage-2.3.0/src/savage_driver.c 2009-09-14 23:28:42.000000000 +0200 +@@ -1531,9 +1531,14 @@ + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "BusType set to PCI\n"); + } else { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- "Invalid BusType option, using %s DMA\n", +- psav->IsPCI ? "PCI" : "AGP"); ++ "Invalid BusType option, using PCI\n"); ++ psav->IsPCI = TRUE; + } ++ } else { ++ /* default to PCI BusType since there are too many issues with AGP */ ++ psav->IsPCI = TRUE; ++ xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, ++ "Using BusType PCI by default\n"); + } + + psav->AgpDMA = !psav->IsPCI; --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch +++ xserver-xorg-video-savage-2.3.6/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch @@ -0,0 +1,26 @@ +From ad4db1cead50e4991c10c85628371d922a2b9d8f Mon Sep 17 00:00:00 2001 +From: Tormod Volden +Date: Tue, 7 May 2013 22:41:31 +0200 +Subject: [PATCH] exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr + +Signed-off-by: Tormod Volden +--- + src/savage_exa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/savage_exa.c b/src/savage_exa.c +index 33c08c7..fd70c0c 100644 +--- a/src/savage_exa.c ++++ b/src/savage_exa.c +@@ -567,7 +567,7 @@ SavageUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int + Bool + SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch) + { +- unsigned char *src = pSrc->devPrivate.ptr; ++ unsigned char *src = (unsigned char *) exaGetPixmapFirstPixel(pSrc); + int src_pitch = exaGetPixmapPitch(pSrc); + int bpp = pSrc->drawable.bitsPerPixel; + +-- +1.7.10.4 + --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch +++ xserver-xorg-video-savage-2.3.6/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch @@ -0,0 +1,43 @@ +From ef43c3af8b3a354ea2cb3abf5cfa8f098c5006d1 Mon Sep 17 00:00:00 2001 +From: Tormod Volden +Date: Thu, 9 May 2013 12:36:33 +0000 +Subject: [PATCH] Really fix up default accel arch when built with no XAA + +After ca9718a887ecbc59b76869af673791ab591b849b it would +still default to XAA unless AccelMethod option was used. + +Signed-off-by: Tormod Volden +--- + src/savage_driver.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/savage_driver.c b/src/savage_driver.c +index 5b49e60..20c7094 100644 +--- a/src/savage_driver.c ++++ b/src/savage_driver.c +@@ -1266,8 +1266,8 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) + if(!psav->NoAccel) { + from = X_DEFAULT; + char *strptr; +- if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { + #ifdef HAVE_XAA_H ++ if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { + if(!xf86NameCmp(strptr,"XAA")) { + from = X_CONFIG; + psav->useEXA = FALSE; +@@ -1275,10 +1275,10 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) + from = X_CONFIG; + psav->useEXA = TRUE; + } ++ } + #else +- psav->useEXA = TRUE; ++ psav->useEXA = TRUE; + #endif +- } + xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", + psav->useEXA ? "EXA" : "XAA"); + } +-- +1.7.9.5 + --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch +++ xserver-xorg-video-savage-2.3.6/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch @@ -0,0 +1,35 @@ +From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Sat, 22 Dec 2012 20:00:00 +1000 +Subject: [PATCH] savage: fix default accel arch when built with no XAA + +Signed-off-by: Dave Airlie +--- + src/savage_driver.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/savage_driver.c b/src/savage_driver.c +index 026bf5c..5b49e60 100644 +--- a/src/savage_driver.c ++++ b/src/savage_driver.c +@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) + from = X_DEFAULT; + char *strptr; + if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { ++#ifdef HAVE_XAA_H + if(!xf86NameCmp(strptr,"XAA")) { + from = X_CONFIG; + psav->useEXA = FALSE; +@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) + from = X_CONFIG; + psav->useEXA = TRUE; + } ++#else ++ psav->useEXA = TRUE; ++#endif + } + xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", + psav->useEXA ? "EXA" : "XAA"); +-- +1.7.10.4 + --- xserver-xorg-video-savage-2.3.6.orig/debian/patches/03_request_16bit_depth.diff +++ xserver-xorg-video-savage-2.3.6/debian/patches/03_request_16bit_depth.diff @@ -0,0 +1,13 @@ +Index: xserver-xorg-video-savage/src/savage_driver.c +=================================================================== +--- xserver-xorg-video-savage.orig/src/savage_driver.c 2008-05-22 07:53:05.000000000 +0200 ++++ xserver-xorg-video-savage/src/savage_driver.c 2008-05-22 20:55:51.000000000 +0200 +@@ -1292,7 +1292,7 @@ + * We support bpp of 8, 16, and 32. + */ + +- if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support32bppFb)) ++ if (!xf86SetDepthBpp(pScrn, 16, 0, 0, Support32bppFb)) + return FALSE; + else { + int requiredBpp;