new xorg

3 files changed, 46 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ee17be8abf5..9155ec1a0ac2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = xf86-video-intel-git
 	pkgdesc = X.org Intel i810/i830/i915/945G/G965+ video drivers
-	pkgver = 2.99.917+781+gc8990575
+	pkgver = 2.99.917+832+g35947721
 	pkgrel = 1
 	epoch = 1
 	url = https://01.org/linuxgraphics
 	install = xf86-video-intel-git.install
-	arch = i686
 	arch = x86_64
 	groups = xorg-drivers
 	license = custom
 	makedepends = xorg-server-devel
-	makedepends = X-ABI-VIDEODRV_VERSION=23
+	makedepends = X-ABI-VIDEODRV_VERSION=24.0
 	makedepends = libx11
 	makedepends = libxrender
 	makedepends = libxrandr
@@ -32,9 +31,9 @@ pkgbase = xf86-video-intel-git
 	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 = xorg-server<1.20
+	conflicts = X-ABI-VIDEODRV_VERSION<24
+	conflicts = X-ABI-VIDEODRV_VERSION>=25
 	conflicts = xf86-video-intel-sna
 	conflicts = xf86-video-intel-uxa
 	conflicts = xf86-video-i810
diff --git a/PKGBUILD b/PKGBUILD
index 287301eb0511..d7c7373d296a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,28 +5,30 @@
 pkgname=xf86-video-intel-git
 _pkgname=xf86-video-intel
 _branch=master
-pkgver=2.99.917+781+gc8990575
+pkgver=2.99.917+832+g35947721
 pkgrel=1
 epoch=1
-arch=(i686 x86_64)
+arch=(x86_64)
 url="https://01.org/linuxgraphics"
 license=('custom')
 install=$pkgname.install
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 depends=('mesa' 'libxvmc' 'pixman' 'xcb-util>=0.3.9' 'libsystemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'libx11' 'libxrender'
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0' 'libx11' 'libxrender'
              # additional deps for intel-virtual-output
              'libxrandr' 'libxinerama' 'libxcursor' 'libxtst' 'libxss'
              # additional for git snapshot
-             'git')
+             'git') # 'meson' 'valgrind')
 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'
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna'
+          "${_pkgname}")
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna'
+          "${_pkgname}")
+conflicts=('xorg-server<1.20' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy'
            "${_pkgname}")
 groups=('xorg-drivers')
@@ -35,12 +37,15 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
-  git describe --long | sed 's/-/+/g'
+  git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
   cd $pkgname
   NOCONFIGURE=1 ./autogen.sh
+
+
+#  mkdir build
 }
 
 build() {
@@ -57,11 +62,16 @@ build() {
     --libexecdir=/usr/lib \
     --with-default-dri=3
   make
+#  cd build
+#  arch-meson $pkgname build \
+#   -Dwith-default-dri=3
+#  ninja -C build
 }
 
 check() {
   cd $pkgname
   make check
+#  meson test -C build
 }
 
 package() {
@@ -69,6 +79,8 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
+#  DESTDIR="$pkgdir" ninja -C build install
+
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/xf86-video-intel.install b/xf86-video-intel.install
new file mode 100644
index 000000000000..1d31abe541a7
--- /dev/null
+++ b/xf86-video-intel.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
+}