debian/changelog | 16 ++++++++++++++-- debian/control | 2 +- debian/patches/20-i915_bios.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 36 insertions(+), 3 deletions(-)
New commits: commit 6cd30eceaa8938c98863ffcaa3872c66cfc02b55 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Feb 6 23:13:21 2007 -0500 * Drop duplicate build dependency on libdrm-dev, so this really closes: #383918. diff --git a/debian/changelog b/debian/changelog index 2421285..1b1b634 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-i810 (2:1.7.2-5) UNRELEASED; urgency=low + + * Drop duplicate build dependency on libdrm-dev, so this really + closes: #383918. + + -- Julien Cristau <[EMAIL PROTECTED]> Sat, 20 Jan 2007 22:13:13 +0100 + xserver-xorg-video-i810 (2:1.7.2-4) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 3c7c75e..28677b4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>, Drew Parsons <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.1.1-1), x11proto-gl-dev, x11proto-video-dev, libdrm-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev +Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>= 2:1.1.1-1), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel commit b9c68da4c20734517d7612d9a45eecdbc9e00ba4 Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 6 23:11:46 2007 -0500 * Apply patch 20-i915_bios.patch from upsteam (1.7.4) to help with faulty BIOSes (where VBE initialization failed). Closes: #382120. diff --git a/debian/changelog b/debian/changelog index 25978bf..2421285 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ -xserver-xorg-video-i810 (2:1.7.2-4) UNRELEASED; urgency=low +xserver-xorg-video-i810 (2:1.7.2-4) unstable; urgency=low + [ Julien Cristau ] * Don't build-dep on libdrm-dev on hurd-i386, and don't try to install the libI810XvMC library there, as it isn't built without drm. Thanks to Samuel Thibault for the patch! (closes: #383918) - -- Julien Cristau <[EMAIL PROTECTED]> Thu, 4 Jan 2007 17:48:10 +0100 + [ Drew Parsons ] + * Apply patch 20-i915_bios.patch from upsteam (1.7.4) to help with faulty + BIOSes (where VBE initialization failed). Closes: #382120. + + -- Drew Parsons <[EMAIL PROTECTED]> Sat, 20 Jan 2007 02:29:30 +1100 xserver-xorg-video-i810 (2:1.7.2-3) unstable; urgency=low diff --git a/debian/patches/20-i915_bios.patch b/debian/patches/20-i915_bios.patch new file mode 100644 index 0000000..4b714b1 --- /dev/null +++ b/debian/patches/20-i915_bios.patch @@ -0,0 +1,20 @@ +From: Alan Hourihane <[EMAIL PROTECTED]> +Date: Tue, 9 Jan 2007 14:02:47 +0000 (+0000) +Subject: Fix bug #8536, i915 BIOS fails when restarting Xserver. +X-Git-Tag: xf86-video-i810-1.7.4 / xf86-video-intel-1.7.4 +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=33c0fac6d63d9a509a24c7a5e5a46a0d6ee4dc5d + +Fix bug #8536, i915 BIOS fails when restarting Xserver. +--- + +--- a/src/i830_driver.c ++++ b/src/i830_driver.c +@@ -7087,7 +7087,7 @@ IntelEmitInvarientState(ScrnInfoPtr pScr + I830Ptr pI830 = I830PTR(pScrn); + CARD32 ctx_addr; + +- if (pI830->noAccel) ++ if (pI830->noAccel || !I830IsPrimary(pScrn)) + return; + + ctx_addr = pI830->ContextMem.Start; diff --git a/debian/patches/series b/debian/patches/series index e45cecf..fd68d75 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 10-overlay_fix_lockup.patch 11-xv_lockup.patch +20-i915_bios.patch -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]