18.1.3

6 files changed, 47 insertions, 155 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1daa75b85aa6..40e7d53a76df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Sun Apr 29 16:03:50 UTC 2018
+# Sun Jul  1 19:55:57 UTC 2018
 pkgbase = lib32-mesa-noglvnd
-	pkgver = 18.0.2
+	pkgver = 18.1.3
 	pkgrel = 1
 	url = https://www.mesa3d.org/
 	arch = x86_64
@@ -27,18 +27,14 @@ pkgbase = lib32-mesa-noglvnd
 	makedepends = wayland-protocols
 	makedepends = lib32-libva
 	makedepends = meson
-	source = https://mesa.freedesktop.org/archive/mesa-18.0.2.tar.xz
-	source = https://mesa.freedesktop.org/archive/mesa-18.0.2.tar.xz.sig
+	source = https://mesa.freedesktop.org/archive/mesa-18.1.3.tar.xz
+	source = https://mesa.freedesktop.org/archive/mesa-18.1.3.tar.xz.sig
 	source = LICENSE
-	source = 0001-glvnd-fix-gl-dot-pc.patch
-	source = 0004-meson-Add-library-versions-to-swr-drivers.patch
-	source = 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
-	sha512sums = 77d24d01c4c22596d28421aeb74932ff232730a4f556ae1a2e8777ece2876e4e352679575385c065505df4a2a83d2c1cf30db92dcf88038417e36a2768332d7e
+	source = 0001-glvnd-fix-gl.pc.patch
+	sha512sums = f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887
 	sha512sums = SKIP
 	sha512sums = f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7
-	sha512sums = 75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028
-	sha512sums = 0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff
-	sha512sums = d3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf
+	sha512sums = 2f40198eff47664c831c56e8a63f60a4d1b815cf697e6bdb0be39e6d9c5df043857f6264b7cd2ccf46c07626186c565144e80f4214b5f7936ef7024c47201437
 
 pkgname = lib32-vulkan-intel-noglvnd
 	pkgdesc = Intel's Vulkan mesa driver (32-bit) - non-libglvnd version
diff --git a/0001-glvnd-fix-gl-dot-pc.patch b/0001-glvnd-fix-gl-dot-pc.patch
deleted file mode 100644
index 68118f45efe8..000000000000
--- a/0001-glvnd-fix-gl-dot-pc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
---- mesa-12.0.3/src/mesa/gl.pc.in.jx	2016-01-18 02:39:26.000000000 -0500
-+++ mesa-12.0.3/src/mesa/gl.pc.in	2016-10-25 13:06:44.013159358 -0400
-@@ -7,7 +7,7 @@ Name: gl
- Description: Mesa OpenGL library
- Requires.private: @GL_PC_REQ_PRIV@
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -l@GL_LIB@
-+Libs: -L${libdir} -lGL
- Libs.private: @GL_PC_LIB_PRIV@
- Cflags: -I${includedir} @GL_PC_CFLAGS@
- glx_tls: @GLX_TLS@
diff --git a/0001-glvnd-fix-gl.pc.patch b/0001-glvnd-fix-gl.pc.patch
new file mode 100644
index 000000000000..fd4507e2316d
--- /dev/null
+++ b/0001-glvnd-fix-gl.pc.patch
@@ -0,0 +1,26 @@
+From a9554de2a6028540fa12a7ebdab4daf2b46010fa Mon Sep 17 00:00:00 2001
+Message-Id: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com>
+From: Unknown <>
+Date: Tue, 15 May 2018 20:10:53 +0200
+Subject: [PATCH 1/4] glvnd: fix gl.pc
+
+---
+ src/mesa/gl.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
+index 181724b97b..8c7b7da8d7 100644
+--- a/src/mesa/gl.pc.in
++++ b/src/mesa/gl.pc.in
+@@ -7,7 +7,7 @@ Name: gl
+ Description: Mesa OpenGL library
+ Requires.private: @GL_PC_REQ_PRIV@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -l@GL_LIB@
++Libs: -L${libdir} -lGL
+ Libs.private: @GL_PC_LIB_PRIV@
+ Cflags: -I${includedir} @GL_PC_CFLAGS@
+ glx_tls: @GLX_TLS@
+-- 
+2.17.0
+
diff --git a/0004-meson-Add-library-versions-to-swr-drivers.patch b/0004-meson-Add-library-versions-to-swr-drivers.patch
deleted file mode 100644
index b9ae485dfc30..000000000000
--- a/0004-meson-Add-library-versions-to-swr-drivers.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From cd56731b2c63532d6ed97f7b39afa5977936b3bc Mon Sep 17 00:00:00 2001
-Message-Id: <cd56731b2c63532d6ed97f7b39afa5977936b3bc.1523725229.git.jan.steffens@gmail.com>
-In-Reply-To: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steffens@gmail.com>
-References: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steffens@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sat, 14 Apr 2018 18:43:23 +0200
-Subject: [PATCH 4/5] meson: Add library versions to swr drivers
-
-This is for parity with autotools.
-
-Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
----
- src/gallium/drivers/swr/meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
-index 43e1c5cc50..a6dbd7a3f6 100644
---- a/src/gallium/drivers/swr/meson.build
-+++ b/src/gallium/drivers/swr/meson.build
-@@ -198,6 +198,7 @@ if with_swr_arches.contains('avx')
-     link_args : [ld_args_gc_sections],
-     include_directories : [swr_incs],
-     dependencies : [dep_thread, dep_llvm],
-+    version : '0.0.0',
-     install : true,
-   )
- endif
-@@ -230,6 +231,7 @@ if with_swr_arches.contains('avx2')
-     link_args : [ld_args_gc_sections],
-     include_directories : [swr_incs],
-     dependencies : [dep_thread, dep_llvm],
-+    version : '0.0.0',
-     install : true,
-   )
- endif
-@@ -257,30 +259,32 @@ if with_swr_arches.contains('knl')
-     link_args : [ld_args_gc_sections],
-     include_directories : [swr_incs],
-     dependencies : [dep_thread, dep_llvm],
-+    version : '0.0.0',
-     install : true,
-   )
- endif
- 
- if with_swr_arches.contains('skx')
-   swr_skx_args = cpp.first_supported_argument(
-     '-target-cpu=x86-skylake', '-march=skylake-avx512', '-xCORE-AVX512',
-     prefix : '''
-       #if !defined(__AVX512F__) || !defined(__AVX512BW__)
-       # error
-       #endif ''',
-   )
-   if swr_skx_args == []
-     error('Cannot find SKX support for swr.')
-   endif
- 
-   swr_arch_defines += '-DHAVE_SWR_SKX'
-   swr_arch_libs += shared_library(
-     'swrSKX',
-     [files_swr_common, files_swr_arch],
-     cpp_args : [swr_cpp_args, swr_skx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512'],
-     link_args : [ld_args_gc_sections],
-     include_directories : [swr_incs],
-     dependencies : [dep_thread, dep_llvm],
-+    version : '0.0.0',
-     install : true,
-   )
- endif
--- 
-2.16.2
-
diff --git a/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch b/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
deleted file mode 100644
index de93fc31afff..000000000000
--- a/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 064f328419936a8a5df2b0474ae76196d92e6fa0 Mon Sep 17 00:00:00 2001
-Message-Id: <064f328419936a8a5df2b0474ae76196d92e6fa0.1523725229.git.jan.steffens@gmail.com>
-In-Reply-To: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steffens@gmail.com>
-References: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steffens@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sat, 14 Apr 2018 18:49:14 +0200
-Subject: [PATCH 5/5] meson: Version libMesaOpenCL like autotools does
-
-This is for parity with autotools. It names the library
-libMesaOpenCL.so.1.0.0 and points mesa.icd to the .1 symlink.
-
-opencl_version now matches configure.ac's OPENCL_VERSION.
-
-Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
----
- src/gallium/targets/opencl/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
-index bebe0547d4..317ad8dab4 100644
---- a/src/gallium/targets/opencl/meson.build
-+++ b/src/gallium/targets/opencl/meson.build
-@@ -20,7 +20,7 @@
- 
- opencl_link_args = []
- opencl_link_deps = []
--opencl_version = '1.0'
-+opencl_version = '1'
- 
- if with_ld_version_script
-   opencl_link_args += [
-@@ -55,7 +55,7 @@ libopencl = shared_library(
-     cpp.find_library('clangLex', dirs : llvm_libdir),
-     cpp.find_library('clangBasic', dirs : llvm_libdir),
-   ],
--  version : opencl_version,
-+  version : '@0@.0.0'.format(opencl_version),
-   install : true,
- )
- 
--- 
-2.16.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 6efcc4cd4296..5314c220cb5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=lib32-mesa-noglvnd
 pkgname=('lib32-vulkan-intel-noglvnd' 'lib32-vulkan-radeon-noglvnd' 'lib32-libva-mesa-driver-noglvnd' 'lib32-mesa-vdpau-noglvnd' 'lib32-mesa-noglvnd' 'lib32-mesa-libgl-noglvnd')
-pkgver=18.0.2
+pkgver=18.1.3
 pkgrel=1
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
@@ -16,29 +16,23 @@ url="https://www.mesa3d.org/"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
-        0001-glvnd-fix-gl-dot-pc.patch
-        0004-meson-Add-library-versions-to-swr-drivers.patch
-        0005-meson-Version-libMesaOpenCL-like-autotools-does.patch)
-sha512sums=('77d24d01c4c22596d28421aeb74932ff232730a4f556ae1a2e8777ece2876e4e352679575385c065505df4a2a83d2c1cf30db92dcf88038417e36a2768332d7e'
+        0001-glvnd-fix-gl.pc.patch)
+sha512sums=('f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887'
             'SKIP'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
-            '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
-            '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff'
-            'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf')
+            '2f40198eff47664c831c56e8a63f60a4d1b815cf697e6bdb0be39e6d9c5df043857f6264b7cd2ccf46c07626186c565144e80f4214b5f7936ef7024c47201437')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov@gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty@igalia.com>
-              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
+              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
+              'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <jasuarez@igalia.com>
+              '71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker <dylan@pnwbakers.com>
 
 prepare() {
   cd mesa-${pkgver}
 
   # glvnd support patches - from Fedora
   # non-upstreamed ones
-  patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch
-
-  # Upstreamed meson fixes
-  patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch
-  patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
+  patch -Np1 -i ../0001-glvnd-fix-gl.pc.patch
 }
 
 build() {
@@ -53,14 +47,14 @@ build() {
     -D b_ndebug=true \
     -D platforms=x11,wayland,drm,surfaceless \
     -D dri-drivers=i915,i965,r100,r200,nouveau \
-    -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr \
+    -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast \
     -D vulkan-drivers=amd,intel \
     -D swr-arches=avx,avx2 \
     -D dri3=true \
     -D egl=true \
     -D gallium-extra-hud=true \
     -D gallium-nine=true \
-    -D gallium-omx=false \
+    -D gallium-omx=disabled \
     -D gallium-opencl=disabled \
     -D gallium-va=true \
     -D gallium-vdpau=true \
@@ -165,13 +159,15 @@ package_lib32-mesa-noglvnd() {
   _install fakeinstall/usr/lib32/d3d
   _install fakeinstall/usr/lib32/lib{gbm,glapi}.so*
   _install fakeinstall/usr/lib32/libOSMesa.so*
-  _install fakeinstall/usr/lib32/libwayland*.so*
   _install fakeinstall/usr/lib32/libxatracker.so*
-  _install fakeinstall/usr/lib32/libswrAVX*.so*
 
 #   # in libglvnd
 #   rm -v fakeinstall/usr/lib32/libGLESv{1_CM,2}.so*
 
+  # in wayland
+  rm -v fakeinstall/usr/lib32/libwayland-egl.so*
+  rm -v fakeinstall/usr/lib32/pkgconfig/wayland-egl.pc
+
   install -m755 -d ${pkgdir}/usr/lib32/mesa
   # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
   mv -v ${srcdir}/fakeinstall/usr/lib32/libGL.so*    ${pkgdir}/usr/lib32/mesa/