[arch-commits] Commit in xf86-video-intel/repos (12 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Thu Jan 2 18:56:49 UTC 2014
Date: Thursday, January 2, 2014 @ 19:56:49
Author: andyrtr
Revision: 203048
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xf86-video-intel/repos/testing-i686/PKGBUILD
(from rev 203047, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/testing-i686/intel-2.21.15-xserver-1.15-compat.patch
(from rev 203047, xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch)
xf86-video-intel/repos/testing-i686/xf86-video-intel.install
(from rev 203047, xf86-video-intel/trunk/xf86-video-intel.install)
xf86-video-intel/repos/testing-x86_64/PKGBUILD
(from rev 203047, xf86-video-intel/trunk/PKGBUILD)
xf86-video-intel/repos/testing-x86_64/intel-2.21.15-xserver-1.15-compat.patch
(from rev 203047, xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch)
xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install
(from rev 203047, xf86-video-intel/trunk/xf86-video-intel.install)
Deleted:
xf86-video-intel/repos/testing-i686/PKGBUILD
xf86-video-intel/repos/testing-i686/intel-2.21.15-xserver-1.15-compat.patch
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/intel-2.21.15-xserver-1.15-compat.patch
xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install
--------------------------------------------------------+
/PKGBUILD | 84 +++++++++++++++
/intel-2.21.15-xserver-1.15-compat.patch | 26 ++++
/xf86-video-intel.install | 44 +++++++
testing-i686/PKGBUILD | 43 -------
testing-i686/intel-2.21.15-xserver-1.15-compat.patch | 13 --
testing-i686/xf86-video-intel.install | 19 ---
testing-x86_64/PKGBUILD | 43 -------
testing-x86_64/intel-2.21.15-xserver-1.15-compat.patch | 13 --
testing-x86_64/xf86-video-intel.install | 19 ---
9 files changed, 154 insertions(+), 150 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2014-01-02 17:53:12 UTC (rev 203047)
+++ testing-i686/PKGBUILD 2014-01-02 18:56:49 UTC (rev 203048)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.21.15
-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=15' 'libx11' 'libxrender')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
- '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
- intel-2.21.15-xserver-1.15-compat.patch)
-sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc'
- 'fbf8fa35974dbf758b095c390d79f542b97993482ae3b63ec6542bffa87ba09f')
-
-build() {
- cd ${pkgname}-${pkgver}
- # fix build with Xorg 1.15
- patch -Np1 -i ${srcdir}/intel-2.21.15-xserver-1.15-compat.patch
- ./configure --prefix=/usr \
- --enable-dri \
- --with-default-accel=sna
-
- make
-}
-
-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/testing-i686/PKGBUILD (from rev 203047, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-01-02 18:56:49 UTC (rev 203048)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.907
+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' 'glamor-egl')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'libx11' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
+ '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=('d0b02255f0ff4baa863f762bef49707ce0b4094a267a26e32e4270abe141117b')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --enable-glamor
+ 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: testing-i686/intel-2.21.15-xserver-1.15-compat.patch
===================================================================
--- testing-i686/intel-2.21.15-xserver-1.15-compat.patch 2014-01-02 17:53:12 UTC (rev 203047)
+++ testing-i686/intel-2.21.15-xserver-1.15-compat.patch 2014-01-02 18:56:49 UTC (rev 203048)
@@ -1,13 +0,0 @@
-diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h
---- xf86-video-intel-2.21.15/src/compat-api.h.jx 2013-05-21 06:15:11.000000000 -0400
-+++ xf86-video-intel-2.21.15/src/compat-api.h 2013-10-24 15:30:52.291337300 -0400
-@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr
- if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
- #endif
-
-+#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0)
-+#define DamageUnregister(a, b) DamageUnregister(a)
-+#endif
-+
- #endif
-
Copied: xf86-video-intel/repos/testing-i686/intel-2.21.15-xserver-1.15-compat.patch (from rev 203047, xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch)
===================================================================
--- testing-i686/intel-2.21.15-xserver-1.15-compat.patch (rev 0)
+++ testing-i686/intel-2.21.15-xserver-1.15-compat.patch 2014-01-02 18:56:49 UTC (rev 203048)
@@ -0,0 +1,13 @@
+diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h
+--- xf86-video-intel-2.21.15/src/compat-api.h.jx 2013-05-21 06:15:11.000000000 -0400
++++ xf86-video-intel-2.21.15/src/compat-api.h 2013-10-24 15:30:52.291337300 -0400
+@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr
+ if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
+ #endif
+
++#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0)
++#define DamageUnregister(a, b) DamageUnregister(a)
++#endif
++
+ #endif
+
Deleted: testing-i686/xf86-video-intel.install
===================================================================
--- testing-i686/xf86-video-intel.install 2014-01-02 17:53:12 UTC (rev 203047)
+++ testing-i686/xf86-video-intel.install 2014-01-02 18:56:49 UTC (rev 203048)
@@ -1,19 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.21.15) < 0 )); then
- post_install
- fi
-}
-
-post_install() {
- cat <<MSG
->>> This driver now uses SNA as the default acceleration method. You can
- still fall back to UXA if you run into trouble. 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" "uxa"
- EndSection
-MSG
-}
-
Copied: xf86-video-intel/repos/testing-i686/xf86-video-intel.install (from rev 203047, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- testing-i686/xf86-video-intel.install (rev 0)
+++ testing-i686/xf86-video-intel.install 2014-01-02 18:56:49 UTC (rev 203048)
@@ -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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2014-01-02 17:53:12 UTC (rev 203047)
+++ testing-x86_64/PKGBUILD 2014-01-02 18:56:49 UTC (rev 203048)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.21.15
-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=15' 'libx11' 'libxrender')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
- '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
- intel-2.21.15-xserver-1.15-compat.patch)
-sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc'
- 'fbf8fa35974dbf758b095c390d79f542b97993482ae3b63ec6542bffa87ba09f')
-
-build() {
- cd ${pkgname}-${pkgver}
- # fix build with Xorg 1.15
- patch -Np1 -i ${srcdir}/intel-2.21.15-xserver-1.15-compat.patch
- ./configure --prefix=/usr \
- --enable-dri \
- --with-default-accel=sna
-
- make
-}
-
-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/testing-x86_64/PKGBUILD (from rev 203047, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-01-02 18:56:49 UTC (rev 203048)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-intel
+pkgver=2.99.907
+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' 'glamor-egl')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'libx11' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
+ '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=('d0b02255f0ff4baa863f762bef49707ce0b4094a267a26e32e4270abe141117b')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --enable-glamor
+ 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: testing-x86_64/intel-2.21.15-xserver-1.15-compat.patch
===================================================================
--- testing-x86_64/intel-2.21.15-xserver-1.15-compat.patch 2014-01-02 17:53:12 UTC (rev 203047)
+++ testing-x86_64/intel-2.21.15-xserver-1.15-compat.patch 2014-01-02 18:56:49 UTC (rev 203048)
@@ -1,13 +0,0 @@
-diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h
---- xf86-video-intel-2.21.15/src/compat-api.h.jx 2013-05-21 06:15:11.000000000 -0400
-+++ xf86-video-intel-2.21.15/src/compat-api.h 2013-10-24 15:30:52.291337300 -0400
-@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr
- if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
- #endif
-
-+#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0)
-+#define DamageUnregister(a, b) DamageUnregister(a)
-+#endif
-+
- #endif
-
Copied: xf86-video-intel/repos/testing-x86_64/intel-2.21.15-xserver-1.15-compat.patch (from rev 203047, xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch)
===================================================================
--- testing-x86_64/intel-2.21.15-xserver-1.15-compat.patch (rev 0)
+++ testing-x86_64/intel-2.21.15-xserver-1.15-compat.patch 2014-01-02 18:56:49 UTC (rev 203048)
@@ -0,0 +1,13 @@
+diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h
+--- xf86-video-intel-2.21.15/src/compat-api.h.jx 2013-05-21 06:15:11.000000000 -0400
++++ xf86-video-intel-2.21.15/src/compat-api.h 2013-10-24 15:30:52.291337300 -0400
+@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr
+ if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
+ #endif
+
++#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0)
++#define DamageUnregister(a, b) DamageUnregister(a)
++#endif
++
+ #endif
+
Deleted: testing-x86_64/xf86-video-intel.install
===================================================================
--- testing-x86_64/xf86-video-intel.install 2014-01-02 17:53:12 UTC (rev 203047)
+++ testing-x86_64/xf86-video-intel.install 2014-01-02 18:56:49 UTC (rev 203048)
@@ -1,19 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.21.15) < 0 )); then
- post_install
- fi
-}
-
-post_install() {
- cat <<MSG
->>> This driver now uses SNA as the default acceleration method. You can
- still fall back to UXA if you run into trouble. 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" "uxa"
- EndSection
-MSG
-}
-
Copied: xf86-video-intel/repos/testing-x86_64/xf86-video-intel.install (from rev 203047, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- testing-x86_64/xf86-video-intel.install (rev 0)
+++ testing-x86_64/xf86-video-intel.install 2014-01-02 18:56:49 UTC (rev 203048)
@@ -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