Accepting request 734077 from home:aaronpuchert:llvm-next

- Rebase n_opencl_dep_libclang.patch after update.

OBS-URL: https://build.opensuse.org/request/show/734077
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=879

Mesa-drivers.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 30 11:42:12 UTC 2019 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Rebase n_opencl_dep_libclang.patch after update.
+
 -------------------------------------------------------------------
 Mon Sep 30 09:02:03 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
 

Mesa.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 30 11:42:12 UTC 2019 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Rebase n_opencl_dep_libclang.patch after update.
+
 -------------------------------------------------------------------
 Mon Sep 30 09:02:03 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
 

n_opencl_dep_libclang.patch

@@ -1,4 +1,4 @@
-From 993bc3af95819bb9a4354b7da2ddb7cfe196f90b Mon Sep 17 00:00:00 2001
+From d63e1627c0ead6165f382765ea3b9a4eba6aa8d7 Mon Sep 17 00:00:00 2001
 From: Aaron Puchert <aaronpuchert@alice-dsl.net>
 Date: Wed, 25 Sep 2019 18:34:34 +0000
 Subject: [PATCH] Link with clang-cpp instead of Clang component libraries
@@ -8,17 +8,17 @@ and the component libraries need no longer be packaged [1].
 
 [1] https://releases.llvm.org/9.0.0/tools/clang/docs/ReleaseNotes.html#build-system-changes
 ---
- src/gallium/targets/opencl/meson.build | 13 +------------
+ src/gallium/targets/opencl/meson.build | 14 +-------------
- 1 file changed, 1 insertion(+), 12 deletions(-)
+ 1 file changed, 1 insertion(+), 13 deletions(-)
 
 diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
-index 317ad8dab4a..5fc00390b00 100644
+index 907cc74337d..031d35b9716 100644
 --- a/src/gallium/targets/opencl/meson.build
 +++ b/src/gallium/targets/opencl/meson.build
-@@ -42,18 +42,7 @@ libopencl = shared_library(
+@@ -43,19 +43,7 @@ libopencl = shared_library(
-   link_with : [libpipe_loader_dynamic, libgallium, libmesa_util],
    dependencies : [
-     dep_thread, dep_clock, dep_dl, dep_unwind, dep_elf, dep_expat,
+     idep_mesautil,
+     dep_clock, dep_dl, dep_unwind, dep_elf,
 -    cpp.find_library('clangCodeGen', dirs : llvm_libdir),
 -    cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
 -    cpp.find_library('clangFrontend', dirs : llvm_libdir),
@@ -28,6 +28,7 @@ index 317ad8dab4a..5fc00390b00 100644
 -    cpp.find_library('clangSema', dirs : llvm_libdir),
 -    cpp.find_library('clangAnalysis', dirs : llvm_libdir),
 -    cpp.find_library('clangAST', dirs : llvm_libdir),
+-    cpp.find_library('clangASTMatchers', dirs : llvm_libdir),
 -    cpp.find_library('clangEdit', dirs : llvm_libdir),
 -    cpp.find_library('clangLex', dirs : llvm_libdir),
 -    cpp.find_library('clangBasic', dirs : llvm_libdir),