kumquat-buildroot/package/mesa3d/0004-Fix-uClibc-build.patch

70 lines
2.0 KiB
Diff
Raw Normal View History

package/{mesa3d, mesa3d-headers}: bump version to 22.1.3 Release notes for 22.0.x: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000665.html https://lists.freedesktop.org/archives/mesa-announce/2022-March/000667.html https://lists.freedesktop.org/archives/mesa-announce/2022-April/000670.html https://lists.freedesktop.org/archives/mesa-announce/2022-May/000673.html https://www.phoronix.com/scan.php?page=news_item&px=Mesa-22.0-Released Release notes for 22.1.x: https://lists.freedesktop.org/archives/mesa-announce/2022-May/000675.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000678.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000681.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000682.html Removed patch 0006, upstream committed a similar fix: https://cgit.freedesktop.org/mesa/mesa/commit/?h=22.1&id=623ff4ec4295dc67bc0c99ed5336eaae1ad76cc9 While sending upstream the rebased version of patch 0007 it occured that the patched file include/c11_compat.h was removed from the main branch. Instead of keeping care of two different uClibc fixes, both for the 22.1 branch and the main branch, we backport two patches from the main branch: - patch 0007 which removes include/c11_compat.h - patch 0006 which is a pre-requisite of patch 0007 and add an upstreamable patch as 0008. Updated license hash due to upstream commits: https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=8bd0446d00dd1aca3cd81ddddc463738aaf3ce61 https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=d16263cdee95ec48864ad7a0f90275e8a4fd374b Removed all DRI driver options due to upstream removal of all DRI drivers: https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=4d45b280bf9a1c804cea5de4d15c317b6bdebfc5 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=f464871932882003e01e3459c8d126dd975d60f8 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=0cad451f007f366d94e058b7c717b96723a3e6cd https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=cdde031ac2c8124721655532ee6f4149e20e9c61 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-07-07 07:12:57 +02:00
From 09ce52fe375a6fc1ccf51b6b691aaa2c3f53fbd5 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Fri, 3 Jun 2022 16:26:03 +0200
Subject: [PATCH] Fix uClibc build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes build errors with uClibc and gcc-9.3.0:
../src/gallium/drivers/lima/lima_texture.c:47:15: error: expected
declaration specifiers or ... before __builtin_offsetof
47 | static_assert(offsetof(lima_tex_desc, va) == 24,
"lima_tex_desc->va offset isn't 24");
../src/egl/main/egldisplay.c: In function _eglGetNativePlatformFromEnv:
../src/egl/main/egldisplay.c:101:4: error: implicit declaration of
function static_assert [-Werror=implicit-function-declaration] 101 |
static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS,
../src/util/macros.h:74:4: error: implicit declaration of function
static_assert [-Werror=implicit-function-declaration]
74 | static_assert(cond, #cond); \
| ^~~~~~~~~~~~~
Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898
package/{mesa3d, mesa3d-headers}: bump version to 22.1.3 Release notes for 22.0.x: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000665.html https://lists.freedesktop.org/archives/mesa-announce/2022-March/000667.html https://lists.freedesktop.org/archives/mesa-announce/2022-April/000670.html https://lists.freedesktop.org/archives/mesa-announce/2022-May/000673.html https://www.phoronix.com/scan.php?page=news_item&px=Mesa-22.0-Released Release notes for 22.1.x: https://lists.freedesktop.org/archives/mesa-announce/2022-May/000675.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000678.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000681.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000682.html Removed patch 0006, upstream committed a similar fix: https://cgit.freedesktop.org/mesa/mesa/commit/?h=22.1&id=623ff4ec4295dc67bc0c99ed5336eaae1ad76cc9 While sending upstream the rebased version of patch 0007 it occured that the patched file include/c11_compat.h was removed from the main branch. Instead of keeping care of two different uClibc fixes, both for the 22.1 branch and the main branch, we backport two patches from the main branch: - patch 0007 which removes include/c11_compat.h - patch 0006 which is a pre-requisite of patch 0007 and add an upstreamable patch as 0008. Updated license hash due to upstream commits: https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=8bd0446d00dd1aca3cd81ddddc463738aaf3ce61 https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=d16263cdee95ec48864ad7a0f90275e8a4fd374b Removed all DRI driver options due to upstream removal of all DRI drivers: https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=4d45b280bf9a1c804cea5de4d15c317b6bdebfc5 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=f464871932882003e01e3459c8d126dd975d60f8 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=0cad451f007f366d94e058b7c717b96723a3e6cd https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=cdde031ac2c8124721655532ee6f4149e20e9c61 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-07-07 07:12:57 +02:00
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
src/util/compiler.h | 10 ++++++++++
src/util/macros.h | 1 +
package/{mesa3d, mesa3d-headers}: bump version to 22.1.3 Release notes for 22.0.x: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000665.html https://lists.freedesktop.org/archives/mesa-announce/2022-March/000667.html https://lists.freedesktop.org/archives/mesa-announce/2022-April/000670.html https://lists.freedesktop.org/archives/mesa-announce/2022-May/000673.html https://www.phoronix.com/scan.php?page=news_item&px=Mesa-22.0-Released Release notes for 22.1.x: https://lists.freedesktop.org/archives/mesa-announce/2022-May/000675.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000678.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000681.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000682.html Removed patch 0006, upstream committed a similar fix: https://cgit.freedesktop.org/mesa/mesa/commit/?h=22.1&id=623ff4ec4295dc67bc0c99ed5336eaae1ad76cc9 While sending upstream the rebased version of patch 0007 it occured that the patched file include/c11_compat.h was removed from the main branch. Instead of keeping care of two different uClibc fixes, both for the 22.1 branch and the main branch, we backport two patches from the main branch: - patch 0007 which removes include/c11_compat.h - patch 0006 which is a pre-requisite of patch 0007 and add an upstreamable patch as 0008. Updated license hash due to upstream commits: https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=8bd0446d00dd1aca3cd81ddddc463738aaf3ce61 https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=d16263cdee95ec48864ad7a0f90275e8a4fd374b Removed all DRI driver options due to upstream removal of all DRI drivers: https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=4d45b280bf9a1c804cea5de4d15c317b6bdebfc5 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=f464871932882003e01e3459c8d126dd975d60f8 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=0cad451f007f366d94e058b7c717b96723a3e6cd https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=cdde031ac2c8124721655532ee6f4149e20e9c61 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-07-07 07:12:57 +02:00
2 files changed, 11 insertions(+)
diff --git a/src/util/compiler.h b/src/util/compiler.h
index d184ad455af..b5c56807acc 100644
package/{mesa3d, mesa3d-headers}: bump version to 22.1.3 Release notes for 22.0.x: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000665.html https://lists.freedesktop.org/archives/mesa-announce/2022-March/000667.html https://lists.freedesktop.org/archives/mesa-announce/2022-April/000670.html https://lists.freedesktop.org/archives/mesa-announce/2022-May/000673.html https://www.phoronix.com/scan.php?page=news_item&px=Mesa-22.0-Released Release notes for 22.1.x: https://lists.freedesktop.org/archives/mesa-announce/2022-May/000675.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000678.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000681.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000682.html Removed patch 0006, upstream committed a similar fix: https://cgit.freedesktop.org/mesa/mesa/commit/?h=22.1&id=623ff4ec4295dc67bc0c99ed5336eaae1ad76cc9 While sending upstream the rebased version of patch 0007 it occured that the patched file include/c11_compat.h was removed from the main branch. Instead of keeping care of two different uClibc fixes, both for the 22.1 branch and the main branch, we backport two patches from the main branch: - patch 0007 which removes include/c11_compat.h - patch 0006 which is a pre-requisite of patch 0007 and add an upstreamable patch as 0008. Updated license hash due to upstream commits: https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=8bd0446d00dd1aca3cd81ddddc463738aaf3ce61 https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=d16263cdee95ec48864ad7a0f90275e8a4fd374b Removed all DRI driver options due to upstream removal of all DRI drivers: https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=4d45b280bf9a1c804cea5de4d15c317b6bdebfc5 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=f464871932882003e01e3459c8d126dd975d60f8 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=0cad451f007f366d94e058b7c717b96723a3e6cd https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=cdde031ac2c8124721655532ee6f4149e20e9c61 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-07-07 07:12:57 +02:00
--- a/src/util/compiler.h
+++ b/src/util/compiler.h
@@ -36,6 +36,16 @@
#include <assert.h>
+/*
+ * C11 static_assert() macro
+ * assert.h only defines that name for C11 and above
+ */
+#if !defined(__cplusplus)
+#ifndef static_assert
+#define static_assert _Static_assert
+#endif
+#endif
+
#include "util/macros.h"
diff --git a/src/util/macros.h b/src/util/macros.h
index 22b18303826..8f73ee72693 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -27,6 +27,7 @@
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
+#include "util/compiler.h"
/* Compute the size of an array */
#ifndef ARRAY_SIZE
package/{mesa3d, mesa3d-headers}: bump version to 22.1.3 Release notes for 22.0.x: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000665.html https://lists.freedesktop.org/archives/mesa-announce/2022-March/000667.html https://lists.freedesktop.org/archives/mesa-announce/2022-April/000670.html https://lists.freedesktop.org/archives/mesa-announce/2022-May/000673.html https://www.phoronix.com/scan.php?page=news_item&px=Mesa-22.0-Released Release notes for 22.1.x: https://lists.freedesktop.org/archives/mesa-announce/2022-May/000675.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000678.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000681.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000682.html Removed patch 0006, upstream committed a similar fix: https://cgit.freedesktop.org/mesa/mesa/commit/?h=22.1&id=623ff4ec4295dc67bc0c99ed5336eaae1ad76cc9 While sending upstream the rebased version of patch 0007 it occured that the patched file include/c11_compat.h was removed from the main branch. Instead of keeping care of two different uClibc fixes, both for the 22.1 branch and the main branch, we backport two patches from the main branch: - patch 0007 which removes include/c11_compat.h - patch 0006 which is a pre-requisite of patch 0007 and add an upstreamable patch as 0008. Updated license hash due to upstream commits: https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=8bd0446d00dd1aca3cd81ddddc463738aaf3ce61 https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=d16263cdee95ec48864ad7a0f90275e8a4fd374b Removed all DRI driver options due to upstream removal of all DRI drivers: https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=4d45b280bf9a1c804cea5de4d15c317b6bdebfc5 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=f464871932882003e01e3459c8d126dd975d60f8 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=0cad451f007f366d94e058b7c717b96723a3e6cd https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=cdde031ac2c8124721655532ee6f4149e20e9c61 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-07-07 07:12:57 +02:00
--
2.34.1
package/{mesa3d, mesa3d-headers}: bump version to 22.1.3 Release notes for 22.0.x: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000665.html https://lists.freedesktop.org/archives/mesa-announce/2022-March/000667.html https://lists.freedesktop.org/archives/mesa-announce/2022-April/000670.html https://lists.freedesktop.org/archives/mesa-announce/2022-May/000673.html https://www.phoronix.com/scan.php?page=news_item&px=Mesa-22.0-Released Release notes for 22.1.x: https://lists.freedesktop.org/archives/mesa-announce/2022-May/000675.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000678.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000681.html https://lists.freedesktop.org/archives/mesa-announce/2022-June/000682.html Removed patch 0006, upstream committed a similar fix: https://cgit.freedesktop.org/mesa/mesa/commit/?h=22.1&id=623ff4ec4295dc67bc0c99ed5336eaae1ad76cc9 While sending upstream the rebased version of patch 0007 it occured that the patched file include/c11_compat.h was removed from the main branch. Instead of keeping care of two different uClibc fixes, both for the 22.1 branch and the main branch, we backport two patches from the main branch: - patch 0007 which removes include/c11_compat.h - patch 0006 which is a pre-requisite of patch 0007 and add an upstreamable patch as 0008. Updated license hash due to upstream commits: https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=8bd0446d00dd1aca3cd81ddddc463738aaf3ce61 https://cgit.freedesktop.org/mesa/mesa/commit/docs/license.rst?h=22.1&id=d16263cdee95ec48864ad7a0f90275e8a4fd374b Removed all DRI driver options due to upstream removal of all DRI drivers: https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=4d45b280bf9a1c804cea5de4d15c317b6bdebfc5 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=f464871932882003e01e3459c8d126dd975d60f8 https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=0cad451f007f366d94e058b7c717b96723a3e6cd https://cgit.freedesktop.org/mesa/mesa/commit/meson_options.txt?h=22.1&id=cdde031ac2c8124721655532ee6f4149e20e9c61 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-07-07 07:12:57 +02:00