Skip to contentSkip to conversation

package/mesa3d: bump version to 20.2.1

PATCH New Bernd Kuhls 2 participants 2 messages Nov 1, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/mesa3d: bump version to 20.2.1

Rebased patch 0002 & 0003, added patch 0004 to fix build error.

Switched license file to license.rst due to upstream commit
https://cgit.freedesktop.org/mesa/mesa/commit/?id=4d066836e3cf307431a74eafcc8a404ce5ccea69
"No modification to the generated results have been done."

Switched true/false configure option values to enabled/disabled due to upstream commit:
https://cgit.freedesktop.org/mesa/mesa/commit/?id=138c003d22739b0d1e6860ed398dd511a44cde04

Remove "MESA3D_PLATFORMS += drm", this platform is now automatically selected:
https://cgit.freedesktop.org/mesa/mesa/commit/?id=e00adef34a5ce485e2c9216a268ca05e89a5fc98

Remove "MESA3D_PLATFORMS += surfaceless", this platform is now automatically selected:
https://cgit.freedesktop.org/mesa/mesa/commit/?id=a38e21d6683aeecb51aea4f933a77c6e7f1a6179

---
 package/mesa3d-headers/mesa3d-headers.mk      |  2 +-
 ...t-proper-value-for-LIBCLC_INCLUDEDIR.patch | 14 +--
 ...tion-to-disable-optional-neon-suppor.patch |  8 +-
 ...r-Include-stddef.h-to-fix-build-erro.patch | 40 +++++++++
 package/mesa3d/mesa3d.hash                    |  8 +-
 package/mesa3d/mesa3d.mk                      | 86 +++++++------------
 6 files changed, 90 insertions(+), 68 deletions(-)
 create mode 100644 package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch
package/mesa3d-headers/mesa3d-headers.mk +1 -1
index 572b7ccc8c..67dc765840 100644
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 20.1.10
+MESA3D_HEADERS_VERSION = 20.2.1
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
 MESA3D_HEADERS_DL_SUBDIR = mesa3d
package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +8 -6
index 6293b8fba4..b1bb2678b4 100644
@@ -17,18 +17,20 @@ that they are not removed by Buildroot target-finalize logic.
 Based on the patch for autotools provided by Valentin Korenblit.
 
 Signed-off-by: Romain Naour <[email protected]>
+Signed-off-by: Bernd Kuhls <[email protected]>
+[rebased for 20.02.0]
 ---
- src/gallium/state_trackers/clover/meson.build | 2 +-
+ src/gallium/frontends/clover/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build
+diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build
 index 62ac5f5278d..ecdeb39669c 100644
---- a/src/gallium/state_trackers/clover/meson.build
-+++ b/src/gallium/state_trackers/clover/meson.build
-@@ -64,7 +64,7 @@
+--- a/src/gallium/frontends/clover/meson.build
++++ b/src/gallium/frontends/clover/meson.build
+@@ -63,7 +63,7 @@
+     clover_cpp_args,
      clover_opencl_cpp_args,
      clover_spirv_cpp_args,
-     cpp_vis_args,
 -    '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')),
 +    '-DLIBCLC_INCLUDEDIR="/usr/share"',
      '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')),
package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +5 -3
index 138f145af5..4b9878fb90 100644
@@ -9,6 +9,8 @@ to force disabling it at compile time.
 
 [Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114]
 Signed-off-by: Peter Seiderer <[email protected]>
+Signed-off-by: Bernd Kuhls <[email protected]>
+[rebased for 20.2.0]
 ---
  meson_options.txt                    | 7 +++++++
  src/gallium/drivers/vc4/meson.build  | 4 ++--
@@ -19,9 +21,9 @@ diff --git a/meson_options.txt b/meson_options.txt
 index a39596a6f19..0f6b6c62b55 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -117,6 +117,13 @@ option(
-   choices : ['auto', 'true', 'false'],
-   description : 'enable gallium va state tracker.',
+@@ -124,6 +124,13 @@ option(
+   choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
+   description : 'enable gallium va frontend.',
  )
 +option(
 +  'gallium-vc4-neon',
package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch new file +40 -0
new file mode 100644
index 0000000000..538aa74e0c
@@ -0,0 +1,40 @@
+From fdc8b5a205e2116408aeb9fd305e57f656e2e89d Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sun, 9 Aug 2020 17:06:26 +0200
+Subject: [PATCH] src/util/rand_xor: Include stddef.h to fix build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes
+
+In file included from ../src/util/rand_xor.c:29:
+output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35:
+ error: unknown type name ?size_t?
+ extern int getrandom(void *__buf, size_t count, unsigned int flags)
+
+seen with gcc version 8.3.0 (Buildroot 2020.02) and uClibc.
+
+Patch sent upstream:
+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6248
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ src/util/rand_xor.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c
+index 81b64f1ea71..fcb481487fa 100644
+--- a/src/util/rand_xor.c
++++ b/src/util/rand_xor.c
+@@ -25,6 +25,7 @@
+ #include "detect_os.h"
+ 
+ #if !DETECT_OS_WINDOWS
++#include <stddef.h>
+ #if defined(HAVE_GETRANDOM)
+ #include <sys/random.h>
+ #endif
+-- 
+2.27.0
+
package/mesa3d/mesa3d.hash +4 -4
index 69f387a45e..287ddc1c0e 100644
@@ -1,6 +1,6 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2020-October/000603.html
-sha256  b1dba69910adac9fcb4cbdfd7833d99a4a8c75b91f3d2e97f0fd0a3cd8c6ee9f  mesa-20.1.10.tar.xz
-sha512  0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a  mesa-20.1.10.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2020-October/000602.html
+sha256  d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a  mesa-20.2.1.tar.xz
+sha512  5d609359754db3e3679bffd5306c1f1d1cf46a2ea98428a9451fe0d99bbf73da863c5d94e6561712cd2012ad13615666cf3d712e54f379b34c091fead39d4795  mesa-20.2.1.tar.xz
 
 # License
-sha256  1ddae7da415352a5b5360ff3a9d7ecf23ba81408f62eeecce0011f32e3ef9da6  docs/license.html
+sha256  1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46  docs/license.rst
package/mesa3d/mesa3d.mk +32 -54

202 lines not on this page · raw message

Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/mesa3d: bump version to 20.2.1

Quoted 19 lines · On Sun, 1 Nov 2020 09:46:57 +0100 Bernd Kuhls <[email protected]> wrote:

Rebased patch 0002 & 0003, added patch 0004 to fix build error.

Switched license file to license.rst due to upstream commit
https://cgit.freedesktop.org/mesa/mesa/commit/?id=4d066836e3cf307431a74eafcc8a404ce5ccea69
"No modification to the generated results have been done."

Switched true/false configure option values to enabled/disabled due to upstream commit:
https://cgit.freedesktop.org/mesa/mesa/commit/?id=138c003d22739b0d1e6860ed398dd511a44cde04

Remove "MESA3D_PLATFORMS += drm", this platform is now automatically selected:
https://cgit.freedesktop.org/mesa/mesa/commit/?id=e00adef34a5ce485e2c9216a268ca05e89a5fc98

Remove "MESA3D_PLATFORMS += surfaceless", this platform is now automatically selected:
https://cgit.freedesktop.org/mesa/mesa/commit/?id=a38e21d6683aeecb51aea4f933a77c6e7f1a6179

Quoted 9 lines
---
 package/mesa3d-headers/mesa3d-headers.mk      |  2 +-
 ...t-proper-value-for-LIBCLC_INCLUDEDIR.patch | 14 +--
 ...tion-to-disable-optional-neon-suppor.patch |  8 +-
 ...r-Include-stddef.h-to-fix-build-erro.patch | 40 +++++++++
 package/mesa3d/mesa3d.hash                    |  8 +-
 package/mesa3d/mesa3d.mk                      | 86 +++++++------------
 6 files changed, 90 insertions(+), 68 deletions(-)
 create mode 100644 package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com