[arch-commits] Commit in xf86-video-intel/repos (10 files)
Laurent Carlier
lcarlier at archlinux.org
Sun Sep 21 19:21:20 UTC 2014
Date: Sunday, September 21, 2014 @ 21:21:19
Author: lcarlier
Revision: 222553
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-intel/repos/extra-i686/0001-sna-Use-default-monitor-options-on-the-first-output.patch
(from rev 222552, xf86-video-intel/trunk/0001-sna-Use-default-monitor-options-on-the-first-output.patch)
xf86-video-intel/repos/extra-i686/PKGBUILD
(from rev 222552, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/extra-i686/xf86-video-intel.install
(from rev 222552, xf86-video-intel/trunk/xf86-video-intel.install)
xf86-video-intel/repos/extra-x86_64/0001-sna-Use-default-monitor-options-on-the-first-output.patch
(from rev 222552, xf86-video-intel/trunk/0001-sna-Use-default-monitor-options-on-the-first-output.patch)
xf86-video-intel/repos/extra-x86_64/PKGBUILD
(from rev 222552, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/extra-x86_64/xf86-video-intel.install
(from rev 222552, 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/0001-sna-Use-default-monitor-options-on-the-first-output.patch | 37 +++
extra-i686/PKGBUILD | 50 ----
extra-i686/xf86-video-intel.install | 22 -
extra-x86_64/0001-sna-Use-default-monitor-options-on-the-first-output.patch | 37 +++
extra-x86_64/PKGBUILD | 50 ----
extra-x86_64/xf86-video-intel.install | 22 -
8 files changed, 236 insertions(+), 144 deletions(-)
Copied: xf86-video-intel/repos/extra-i686/0001-sna-Use-default-monitor-options-on-the-first-output.patch (from rev 222552, xf86-video-intel/trunk/0001-sna-Use-default-monitor-options-on-the-first-output.patch)
===================================================================
--- extra-i686/0001-sna-Use-default-monitor-options-on-the-first-output.patch (rev 0)
+++ extra-i686/0001-sna-Use-default-monitor-options-on-the-first-output.patch 2014-09-21 19:21:19 UTC (rev 222553)
@@ -0,0 +1,37 @@
+From 1aefd16964c30264c05d136cef3e1e7de5eb9c53 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri, 12 Sep 2014 07:46:43 +0100
+Subject: [PATCH] sna: Use default monitor options on the first output
+
+commit 6554cf0a69f04710b64f3488384fe5cb2748dc35
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Mon Aug 11 12:22:17 2014 +0100
+
+ sna: Parse output options early during initialisation
+
+rearranged the monitor query to before the num_outputs increment. The
+result was that it choose the second output as the default and not the
+intended first.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=522500
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index f136c20..f6cfc80 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -3751,7 +3751,7 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
+ output->name = (char *)(output + 1);
+ memcpy(output->name, name, len + 1);
+
+- output->use_screen_monitor = config->num_output != 1;
++ output->use_screen_monitor = config->num_output != 0;
+ xf86OutputUseScreenMonitor(output, !output->use_screen_monitor);
+ assert(output->options);
+
+--
+2.1.0
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-09-21 19:21:05 UTC (rev 222552)
+++ extra-i686/PKGBUILD 2014-09-21 19:21:19 UTC (rev 222553)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.99.916
-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=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01')
-
-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 222552, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-09-21 19:21:19 UTC (rev 222553)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.916
+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
+ 0001-sna-Use-default-monitor-options-on-the-first-output.patch)
+sha256sums=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01'
+ '0195f5e5e69fc4b86d7ab51bc3d297e283cbdaec5c729702cca1b213809b4a18')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Fix FS#41944 merged upstream
+ patch -Np1 -i ../0001-sna-Use-default-monitor-options-on-the-first-output.patch
+}
+
+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}/"
+}
Deleted: extra-i686/xf86-video-intel.install
===================================================================
--- extra-i686/xf86-video-intel.install 2014-09-21 19:21:05 UTC (rev 222552)
+++ extra-i686/xf86-video-intel.install 2014-09-21 19:21:19 UTC (rev 222553)
@@ -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 222552, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- extra-i686/xf86-video-intel.install (rev 0)
+++ extra-i686/xf86-video-intel.install 2014-09-21 19:21:19 UTC (rev 222553)
@@ -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
+}
+
Copied: xf86-video-intel/repos/extra-x86_64/0001-sna-Use-default-monitor-options-on-the-first-output.patch (from rev 222552, xf86-video-intel/trunk/0001-sna-Use-default-monitor-options-on-the-first-output.patch)
===================================================================
--- extra-x86_64/0001-sna-Use-default-monitor-options-on-the-first-output.patch (rev 0)
+++ extra-x86_64/0001-sna-Use-default-monitor-options-on-the-first-output.patch 2014-09-21 19:21:19 UTC (rev 222553)
@@ -0,0 +1,37 @@
+From 1aefd16964c30264c05d136cef3e1e7de5eb9c53 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri, 12 Sep 2014 07:46:43 +0100
+Subject: [PATCH] sna: Use default monitor options on the first output
+
+commit 6554cf0a69f04710b64f3488384fe5cb2748dc35
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Mon Aug 11 12:22:17 2014 +0100
+
+ sna: Parse output options early during initialisation
+
+rearranged the monitor query to before the num_outputs increment. The
+result was that it choose the second output as the default and not the
+intended first.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=522500
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index f136c20..f6cfc80 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -3751,7 +3751,7 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
+ output->name = (char *)(output + 1);
+ memcpy(output->name, name, len + 1);
+
+- output->use_screen_monitor = config->num_output != 1;
++ output->use_screen_monitor = config->num_output != 0;
+ xf86OutputUseScreenMonitor(output, !output->use_screen_monitor);
+ assert(output->options);
+
+--
+2.1.0
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-09-21 19:21:05 UTC (rev 222552)
+++ extra-x86_64/PKGBUILD 2014-09-21 19:21:19 UTC (rev 222553)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.99.916
-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=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01')
-
-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 222552, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-09-21 19:21:19 UTC (rev 222553)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.916
+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
+ 0001-sna-Use-default-monitor-options-on-the-first-output.patch)
+sha256sums=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01'
+ '0195f5e5e69fc4b86d7ab51bc3d297e283cbdaec5c729702cca1b213809b4a18')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Fix FS#41944 merged upstream
+ patch -Np1 -i ../0001-sna-Use-default-monitor-options-on-the-first-output.patch
+}
+
+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}/"
+}
Deleted: extra-x86_64/xf86-video-intel.install
===================================================================
--- extra-x86_64/xf86-video-intel.install 2014-09-21 19:21:05 UTC (rev 222552)
+++ extra-x86_64/xf86-video-intel.install 2014-09-21 19:21:19 UTC (rev 222553)
@@ -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 222552, 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-09-21 19:21:19 UTC (rev 222553)
@@ -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
+}
+
More information about the arch-commits
mailing list