debian/changelog | 17 ++++++++++++ debian/patches/101_fix_build_aginst_1.10rc3.diff | 32 +++++++++++++++++++++++ debian/patches/102_disable_pageflip_on_palm.diff | 13 +++++++++ debian/patches/series | 2 + 4 files changed, 64 insertions(+)
New commits: commit 04a84efe2a38ec60d51a449049403e988d6b1610 Author: Christopher James Halse Rogers <[email protected]> Date: Thu Mar 17 12:32:38 2011 +1100 Merge -0ubuntu2 upload into git diff --git a/debian/changelog b/debian/changelog index bcf8d79..568f67a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-ati (1:6.14.0-0ubuntu2) natty; urgency=low +xserver-xorg-video-ati (1:6.14.0-0ubuntu3) natty; urgency=low * Rebuild against final Xserver 1.10 ABI * debian/patches/101_fix_build_aginst_1.10rc3.diff: @@ -9,6 +9,12 @@ xserver-xorg-video-ati (1:6.14.0-0ubuntu2) natty; urgency=low -- Christopher James Halse Rogers <[email protected]> Wed, 09 Mar 2011 18:45:43 +1100 +xserver-xorg-video-ati (1:6.14.0-0ubuntu2) natty; urgency=low + + * Rebuild to pick up new Xserver dependencies + + -- Christopher James Halse Rogers <[email protected]> Wed, 23 Feb 2011 17:52:57 +1100 + xserver-xorg-video-ati (1:6.14.0-0ubuntu1) natty; urgency=low * New upstream release commit 9e5b5505f1b2665e410954988cb2ead21b650747 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Mar 9 19:02:28 2011 +1100 Disable pageflip on Palm (LP: #714330) diff --git a/debian/changelog b/debian/changelog index 1a5a30f..bcf8d79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ xserver-xorg-video-ati (1:6.14.0-0ubuntu2) natty; urgency=low * Rebuild against final Xserver 1.10 ABI * debian/patches/101_fix_build_aginst_1.10rc3.diff: - Cherry-pick build-fix against xserver 1.10rc3 and later. + * debian/patches/102_disable_pageflip_on_palm.diff: + - Disable page-flipping on Palm. This doesn't work, causing the desktop + to freeze on compiz start up. (LP: #715330) -- Christopher James Halse Rogers <[email protected]> Wed, 09 Mar 2011 18:45:43 +1100 diff --git a/debian/patches/102_disable_pageflip_on_palm.diff b/debian/patches/102_disable_pageflip_on_palm.diff new file mode 100644 index 0000000..57bd68b --- /dev/null +++ b/debian/patches/102_disable_pageflip_on_palm.diff @@ -0,0 +1,13 @@ +diff --git a/src/radeon_kms.c b/src/radeon_kms.c +index 125a132..e05f2aa 100644 +--- a/src/radeon_kms.c ++++ b/src/radeon_kms.c +@@ -660,7 +660,7 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "KMS Color Tiling: %sabled\n", info->allowColorTiling ? "en" : "dis"); + +- if (info->dri->pKernelDRMVersion->version_minor >= 8) { ++ if (info->dri->pKernelDRMVersion->version_minor >= 8 && info->ChipFamily != CHIP_FAMILY_PALM) { + info->allowPageFlip = xf86ReturnOptValBool(info->Options, + OPTION_PAGE_FLIP, TRUE); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, diff --git a/debian/patches/series b/debian/patches/series index 139a73c..93325f8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 100_radeon-6.9.0-bgnr-enable.patch 101_fix_build_aginst_1.10rc3.diff +102_disable_pageflip_on_palm.diff commit f0ea27c09321efe1a785ba19a47ec5de86c2cb07 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Mar 9 18:52:34 2011 +1100 Fix build against Xserver 1.10rc3 diff --git a/debian/changelog b/debian/changelog index 5bea215..1a5a30f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-ati (1:6.14.0-0ubuntu2) natty; urgency=low + + * Rebuild against final Xserver 1.10 ABI + * debian/patches/101_fix_build_aginst_1.10rc3.diff: + - Cherry-pick build-fix against xserver 1.10rc3 and later. + + -- Christopher James Halse Rogers <[email protected]> Wed, 09 Mar 2011 18:45:43 +1100 + xserver-xorg-video-ati (1:6.14.0-0ubuntu1) natty; urgency=low * New upstream release diff --git a/debian/patches/101_fix_build_aginst_1.10rc3.diff b/debian/patches/101_fix_build_aginst_1.10rc3.diff new file mode 100644 index 0000000..9852fbd --- /dev/null +++ b/debian/patches/101_fix_build_aginst_1.10rc3.diff @@ -0,0 +1,32 @@ +commit ecfdb209afe2aafc378baab8c511f5df7b000270 +Author: Sedat Dilek <[email protected]> +Date: Fri Feb 25 21:48:14 2011 +0100 + + UMS: Fix build against xserver 1.10-rc3 + + This issue was introduced due to last minute backout of RandR-1.4 + in xserver 1.10-rc3. + + Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard. + See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>. + + Note: + The ddx needs a rebuild as the X video driver ABI changed to version 10.0. + + Reported-by: Alex Deucher <[email protected]> + CC: Keith Packard <[email protected]> + Signed-off-by: Sedat Dilek <[email protected]> + +diff --git a/src/radeon_output.c b/src/radeon_output.c +index 15cef06..ccde346 100644 +--- a/src/radeon_output.c ++++ b/src/radeon_output.c +@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output) + xf86CrtcPtr crtc = output->crtc; + + if (crtc->enabled) { +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) ++#ifdef RANDR_14_INTERFACE + xf86CrtcSetRec crtc_set_rec; + + crtc_set_rec.flags = (XF86CrtcSetMode | diff --git a/debian/patches/series b/debian/patches/series index 1503711..139a73c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 100_radeon-6.9.0-bgnr-enable.patch +101_fix_build_aginst_1.10rc3.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
