removed lib32-opencl-mesa from provides/conflicts, switch to meson 0.49 --native option so meson will use llvm32-config instead of llvm-config

3 files changed, 13 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd9393634430..32b605adc2d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 19.0.0_devel.105871.d4e7d8b7f0
+	pkgver = 19.0.0_devel.106153.fb88dcf5ca
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -37,22 +37,22 @@ pkgbase = lib32-mesa-git
 	depends = lib32-lm_sensors
 	optdepends = opengl-man-pages: for the OpenGL API man pages
 	provides = lib32-mesa
-	provides = lib32-opencl-mesa
 	provides = lib32-vulkan-intel
 	provides = lib32-vulkan-radeon
 	provides = lib32-libva-mesa-driver
 	provides = lib32-mesa-vdpau
 	provides = lib32-opengl-driver
 	conflicts = lib32-mesa
-	conflicts = lib32-opencl-mesa
 	conflicts = lib32-vulkan-intel
 	conflicts = lib32-vulkan-radeon
 	conflicts = lib32-libva-mesa-driver
 	conflicts = lib32-mesa-vdpau
 	source = mesa::git://anongit.freedesktop.org/mesa/mesa
 	source = LICENSE
+	source = llvm32.native
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
+	sha512sums = c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe
 
 pkgname = lib32-mesa-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 33a3ec91fb2c..83b0bcbc1f20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 pkgbase=lib32-mesa-git
 pkgname=('lib32-mesa-git')
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=19.0.0_devel.105871.d4e7d8b7f0
+pkgver=19.0.0_devel.106153.fb88dcf5ca
 pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -21,16 +21,18 @@ makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
 depends=('mesa-git' 'lib32-gcc-libs' 'lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-elfutils'
            'lib32-llvm-libs-svn' 'lib32-libunwind' 'lib32-lm_sensors')
 optdepends=('opengl-man-pages: for the OpenGL API man pages')
-provides=('lib32-mesa' 'lib32-opencl-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-opengl-driver')
-conflicts=('lib32-mesa' 'lib32-opencl-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau')
+provides=('lib32-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-opengl-driver')
+conflicts=('lib32-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau')
 url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
-               'LICENSE'
+         'LICENSE'
+	'llvm32.native'
 )
 
 sha512sums=('SKIP'
-            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
+            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+            'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe')
 
 
 pkgver() {
@@ -43,15 +45,12 @@ build () {
     export CC="gcc -m32"
     export CXX="g++ -m32"
     export PKG_CONFIG=/usr/bin/pkg-config-32  
-    export LLVM_CONFIG=/usr/bin/llvm-config32
-    # meson doesn't honor LLVM_CONFIG and 0.48.2 has no alternative
-    # 0.49 will probably have one
-    # https://bbs.archlinux.org/viewtopic.php?id=241990
 
       if [  -d _build ]; then
         rm -rf _build
     fi
     meson setup mesa _build \
+	--native-file llvm32.native \
        -D b_ndebug=true \
        -D buildtype=plain \
        --wrap-mode=nofallback \
diff --git a/llvm32.native b/llvm32.native
new file mode 100644
index 000000000000..cb4442fff26e
--- /dev/null
+++ b/llvm32.native
@@ -0,0 +1,2 @@
+[binaries]
+llvm-config = '/usr/bin/llvm-config32'