update to arch version

3 files changed, 103 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc80b5e966f2..38f8d0668285 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,49 @@
-# Generated by mksrcinfo v8
-# Sat Mar 19 03:43:46 UTC 2016
 pkgbase = xf86-video-intel-git
 	pkgdesc = X.org Intel i810/i830/i915/945G/G965+ video drivers
-	pkgver = 2.99.917+560+gd167280
+	pkgver = 2.99.917+747+g028c946d
 	pkgrel = 1
-	url = http://intellinuxgraphics.org/
+	epoch = 1
+	url = https://01.org/linuxgraphics
+	install = xf86-video-intel-git.install
 	arch = i686
 	arch = x86_64
+	groups = xorg-drivers
 	license = custom
-	makedepends = git
 	makedepends = xorg-server-devel
-	makedepends = X-ABI-VIDEODRV_VERSION=20
+	makedepends = X-ABI-VIDEODRV_VERSION=23
 	makedepends = libx11
-	makedepends = xf86driproto
-	makedepends = glproto
-	makedepends = resourceproto
-	makedepends = scrnsaverproto
-	makedepends = mesa
 	makedepends = libxrender
-	depends = intel-dri
+	makedepends = libxrandr
+	makedepends = libxinerama
+	makedepends = libxcursor
+	makedepends = libxtst
+	makedepends = libxss
+	makedepends = git
+	depends = mesa-dri
 	depends = libxvmc
-	depends = libpciaccess
-	depends = libdrm
-	depends = dri2proto
-	depends = xcb-util
-	depends = libxfixes
-	depends = udev
+	depends = pixman
+	depends = xcb-util>=0.3.9
+	optdepends = libxrandr: for intel-virtual-output
+	optdepends = libxinerama: for intel-virtual-output
+	optdepends = libxcursor: for intel-virtual-output
+	optdepends = libxtst: for intel-virtual-output
+	optdepends = libxss: for intel-virtual-output
+	provides = xf86-video-intel-uxa
+	provides = xf86-video-intel-sna
 	provides = xf86-video-intel
+	conflicts = xorg-server<1.19
+	conflicts = X-ABI-VIDEODRV_VERSION<23
+	conflicts = X-ABI-VIDEODRV_VERSION>=24
+	conflicts = xf86-video-intel-sna
+	conflicts = xf86-video-intel-uxa
+	conflicts = xf86-video-i810
+	conflicts = xf86-video-intel-legacy
 	conflicts = xf86-video-intel
+	replaces = xf86-video-intel-uxa
+	replaces = xf86-video-intel-sna
 	replaces = xf86-video-intel
-	options = !libtool
-	options = !strip
-	source = xf86-video-intel-git::git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel
-	sha1sums = SKIP
+	source = xf86-video-intel-git::git://anongit.freedesktop.org/xorg/driver/xf86-video-intel#branch=master
+	sha256sums = SKIP
 
 pkgname = xf86-video-intel-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2129ad771074..de47c8d86dac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,66 @@
-# Maintainer: Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad>
-# Contributor: Marcel Korpel <marcel[dot]korpel[at]gmail>
-# Contributor: Thomas Dziedzic < gostrc [at] gmail >
-# Contributor: breakdown <breakdown[at]archlinux[dot]us>
-# Contributor: fs4000 <matthias_dienstbier[at]yahoo[dot]de>
-# Contributor: William Heinbockel <wheinbockel[at]gmail[dot]com>
-# Contributor: Adrian C. <anrxc..sysphere.org>
+# Maintainer: Yurii Kolesnykov <yurikoles@gmail.com>
+# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel-git
-pkgver=2.99.917+560+gd167280
+_branch=master
+pkgver=2.99.917+747+g028c946d
 pkgrel=1
-
+epoch=1
+arch=(i686 x86_64)
+url="https://01.org/linuxgraphics"
+license=('custom')
+install=$pkgname.install
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-url="http://intellinuxgraphics.org/"
-arch=("i686" "x86_64")
-license=("custom")
-
-depends=("intel-dri" "libxvmc" "libpciaccess" "libdrm" "dri2proto" "xcb-util" "libxfixes" "udev")
-makedepends=("git" "xorg-server-devel" "X-ABI-VIDEODRV_VERSION=20" "libx11"
-             "xf86driproto" "glproto" "resourceproto" "scrnsaverproto" "mesa" "libxrender")
-provides=("xf86-video-intel")
-conflicts=("xf86-video-intel")
-replaces=("xf86-video-intel")
-
-options=("!libtool" "!strip")
-source=($pkgname::git://anongit.freedesktop.org/git/xorg/driver/${pkgname%-git})
-sha1sums=('SKIP')
+depends=('mesa-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'libx11' 'libxrender'
+             # additional deps for intel-virtual-output
+             'libxrandr' 'libxinerama' 'libxcursor' 'libxtst' 'libxss'
+             # additional for git snapshot
+             'git')
+optdepends=('libxrandr: for intel-virtual-output'
+            'libxinerama: for intel-virtual-output'
+            'libxcursor: for intel-virtual-output'
+            'libxtst: for intel-virtual-output'
+            'libxss: for intel-virtual-output')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna' 'xf86-video-intel')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna' 'xf86-video-intel')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24'
+           'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy'
+           'xf86-video-intel')
+groups=('xorg-drivers')
+#source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+source=("$pkgname::git://anongit.freedesktop.org/xorg/driver/xf86-video-intel#branch=${_branch}")
+sha256sums=('SKIP')
 
 pkgver() {
-    cd "$pkgname"
-    git describe --always | sed 's|-|.|g'
+  cd $pkgname
+  git describe --long | sed 's/-/+/g'
 }
 
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-    cd "$pkgname"
-    ./autogen.sh --prefix=/usr \
-		 --enable-xvmc \
-		 --enable-sna
-    # --enable-glamor
-    # --enable-kms-only
-    make
+  cd $pkgname
+  ./configure --prefix=/usr \
+    --libexecdir=/usr/lib \
+    --with-default-dri=3
+  make
 }
 
 check() {
-    cd "$pkgname"
-    make check
+  cd $pkgname
+  make check
 }
 
-package () {
-    cd "$pkgname"
-    make DESTDIR="$pkgdir" install
+package() {
+  cd $pkgname
+
+  make DESTDIR="${pkgdir}" install
 
-    install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/xf86-video-intel-git.install b/xf86-video-intel-git.install
new file mode 100644
index 000000000000..1d31abe541a7
--- /dev/null
+++ b/xf86-video-intel-git.install
@@ -0,0 +1,21 @@
+post_install() {
+  cat <<MSG
+>>> This driver now uses DRI3 as the default Direct Rendering
+    Infrastructure. You can try falling back to DRI2 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      "DRI" "2"             # DRI3 is now default 
+        #Option      "AccelMethod"  "sna" # default
+        #Option      "AccelMethod"  "uxa" # fallback
+      EndSection
+MSG
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 1:2.99.917+684+g6988b87-3) < 0 )); then
+    post_install
+  fi
+}