zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Patch missing gl symbols in OSMesa (#11518)

Browse Source
This commit is contained in:
Chuck Atkins 2019-05-20 22:41:41 -04:00 committed by GitHub
parent d1ea5ba2cd
commit a34142ed30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
var/spack/repos/builtin/packages/mesa/meson-expose-glapi-through-osmesa.patch Normal file
View File

@ -0,0 +1,45 @@
commit ccb8ea7acfb710c6c5298f3ffcadbe3d79b9b913
Author: Eric Engestrom <eric.engestrom@intel.com>
Date: Thu May 2 12:42:48 2019 +0100
meson: expose glapi through osmesa
Suggested-by: Pierre Guillou <pierre.guillou@lip6.fr>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109659
Fixes: f121a669c7d94d2ff672 "meson: build gallium based osmesa"
Fixes: cbbd5bb889a2c271a504 "meson: build classic osmesa"
Cc: Brian Paul <brianp@vmware.com>
Cc: Dylan Baker <dylan@pnwbakers.com>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Tested-by: Chuck Atkins <chuck.atkins@kitware.com>
diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
index b4ae8f4..e873e31 100644
--- a/src/gallium/targets/osmesa/meson.build
+++ b/src/gallium/targets/osmesa/meson.build
@@ -43,9 +43,9 @@ libosmesa = shared_library(
inc_gallium_drivers,
],
link_depends : osmesa_link_deps,
- link_whole : [libosmesa_st],
+ link_whole : [libosmesa_st, libglapi_static],
link_with : [
- libmesa_gallium, libgallium, libglapi_static, libws_null, osmesa_link_with,
+ libmesa_gallium, libgallium, libws_null, osmesa_link_with,
],
dependencies : [
dep_selinux, dep_thread, dep_clock, dep_unwind,
diff --git a/src/mesa/drivers/osmesa/meson.build b/src/mesa/drivers/osmesa/meson.build
index a406bb3..c479b74 100644
--- a/src/mesa/drivers/osmesa/meson.build
+++ b/src/mesa/drivers/osmesa/meson.build
@@ -33,7 +33,8 @@ libosmesa = shared_library(
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux,
],
- link_with : [libmesa_classic, libglapi_static, osmesa_link_with],
+ link_whole : libglapi_static,
+ link_with : [libmesa_classic, osmesa_link_with],
dependencies : [dep_thread, dep_selinux],
version : '8.0.0',
install : true,

4
var/spack/repos/builtin/packages/mesa/package.py
View File

@ -82,6 +82,10 @@ class Mesa(MesonPackage):
# Was included in the upstream patch release for 19.0.4
patch('glproto-mr806.patch', when='@19.0.0:19.0.3')
# Fix missing gl symbols in OSMesa
# https://bugs.freedesktop.org/show_bug.cgi?id=109659
patch('meson-expose-glapi-through-osmesa.patch', when='@19.0.0:')
def meson_args(self):
spec = self.spec
args = [