Date: Thursday, July 31, 2014 @ 17:36:46
Author: tpowa
Revision: 218458
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-intel/repos/extra-i686/PKGBUILD
(from rev 218457, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/extra-i686/fix-i810-segfault-2.99.914.patch
(from rev 218457, xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch)
xf86-video-intel/repos/extra-i686/xf86-video-intel.install
(from rev 218457, xf86-video-intel/trunk/xf86-video-intel.install)
xf86-video-intel/repos/extra-x86_64/PKGBUILD
(from rev 218457, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/extra-x86_64/fix-i810-segfault-2.99.914.patch
(from rev 218457, xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch)
xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install
(from rev 218457, xf86-video-intel/trunk/xf86-video-intel.install)
Deleted:
xf86-video-intel/repos/extra-i686/PKGBUILD
xf86-video-intel/repos/extra-i686/xf86-video-intel.install
xf86-video-intel/repos/extra-x86_64/PKGBUILD
xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install
-----------------------------------------------+
/PKGBUILD | 118 ++++++++++++++++++++++++
/xf86-video-intel.install | 44 ++++++++
extra-i686/PKGBUILD | 56 -----------
extra-i686/fix-i810-segfault-2.99.914.patch | 31 ++++++
extra-i686/xf86-video-intel.install | 22 ----
extra-x86_64/PKGBUILD | 56 -----------
extra-x86_64/fix-i810-segfault-2.99.914.patch | 31 ++++++
extra-x86_64/xf86-video-intel.install | 22 ----
8 files changed, 224 insertions(+), 156 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-07-31 15:36:36 UTC (rev 218457)
+++ extra-i686/PKGBUILD 2014-07-31 15:36:46 UTC (rev 218458)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andy...@archlinux.org>
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.99.914
-pkgrel=1
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-install=$pkgname.install
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'libx11'
'libxrender'
- # additional deps for intel-virtual-output
- 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
-optdepends=('libxrandr: for intel-virtual-output'
- 'libxinerama: for intel-virtual-output'
- 'libxcursor: for intel-virtual-output'
- 'libxtst: for intel-virtual-output')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-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)
-sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
-# autoreconf -fiv
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib \
- --enable-glamor \
- --disable-dri3
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-intel/repos/extra-i686/PKGBUILD (from rev 218457,
xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-07-31 15:36:46 UTC (rev 218458)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: AndyRTR <andy...@archlinux.org>
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.914
+pkgrel=2
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+install=$pkgname.install
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'libx11'
'libxrender'
+ # additional deps for intel-virtual-output
+ 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
+optdepends=('libxrandr: for intel-virtual-output'
+ 'libxinerama: for intel-virtual-output'
+ 'libxcursor: for intel-virtual-output'
+ 'libxtst: for intel-virtual-output')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+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
+ fix-i810-segfault-2.99.914.patch)
+sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
+ 'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix segfaulting on i810 chipsets
+ patch -Np1 -i ../fix-i810-segfault-2.99.914.patch
+# autoreconf -fiv
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --enable-glamor \
+ --disable-dri3
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-intel/repos/extra-i686/fix-i810-segfault-2.99.914.patch
(from rev 218457, xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch)
===================================================================
--- extra-i686/fix-i810-segfault-2.99.914.patch (rev 0)
+++ extra-i686/fix-i810-segfault-2.99.914.patch 2014-07-31 15:36:46 UTC (rev
218458)
@@ -0,0 +1,31 @@
+From ce804875914f52dba5356f8aefec850d411b051a Mon Sep 17 00:00:00 2001
+From: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Thu, 31 Jul 2014 15:18:02 +0000
+Subject: i810: Fix startup after marking GPU screens in the module
+
+Fixes regression from
+
+commit d6830190bc9956f485db6c3420f7a4a79793a693
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Jul 23 10:53:40 2014 +0100
+
+ sna: Disable all outputs when initializing as a slaved output provider
+
+Reported-by: Tobias Powalowski
+Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+---
+diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
+index a1b73fd..3d53d04 100644
+--- a/src/legacy/i810/i810_driver.c
++++ b/src/legacy/i810/i810_driver.c
+@@ -152,7 +152,7 @@ static int i810_pitches[] = {
+ static Bool
+ I810GetRec(ScrnInfoPtr scrn)
+ {
+- if (((uintptr_t)scrn->driverPrivate & 1) == 0)
++ if (((uintptr_t)scrn->driverPrivate & 3) == 0)
+ return TRUE;
+
+ scrn->driverPrivate = xnfcalloc(sizeof(I810Rec), 1);
+--
+cgit v0.9.0.2-2-gbebe
Deleted: extra-i686/xf86-video-intel.install
===================================================================
--- extra-i686/xf86-video-intel.install 2014-07-31 15:36:36 UTC (rev 218457)
+++ extra-i686/xf86-video-intel.install 2014-07-31 15:36:46 UTC (rev 218458)
@@ -1,22 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.21.15) < 0 )); then
- post_install
- fi
-}
-
-post_install() {
- cat <<MSG
->>> This driver uses SNA as the default acceleration method. You can
- fall back to UXA if you run into trouble or test experimental
- Glamor acceleration. To do so, save a file with the following
- content as /etc/X11/xorg.conf.d/20-intel.conf :
- Section "Device"
- Identifier "Intel Graphics"
- Driver "intel"
- Option "AccelMethod" "sna"
- #Option "AccelMethod" "uxa"
- #Option "AccelMethod" "glamor"
- EndSection
-MSG
-}
-
Copied: xf86-video-intel/repos/extra-i686/xf86-video-intel.install (from rev
218457, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- extra-i686/xf86-video-intel.install (rev 0)
+++ extra-i686/xf86-video-intel.install 2014-07-31 15:36:46 UTC (rev 218458)
@@ -0,0 +1,22 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.21.15) < 0 )); then
+ post_install
+ fi
+}
+
+post_install() {
+ cat <<MSG
+>>> This driver uses SNA as the default acceleration method. You can
+ fall back to UXA if you run into trouble or test experimental
+ Glamor acceleration. To do so, save a file with the following
+ content as /etc/X11/xorg.conf.d/20-intel.conf :
+ Section "Device"
+ Identifier "Intel Graphics"
+ Driver "intel"
+ Option "AccelMethod" "sna"
+ #Option "AccelMethod" "uxa"
+ #Option "AccelMethod" "glamor"
+ EndSection
+MSG
+}
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-07-31 15:36:36 UTC (rev 218457)
+++ extra-x86_64/PKGBUILD 2014-07-31 15:36:46 UTC (rev 218458)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andy...@archlinux.org>
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.99.914
-pkgrel=1
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-install=$pkgname.install
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'libx11'
'libxrender'
- # additional deps for intel-virtual-output
- 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
-optdepends=('libxrandr: for intel-virtual-output'
- 'libxinerama: for intel-virtual-output'
- 'libxcursor: for intel-virtual-output'
- 'libxtst: for intel-virtual-output')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-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)
-sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
-# autoreconf -fiv
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib \
- --enable-glamor \
- --disable-dri3
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-intel/repos/extra-x86_64/PKGBUILD (from rev 218457,
xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-07-31 15:36:46 UTC (rev 218458)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: AndyRTR <andy...@archlinux.org>
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.914
+pkgrel=2
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/";
+license=('custom')
+install=$pkgname.install
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
+depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'libx11'
'libxrender'
+ # additional deps for intel-virtual-output
+ 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
+optdepends=('libxrandr: for intel-virtual-output'
+ 'libxinerama: for intel-virtual-output'
+ 'libxcursor: for intel-virtual-output'
+ 'libxtst: for intel-virtual-output')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+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
+ fix-i810-segfault-2.99.914.patch)
+sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
+ 'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix segfaulting on i810 chipsets
+ patch -Np1 -i ../fix-i810-segfault-2.99.914.patch
+# autoreconf -fiv
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --enable-glamor \
+ --disable-dri3
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-intel/repos/extra-x86_64/fix-i810-segfault-2.99.914.patch
(from rev 218457, xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch)
===================================================================
--- extra-x86_64/fix-i810-segfault-2.99.914.patch
(rev 0)
+++ extra-x86_64/fix-i810-segfault-2.99.914.patch 2014-07-31 15:36:46 UTC
(rev 218458)
@@ -0,0 +1,31 @@
+From ce804875914f52dba5356f8aefec850d411b051a Mon Sep 17 00:00:00 2001
+From: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Thu, 31 Jul 2014 15:18:02 +0000
+Subject: i810: Fix startup after marking GPU screens in the module
+
+Fixes regression from
+
+commit d6830190bc9956f485db6c3420f7a4a79793a693
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Jul 23 10:53:40 2014 +0100
+
+ sna: Disable all outputs when initializing as a slaved output provider
+
+Reported-by: Tobias Powalowski
+Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+---
+diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
+index a1b73fd..3d53d04 100644
+--- a/src/legacy/i810/i810_driver.c
++++ b/src/legacy/i810/i810_driver.c
+@@ -152,7 +152,7 @@ static int i810_pitches[] = {
+ static Bool
+ I810GetRec(ScrnInfoPtr scrn)
+ {
+- if (((uintptr_t)scrn->driverPrivate & 1) == 0)
++ if (((uintptr_t)scrn->driverPrivate & 3) == 0)
+ return TRUE;
+
+ scrn->driverPrivate = xnfcalloc(sizeof(I810Rec), 1);
+--
+cgit v0.9.0.2-2-gbebe
Deleted: extra-x86_64/xf86-video-intel.install
===================================================================
--- extra-x86_64/xf86-video-intel.install 2014-07-31 15:36:36 UTC (rev
218457)
+++ extra-x86_64/xf86-video-intel.install 2014-07-31 15:36:46 UTC (rev
218458)
@@ -1,22 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.21.15) < 0 )); then
- post_install
- fi
-}
-
-post_install() {
- cat <<MSG
->>> This driver uses SNA as the default acceleration method. You can
- fall back to UXA if you run into trouble or test experimental
- Glamor acceleration. To do so, save a file with the following
- content as /etc/X11/xorg.conf.d/20-intel.conf :
- Section "Device"
- Identifier "Intel Graphics"
- Driver "intel"
- Option "AccelMethod" "sna"
- #Option "AccelMethod" "uxa"
- #Option "AccelMethod" "glamor"
- EndSection
-MSG
-}
-
Copied: xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install (from rev
218457, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- extra-x86_64/xf86-video-intel.install (rev 0)
+++ extra-x86_64/xf86-video-intel.install 2014-07-31 15:36:46 UTC (rev
218458)
@@ -0,0 +1,22 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.21.15) < 0 )); then
+ post_install
+ fi
+}
+
+post_install() {
+ cat <<MSG
+>>> This driver uses SNA as the default acceleration method. You can
+ fall back to UXA if you run into trouble or test experimental
+ Glamor acceleration. To do so, save a file with the following
+ content as /etc/X11/xorg.conf.d/20-intel.conf :
+ Section "Device"
+ Identifier "Intel Graphics"
+ Driver "intel"
+ Option "AccelMethod" "sna"
+ #Option "AccelMethod" "uxa"
+ #Option "AccelMethod" "glamor"
+ EndSection
+MSG
+}
+
