debian/changelog | 15 +++ debian/patches/.gitignore | 1 debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch | 26 ++++++ debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch | 35 ++++++++ debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch | 43 ++++++++++ debian/patches/series | 3 6 files changed, 123 insertions(+)
New commits: commit d3bbce9ad337b83cbb26e070a2aae80538b6df43 Author: Maarten Lankhorst <[email protected]> Date: Wed May 22 16:45:31 2013 +0200 Rebuild to pick up new Xserver dependencies. diff --git a/debian/changelog b/debian/changelog index 7ca9975..a7286e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.6-0ubuntu3) saucy; urgency=low + + * Rebuild to pick up new Xserver dependencies. + + -- Maarten Lankhorst <[email protected]> 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) commit 2a53ee8cc0aad99d7e680c3104f181d0e28caca7 Author: Tormod Volden <[email protected]> Date: Mon May 13 13:11:29 2013 +0200 Fix EXA and use it by default (LP: 1083032) * 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 Add debian/patches/.gitignore to fixup missing patch files. (mlankhorst) diff --git a/debian/changelog b/debian/changelog index 1e529ea..7ca9975 100644 --- a/debian/changelog +++ b/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 <[email protected]> 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 --git a/debian/patches/.gitignore b/debian/patches/.gitignore new file mode 100644 index 0000000..69f1bf4 --- /dev/null +++ b/debian/patches/.gitignore @@ -0,0 +1 @@ +!*.patch diff --git a/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch b/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch new file mode 100644 index 0000000..4d3c1be --- /dev/null +++ b/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 <[email protected]> +Date: Tue, 7 May 2013 22:41:31 +0200 +Subject: [PATCH] exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr + +Signed-off-by: Tormod Volden <[email protected]> +--- + 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 + diff --git a/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch b/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch new file mode 100644 index 0000000..6ad0a3e --- /dev/null +++ b/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 <[email protected]> +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 <[email protected]> +--- + 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 + diff --git a/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch b/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch new file mode 100644 index 0000000..3fdc2b1 --- /dev/null +++ b/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 <[email protected]> +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 <[email protected]> +--- + 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 + diff --git a/debian/patches/series b/debian/patches/series index ddccdcf..229e147 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +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 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
