2.99.917+847+g25c9a2fc-2

2 files changed, 9 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 581a41e0456f..d42be89a615e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xf86-video-intel-git
 	pkgdesc = X.org Intel i810/i830/i915/945G/G965+ video drivers
 	pkgver = 2.99.917+847+g25c9a2fc
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = https://01.org/linuxgraphics
 	install = xf86-video-intel.install
@@ -28,20 +28,18 @@ pkgbase = xf86-video-intel-git
 	optdepends = libxcursor: for intel-virtual-output
 	optdepends = libxtst: for intel-virtual-output
 	optdepends = libxss: for intel-virtual-output
+	provides = xf86-video-intel
 	provides = xf86-video-intel-uxa
 	provides = xf86-video-intel-sna
-	provides = xf86-video-intel
+	conflicts = xf86-video-intel
 	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
 	conflicts = xf86-video-intel-legacy
-	conflicts = xf86-video-intel
+	replaces = xf86-video-intel
 	replaces = xf86-video-intel-uxa
 	replaces = xf86-video-intel-sna
-	replaces = xf86-video-intel
 	source = xf86-video-intel-git::git+https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git
 	source = 0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index bc4c1518a449..ae9b0db0860b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=xf86-video-intel-git
 _pkgname=xf86-video-intel
 pkgver=2.99.917+847+g25c9a2fc
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=(x86_64)
 url="https://01.org/linuxgraphics"
@@ -23,13 +23,10 @@ optdepends=('libxrandr: 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'
-          "${_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}")
+replaces=("${_pkgname}" 'xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=("${_pkgname}" 'xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=("${_pkgname}" 'xorg-server<1.20' 'xf86-video-intel-sna'
+           'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 groups=('xorg-drivers')
 source=("$pkgname::git+https://gitlab.freedesktop.org/xorg/driver/${_pkgname}.git"
         0001-SNA-fix-PRIME-output-support-since-xserver-1.20.patch)