Date: Saturday, April 14, 2018 @ 17:26:29
  Author: heftig
Revision: 321804

Use upstreamed patches

Added:
  mesa/trunk/0001-meson-fix-megadriver-symlinking.patch
    (from rev 321803, mesa/trunk/fix-install.diff)
  mesa/trunk/0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
    (from rev 321801, mesa/trunk/fix-versions.diff)
  mesa/trunk/0003-meson-Define-NDEBUG-for-non-debug-builds.patch
    (from rev 321803, mesa/trunk/ndebug.diff)
  mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch
    (from rev 321803, mesa/trunk/fix-versions.diff)
  mesa/trunk/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
    (from rev 321801, mesa/trunk/fix-versions.diff)
Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/fix-install.diff
  mesa/trunk/fix-versions.diff
  mesa/trunk/ndebug.diff

-------------------------------------------------------------+
 0001-meson-fix-megadriver-symlinking.patch                  |   34 ++++
 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch |   59 +++++++
 0003-meson-Define-NDEBUG-for-non-debug-builds.patch         |   34 ++++
 0004-meson-Add-library-versions-to-swr-drivers.patch        |   71 +++++++++
 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch  |   43 +++++
 PKGBUILD                                                    |   33 ++--
 fix-install.diff                                            |   29 ---
 fix-versions.diff                                           |   74 ----------
 ndebug.diff                                                 |   13 -
 9 files changed, 257 insertions(+), 133 deletions(-)

Copied: mesa/trunk/0001-meson-fix-megadriver-symlinking.patch (from rev 321803, 
mesa/trunk/fix-install.diff)
===================================================================
--- 0001-meson-fix-megadriver-symlinking.patch                          (rev 0)
+++ 0001-meson-fix-megadriver-symlinking.patch  2018-04-14 17:26:29 UTC (rev 
321804)
@@ -0,0 +1,34 @@
+From ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd Mon Sep 17 00:00:00 2001
+Message-Id: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+From: Dylan Baker <dy...@pnwbakers.com>
+Date: Wed, 4 Apr 2018 10:23:02 -0700
+Subject: [PATCH 1/5] meson: fix megadriver symlinking
+
+Which should be relative instead of absolute.
+
+Fixes: f7f1b30f81e842db6057591470ce3cb6d4fb2795
+       ("meson: extend install_megadrivers script to handle symmlinking")
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105567
+Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
+Reviewed-and-Tested-by: Eric Engestrom <eric.engest...@imgtec.com>
+Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
+---
+ bin/install_megadrivers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
+index 86bfa35918..7931a544bd 100755
+--- a/bin/install_megadrivers.py
++++ b/bin/install_megadrivers.py
+@@ -58,7 +58,7 @@ def main():
+             while ext != '.so':
+                 if os.path.exists(name):
+                     os.unlink(name)
+-                os.symlink(driver, name)
++                os.symlink(each, name)
+                 name, ext = os.path.splitext(name)
+         finally:
+             os.chdir(ret)
+-- 
+2.16.2
+

Copied: mesa/trunk/0002-meson-Set-.so-version-for-xa-like-autotools-does.patch 
(from rev 321801, mesa/trunk/fix-versions.diff)
===================================================================
--- 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch                 
        (rev 0)
+++ 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch 2018-04-14 
17:26:29 UTC (rev 321804)
@@ -0,0 +1,59 @@
+From bc13bd64008dc32586a0b4d41189b74a2ab27265 Mon Sep 17 00:00:00 2001
+Message-Id: 
<bc13bd64008dc32586a0b4d41189b74a2ab27265.1523725229.git.jan.steff...@gmail.com>
+In-Reply-To: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+References: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+From: Dylan Baker <dy...@pnwbakers.com>
+Date: Wed, 4 Apr 2018 10:53:16 -0700
+Subject: [PATCH 2/5] meson: Set .so version for xa like autotools does
+
+Fixes: 0ba909f0f111824223bc38563d1a6bc73e69c2cc
+       ("meson: build gallium xa state tracker")
+Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
+Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
+Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
+---
+ src/gallium/targets/xa/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/targets/xa/meson.build 
b/src/gallium/targets/xa/meson.build
+index ea6e1296da..733ef54ff8 100644
+--- a/src/gallium/targets/xa/meson.build
++++ b/src/gallium/targets/xa/meson.build
+@@ -30,31 +30,33 @@ if with_ld_version_script
+   xa_link_depends += files('xa.sym')
+ endif
+ 
++_xa_version = '.'.join(xa_version)
+ 
+ libxatracker = shared_library(
+   'xatracker',
+   'target.c',
+   c_args : c_vis_args,
+   cpp_args : cpp_vis_args,
+   link_args : [xa_link_args, ld_args_gc_sections],
+   include_directories : [
+     inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+   ],
+   link_whole : [libxa_st],
+   link_with : [
+     libgalliumvl_stub, libgallium, libmesa_util, libpipe_loader_static,
+     libws_null, libwsw, libswdri, libswkmsdri,
+   ],
+   link_depends : xa_link_depends,
+   dependencies : [
+     dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno,
+   ],
++  version : _xa_version,
+   install : true,
+ )
+ 
+ pkg.generate(
+   name : 'xatracker',
+   description : 'Xorg gallium3D acceleration library',
+-  version : '.'.join(xa_version),
++  version : _xa_version,
+   libraries : libxatracker,
+ )
+-- 
+2.16.2
+

Copied: mesa/trunk/0003-meson-Define-NDEBUG-for-non-debug-builds.patch (from 
rev 321803, mesa/trunk/ndebug.diff)
===================================================================
--- 0003-meson-Define-NDEBUG-for-non-debug-builds.patch                         
(rev 0)
+++ 0003-meson-Define-NDEBUG-for-non-debug-builds.patch 2018-04-14 17:26:29 UTC 
(rev 321804)
@@ -0,0 +1,34 @@
+From 8ea7fb2d833e673a13488a9a5301c906b781fc04 Mon Sep 17 00:00:00 2001
+Message-Id: 
<8ea7fb2d833e673a13488a9a5301c906b781fc04.1523725229.git.jan.steff...@gmail.com>
+In-Reply-To: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+References: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
+Date: Sat, 14 Apr 2018 18:32:44 +0200
+Subject: [PATCH 3/5] meson: Define NDEBUG for non-debug-builds
+
+This is for parity with autotools. We were suddenly getting assertion
+failures after switching to meson, see [1].
+
+[1]: https://bugs.archlinux.org/task/58218
+
+Signed-off-by: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index bc1905178d..41a5a0c2ba 100644
+--- a/meson.build
++++ b/meson.build
+@@ -646,6 +646,8 @@ endif
+ # Define DEBUG for debug builds only (debugoptimized is not included on this 
one)
+ if get_option('buildtype') == 'debug'
+   pre_args += '-DDEBUG'
++else
++  pre_args += '-DNDEBUG'
+ endif
+ 
+ if get_option('shader-cache')
+-- 
+2.16.2
+

Copied: mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch (from 
rev 321803, mesa/trunk/fix-versions.diff)
===================================================================
--- 0004-meson-Add-library-versions-to-swr-drivers.patch                        
        (rev 0)
+++ 0004-meson-Add-library-versions-to-swr-drivers.patch        2018-04-14 
17:26:29 UTC (rev 321804)
@@ -0,0 +1,71 @@
+From cd56731b2c63532d6ed97f7b39afa5977936b3bc Mon Sep 17 00:00:00 2001
+Message-Id: 
<cd56731b2c63532d6ed97f7b39afa5977936b3bc.1523725229.git.jan.steff...@gmail.com>
+In-Reply-To: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+References: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@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.steff...@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
+

Copied: mesa/trunk/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch 
(from rev 321801, mesa/trunk/fix-versions.diff)
===================================================================
--- 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch                  
        (rev 0)
+++ 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch  2018-04-14 
17:26:29 UTC (rev 321804)
@@ -0,0 +1,43 @@
+From 064f328419936a8a5df2b0474ae76196d92e6fa0 Mon Sep 17 00:00:00 2001
+Message-Id: 
<064f328419936a8a5df2b0474ae76196d92e6fa0.1523725229.git.jan.steff...@gmail.com>
+In-Reply-To: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+References: 
<ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@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.steff...@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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-04-14 16:38:01 UTC (rev 321803)
+++ PKGBUILD    2018-04-14 17:26:29 UTC (rev 321804)
@@ -18,17 +18,21 @@
         
"meson_get_version.py::https://cgit.freedesktop.org/mesa/mesa/plain/bin/meson_get_version.py?h=mesa-18.0.0";
         LICENSE
         0001-glvnd-fix-gl-dot-pc.patch
-        fix-install.diff
-        fix-versions.diff
-        ndebug.diff)
+        0001-meson-fix-megadriver-symlinking.patch
+        0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
+        0003-meson-Define-NDEBUG-for-non-debug-builds.patch
+        0004-meson-Add-library-versions-to-swr-drivers.patch
+        0005-meson-Version-libMesaOpenCL-like-autotools-does.patch)
 
sha512sums=('1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396'
             'SKIP'
             
'cdc608d7b7de9e6eb6f1b2b4faef4864ac213d379b9dedc7c06e71726c2a1b88a0035d6ec50812a14ba4639e100158c6dff3a1d9456ab36c0a52988287c0d4bd'
             
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
             
'75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
-            
'da32ac3b025282c584bfc962723151b6e11887e59e35086c616a987cb3a471051d60f2b303a91f37106ebb75621cbd9b3f560036f5beb88518cfe9d75c45ee03'
-            
'836f06af6feaa79a16bedd7a136d637b7f16e53d98b8b267554d98b5ff8c3fa45955b9e3ce0b8366d86860194e9147baf0257614fff85a471e2b90bbb3b1f5ab'
-            
'9ca216f8a84e767e4df2d02135004b173cb7905368573402cb8329e8e53101c5b519bf9b74cebfeab9ccd550b6c62c0fc88ec9a9e631023e011bb5634522c034')
+            
'9dc2098f98694fb0f3d0b1d3d8c2bed43a8e6379ee73f6638b691a6823baaa28712ffddbae90d06b9295ae0536aa1091a0415ee72207ec3621acfb72f7d22f32'
+            
'81d374421ba036a45699bc2a84006f5359fe914d25af6c0f23d2a86d1a6a9f61e909faaad11f0191517b4eed7d8dba42fd8c596cffe70b917544d502bf57396b'
+            
'4884ff93eb17c4601f1d03f43848c803cbfb87d131e8e21261e22a0f197e6241a1d4b12b97af6a79ca57b010c8425b1c9544acfa1c19f90a447d5d4b3c6dd69e'
+            
'0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff'
+            
'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov 
<emil.l.veli...@gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez 
<ta...@igalia.com>
               'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio 
Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>"
@@ -40,18 +44,13 @@
   # non-upstreamed ones
   patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch
 
-  # fix symlinks created for vdpau drivers to be relative
-  # this is upstreamable
-  patch -Np1 -i ../fix-install.diff
+  # Upstreamed meson fixes
+  patch -Np1 -i ../0001-meson-fix-megadriver-symlinking.patch
+  patch -Np1 -i ../0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
+  patch -Np1 -i ../0003-meson-Define-NDEBUG-for-non-debug-builds.patch
+  patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch
+  patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
 
-  # fix library versioning
-  # this is upstreamable
-  patch -Np1 -i ../fix-versions.diff
-
-  # define NDEBUG for non-debug builds, like configure does
-  # this is upstreamable
-  patch -Np1 -i ../ndebug.diff
-
   # file missing from tarball
   cp ../meson_get_version.py bin/
 }

Deleted: fix-install.diff
===================================================================
--- fix-install.diff    2018-04-14 16:38:01 UTC (rev 321803)
+++ fix-install.diff    2018-04-14 17:26:29 UTC (rev 321804)
@@ -1,29 +0,0 @@
-diff -u -r mesa/bin/install_megadrivers.py 
mesa-patched/bin/install_megadrivers.py
---- mesa/bin/install_megadrivers.py    2018-03-27 19:35:14.000000000 +0200
-+++ mesa-patched/bin/install_megadrivers.py    2018-03-28 10:27:15.898280592 
+0200
-@@ -50,18 +50,13 @@
-         print('installing {} to {}'.format(args.megadriver, driver))
-         os.link(master, driver)
- 
--        try:
--            ret = os.getcwd()
--            os.chdir(to)
--
--            name, ext = os.path.splitext(each)
--            while ext != '.so':
--                if os.path.exists(name):
--                    os.unlink(name)
--                os.symlink(driver, name)
--                name, ext = os.path.splitext(name)
--        finally:
--            os.chdir(ret)
-+        name, ext = os.path.splitext(each)
-+        while ext != '.so':
-+            symlink = os.path.join(to, name)
-+            if os.path.exists(symlink):
-+                os.unlink(symlink)
-+            os.symlink(each, symlink)
-+            name, ext = os.path.splitext(name)
-     os.unlink(master)
- 
- 

Deleted: fix-versions.diff
===================================================================
--- fix-versions.diff   2018-04-14 16:38:01 UTC (rev 321803)
+++ fix-versions.diff   2018-04-14 17:26:29 UTC (rev 321804)
@@ -1,74 +0,0 @@
-diff -u -r mesa/src/gallium/drivers/swr/meson.build 
mesa-patched/src/gallium/drivers/swr/meson.build
---- mesa/src/gallium/drivers/swr/meson.build   2018-03-27 19:35:15.000000000 
+0200
-+++ mesa-patched/src/gallium/drivers/swr/meson.build   2018-03-28 
11:27:05.025710444 +0200
-@@ -198,6 +198,7 @@
-     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 @@
-     link_args : [ld_args_gc_sections],
-     include_directories : [swr_incs],
-     dependencies : [dep_thread, dep_llvm],
-+    version : '0.0.0',
-     install : true,
-   )
- endif
-@@ -257,6 +259,7 @@
-     link_args : [ld_args_gc_sections],
-     include_directories : [swr_incs],
-     dependencies : [dep_thread, dep_llvm],
-+    version : '0.0.0',
-     install : true,
-   )
- endif
-@@ -281,6 +284,7 @@
-     link_args : [ld_args_gc_sections],
-     include_directories : [swr_incs],
-     dependencies : [dep_thread, dep_llvm],
-+    version : '0.0.0',
-     install : true,
-   )
- endif
-diff -u -r mesa/src/gallium/targets/opencl/meson.build 
mesa-patched/src/gallium/targets/opencl/meson.build
---- mesa/src/gallium/targets/opencl/meson.build        2018-03-27 
19:35:15.000000000 +0200
-+++ mesa-patched/src/gallium/targets/opencl/meson.build        2018-03-28 
11:28:56.345996522 +0200
-@@ -20,7 +20,6 @@
- 
- opencl_link_args = []
- opencl_link_deps = []
--opencl_version = '1.0'
- 
- if with_ld_version_script
-   opencl_link_args += [
-@@ -55,14 +54,14 @@
-     cpp.find_library('clangLex', dirs : llvm_libdir),
-     cpp.find_library('clangBasic', dirs : llvm_libdir),
-   ],
--  version : opencl_version,
-+  version : '1.0.0',
-   install : true,
- )
- 
- if with_opencl_icd
-   _config = configuration_data()
-   _config.set('OPENCL_LIBNAME', 'MesaOpenCL')
--  _config.set('OPENCL_VERSION', opencl_version)
-+  _config.set('OPENCL_VERSION', '1')
-   configure_file(
-     configuration : _config,
-     input : 'mesa.icd.in',
-diff -u -r mesa/src/gallium/targets/xa/meson.build 
mesa-patched/src/gallium/targets/xa/meson.build
---- mesa/src/gallium/targets/xa/meson.build    2018-03-27 19:35:15.000000000 
+0200
-+++ mesa-patched/src/gallium/targets/xa/meson.build    2018-03-28 
11:10:32.110287167 +0200
-@@ -49,6 +49,7 @@
-   dependencies : [
-     dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno,
-   ],
-+  version : '2.3.0',
-   install : true,
- )
- 

Deleted: ndebug.diff
===================================================================
--- ndebug.diff 2018-04-14 16:38:01 UTC (rev 321803)
+++ ndebug.diff 2018-04-14 17:26:29 UTC (rev 321804)
@@ -1,13 +0,0 @@
-diff --git i/meson.build w/meson.build
-index a4dfa62255..931e0389e6 100644
---- i/meson.build
-+++ w/meson.build
-@@ -705,6 +705,8 @@ endif
- # Define DEBUG for debug builds only (debugoptimized is not included on this 
one)
- if get_option('buildtype') == 'debug'
-   pre_args += '-DDEBUG'
-+else
-+  pre_args += '-DNDEBUG'
- endif
- 
- if get_option('shader-cache')

Reply via email to