Mesa (main): Use proper types for meson objects
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Apr 18 10:38:47 UTC 2022
Module: Mesa
Branch: main
Commit: 67af7e2b400fa44191ad682f235af43eac5c3e69
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=67af7e2b400fa44191ad682f235af43eac5c3e69
Author: illiliti <illiliti at protonmail.com>
Date: Fri Apr 1 18:57:13 2022 +0300
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 at gmail.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15715>
---
meson_options.txt | 2 +-
src/amd/drm-shim/meson.build | 2 +-
src/broadcom/drm-shim/meson.build | 6 +++---
src/freedreno/drm-shim/meson.build | 2 +-
src/gallium/drivers/lima/drm-shim/meson.build | 2 +-
src/intel/dev/meson.build | 2 +-
src/intel/tools/meson.build | 2 +-
src/nouveau/drm-shim/meson.build | 2 +-
src/panfrost/drm-shim/meson.build | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/meson_options.txt b/meson_options.txt
index 5baa70d051b..9afe105241f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -357,7 +357,7 @@ option(
option(
'draw-use-llvm',
type : 'boolean',
- value : 'true',
+ value : true,
description : 'Whether to use LLVM for the Gallium draw module, if LLVM is included.'
)
option(
diff --git a/src/amd/drm-shim/meson.build b/src/amd/drm-shim/meson.build
index dd0b86d547b..b7be863bd02 100644
--- a/src/amd/drm-shim/meson.build
+++ b/src/amd/drm-shim/meson.build
@@ -20,7 +20,7 @@
# IN THE SOFTWARE.
libradeon_noop_drm_shim = shared_library(
- ['radeon_noop_drm_shim'],
+ 'radeon_noop_drm_shim',
'radeon_noop_drm_shim.c',
include_directories: [inc_include, inc_src, inc_amd],
dependencies: dep_drm_shim,
diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build
index 8ef4935ab2f..a5636c8827a 100644
--- a/src/broadcom/drm-shim/meson.build
+++ b/src/broadcom/drm-shim/meson.build
@@ -19,7 +19,7 @@
# SOFTWARE.
libvc4_noop_drm_shim = shared_library(
- ['vc4_noop_drm_shim'],
+ 'vc4_noop_drm_shim',
'vc4_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies: dep_drm_shim,
@@ -28,10 +28,10 @@ libvc4_noop_drm_shim = shared_library(
)
libv3d_noop_drm_shim = shared_library(
- ['v3d_noop_drm_shim'],
+ 'v3d_noop_drm_shim',
'v3d_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies: dep_drm_shim,
gnu_symbol_visibility : 'hidden',
install : true,
-)
\ No newline at end of file
+)
diff --git a/src/freedreno/drm-shim/meson.build b/src/freedreno/drm-shim/meson.build
index c5fbbc6d53c..2b4bddbf2ba 100644
--- a/src/freedreno/drm-shim/meson.build
+++ b/src/freedreno/drm-shim/meson.build
@@ -20,7 +20,7 @@
# IN THE SOFTWARE.
libfreedreno_noop_drm_shim = shared_library(
- ['freedreno_noop_drm_shim'],
+ 'freedreno_noop_drm_shim',
'freedreno_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies: dep_drm_shim,
diff --git a/src/gallium/drivers/lima/drm-shim/meson.build b/src/gallium/drivers/lima/drm-shim/meson.build
index a978d3505ba..db1806064bb 100644
--- a/src/gallium/drivers/lima/drm-shim/meson.build
+++ b/src/gallium/drivers/lima/drm-shim/meson.build
@@ -20,7 +20,7 @@
# IN THE SOFTWARE.
liblima_noop_drm_shim = shared_library(
- ['lima_noop_drm_shim'],
+ 'lima_noop_drm_shim',
'lima_noop.c',
include_directories: [inc_include, inc_src],
dependencies: dep_drm_shim,
diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
index 30d31bb52da..e15f45a1e71 100644
--- a/src/intel/dev/meson.build
+++ b/src/intel/dev/meson.build
@@ -30,7 +30,7 @@ files_libintel_dev = files(
)
libintel_dev = static_library(
- ['intel_dev'],
+ 'intel_dev',
[files_libintel_dev, sha1_h],
include_directories : [inc_include, inc_src, inc_intel],
dependencies : [dep_libdrm, idep_mesautil],
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 522737c9a66..0a968e93b8d 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -135,7 +135,7 @@ if with_tools.contains('drm-shim')
)
libintel_stub_gpu = shared_library(
- ['intel_noop_drm_shim'],
+ 'intel_noop_drm_shim',
'intel_noop_drm_shim.c',
include_directories: [inc_include, inc_src, inc_intel],
link_with: libintel_dev,
diff --git a/src/nouveau/drm-shim/meson.build b/src/nouveau/drm-shim/meson.build
index 42d9bfbdc1b..6e2154ae905 100644
--- a/src/nouveau/drm-shim/meson.build
+++ b/src/nouveau/drm-shim/meson.build
@@ -20,7 +20,7 @@
# IN THE SOFTWARE.
libnouveau_noop_drm_shim = shared_library(
- ['nouveau_noop_drm_shim'],
+ 'nouveau_noop_drm_shim',
'nouveau_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies: dep_drm_shim,
diff --git a/src/panfrost/drm-shim/meson.build b/src/panfrost/drm-shim/meson.build
index b6976dffc50..5a922aee557 100644
--- a/src/panfrost/drm-shim/meson.build
+++ b/src/panfrost/drm-shim/meson.build
@@ -20,7 +20,7 @@
# IN THE SOFTWARE.
libpanfrost_noop_drm_shim = shared_library(
- ['panfrost_noop_drm_shim'],
+ 'panfrost_noop_drm_shim',
'panfrost_noop.c',
include_directories: [inc_include, inc_src],
dependencies: dep_drm_shim,
More information about the mesa-commit
mailing list