KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use proper types for meson objects 

Fix invalid usage of meson objects which violates official meson
specification and thus breaks muon, an implementation of meson
written in C.

Reviewed-by: Mihai Preda <mhpreda@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15715>
This commit is contained in:
illiliti 2022-04-01 18:57:13 +03:00
parent ed7d831525
commit 67af7e2b40
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson_options.txt
View File

@ -357,7 +357,7 @@ option(
option( option(
'draw-use-llvm', 'draw-use-llvm',
type : 'boolean', type : 'boolean',
value : 'true', value : true,
description : 'Whether to use LLVM for the Gallium draw module, if LLVM is included.' description : 'Whether to use LLVM for the Gallium draw module, if LLVM is included.'
) )
option( option(

2
src/amd/drm-shim/meson.build
View File

@ -20,7 +20,7 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
libradeon_noop_drm_shim = shared_library( libradeon_noop_drm_shim = shared_library(
['radeon_noop_drm_shim'], 'radeon_noop_drm_shim',
'radeon_noop_drm_shim.c', 'radeon_noop_drm_shim.c',
include_directories: [inc_include, inc_src, inc_amd], include_directories: [inc_include, inc_src, inc_amd],
dependencies: dep_drm_shim, dependencies: dep_drm_shim,

6
src/broadcom/drm-shim/meson.build
View File

@ -19,7 +19,7 @@
# SOFTWARE. # SOFTWARE.
libvc4_noop_drm_shim = shared_library( libvc4_noop_drm_shim = shared_library(
['vc4_noop_drm_shim'], 'vc4_noop_drm_shim',
'vc4_noop.c', 'vc4_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies: dep_drm_shim, dependencies: dep_drm_shim,
@ -28,10 +28,10 @@ libvc4_noop_drm_shim = shared_library(
) )
libv3d_noop_drm_shim = shared_library( libv3d_noop_drm_shim = shared_library(
['v3d_noop_drm_shim'], 'v3d_noop_drm_shim',
'v3d_noop.c', 'v3d_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies: dep_drm_shim, dependencies: dep_drm_shim,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
install : true, install : true,
) )

2
src/freedreno/drm-shim/meson.build
View File

@ -20,7 +20,7 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
libfreedreno_noop_drm_shim = shared_library( libfreedreno_noop_drm_shim = shared_library(
['freedreno_noop_drm_shim'], 'freedreno_noop_drm_shim',
'freedreno_noop.c', 'freedreno_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies: dep_drm_shim, dependencies: dep_drm_shim,

2
src/gallium/drivers/lima/drm-shim/meson.build
View File

@ -20,7 +20,7 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
liblima_noop_drm_shim = shared_library( liblima_noop_drm_shim = shared_library(
['lima_noop_drm_shim'], 'lima_noop_drm_shim',
'lima_noop.c', 'lima_noop.c',
include_directories: [inc_include, inc_src], include_directories: [inc_include, inc_src],
dependencies: dep_drm_shim, dependencies: dep_drm_shim,

2
src/intel/dev/meson.build
View File

@ -30,7 +30,7 @@ files_libintel_dev = files(
) )
libintel_dev = static_library( libintel_dev = static_library(
['intel_dev'], 'intel_dev',
[files_libintel_dev, sha1_h], [files_libintel_dev, sha1_h],
include_directories : [inc_include, inc_src, inc_intel], include_directories : [inc_include, inc_src, inc_intel],
dependencies : [dep_libdrm, idep_mesautil], dependencies : [dep_libdrm, idep_mesautil],

2
src/intel/tools/meson.build
View File

@ -135,7 +135,7 @@ if with_tools.contains('drm-shim')
) )
libintel_stub_gpu = shared_library( libintel_stub_gpu = shared_library(
['intel_noop_drm_shim'], 'intel_noop_drm_shim',
'intel_noop_drm_shim.c', 'intel_noop_drm_shim.c',
include_directories: [inc_include, inc_src, inc_intel], include_directories: [inc_include, inc_src, inc_intel],
link_with: libintel_dev, link_with: libintel_dev,

2
src/nouveau/drm-shim/meson.build
View File

@ -20,7 +20,7 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
libnouveau_noop_drm_shim = shared_library( libnouveau_noop_drm_shim = shared_library(
['nouveau_noop_drm_shim'], 'nouveau_noop_drm_shim',
'nouveau_noop.c', 'nouveau_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies: dep_drm_shim, dependencies: dep_drm_shim,

2
src/panfrost/drm-shim/meson.build
View File

@ -20,7 +20,7 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
libpanfrost_noop_drm_shim = shared_library( libpanfrost_noop_drm_shim = shared_library(
['panfrost_noop_drm_shim'], 'panfrost_noop_drm_shim',
'panfrost_noop.c', 'panfrost_noop.c',
include_directories: [inc_include, inc_src], include_directories: [inc_include, inc_src],
dependencies: dep_drm_shim, dependencies: dep_drm_shim,