diff options
| author | Roman Stratiienko <r.stratiienko@gmail.com> | 2022-11-28 12:21:06 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-11-30 09:16:13 -0800 |
| commit | 5ff1f429c32fd023542566fcc0d32dd2e3845b3b (patch) | |
| tree | d647d99432e6dc77deab16495262357476da90c6 | |
| parent | ab71151624c8d8bb68c06dc2862cf40411f85099 (diff) | |
| download | mesa-staging/22.2.tar.gz | |
meson: Enable system_has_kms_drm for androidstaging/22.2
This allows to build libgbm when system = 'android' is set in
the cross_file.
Cc: "22.3" "22.2" mesa-stable
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Acked-by: Mauro Rossi <issor.oruam@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20033>
(cherry picked from commit 09ac29cca9bf7978911f81bcfce12ce71c260a97)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 9a60d5515d4..b8ad68c5561 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -256,7 +256,7 @@ "description": "meson: Enable system_has_kms_drm for android", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/meson.build b/meson.build index f85650bccea..9559dd2ebb1 100644 --- a/meson.build +++ b/meson.build @@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 # Only build shared_glapi if at least one OpenGL API is enabled with_shared_glapi = with_shared_glapi and with_any_opengl -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) dri_drivers = get_option('dri-drivers') if dri_drivers.length() != 0 |