debian/changelog | 9 ++++++ debian/control | 1 debian/patches/disable-uxa-render-accel-on-i8xx.patch | 27 ++++++++++++++++++ debian/patches/series | 1 debian/rules | 2 - debian/xsfbs/xsfbs.sh | 10 ------ 6 files changed, 39 insertions(+), 11 deletions(-)
New commits: commit 7044a130ba4225295c890f3d65763dc21cff5846 Author: Julien Cristau <jcris...@debian.org> Date: Fri Jul 31 21:51:06 2009 +0200 Disable UXA render accel on i8xx chips for now. It currently causes hangs, and doesn't seem likely to get fixed quickly upstream (closes: #527349). Reenable patch system and bring back quilt build-dep. diff --git a/debian/changelog b/debian/changelog index 02c3b4a..af4a062 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xserver-xorg-video-intel (2:2.8.0-2) UNRELEASED; urgency=low + + * Disable UXA render accel on i8xx chips for now. It currently causes + hangs, and doesn't seem likely to get fixed quickly upstream + (closes: #527349). + * Reenable patch system and bring back quilt build-dep. + + -- Julien Cristau <jcris...@debian.org> Fri, 31 Jul 2009 21:47:24 +0200 + xserver-xorg-video-intel (2:2.8.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 8377bb9..2423310 100644 --- a/debian/control +++ b/debian/control @@ -27,6 +27,7 @@ Build-Depends: libxfixes-dev, # end xvmc dpkg-dev (>= 1.14.17), + quilt, automake, libtool, xutils-dev diff --git a/debian/patches/disable-uxa-render-accel-on-i8xx.patch b/debian/patches/disable-uxa-render-accel-on-i8xx.patch new file mode 100644 index 0000000..6cb74f2 --- /dev/null +++ b/debian/patches/disable-uxa-render-accel-on-i8xx.patch @@ -0,0 +1,27 @@ +From cb66b0945fcb86027cf74d22c1c061bf611564c4 Mon Sep 17 00:00:00 2001 +From: Julien Cristau <jcris...@debian.org> +Date: Fri, 31 Jul 2009 21:24:12 +0200 +Subject: [PATCH] disable uxa render accel on i8xx + +--- + src/i830_uxa.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/i830_uxa.c b/src/i830_uxa.c +index 2050c48..5ab266f 100644 +--- a/src/i830_uxa.c ++++ b/src/i830_uxa.c +@@ -709,8 +709,8 @@ i830_uxa_init (ScreenPtr pScreen) + + /* Composite */ + if (!IS_I9XX(i830)) { +- i830->uxa_driver->check_composite = i830_check_composite; +- i830->uxa_driver->prepare_composite = i830_prepare_composite; ++ i830->uxa_driver->check_composite = NULL; ++ i830->uxa_driver->prepare_composite = NULL; + i830->uxa_driver->composite = i830_composite; + i830->uxa_driver->done_composite = i830_done_composite; + } else if (IS_I915G(i830) || IS_I915GM(i830) || +-- +1.6.3.3 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7601b0f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +disable-uxa-render-accel-on-i8xx.patch diff --git a/debian/rules b/debian/rules index 99fcc6e..a907d80 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ endif # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so confflags += --disable-static -configure: +configure: $(STAMP_DIR)/patch dh_testdir autoreconf -vfi commit 8f72294ada477f003888b6776883c1dd98289f3f Author: Julien Cristau <jcris...@debian.org> Date: Wed Jun 3 03:37:37 2009 +0200 Kill custom readlink function This was needed for very, very old versions of debianutils. Closes: #498890 diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 197eb74..781826f 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -303,16 +303,6 @@ EOF fi } -# we require a readlink command or shell function -if ! which readlink > /dev/null 2>&1; then - message "The readlink command was not found. Please install version" \ - "1.13.1 or later of the debianutils package." - readlink () { - # returns what symlink in $1 actually points to - perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" - } -fi - check_symlink () { # syntax: check_symlink symlink # -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org