rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 733402 from home:aaronpuchert:llvm-next

Browse Source 
- n_opencl_dep_libclang.patch
  * Link OpenCL library with libclang-cpp.so instead of the
    component libraries for LLVM >= 9.

OBS-URL: https://build.opensuse.org/request/show/733402
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=865
This commit is contained in:
Stefan Dirsch 2019-09-26 12:26:35 +00:00 committed by Git OBS Bridge
parent b5c9a5fae4
commit f33c67cb49
5 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mesa-drivers.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- n_opencl_dep_libclang.patch
* Link OpenCL library with libclang-cpp.so instead of the
component libraries for LLVM >= 9.
-------------------------------------------------------------------
Wed Sep 25 18:00:45 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

6
Mesa-drivers.spec
View File

@ -125,6 +125,7 @@ Source4: manual-pages.tar.bz2
Source6: %{name}-rpmlintrc
Source7: Mesa.keyring
Patch0: U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch
Patch1: n_opencl_dep_libclang.patch
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
@ -731,6 +732,11 @@ programs against the XA state tracker.
rm -rf docs/README.{VMS,WIN32,OS2}
%patch0 -p1
%if 0%{with_llvm}
%if %{_llvm_sonum} >= 9
%patch1 -p1
%endif
%endif
%patch54 -p1
%patch58 -p1
%patch60 -p1

7
Mesa.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- n_opencl_dep_libclang.patch
* Link OpenCL library with libclang-cpp.so instead of the
component libraries for LLVM >= 9.
-------------------------------------------------------------------
Wed Sep 25 18:00:45 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

6
Mesa.spec
View File

@ -124,6 +124,7 @@ Source4: manual-pages.tar.bz2
Source6: %{name}-rpmlintrc
Source7: Mesa.keyring
Patch0: U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch
Patch1: n_opencl_dep_libclang.patch
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
@ -730,6 +731,11 @@ programs against the XA state tracker.
rm -rf docs/README.{VMS,WIN32,OS2}
%patch0 -p1
%if 0%{with_llvm}
%if %{_llvm_sonum} >= 9
%patch1 -p1
%endif
%endif
%patch54 -p1
%patch58 -p1
%patch60 -p1

40
n_opencl_dep_libclang.patch Normal file
View File

@ -0,0 +1,40 @@
From 993bc3af95819bb9a4354b7da2ddb7cfe196f90b 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
Since LLVM 9, the Clang C++ API is exposed via the new clang-cpp target,
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 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
index 317ad8dab4a..5fc00390b00 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -42,18 +42,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,
- cpp.find_library('clangCodeGen', dirs : llvm_libdir),
- cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
- cpp.find_library('clangFrontend', dirs : llvm_libdir),
- cpp.find_library('clangDriver', dirs : llvm_libdir),
- cpp.find_library('clangSerialization', dirs : llvm_libdir),
- cpp.find_library('clangParse', dirs : llvm_libdir),
- cpp.find_library('clangSema', dirs : llvm_libdir),
- cpp.find_library('clangAnalysis', dirs : llvm_libdir),
- cpp.find_library('clangAST', dirs : llvm_libdir),
- cpp.find_library('clangEdit', dirs : llvm_libdir),
- cpp.find_library('clangLex', dirs : llvm_libdir),
- cpp.find_library('clangBasic', dirs : llvm_libdir),
+ cpp.find_library('clang-cpp', dirs : llvm_libdir),
],
version : '@0@.0.0'.format(opencl_version),
install : true,
--
2.23.0