diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2024-05-16 13:26:28 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-07-17 05:36:14 -0700 |
| commit | 982637c22b78a70a03d129b482adb84ec6fc6b37 (patch) | |
| tree | d49d68ec5dbeb405237ec690b9670abcd36e95c2 | |
| parent | 6f9dd4361d567aa8a73ffbf4646bffa9ae81e919 (diff) | |
| download | poky-982637c22b78a70a03d129b482adb84ec6fc6b37.tar.gz | |
mesa: remove obsolete 0001-meson.build-check-for-all-linux-host_os-combinations.patch
The patch was submitted upstream
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28895
but further investigation revealed that the problem had been solved properly
in meson.class:
https://git.yoctoproject.org/poky/commit/?id=6bf674374d568b2419a4c6eef00d893028878881
(From OE-Core rev: 5dabb17313ed5e4e143708f0c7703cac663e9647)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 020345d63f0ffd3ed2b046bbb5e09b5359b24dd6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 1 |
2 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch deleted file mode 100644 index 7be7d81eeb..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alistair Francis <alistair@alistair23.me> | ||
| 3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 | ||
| 4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | ||
| 5 | |||
| 6 | Make sure that we are also looking for our host_os combinations like | ||
| 7 | linux-musl etc. when assuming support for DRM/KMS. | ||
| 8 | |||
| 9 | Also delete a duplicate line. | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 14 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
| 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 16 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | ||
| 17 | --- | ||
| 18 | meson.build | 4 ++-- | ||
| 19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/meson.build b/meson.build | ||
| 22 | index 133fd9a..817861e 100644 | ||
| 23 | --- a/meson.build | ||
| 24 | +++ b/meson.build | ||
| 25 | @@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 | ||
| 26 | # Only build shared_glapi if at least one OpenGL API is enabled | ||
| 27 | with_shared_glapi = with_shared_glapi and with_any_opengl | ||
| 28 | |||
| 29 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) | ||
| 30 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') | ||
| 31 | |||
| 32 | gallium_drivers = get_option('gallium-drivers') | ||
| 33 | if gallium_drivers.contains('auto') | ||
| 34 | @@ -997,7 +997,7 @@ if cc.has_function('fmemopen') | ||
| 35 | endif | ||
| 36 | |||
| 37 | # TODO: this is very incomplete | ||
| 38 | -if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) | ||
| 39 | +if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') | ||
| 40 | pre_args += '-D_GNU_SOURCE' | ||
| 41 | elif host_machine.system() == 'sunos' | ||
| 42 | pre_args += '-D__EXTENSIONS__' | ||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 77e9c80fcb..a8f3397e04 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
| @@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10 | |||
| 15 | PE = "2" | 15 | PE = "2" |
| 16 | 16 | ||
| 17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | 17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ |
| 18 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ | ||
| 19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 18 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
| 20 | file://0001-drisw-fix-build-without-dri3.patch \ | 19 | file://0001-drisw-fix-build-without-dri3.patch \ |
| 21 | file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ | 20 | file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ |
