[arch-commits] Commit in xf86-video-intel/repos (8 files)

Andreas Radke andyrtr at nymeria.archlinux.org
Sat Dec 28 14:05:02 UTC 2013 

    Date: Saturday, December 28, 2013 @ 15:05:02
  Author: andyrtr
Revision: 202839

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-intel/repos/staging-i686/
  xf86-video-intel/repos/staging-i686/PKGBUILD
    (from rev 202838, xf86-video-intel/trunk/PKGBUILD)
  xf86-video-intel/repos/staging-i686/intel-2.21.15-xserver-1.15-compat.patch
    (from rev 202838, xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch)
  xf86-video-intel/repos/staging-i686/xf86-video-intel.install
    (from rev 202838, xf86-video-intel/trunk/xf86-video-intel.install)
  xf86-video-intel/repos/staging-x86_64/
  xf86-video-intel/repos/staging-x86_64/PKGBUILD
    (from rev 202838, xf86-video-intel/trunk/PKGBUILD)
  xf86-video-intel/repos/staging-x86_64/intel-2.21.15-xserver-1.15-compat.patch
    (from rev 202838, xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch)
  xf86-video-intel/repos/staging-x86_64/xf86-video-intel.install
    (from rev 202838, xf86-video-intel/trunk/xf86-video-intel.install)

--------------------------------------------------------+
 staging-i686/PKGBUILD                                  |   43 +++++++++++++++
 staging-i686/intel-2.21.15-xserver-1.15-compat.patch   |   13 ++++
 staging-i686/xf86-video-intel.install                  |   19 ++++++
 staging-x86_64/PKGBUILD                                |   43 +++++++++++++++
 staging-x86_64/intel-2.21.15-xserver-1.15-compat.patch |   13 ++++
 staging-x86_64/xf86-video-intel.install                |   19 ++++++
 6 files changed, 150 insertions(+)

Copied: xf86-video-intel/repos/staging-i686/PKGBUILD (from rev 202838, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2013-12-28 14:05:02 UTC (rev 202839)
@@ -0,0 +1,43 @@
+# $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/staging-i686/intel-2.21.15-xserver-1.15-compat.patch (from rev 202838, xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch)
===================================================================
--- staging-i686/intel-2.21.15-xserver-1.15-compat.patch	                        (rev 0)
+++ staging-i686/intel-2.21.15-xserver-1.15-compat.patch	2013-12-28 14:05:02 UTC (rev 202839)
@@ -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
+

Copied: xf86-video-intel/repos/staging-i686/xf86-video-intel.install (from rev 202838, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- staging-i686/xf86-video-intel.install	                        (rev 0)
+++ staging-i686/xf86-video-intel.install	2013-12-28 14:05:02 UTC (rev 202839)
@@ -0,0 +1,19 @@
+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/staging-x86_64/PKGBUILD (from rev 202838, xf86-video-intel/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2013-12-28 14:05:02 UTC (rev 202839)
@@ -0,0 +1,43 @@
+# $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/staging-x86_64/intel-2.21.15-xserver-1.15-compat.patch (from rev 202838, xf86-video-intel/trunk/intel-2.21.15-xserver-1.15-compat.patch)
===================================================================
--- staging-x86_64/intel-2.21.15-xserver-1.15-compat.patch	                        (rev 0)
+++ staging-x86_64/intel-2.21.15-xserver-1.15-compat.patch	2013-12-28 14:05:02 UTC (rev 202839)
@@ -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
+

Copied: xf86-video-intel/repos/staging-x86_64/xf86-video-intel.install (from rev 202838, xf86-video-intel/trunk/xf86-video-intel.install)
===================================================================
--- staging-x86_64/xf86-video-intel.install	                        (rev 0)
+++ staging-x86_64/xf86-video-intel.install	2013-12-28 14:05:02 UTC (rev 202839)
@@ -0,0 +1,19 @@
+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
+}
+

More information about the arch-commits mailing list