[arch-commits] Commit in xf86-video-intel/repos (10 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Mon Jun 24 18:08:39 UTC 2013
Date: Monday, June 24, 2013 @ 20:08:39
Author: andyrtr
Revision: 188899
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xf86-video-intel/repos/testing-i686/PKGBUILD
(from rev 188898, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/testing-i686/firefox_image_fix.diff
(from rev 188898, xf86-video-intel/trunk/firefox_image_fix.diff)
xf86-video-intel/repos/testing-i686/xf86-video-intel.install
(from rev 188898, xf86-video-intel/trunk/xf86-video-intel.install)
xf86-video-intel/repos/testing-x86_64/PKGBUILD
(from rev 188898, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/testing-x86_64/firefox_image_fix.diff
(from rev 188898, xf86-video-intel/trunk/firefox_image_fix.diff)
xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install
(from rev 188898, xf86-video-intel/trunk/xf86-video-intel.install)
Deleted:
xf86-video-intel/repos/testing-i686/PKGBUILD
xf86-video-intel/repos/testing-i686/xf86-video-intel.install
xf86-video-intel/repos/testing-x86_64/PKGBUILD
xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install
-----------------------------------------+
/PKGBUILD | 90 ++++++++++++++++++++++++++++++
/xf86-video-intel.install | 16 +++++
testing-i686/PKGBUILD | 40 -------------
testing-i686/firefox_image_fix.diff | 30 ++++++++++
testing-i686/xf86-video-intel.install | 8 --
testing-x86_64/PKGBUILD | 40 -------------
testing-x86_64/firefox_image_fix.diff | 30 ++++++++++
testing-x86_64/xf86-video-intel.install | 8 --
8 files changed, 166 insertions(+), 96 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-06-24 18:08:15 UTC (rev 188898)
+++ testing-i686/PKGBUILD 2013-06-24 18:08:39 UTC (rev 188899)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.21.10
-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' 'xcb-util>=0.3.9' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15'
- 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --enable-dri
-
- make
-}
-
-package() {
- cd "${srcdir}/${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/testing-i686/PKGBUILD (from rev 188898, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-06-24 18:08:39 UTC (rev 188899)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.21.10
+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' 'xcb-util>=0.3.9' 'systemd')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15'
+ 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ firefox_image_fix.diff)
+sha256sums=('7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6'
+ '33465c66b0a4bca2dfd242c86cb8cb882fbf841e1c2da632a5aa76f9d04b84d1')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # fix image issues in FF+TB, https://bugs.freedesktop.org/show_bug.cgi?id=66059
+ patch -Np1 -i ${srcdir}/firefox_image_fix.diff
+
+ ./configure --prefix=/usr \
+ --enable-dri
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${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/testing-i686/firefox_image_fix.diff (from rev 188898, xf86-video-intel/trunk/firefox_image_fix.diff)
===================================================================
--- testing-i686/firefox_image_fix.diff (rev 0)
+++ testing-i686/firefox_image_fix.diff 2013-06-24 18:08:39 UTC (rev 188899)
@@ -0,0 +1,30 @@
+From 77ddadf0ec6b867a0638660bf06c82ad31577795 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Sun, 23 Jun 2013 21:01:12 +0000
+Subject: sna: Clear 'clear' hint upon uploading into tiled
+
+Fixes regression from
+commit 53c113c3cc2f8527debc185f0819139ca8637637 [2.21.10]
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri Jun 21 19:27:24 2013 +0100
+
+ sna: Allow PutImage to write inplace using manual tiling
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66059
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 0994c33..43d6a67 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -4000,6 +4000,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
+ } while (--n);
+ __kgem_bo_unmap__cpu(&sna->kgem, priv->gpu_bo, dst);
+
++ priv->clear = false;
++ priv->cpu = false;
+ return true;
+ }
+
+--
+cgit v0.9.0.2-2-gbebe
Deleted: testing-i686/xf86-video-intel.install
===================================================================
--- testing-i686/xf86-video-intel.install 2013-06-24 18:08:15 UTC (rev 188898)
+++ testing-i686/xf86-video-intel.install 2013-06-24 18:08:39 UTC (rev 188899)
@@ -1,8 +0,0 @@
-post_install() {
- echo ">>> This driver now allows to switch"
- echo ">>> between sna/uxa acceleration methods."
- echo ">>> Add to the device section in /etc/X11/xorg.conf"
- echo ">>> Option \"AccelMethod\" \"sna\""
- echo ">>> use uxa method if you run into trouble with sna."
-}
-
Copied: xf86-video-intel/repos/testing-i686/xf86-video-intel.install (from rev 188898, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- testing-i686/xf86-video-intel.install (rev 0)
+++ testing-i686/xf86-video-intel.install 2013-06-24 18:08:39 UTC (rev 188899)
@@ -0,0 +1,8 @@
+post_install() {
+ echo ">>> This driver now allows to switch"
+ echo ">>> between sna/uxa acceleration methods."
+ echo ">>> Add to the device section in /etc/X11/xorg.conf"
+ echo ">>> Option \"AccelMethod\" \"sna\""
+ echo ">>> use uxa method if you run into trouble with sna."
+}
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-06-24 18:08:15 UTC (rev 188898)
+++ testing-x86_64/PKGBUILD 2013-06-24 18:08:39 UTC (rev 188899)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.21.10
-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' 'xcb-util>=0.3.9' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15'
- 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --enable-dri
-
- make
-}
-
-package() {
- cd "${srcdir}/${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/testing-x86_64/PKGBUILD (from rev 188898, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-06-24 18:08:39 UTC (rev 188899)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.21.10
+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' 'xcb-util>=0.3.9' 'systemd')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15'
+ 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ firefox_image_fix.diff)
+sha256sums=('7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6'
+ '33465c66b0a4bca2dfd242c86cb8cb882fbf841e1c2da632a5aa76f9d04b84d1')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # fix image issues in FF+TB, https://bugs.freedesktop.org/show_bug.cgi?id=66059
+ patch -Np1 -i ${srcdir}/firefox_image_fix.diff
+
+ ./configure --prefix=/usr \
+ --enable-dri
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${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/testing-x86_64/firefox_image_fix.diff (from rev 188898, xf86-video-intel/trunk/firefox_image_fix.diff)
===================================================================
--- testing-x86_64/firefox_image_fix.diff (rev 0)
+++ testing-x86_64/firefox_image_fix.diff 2013-06-24 18:08:39 UTC (rev 188899)
@@ -0,0 +1,30 @@
+From 77ddadf0ec6b867a0638660bf06c82ad31577795 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Sun, 23 Jun 2013 21:01:12 +0000
+Subject: sna: Clear 'clear' hint upon uploading into tiled
+
+Fixes regression from
+commit 53c113c3cc2f8527debc185f0819139ca8637637 [2.21.10]
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri Jun 21 19:27:24 2013 +0100
+
+ sna: Allow PutImage to write inplace using manual tiling
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66059
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 0994c33..43d6a67 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -4000,6 +4000,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
+ } while (--n);
+ __kgem_bo_unmap__cpu(&sna->kgem, priv->gpu_bo, dst);
+
++ priv->clear = false;
++ priv->cpu = false;
+ return true;
+ }
+
+--
+cgit v0.9.0.2-2-gbebe
Deleted: testing-x86_64/xf86-video-intel.install
===================================================================
--- testing-x86_64/xf86-video-intel.install 2013-06-24 18:08:15 UTC (rev 188898)
+++ testing-x86_64/xf86-video-intel.install 2013-06-24 18:08:39 UTC (rev 188899)
@@ -1,8 +0,0 @@
-post_install() {
- echo ">>> This driver now allows to switch"
- echo ">>> between sna/uxa acceleration methods."
- echo ">>> Add to the device section in /etc/X11/xorg.conf"
- echo ">>> Option \"AccelMethod\" \"sna\""
- echo ">>> use uxa method if you run into trouble with sna."
-}
-
Copied: xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install (from rev 188898, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- testing-x86_64/xf86-video-intel.install (rev 0)
+++ testing-x86_64/xf86-video-intel.install 2013-06-24 18:08:39 UTC (rev 188899)
@@ -0,0 +1,8 @@
+post_install() {
+ echo ">>> This driver now allows to switch"
+ echo ">>> between sna/uxa acceleration methods."
+ echo ">>> Add to the device section in /etc/X11/xorg.conf"
+ echo ">>> Option \"AccelMethod\" \"sna\""
+ echo ">>> use uxa method if you run into trouble with sna."
+}
+
More information about the arch-commits
mailing list