debian/changelog | 8 + debian/patches/101-pointer.diff | 12 ++ 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 | 4 6 files changed, 21 insertions(+), 107 deletions(-)
New commits: commit 0e6c177f5d5e82ba6abc7a5cafbfaeeea467de09 Author: Maarten Lankhorst <[email protected]> Date: Tue Jan 7 16:05:56 2014 +0100 Merge released debian-unstable. - Drop upstream patches. - Add patch to include missing header. diff --git a/debian/changelog b/debian/changelog index 48ef800..9f67380 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-savage (1:2.3.7-2ubuntu1) trusty; urgency=low + + * Merge released debian-unstable. + * Drop upstream patches. + * Add patch to include missing header. + + -- Maarten Lankhorst <[email protected]> Tue, 07 Jan 2014 15:56:54 +0100 + xserver-xorg-video-savage (1:2.3.7-2) unstable; urgency=low * Actually upload with correct contents. (closes: #724675) diff --git a/debian/patches/101-pointer.diff b/debian/patches/101-pointer.diff new file mode 100644 index 0000000..1a2e8dd --- /dev/null +++ b/debian/patches/101-pointer.diff @@ -0,0 +1,12 @@ +diff --git a/src/savage_driver.c b/src/savage_driver.c +index bca2c60..92244f7 100644 +--- a/src/savage_driver.c ++++ b/src/savage_driver.c +@@ -53,6 +53,7 @@ + #endif + + ++#include "xf86Modes.h" + #include "xf86xv.h" + + #include "savage_driver.h" diff --git a/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch b/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch deleted file mode 100644 index 4d3c1be..0000000 --- a/debian/patches/110-exa-Use-exaGetPixmapFirstPixel-instead-of-devPrivate.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 6ad0a3e..0000000 --- a/debian/patches/120-savage-fix-default-accel-arch-when-built-with-no-XAA.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 3fdc2b1..0000000 --- a/debian/patches/130-Really-fix-up-default-accel-arch-when-built-with-no-.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 229e147..f420099 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ 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 +101-pointer.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
