From eab6a5930f25c398653c91180296aa7c178ac7c6 Mon Sep 17 00:00:00 2001
From: LW-archlinux <lonewolf@xs4all.nl>
Date: Tue, 3 Oct 2017 14:56:06 +0200
Subject: [PATCH] txc_dtn is now integrated in mesa

---
 .SRCINFO |  7 ++++---
 PKGBUILD | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 594f1d4..3470f8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 17.3.0_devel.95834.969537d935
-	pkgrel = 1
+	pkgver = 17.3.0_devel.96241.2d4b57fc3e
+	pkgrel = 2
 	url = http://mesa3d.sourceforge.net
 	arch = x86_64
 	license = custom
@@ -31,7 +31,6 @@ pkgbase = mesa-git
 	depends = libxshmfence
 	depends = libelf
 	depends = libomxil-bellagio
-	depends = libtxc_dxtn
 	depends = llvm-libs-svn
 	depends = libunwind
 	depends = libglvnd
@@ -46,6 +45,7 @@ pkgbase = mesa-git
 	provides = vulkan-driver
 	provides = opencl-driver
 	provides = opengl-driver
+	provides = libtxc_dxtn
 	conflicts = mesa
 	conflicts = opencl-mesa
 	conflicts = vulkan-intel
@@ -53,6 +53,7 @@ pkgbase = mesa-git
 	conflicts = libva-mesa-driver
 	conflicts = mesa-vdpau
 	conflicts = mesa-libgl
+	conflicts = libtxc_dxtn
 	source = mesa::git://anongit.freedesktop.org/mesa/mesa
 	source = LICENSE
 	source = 0001-Fix-linkage-against-shared-glapi.patch
diff --git a/PKGBUILD b/PKGBUILD
index b7c6ef0..48139a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,18 +12,18 @@
 pkgbase=mesa-git
 pkgname=('mesa-git')
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=17.3.0_devel.95834.969537d935
-pkgrel=1
+pkgver=17.3.0_devel.96241.2d4b57fc3e
+pkgrel=2
 arch=('x86_64')
 makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'glproto'
              'dri2proto' 'dri3proto' 'presentproto' 'libxml2' 'libx11' 
              'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio'
              'ocl-icd' 'vulkan-icd-loader' 'libgcrypt' 'wayland-protocols')
 depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
-         'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs-svn' 'libunwind' 'libglvnd')
+         'libomxil-bellagio' 'llvm-libs-svn' 'libunwind' 'libglvnd')
 optdepends=('opengl-man-pages: for the OpenGL API man pages')
-provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl' 'vulkan-driver' 'opencl-driver' 'opengl-driver')
-conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl')
+provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl' 'vulkan-driver' 'opencl-driver' 'opengl-driver' 'libtxc_dxtn')
+conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl' 'libtxc_dxtn')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=('mesa::git://anongit.freedesktop.org/mesa/mesa'