diff options
Diffstat (limited to 'poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch')
-rw-r--r-- | poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index 61e24c6e9..0064dc643 100644 --- a/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch @@ -1,7 +1,7 @@ -From 498f230c9446fc7a1b4dc77ff6b84ee1a3b53bf4 Mon Sep 17 00:00:00 2001 +From da6b9188f29942684d4262f0c6264d09bb6fe7de Mon Sep 17 00:00:00 2001 From: Fabio Berton <fabio.berton@ossystems.com.br> -Date: Wed, 24 Apr 2019 17:01:24 -0300 -Subject: [PATCH] meson.build: check for all linux host_os combinations +Date: Wed, 12 Jun 2019 13:40:20 -0300 +Subject: [PATCH 1/3] meson.build: check for all linux host_os combinations Organization: O.S. Systems Software LTDA. Make sure that we are also looking for our host_os combinations like @@ -9,6 +9,8 @@ linux-musl etc. when assuming support for DRM/KMS. Also delete a duplicate line. +Upstream-Status: Pending + Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> --- @@ -16,7 +18,7 @@ Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build -index 53d02e31097..c41f6b4e402 100644 +index 8ab8a550f56..e11880f2902 100644 --- a/meson.build +++ b/meson.build @@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp') @@ -28,16 +30,16 @@ index 53d02e31097..c41f6b4e402 100644 # Arguments for the preprocessor, put these in a separate array from the C and # C++ (cpp in meson terminology) arguments since they need to be added to the # default arguments for both C and C++. -@@ -89,8 +91,6 @@ if (with_gles1 or with_gles2) and not with_opengl - error('building OpenGL ES without OpenGL is not supported.') - endif +@@ -107,8 +109,6 @@ 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 = get_option('shared-glapi') and with_any_opengl -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) - - _drivers = get_option('dri-drivers') - if _drivers.contains('auto') + dri_drivers = get_option('dri-drivers') + if dri_drivers.contains('auto') if system_has_kms_drm -@@ -792,7 +792,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', +@@ -836,7 +836,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', endif # TODO: this is very incomplete @@ -47,5 +49,5 @@ index 53d02e31097..c41f6b4e402 100644 endif -- -2.21.0 +2.22.0 |