Date: Wednesday, July 23, 2014 @ 17:16:31 Author: andyrtr Revision: 217743
upgpkg: xf86-video-intel 2.99.913-1 upstream update 2.99.913 Modified: xf86-video-intel/trunk/PKGBUILD Deleted: xf86-video-intel/trunk/0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch xf86-video-intel/trunk/disable-dri3.patch -----------------------------------------------------------------+ 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch | 56 ---------- PKGBUILD | 21 +-- disable-dri3.patch | 52 --------- 3 files changed, 7 insertions(+), 122 deletions(-) Deleted: 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch =================================================================== --- 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch 2014-07-23 02:41:03 UTC (rev 217742) +++ 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch 2014-07-23 15:16:31 UTC (rev 217743) @@ -1,56 +0,0 @@ -From e2bfa715a9e115921263d572b9f4c496b550a494 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <[email protected]> -Date: Tue, 10 Jun 2014 21:28:32 +0100 -Subject: [PATCH] sna/dri2: Check that the window covers the whole CRTC before - xchg - -Fixes TearFre regression from - -commit 3932e97057fca16615adaefbc1eb25a0d51a1d8b [2.99.912] -Author: Chris Wilson <[email protected]> -Date: Mon Jun 9 08:58:15 2014 +0100 - - sna/dri2: Allow TearFree flipping to individual CRTC - -Signed-off-by: Chris Wilson <[email protected]> ---- - src/sna/sna_display.c | 1 + - src/sna/sna_dri2.c | 10 ++++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c -index dcbe622..7169779 100644 ---- a/src/sna/sna_display.c -+++ b/src/sna/sna_display.c -@@ -332,6 +332,7 @@ static unsigned get_fb(struct sna *sna, struct kgem_bo *bo, - assert(bo->refcnt); - assert(bo->proxy == NULL); - assert(!bo->snoop); -+ assert(8*bo->pitch >= width * scrn->bitsPerPixel); - assert(height * bo->pitch <= kgem_bo_size(bo)); /* XXX crtc offset */ - if (bo->delta) { - DBG(("%s: reusing fb=%d for handle=%d\n", -diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c -index 1baaf2b..e196464 100644 ---- a/src/sna/sna_dri2.c -+++ b/src/sna/sna_dri2.c -@@ -1605,6 +1605,16 @@ can_xchg_one(struct sna *sna, - return false; - } - -+ if (memcmp(&win->clipList.extents, &crtc->bounds, sizeof(crtc->bounds))) { -+ DBG(("%s: no, window [(%d, %d), (%d, %d)] does not cover CRTC [(%d, %d), (%d, %d)]\n", -+ __FUNCTION__, -+ win->clipList.extents.x1, win->clipList.extents.y1, -+ win->clipList.extents.x2, win->clipList.extents.y2, -+ crtc->bounds.x1, crtc->bounds.y1, -+ crtc->bounds.x2, crtc->bounds.y2)); -+ return false; -+ } -+ - if (sna_crtc_is_transformed(crtc)) { - DBG(("%s: no, CRTC is rotated\n", __FUNCTION__)); - return false; --- -2.0.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-07-23 02:41:03 UTC (rev 217742) +++ PKGBUILD 2014-07-23 15:16:31 UTC (rev 217743) @@ -3,8 +3,8 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=xf86-video-intel -pkgver=2.99.912 -pkgrel=4 +pkgver=2.99.913 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; license=('custom') @@ -23,21 +23,13 @@ conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19' 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy') groups=('xorg-drivers' 'xorg') -source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch - disable-dri3.patch) -sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501' - '19fe39fa5cd175e14f77d67dbd731f992c8f51161d90b73c63f52604a9eed7ce' - '2cddfd09c7c32f0cd80819fbb1226095bc77665e9e1943df4a1e9d3a8295cedb') +source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6253ea35b4d6a53f0c80198b64ff810cec5f8278b80b2b639677dd9401517126') prepare() { cd ${pkgname}-${pkgver} - # fix FS#40863, merged upstream - patch -Np1 -i ../0001-sna-dri2-Check-that-the-window-covers-the-whole-CRTC.patch - # ugly patch from fedora to disable dri3 (FS#41275 FS#41264 FS#41261) - patch -Np1 -i ../disable-dri3.patch - autoreconf -fiv +# autoreconf -fiv } build() { @@ -44,7 +36,8 @@ cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --libexecdir=/usr/lib \ - --enable-glamor + --enable-glamor \ + --disable-dri3 make } Deleted: disable-dri3.patch =================================================================== --- disable-dri3.patch 2014-07-23 02:41:03 UTC (rev 217742) +++ disable-dri3.patch 2014-07-23 15:16:31 UTC (rev 217743) @@ -1,52 +0,0 @@ -From 86b58835fce56ae13453a89a0b0d93c9517c2758 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <[email protected]> -Date: Thu, 12 Jun 2014 22:54:50 +0200 -Subject: [PATCH] HACK/quick-fix: disable dri3 - -Signed-off-by: Hans de Goede <[email protected]> ---- - configure.ac | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b3b6e8e..2937afc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -248,7 +248,8 @@ if test "x$shm" = "xyes"; then - AC_MSG_RESULT(assuming no)) - fi - --PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) -+dnl PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) -+x11_dri3="no" - AM_CONDITIONAL(X11_DRI3, test "x$x11_dri3" = "xyes" -a "x$shm" = "xyes") - - AC_ARG_ENABLE(tools, -@@ -264,7 +265,8 @@ fi - if test "x$tools" != "xno"; then - ivo_requires="xinerama xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1" - PKG_CHECK_MODULES(IVO, [$ivo_requires], [ivo="yes"], [ivo="no"]) -- PKG_CHECK_MODULES(IVO_DRI3, [xcb-dri3 xcb-sync x11-xcb xshmfence x11], [ivo_dri3="yes"], [ivo_dri3="no"]) -+ dnl PKG_CHECK_MODULES(IVO_DRI3, [xcb-dri3 xcb-sync x11-xcb xshmfence x11], [ivo_dri3="yes"], [ivo_dri3="no"]) -+ ivo_dri3="no" - if test "x$ivo_dri3" = "xyes"; then - IVO_CFLAGS="$IVO_CFLAGS $IVO_DRI3_CFLAGS -DDRI3" - IVO_LIBS="$IVO_LIBS $IVO_DRI3_LIBS" -@@ -520,10 +522,10 @@ if test "x$DRI" != "xno"; then - CFLAGS=$save_CFLAGS - fi - -- XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) -- if test "x$_EXT_CHECK" != "xno"; then -- PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], []) -- fi -+ dnl XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) -+ dnl if test "x$_EXT_CHECK" != "xno"; then -+ dnl PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], []) -+ dnl fi - if test "x$DRI3" != "xno"; then - save_CFLAGS=$CFLAGS - CFLAGS="$XORG_CFLAGS $DRI3_CFLAGS" --- -2.0.0 -
