* [Buildroot] [PATCH 2/8] package/llvm-project/libclc: add host variant
2024-12-02 19:06 [Buildroot] [PATCH 1/8] package/libdrm: add host variant Bernd Kuhls
@ 2024-12-02 19:06 ` Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 3/8] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib Bernd Kuhls
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Bernd Kuhls @ 2024-12-02 19:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Daniel Lang, Romain Naour, Yann E . MORIN,
Valentin Korenblit
Needed for mesa3d bump to 24.1.0.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
package/llvm-project/libclc/libclc.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/llvm-project/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk
index 9f303d6d2f..cfa978a8ac 100644
--- a/package/llvm-project/libclc/libclc.mk
+++ b/package/llvm-project/libclc/libclc.mk
@@ -11,6 +11,7 @@ LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT
LIBCLC_LICENSE_FILES = LICENSE.TXT
LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator
+HOST_LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator
LIBCLC_INSTALL_STAGING = YES
# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes
@@ -39,4 +40,8 @@ LIBCLC_CONF_OPTS = \
-DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \
-DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config"
+HOST_LIBCLC_CONF_OPTS = \
+ -DLIBCLC_TARGETS_TO_BUILD=spirv64-mesa3d-
+
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 3/8] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib
2024-12-02 19:06 [Buildroot] [PATCH 1/8] package/libdrm: add host variant Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 2/8] package/llvm-project/libclc: " Bernd Kuhls
@ 2024-12-02 19:06 ` Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 4/8] package/spirv-tools: add host variant Bernd Kuhls
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Bernd Kuhls @ 2024-12-02 19:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Sebastian Weyer, Daniel Lang, Romain Naour,
Antoine Coutant, Romain Naour, Yann E . MORIN, Valentin Korenblit
From: Romain Naour <romain.naour@smile.fr>
This target version is needed for Rusticl which is an LLVM based OpenCL
framework[1]. Rusticl allow programs to compile OpenCL C/C++ code
at runtime with Clang. Clang generates LLVM IR which is translated into
SPIR-V by spirv-llvm-translator. Finally, mesa can use its internal
tools to manage SPIR-V.
[1]: https://docs.mesa3d.org/rusticl.html
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Sebastian Weyer <sebastian.weyer@smile.fr>
Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
package/Config.in | 1 +
package/spirv-llvm-translator/Config.in | 22 +++++++++++++++++++
.../spirv-llvm-translator.mk | 10 +++++++++
3 files changed, 33 insertions(+)
create mode 100644 package/spirv-llvm-translator/Config.in
diff --git a/package/Config.in b/package/Config.in
index 3e54dd6b8f..3cf312eaf0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -335,6 +335,7 @@ comment "Graphic applications"
source "package/pngquant/Config.in"
source "package/qt5cinex/Config.in"
source "package/rrdtool/Config.in"
+ source "package/spirv-llvm-translator/Config.in"
source "package/spirv-tools/Config.in"
source "package/stellarium/Config.in"
source "package/sway/Config.in"
diff --git a/package/spirv-llvm-translator/Config.in b/package/spirv-llvm-translator/Config.in
new file mode 100644
index 0000000000..73ca787d8a
--- /dev/null
+++ b/package/spirv-llvm-translator/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR
+ bool "spirv-translator"
+ depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS
+ depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm
+ select BR2_PACKAGE_LLVM
+ select BR2_PACKAGE_SPIRV_HEADERS
+ select BR2_PACKAGE_ZLIB
+ help
+ LLVM/SPIR-V Bi-Directional Translator is a library and tool
+ for translation between LLVM IR and SPIR-V.
+
+ https://github.com/khronosGroup/SPIRV-LLVM-Translator
+
+comment "spirv-translator needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, host gcc >= 7"
+ depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \
+ || BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_7
diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk
index 523890a986..ffc8a63b89 100644
--- a/package/spirv-llvm-translator/spirv-llvm-translator.mk
+++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk
@@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \
-DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \
-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include
+SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES
+SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm spirv-headers
+SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \
+ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(STAGING_DIR)/usr \
+ -DLLVM_BUILD_TOOLS=ON \
+ -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \
+ -DLLVM_SPIRV_BUILD_EXTERNAL=YES \
+ -DLLVM_SPIRV_INCLUDE_TESTS=OFF
+
+$(eval $(cmake-package))
$(eval $(host-cmake-package))
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 4/8] package/spirv-tools: add host variant
2024-12-02 19:06 [Buildroot] [PATCH 1/8] package/libdrm: add host variant Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 2/8] package/llvm-project/libclc: " Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 3/8] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib Bernd Kuhls
@ 2024-12-02 19:06 ` Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 5/8] package/wayland-protocols: bump version to 1.38 Bernd Kuhls
` (3 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Bernd Kuhls @ 2024-12-02 19:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Daniel Lang, Romain Naour, Yann E . MORIN,
Valentin Korenblit
Needed for mesa3d bump to 24.1.0.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
package/spirv-tools/spirv-tools.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/spirv-tools/spirv-tools.mk b/package/spirv-tools/spirv-tools.mk
index e863911b03..51b1c9f22a 100644
--- a/package/spirv-tools/spirv-tools.mk
+++ b/package/spirv-tools/spirv-tools.mk
@@ -10,6 +10,7 @@ SPIRV_TOOLS_SITE = $(call github,KhronosGroup,SPIRV-Tools,sdk-$(SPIRV_TOOLS_VERS
SPIRV_TOOLS_LICENSE = Apache-2.0
SPIRV_TOOLS_LICENSE_FILES = LICENSE
SPIRV_TOOLS_DEPENDENCIES = spirv-headers
+HOST_SPIRV_TOOLS_DEPENDENCIES = host-spirv-headers
SPIRV_TOOLS_INSTALL_STAGING = YES
SPIRV_TOOLS_CONF_OPTS = \
@@ -18,4 +19,11 @@ SPIRV_TOOLS_CONF_OPTS = \
-DSPIRV_SKIP_TESTS=ON \
-DSPIRV_WERROR=OFF
+HOST_SPIRV_TOOLS_CONF_OPTS = \
+ -DSPIRV-Headers_SOURCE_DIR=$(HOST_DIR) \
+ -DSPIRV_TOOLS_BUILD_STATIC=OFF \
+ -DSPIRV_SKIP_TESTS=ON \
+ -DSPIRV_WERROR=OFF
+
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 5/8] package/wayland-protocols: bump version to 1.38
2024-12-02 19:06 [Buildroot] [PATCH 1/8] package/libdrm: add host variant Bernd Kuhls
` (2 preceding siblings ...)
2024-12-02 19:06 ` [Buildroot] [PATCH 4/8] package/spirv-tools: add host variant Bernd Kuhls
@ 2024-12-02 19:06 ` Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 6/8] package/{mesa3d, mesa3d-headers}: bump version to 24.3.0 Bernd Kuhls
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Bernd Kuhls @ 2024-12-02 19:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Daniel Lang, Romain Naour, Yann E . MORIN,
Valentin Korenblit
Needed for mesa3d bump to 24.3.0:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/cdef622a0a2ba95302a5b21bdeed99a95dbc8347
Release notes:
https://lists.freedesktop.org/archives/wayland-devel/2024-August/043774.html
https://lists.freedesktop.org/archives/wayland-devel/2024-October/043851.html
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
package/wayland-protocols/wayland-protocols.hash | 7 ++++---
package/wayland-protocols/wayland-protocols.mk | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash
index 93d40a919c..c04876eaa1 100644
--- a/package/wayland-protocols/wayland-protocols.hash
+++ b/package/wayland-protocols/wayland-protocols.hash
@@ -1,4 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2024-April/043581.html
-sha256 71fd4de05e79f9a1ca559fac30c1f8365fa10346422f9fe795f74d77b9ef7e92 wayland-protocols-1.36.tar.xz
-sha512 5448b9aedc953ce6be0f378da900c195c8743cb6001f615823b5fc9cab3e3ee54271132055743278e10decef7f8e9dcdeef31593a2a12062575fb90eb0084be0 wayland-protocols-1.36.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2024-October/043851.html
+sha256 ff17292c05159d2b20ce6cacfe42d7e31a28198fa1429a769b03af7c38581dbe wayland-protocols-1.38.tar.xz
+sha512 43fc36d35bedb245deed0e2de246f42d2bbfa6ecafa094f2a7fb103d6df8ae28f3cc200bc5aa24745b9131a28381883c24779da0a6d9ac954753bd5ebb1405db wayland-protocols-1.38.tar.xz
+# Locally computed
sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING
diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk
index c0dfe69401..e989c75d16 100644
--- a/package/wayland-protocols/wayland-protocols.mk
+++ b/package/wayland-protocols/wayland-protocols.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WAYLAND_PROTOCOLS_VERSION = 1.36
+WAYLAND_PROTOCOLS_VERSION = 1.38
WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads
WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz
WAYLAND_PROTOCOLS_LICENSE = MIT
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 6/8] package/{mesa3d, mesa3d-headers}: bump version to 24.3.0
2024-12-02 19:06 [Buildroot] [PATCH 1/8] package/libdrm: add host variant Bernd Kuhls
` (3 preceding siblings ...)
2024-12-02 19:06 ` [Buildroot] [PATCH 5/8] package/wayland-protocols: bump version to 1.38 Bernd Kuhls
@ 2024-12-02 19:06 ` Bernd Kuhls
2024-12-03 9:22 ` Andy Yan
2024-12-02 19:06 ` [Buildroot] [PATCH 7/8] package/mesa3d: add option to enable VIRTIO vulkan driver Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 8/8] package/vkmark: add vkmark benchmarking tool Bernd Kuhls
6 siblings, 1 reply; 13+ messages in thread
From: Bernd Kuhls @ 2024-12-02 19:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Daniel Lang, Romain Naour, Yann E . MORIN,
Valentin Korenblit
Release notes:
https://lists.freedesktop.org/archives/mesa-announce/2024-May/000762.html
https://lists.freedesktop.org/archives/mesa-announce/2024-June/000763.html
https://lists.freedesktop.org/archives/mesa-announce/2024-June/000765.html
https://lists.freedesktop.org/archives/mesa-announce/2024-July/000766.html
https://lists.freedesktop.org/archives/mesa-announce/2024-July/000767.html
https://lists.freedesktop.org/archives/mesa-announce/2024-July/000771.html
https://lists.freedesktop.org/archives/mesa-announce/2024-August/000773.html
https://lists.freedesktop.org/archives/mesa-announce/2024-August/000776.html
https://lists.freedesktop.org/archives/mesa-announce/2024-September/000778.html
https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html
https://lists.freedesktop.org/archives/mesa-announce/2024-October/000780.html
https://lists.freedesktop.org/archives/mesa-announce/2024-October/000781.html
https://lists.freedesktop.org/archives/mesa-announce/2024-October/000782.html
https://lists.freedesktop.org/archives/mesa-announce/2024-November/000784.html
https://lists.freedesktop.org/archives/mesa-announce/2024-November/000786.html
------------------------------------------------------------------------
Changes needed for the bump to 24.1.x:
Added dependency to llvm & Co. for iris driver due to upstream commit:
https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=a512c2a8b572c5da360873320dbbd343c6223cd6
Added host version of mesa tool intel_clc needed for target build of the
iris driver.
Added dependency to host-python-pycparser for etnaviv driver due to
upstream commit:
https://cgit.freedesktop.org/mesa/mesa/commit/src/etnaviv/hwdb/meson.build?h=24.1&id=2192e620bb0c68b75ff45165d0b117c7ecb77268
Added dependency to host-python-ply for intel vulkan driver due to
upstream commit:
https://cgit.freedesktop.org/mesa/mesa/commit/src/intel/vulkan/grl/meson.build?h=24.1&id=dc1aedef2bd054884685ad971a3ef5be07ecd101
Although this dependency exists since mesa3d 22.3 it is only needed when
intel-clc is enabled, this dependency is added with this patch so no need
to backport this dependency to older buildroot trees.
Update configure parameter of glvnd option due to upstream commit:
https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=4f25b84b2460524d375424a81b42faa4d99c8e60
------------------------------------------------------------------------
Changes needed for the bump to 24.2.x:
Added dependency to host-python-pyyaml to host and target build, needed
due to upstream commit
https://gitlab.freedesktop.org/mesa/mesa/-/commit/a3813327575e8875c8c3ed24b5f45a0b7ba64446
Rebased patch 0002 due to upstream commit:
https://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/vc4/meson.build?h=24.2&id=da70827656757cd070faac7aff5ca057f1e7fb8a
Renamed BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST to
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE and added new option
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE due to upstream commit
https://gitlab.freedesktop.org/mesa/mesa/-/commit/010b2f9497ab256d9e8041207902948331af5b4b
"gallium/meson: Deconflate swrast/softpipe/llvmpipe"
------------------------------------------------------------------------
Changes needed for the bump to 24.3.x:
Rebased patch 0002 again due to upstream commit:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/25ba90fd888cef431c2098c8afdb0a2bbd34b303
Removed dri3 configure option:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/8f6fca89aa1812b03da6d9f7fac3966955abc41e
Removed gallium-omx configure option:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/9b6c27a320ab4b0fcf1fb16220ae7c3d3f06f7df
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
Config.in.legacy | 7 +++
| 2 +-
...tion-to-disable-optional-neon-suppor.patch | 18 +++---
package/mesa3d/Config.in | 28 +++++++--
package/mesa3d/mesa3d.hash | 6 +-
package/mesa3d/mesa3d.mk | 58 ++++++++++++++-----
6 files changed, 88 insertions(+), 31 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 63360b42b8..a10dde7eda 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2024.11"
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
+ bool "mesa Gallium swrast driver was replaced by softpipe"
+ select BR2_LEGACY
+ select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
+ help
+ The Gallium swrast driver was replaced by softpipe.
+
config BR2_PACKAGE_BSDIFF
bool "bsdiff has been removed"
select BR2_LEGACY
--git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 33c60b285f..11201d6c82 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 24.0.9
+MESA3D_HEADERS_VERSION = 24.3.0
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://archive.mesa3d.org
MESA3D_HEADERS_DL_SUBDIR = mesa3d
diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
index f3919478a6..3b9bca0693 100644
--- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
+++ b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
@@ -9,8 +9,8 @@ to force disabling it at compile time.
Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0 & 23.2.0]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0 & 24.3.0]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[fix syntax error after previous rebases]
---
@@ -23,7 +23,7 @@ diff --git a/meson_options.txt b/meson_options.txt
index 8e0bf2a..1cf0e07 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -124,6 +124,13 @@ option(
+@@ -117,6 +117,13 @@ option(
description : 'enable gallium va frontend.',
)
@@ -41,18 +41,18 @@ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson
index 84da951..7f950de 100644
--- a/src/gallium/drivers/vc4/meson.build
+++ b/src/gallium/drivers/vc4/meson.build
-@@ -84,7 +84,7 @@ files_libvc4 = files(
- vc4_c_args = []
+@@ -72,7 +72,7 @@ files_libvc4 = files(
+ ]
libvc4_neon = []
-if host_machine.cpu_family() == 'arm'
+if host_machine.cpu_family() == 'arm' and not get_option('gallium-vc4-neon').disabled()
libvc4_neon = static_library(
'vc4_neon',
- 'vc4_tiling_lt_neon.c',
-@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm'
- ],
- c_args : '-mfpu=neon',
+ 'vc4_tiling_lt.c',
+@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm'
+ c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'],
+ dependencies : vc4_deps,
)
- vc4_c_args += '-DUSE_ARM_ASM'
+ vc4_c_args += '-DVC4_TILING_LT_NEON'
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 7761b0a650..b42e593be7 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -50,7 +50,8 @@ config BR2_PACKAGE_MESA3D_OPENCL
bool "OpenCL support"
depends on BR2_PACKAGE_MESA3D_LLVM
depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \
- BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
+ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \
+ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
select BR2_PACKAGE_LLVM_RTTI
select BR2_PACKAGE_CLANG
select BR2_PACKAGE_LIBCLC
@@ -129,10 +130,18 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
bool "Gallium iris driver"
depends on BR2_i386 || BR2_x86_64
+ depends on BR2_PACKAGE_MESA3D_LLVM
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+ select BR2_PACKAGE_MESA3D_OPENCL
+ select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR
+ select BR2_PACKAGE_SPIRV_TOOLS
help
Mesa driver for iris-based Intel GPUs.
+comment "iris driver needs llvm"
+ depends on BR2_i386 || BR2_x86_64
+ depends on !BR2_PACKAGE_MESA3D_LLVM
+
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA
bool "Gallium lima driver"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
@@ -140,6 +149,17 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA
help
Mesa driver for ARM Mali Utgard GPUs.
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE
+ bool "Gallium llvmpipe driver"
+ depends on BR2_PACKAGE_MESA3D_LLVM
+ select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+ help
+ This is a llvm opengl implementation using the Gallium3D
+ infrastructure.
+
+comment "llvmpipe driver needs llvm"
+ depends on !BR2_PACKAGE_MESA3D_LLVM
+
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
bool "Gallium nouveau driver"
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
@@ -212,8 +232,8 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
help
This is a virtual GPU driver for VMWare virtual machines.
-config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
- bool "Gallium swrast driver"
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
+ bool "Gallium softpipe driver"
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
help
This is a software opengl implementation using the Gallium3D
@@ -285,7 +305,7 @@ comment "Vulkan drivers"
config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM
bool "Vulkan broadcom driver"
depends on BR2_arm || BR2_aarch64
- depends on BR2_TOOLCHAIN_HAS_SYNC_4 # dri3/libxshmfence
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence
select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
help
Vulkan broadcom driver.
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index d506d398b8..2e0f99a8de 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,5 +1,5 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html
-sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz
-sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2024-November/000786.html
+sha256 97813fe65028ef21b4d4e54164563059e8408d8fee3489a2323468d198bf2efc mesa-24.3.0.tar.xz
+sha512 20168ae4c278776a60d5febf53b3367cf08bffffb40ef2054821e68d7a8c37a07871d097ab17555f41a4fe716f0de7df95ad7d452b1ed57db6527838eb839ba4 mesa-24.3.0.tar.xz
# License
sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index ce460c4475..d7459d0f19 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 24.0.9
+MESA3D_VERSION = 24.3.0
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://archive.mesa3d.org
MESA3D_LICENSE = MIT, SGI, Khronos
@@ -21,19 +21,20 @@ MESA3D_DEPENDENCIES = \
host-bison \
host-flex \
host-python-mako \
+ host-python-pyyaml \
expat \
libdrm \
zlib
MESA3D_CONF_OPTS = \
- -Dgallium-omx=disabled \
+ -Dgallium-opencl=disabled \
+ -Dgallium-rusticl=false \
+ -Dmicrosoft-clc=disabled \
+ -Dopencl-spirv=false \
-Dpower8=disabled
ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy)
-MESA3D_CONF_OPTS += -Ddri3=enabled
MESA3D_DEPENDENCIES += xlib_libxshmfence
-else
-MESA3D_CONF_OPTS += -Ddri3=disabled
endif
ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y)
@@ -50,14 +51,9 @@ else
MESA3D_CONF_OPTS += -Dllvm=disabled
endif
-# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of
-# libMesaOpenCL and CL headers are installed
ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y)
MESA3D_PROVIDES += libopencl
MESA3D_DEPENDENCIES += clang libclc
-MESA3D_CONF_OPTS += -Dgallium-opencl=standalone
-else
-MESA3D_CONF_OPTS += -Dgallium-opencl=disabled
endif
ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)
@@ -99,13 +95,14 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedre
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE) += llvmpipe
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300) += r300
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga
-MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE) += softpipe
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA) += tegra
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d
MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4
@@ -126,6 +123,19 @@ MESA3D_CONF_OPTS += \
-Dgallium-extra-hud=true
endif
+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y)
+MESA3D_DEPENDENCIES += host-python-pycparser
+endif
+
+ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y)
+MESA3D_DEPENDENCIES += host-python-ply
+endif
+
+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y)
+MESA3D_CONF_OPTS += -Dintel-clc=system
+MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools
+endif
+
ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),)
MESA3D_CONF_OPTS += \
-Dvulkan-drivers=
@@ -251,12 +261,32 @@ endif
ifeq ($(BR2_PACKAGE_LIBGLVND),y)
ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),)
MESA3D_DEPENDENCIES += libglvnd
-MESA3D_CONF_OPTS += -Dglvnd=true
+MESA3D_CONF_OPTS += -Dglvnd=enabled
else
-MESA3D_CONF_OPTS += -Dglvnd=false
+MESA3D_CONF_OPTS += -Dglvnd=disabled
endif
else
-MESA3D_CONF_OPTS += -Dglvnd=false
+MESA3D_CONF_OPTS += -Dglvnd=disabled
endif
+HOST_MESA3D_CONF_OPTS = \
+ -Dglvnd=disabled \
+ -Dgallium-drivers=iris \
+ -Dgallium-vdpau=disabled \
+ -Dplatforms= \
+ -Dglx=disabled \
+ -Dvulkan-drivers=""
+
+HOST_MESA3D_DEPENDENCIES = \
+ host-libclc \
+ host-libdrm \
+ host-python-mako \
+ host-python-pyyaml \
+ host-spirv-tools
+
+define HOST_MESA3D_INSTALL_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/build/src/intel/compiler/intel_clc $(HOST_DIR)/bin/intel_clc
+endef
+
$(eval $(meson-package))
+$(eval $(host-meson-package))
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [Buildroot] [PATCH 6/8] package/{mesa3d, mesa3d-headers}: bump version to 24.3.0
2024-12-02 19:06 ` [Buildroot] [PATCH 6/8] package/{mesa3d, mesa3d-headers}: bump version to 24.3.0 Bernd Kuhls
@ 2024-12-03 9:22 ` Andy Yan
0 siblings, 0 replies; 13+ messages in thread
From: Andy Yan @ 2024-12-03 9:22 UTC (permalink / raw)
To: Bernd Kuhls
Cc: buildroot, Eric Le Bihan, Daniel Lang, Romain Naour,
Yann E . MORIN, Valentin Korenblit
Hi,
At 2024-12-03 03:06:45, "Bernd Kuhls" <bernd@kuhls.net> wrote:
>Release notes:
>https://lists.freedesktop.org/archives/mesa-announce/2024-May/000762.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-June/000763.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-June/000765.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-July/000766.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-July/000767.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-July/000771.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-August/000773.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-August/000776.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-September/000778.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-October/000780.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-October/000781.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-October/000782.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-November/000784.html
>https://lists.freedesktop.org/archives/mesa-announce/2024-November/000786.html
>------------------------------------------------------------------------
>Changes needed for the bump to 24.1.x:
>
>Added dependency to llvm & Co. for iris driver due to upstream commit:
>https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=a512c2a8b572c5da360873320dbbd343c6223cd6
>
>Added host version of mesa tool intel_clc needed for target build of the
>iris driver.
>
>Added dependency to host-python-pycparser for etnaviv driver due to
>upstream commit:
>https://cgit.freedesktop.org/mesa/mesa/commit/src/etnaviv/hwdb/meson.build?h=24.1&id=2192e620bb0c68b75ff45165d0b117c7ecb77268
>
>Added dependency to host-python-ply for intel vulkan driver due to
>upstream commit:
>https://cgit.freedesktop.org/mesa/mesa/commit/src/intel/vulkan/grl/meson.build?h=24.1&id=dc1aedef2bd054884685ad971a3ef5be07ecd101
>
>Although this dependency exists since mesa3d 22.3 it is only needed when
>intel-clc is enabled, this dependency is added with this patch so no need
>to backport this dependency to older buildroot trees.
>
>Update configure parameter of glvnd option due to upstream commit:
>https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=4f25b84b2460524d375424a81b42faa4d99c8e60
>------------------------------------------------------------------------
>Changes needed for the bump to 24.2.x:
>
>Added dependency to host-python-pyyaml to host and target build, needed
>due to upstream commit
>https://gitlab.freedesktop.org/mesa/mesa/-/commit/a3813327575e8875c8c3ed24b5f45a0b7ba64446
>
>Rebased patch 0002 due to upstream commit:
>https://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/vc4/meson.build?h=24.2&id=da70827656757cd070faac7aff5ca057f1e7fb8a
>
>Renamed BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST to
>BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE and added new option
>BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE due to upstream commit
>https://gitlab.freedesktop.org/mesa/mesa/-/commit/010b2f9497ab256d9e8041207902948331af5b4b
>"gallium/meson: Deconflate swrast/softpipe/llvmpipe"
>------------------------------------------------------------------------
>Changes needed for the bump to 24.3.x:
>
>Rebased patch 0002 again due to upstream commit:
>https://gitlab.freedesktop.org/mesa/mesa/-/commit/25ba90fd888cef431c2098c8afdb0a2bbd34b303
>
>Removed dri3 configure option:
>https://gitlab.freedesktop.org/mesa/mesa/-/commit/8f6fca89aa1812b03da6d9f7fac3966955abc41e
>
>Removed gallium-omx configure option:
>https://gitlab.freedesktop.org/mesa/mesa/-/commit/9b6c27a320ab4b0fcf1fb16220ae7c3d3f06f7df
>
>Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
I have a test on Arm mali valhall gpu with panfrost driver.
Tested-by: Andy Yan <andyshrk@163.com>
>---
> Config.in.legacy | 7 +++
> package/mesa3d-headers/mesa3d-headers.mk | 2 +-
> ...tion-to-disable-optional-neon-suppor.patch | 18 +++---
> package/mesa3d/Config.in | 28 +++++++--
> package/mesa3d/mesa3d.hash | 6 +-
> package/mesa3d/mesa3d.mk | 58 ++++++++++++++-----
> 6 files changed, 88 insertions(+), 31 deletions(-)
>
>diff --git a/Config.in.legacy b/Config.in.legacy
>index 63360b42b8..a10dde7eda 100644
>--- a/Config.in.legacy
>+++ b/Config.in.legacy
>@@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2024.11"
>
>+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
>+ bool "mesa Gallium swrast driver was replaced by softpipe"
>+ select BR2_LEGACY
>+ select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
>+ help
>+ The Gallium swrast driver was replaced by softpipe.
>+
> config BR2_PACKAGE_BSDIFF
> bool "bsdiff has been removed"
> select BR2_LEGACY
>diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
>index 33c60b285f..11201d6c82 100644
>--- a/package/mesa3d-headers/mesa3d-headers.mk
>+++ b/package/mesa3d-headers/mesa3d-headers.mk
>@@ -12,7 +12,7 @@ endif
>
> # Not possible to directly refer to mesa3d variables, because of
> # first/second expansion trickery...
>-MESA3D_HEADERS_VERSION = 24.0.9
>+MESA3D_HEADERS_VERSION = 24.3.0
> MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
> MESA3D_HEADERS_SITE = https://archive.mesa3d.org
> MESA3D_HEADERS_DL_SUBDIR = mesa3d
>diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
>index f3919478a6..3b9bca0693 100644
>--- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
>+++ b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
>@@ -9,8 +9,8 @@ to force disabling it at compile time.
>
> Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
>-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
>-[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0 & 23.2.0]
>+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
>+[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0 & 24.3.0]
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> [fix syntax error after previous rebases]
> ---
>@@ -23,7 +23,7 @@ diff --git a/meson_options.txt b/meson_options.txt
> index 8e0bf2a..1cf0e07 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
>-@@ -124,6 +124,13 @@ option(
>+@@ -117,6 +117,13 @@ option(
> description : 'enable gallium va frontend.',
> )
>
>@@ -41,18 +41,18 @@ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson
> index 84da951..7f950de 100644
> --- a/src/gallium/drivers/vc4/meson.build
> +++ b/src/gallium/drivers/vc4/meson.build
>-@@ -84,7 +84,7 @@ files_libvc4 = files(
>- vc4_c_args = []
>+@@ -72,7 +72,7 @@ files_libvc4 = files(
>+ ]
>
> libvc4_neon = []
> -if host_machine.cpu_family() == 'arm'
> +if host_machine.cpu_family() == 'arm' and not get_option('gallium-vc4-neon').disabled()
> libvc4_neon = static_library(
> 'vc4_neon',
>- 'vc4_tiling_lt_neon.c',
>-@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm'
>- ],
>- c_args : '-mfpu=neon',
>+ 'vc4_tiling_lt.c',
>+@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm'
>+ c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'],
>+ dependencies : vc4_deps,
> )
> - vc4_c_args += '-DUSE_ARM_ASM'
> + vc4_c_args += '-DVC4_TILING_LT_NEON'
>diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
>index 7761b0a650..b42e593be7 100644
>--- a/package/mesa3d/Config.in
>+++ b/package/mesa3d/Config.in
>@@ -50,7 +50,8 @@ config BR2_PACKAGE_MESA3D_OPENCL
> bool "OpenCL support"
> depends on BR2_PACKAGE_MESA3D_LLVM
> depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \
>- BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
>+ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \
>+ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
> select BR2_PACKAGE_LLVM_RTTI
> select BR2_PACKAGE_CLANG
> select BR2_PACKAGE_LIBCLC
>@@ -129,10 +130,18 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915
> config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
> bool "Gallium iris driver"
> depends on BR2_i386 || BR2_x86_64
>+ depends on BR2_PACKAGE_MESA3D_LLVM
> select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
>+ select BR2_PACKAGE_MESA3D_OPENCL
>+ select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR
>+ select BR2_PACKAGE_SPIRV_TOOLS
> help
> Mesa driver for iris-based Intel GPUs.
>
>+comment "iris driver needs llvm"
>+ depends on BR2_i386 || BR2_x86_64
>+ depends on !BR2_PACKAGE_MESA3D_LLVM
>+
> config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA
> bool "Gallium lima driver"
> depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
>@@ -140,6 +149,17 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA
> help
> Mesa driver for ARM Mali Utgard GPUs.
>
>+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE
>+ bool "Gallium llvmpipe driver"
>+ depends on BR2_PACKAGE_MESA3D_LLVM
>+ select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
>+ help
>+ This is a llvm opengl implementation using the Gallium3D
>+ infrastructure.
>+
>+comment "llvmpipe driver needs llvm"
>+ depends on !BR2_PACKAGE_MESA3D_LLVM
>+
> config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
> bool "Gallium nouveau driver"
> select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
>@@ -212,8 +232,8 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
> help
> This is a virtual GPU driver for VMWare virtual machines.
>
>-config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
>- bool "Gallium swrast driver"
>+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
>+ bool "Gallium softpipe driver"
> select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
> help
> This is a software opengl implementation using the Gallium3D
>@@ -285,7 +305,7 @@ comment "Vulkan drivers"
> config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM
> bool "Vulkan broadcom driver"
> depends on BR2_arm || BR2_aarch64
>- depends on BR2_TOOLCHAIN_HAS_SYNC_4 # dri3/libxshmfence
>+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence
> select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
> help
> Vulkan broadcom driver.
>diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
>index d506d398b8..2e0f99a8de 100644
>--- a/package/mesa3d/mesa3d.hash
>+++ b/package/mesa3d/mesa3d.hash
>@@ -1,5 +1,5 @@
>-# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html
>-sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz
>-sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz
>+# From https://lists.freedesktop.org/archives/mesa-announce/2024-November/000786.html
>+sha256 97813fe65028ef21b4d4e54164563059e8408d8fee3489a2323468d198bf2efc mesa-24.3.0.tar.xz
>+sha512 20168ae4c278776a60d5febf53b3367cf08bffffb40ef2054821e68d7a8c37a07871d097ab17555f41a4fe716f0de7df95ad7d452b1ed57db6527838eb839ba4 mesa-24.3.0.tar.xz
> # License
> sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst
>diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
>index ce460c4475..d7459d0f19 100644
>--- a/package/mesa3d/mesa3d.mk
>+++ b/package/mesa3d/mesa3d.mk
>@@ -5,7 +5,7 @@
> ################################################################################
>
> # When updating the version, please also update mesa3d-headers
>-MESA3D_VERSION = 24.0.9
>+MESA3D_VERSION = 24.3.0
> MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
> MESA3D_SITE = https://archive.mesa3d.org
> MESA3D_LICENSE = MIT, SGI, Khronos
>@@ -21,19 +21,20 @@ MESA3D_DEPENDENCIES = \
> host-bison \
> host-flex \
> host-python-mako \
>+ host-python-pyyaml \
> expat \
> libdrm \
> zlib
>
> MESA3D_CONF_OPTS = \
>- -Dgallium-omx=disabled \
>+ -Dgallium-opencl=disabled \
>+ -Dgallium-rusticl=false \
>+ -Dmicrosoft-clc=disabled \
>+ -Dopencl-spirv=false \
> -Dpower8=disabled
>
> ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy)
>-MESA3D_CONF_OPTS += -Ddri3=enabled
> MESA3D_DEPENDENCIES += xlib_libxshmfence
>-else
>-MESA3D_CONF_OPTS += -Ddri3=disabled
> endif
>
> ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y)
>@@ -50,14 +51,9 @@ else
> MESA3D_CONF_OPTS += -Dllvm=disabled
> endif
>
>-# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of
>-# libMesaOpenCL and CL headers are installed
> ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y)
> MESA3D_PROVIDES += libopencl
> MESA3D_DEPENDENCIES += clang libclc
>-MESA3D_CONF_OPTS += -Dgallium-opencl=standalone
>-else
>-MESA3D_CONF_OPTS += -Dgallium-opencl=disabled
> endif
>
> ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)
>@@ -99,13 +95,14 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedre
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima
>+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE) += llvmpipe
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300) += r300
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga
>-MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast
>+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE) += softpipe
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA) += tegra
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d
> MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4
>@@ -126,6 +123,19 @@ MESA3D_CONF_OPTS += \
> -Dgallium-extra-hud=true
> endif
>
>+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y)
>+MESA3D_DEPENDENCIES += host-python-pycparser
>+endif
>+
>+ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y)
>+MESA3D_DEPENDENCIES += host-python-ply
>+endif
>+
>+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y)
>+MESA3D_CONF_OPTS += -Dintel-clc=system
>+MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools
>+endif
>+
> ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),)
> MESA3D_CONF_OPTS += \
> -Dvulkan-drivers=
>@@ -251,12 +261,32 @@ endif
> ifeq ($(BR2_PACKAGE_LIBGLVND),y)
> ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),)
> MESA3D_DEPENDENCIES += libglvnd
>-MESA3D_CONF_OPTS += -Dglvnd=true
>+MESA3D_CONF_OPTS += -Dglvnd=enabled
> else
>-MESA3D_CONF_OPTS += -Dglvnd=false
>+MESA3D_CONF_OPTS += -Dglvnd=disabled
> endif
> else
>-MESA3D_CONF_OPTS += -Dglvnd=false
>+MESA3D_CONF_OPTS += -Dglvnd=disabled
> endif
>
>+HOST_MESA3D_CONF_OPTS = \
>+ -Dglvnd=disabled \
>+ -Dgallium-drivers=iris \
>+ -Dgallium-vdpau=disabled \
>+ -Dplatforms= \
>+ -Dglx=disabled \
>+ -Dvulkan-drivers=""
>+
>+HOST_MESA3D_DEPENDENCIES = \
>+ host-libclc \
>+ host-libdrm \
>+ host-python-mako \
>+ host-python-pyyaml \
>+ host-spirv-tools
>+
>+define HOST_MESA3D_INSTALL_CMDS
>+ $(INSTALL) -D -m 0755 $(@D)/build/src/intel/compiler/intel_clc $(HOST_DIR)/bin/intel_clc
>+endef
>+
> $(eval $(meson-package))
>+$(eval $(host-meson-package))
>--
>2.39.5
>
>_______________________________________________
>buildroot mailing list
>buildroot@buildroot.org
>https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 7/8] package/mesa3d: add option to enable VIRTIO vulkan driver
2024-12-02 19:06 [Buildroot] [PATCH 1/8] package/libdrm: add host variant Bernd Kuhls
` (4 preceding siblings ...)
2024-12-02 19:06 ` [Buildroot] [PATCH 6/8] package/{mesa3d, mesa3d-headers}: bump version to 24.3.0 Bernd Kuhls
@ 2024-12-02 19:06 ` Bernd Kuhls
2024-12-02 19:06 ` [Buildroot] [PATCH 8/8] package/vkmark: add vkmark benchmarking tool Bernd Kuhls
6 siblings, 0 replies; 13+ messages in thread
From: Bernd Kuhls @ 2024-12-02 19:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Daniel Lang, Romain Naour, Yann E . MORIN,
Valentin Korenblit
From: Alex Bennée <alex.bennee@linaro.org>
The support for Venus (the Vulkan VirtIO encapsulation) in MESA has
been stable since 23.2 so add an option to enable it.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240822181546.64900-6-bernd@kuhls.net>
---
package/mesa3d/Config.in | 6 ++++++
package/mesa3d/mesa3d.mk | 1 +
2 files changed, 7 insertions(+)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index b42e593be7..089286f7c4 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -334,6 +334,12 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST
help
Vulkan swrast driver.
+config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO
+ bool "Vulkan VirtIO driver (Venus)"
+ select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
+ help
+ Vulkan VirtIO (venus) driver.
+
comment "Off-screen Rendering"
config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index d7459d0f19..bd6e53d8da 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -111,6 +111,7 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl
MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom
MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel
MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast
+MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO) += virtio
ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),)
MESA3D_CONF_OPTS += \
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 8/8] package/vkmark: add vkmark benchmarking tool
2024-12-02 19:06 [Buildroot] [PATCH 1/8] package/libdrm: add host variant Bernd Kuhls
` (5 preceding siblings ...)
2024-12-02 19:06 ` [Buildroot] [PATCH 7/8] package/mesa3d: add option to enable VIRTIO vulkan driver Bernd Kuhls
@ 2024-12-02 19:06 ` Bernd Kuhls
2024-12-03 21:57 ` Julien Olivain
6 siblings, 1 reply; 13+ messages in thread
From: Bernd Kuhls @ 2024-12-02 19:06 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Daniel Lang, Romain Naour, Yann E . MORIN,
Valentin Korenblit
From: Alex Bennée <alex.bennee@linaro.org>
We build from the current master as we need fairly upto date bits for
cross compile support.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
DEVELOPERS | 3 +++
package/Config.in | 1 +
package/vkmark/Config.in | 47 ++++++++++++++++++++++++++++++++++++++
package/vkmark/vkmark.hash | 2 ++
package/vkmark/vkmark.mk | 34 +++++++++++++++++++++++++++
5 files changed, 87 insertions(+)
create mode 100644 package/vkmark/Config.in
create mode 100644 package/vkmark/vkmark.hash
create mode 100644 package/vkmark/vkmark.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index bfbe7be0d3..ac1e5789b2 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -138,6 +138,9 @@ F: package/liblog4c-localtime/
N: Alexandre Belloni <alexandre.belloni@bootlin.com>
F: package/tz/
+N: Alex Bennée <alex.bennee@linaro.org>
+F: package/vkmark/
+
N: Alexandre Esse <alexandre.esse.dev@gmail.com>
F: package/kvazaar/
F: package/v4l2loopback/
diff --git a/package/Config.in b/package/Config.in
index 3cf312eaf0..cead5640f8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -342,6 +342,7 @@ comment "Graphic applications"
source "package/swaybg/Config.in"
source "package/tesseract-ocr/Config.in"
source "package/tinifier/Config.in"
+ source "package/vkmark/Config.in"
comment "Graphic libraries"
source "package/cegui/Config.in"
diff --git a/package/vkmark/Config.in b/package/vkmark/Config.in
new file mode 100644
index 0000000000..e0397d9c30
--- /dev/null
+++ b/package/vkmark/Config.in
@@ -0,0 +1,47 @@
+config BR2_PACKAGE_VKMARK_FLAVOR_ANY
+ bool
+
+config BR2_PACKAGE_VKMARK_FLAVOR_KMS
+ bool
+ default y if BR2_PACKAGE_HAS_LIBGBM
+ select BR2_PACKAGE_VKMARK_FLAVOR_ANY
+
+config BR2_PACKAGE_VKMARK_FLAVOR_WAYLAND
+ bool
+ default y if BR2_PACKAGE_WAYLAND
+ select BR2_PACKAGE_VKMARK_FLAVOR_ANY
+
+config BR2_PACKAGE_VKMARK_FLAVOR_X11
+ bool
+ default y if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_VKMARK_FLAVOR_ANY
+
+config BR2_PACKAGE_VKMARK
+ bool "vkmark"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
+ depends on BR2_PACKAGE_VKMARK_FLAVOR_ANY
+ select BR2_PACKAGE_VULKAN_HEADERS
+ select BR2_PACKAGE_VULKAN_LOADER
+ depends on !BR2_STATIC_LIBS # vulkan-loader
+ depends on BR2_TOOLCHAIN_HAS_THREADS # vulkan-loader
+ select BR2_PACKAGE_GLM
+ depends on BR2_USE_WCHAR # assimp
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # assimp
+ depends on BR2_INSTALL_LIBSTDCPP # vulkan-loader, glm, assimp, vkmark
+ select BR2_PACKAGE_ASSIMP
+ select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_VKMARK_FLAVOR_WAYLAND
+ select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_VKMARK_FLAVOR_X11
+ select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_VKMARK_FLAVOR_KMS
+ help
+ vmmark is an Vulkan GPU benchmark.
+
+ https://github.com/vkmark/vkmark
+
+if BR2_PACKAGE_VKMARK_FLAVOR_ANY
+
+comment "vkmark needs a toolchain w/ C++, dynamic library, threads"
+comment "and some form of backend (wayland, xcb or drm)"
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
+ !BR2_TOOLCHAIN_HAS_THREADS
+endif
diff --git a/package/vkmark/vkmark.hash b/package/vkmark/vkmark.hash
new file mode 100644
index 0000000000..ee8241d7de
--- /dev/null
+++ b/package/vkmark/vkmark.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 d08143e8828d5b9ed005cb6dcef4d88a49df0ac4c9e1356ace739b449c165f54 vkmark-ab6e6f34077722d5ae33f6bd40b18ef9c0e99a15.tar.gz
diff --git a/package/vkmark/vkmark.mk b/package/vkmark/vkmark.mk
new file mode 100644
index 0000000000..5749ebf878
--- /dev/null
+++ b/package/vkmark/vkmark.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# vkmark
+#
+################################################################################
+
+VKMARK_VERSION = ab6e6f34077722d5ae33f6bd40b18ef9c0e99a15
+VKMARK_SITE = $(call github,vkmark,vkmark,$(VKMARK_VERSION))
+VKMARK_LICENSE = LGPL-2.1
+VKMARK_LICENSE_FILES = COPYING-LGPL2.1
+VKMARK_DEPENDENCIES = host-pkgconf vulkan-headers vulkan-loader glm
+
+ifeq ($(BR2_PACKAGE_VKMARK_FLAVOR_KMS),y)
+VKMARK_DEPENDENCIES += libdrm libgbm
+VKMARK_CONF_OPTS += -Dkms=true
+else
+VKMARK_CONF_OPTS += -Dkms=false
+endif
+
+ifeq ($(BR2_PACKAGE_VKMARK_FLAVOR_WAYLAND),y)
+VKMARK_DEPENDENCIES += wayland wayland-protocols
+VKMARK_CONF_OPTS += -Dwayland=true
+else
+VKMARK_CONF_OPTS += -Dwayland=false
+endif
+
+ifeq ($(BR2_PACKAGE_VKMARK_FLAVOR_X11),y)
+VKMARK_DEPENDENCIES += libxcb
+VKMARK_CONF_OPTS += -Dxcb=true
+else
+VKMARK_CONF_OPTS += -Dxcb=false
+endif
+
+$(eval $(meson-package))
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [Buildroot] [PATCH 8/8] package/vkmark: add vkmark benchmarking tool
2024-12-02 19:06 ` [Buildroot] [PATCH 8/8] package/vkmark: add vkmark benchmarking tool Bernd Kuhls
@ 2024-12-03 21:57 ` Julien Olivain
2024-12-03 23:07 ` Alex Bennée
[not found] ` <87ldwwbc1j.fsf__10394.9673286238$1733267303$gmane$org@draig.linaro.org>
0 siblings, 2 replies; 13+ messages in thread
From: Julien Olivain @ 2024-12-03 21:57 UTC (permalink / raw)
To: Bernd Kuhls
Cc: Eric Le Bihan, Daniel Lang, buildroot, Romain Naour,
Yann E . MORIN, Valentin Korenblit
Hi Bernd, Alex,
Thanks for the patch.
On 02/12/2024 20:06, Bernd Kuhls wrote:
> From: Alex Bennée <alex.bennee@linaro.org>
>
> We build from the current master as we need fairly upto date bits for
> cross compile support.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
This patch generates few "make check-package" errors. Running:
utils/docker-run make check-package
Shows:
package/vkmark/Config.in:7: should be indented with one tab
(https://nightly.buildroot.org/#_config_files)
package/vkmark/Config.in:17: should be indented with one tab
(https://nightly.buildroot.org/#_config_files)
package/vkmark/Config.in:26: attributes order: type, default,
depends on, select, help (https://nightly.buildroot.org/#_config_files)
package/vkmark/Config.in:26: should be indented with one tab
(https://nightly.buildroot.org/#_config_files)
package/vkmark/Config.in:27: should be indented with one tab
(https://nightly.buildroot.org/#_config_files)
package/vkmark/Config.in:29: attributes order: type, default,
depends on, select, help (https://nightly.buildroot.org/#_config_files)
package/vkmark/Config.in:29: should be indented with one tab
(https://nightly.buildroot.org/#_config_files)
package/vkmark/Config.in:30: should be indented with one tab
(https://nightly.buildroot.org/#_config_files)
Could you fix those, please?
Best regards,
Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [Buildroot] [PATCH 8/8] package/vkmark: add vkmark benchmarking tool
2024-12-03 21:57 ` Julien Olivain
@ 2024-12-03 23:07 ` Alex Bennée
[not found] ` <87ldwwbc1j.fsf__10394.9673286238$1733267303$gmane$org@draig.linaro.org>
1 sibling, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2024-12-03 23:07 UTC (permalink / raw)
To: Julien Olivain
Cc: Bernd Kuhls, buildroot, Eric Le Bihan, Daniel Lang, Romain Naour,
Yann E . MORIN, Valentin Korenblit
Julien Olivain <ju.o@free.fr> writes:
> Hi Bernd, Alex,
>
> Thanks for the patch.
>
> On 02/12/2024 20:06, Bernd Kuhls wrote:
>> From: Alex Bennée <alex.bennee@linaro.org>
>> We build from the current master as we need fairly upto date bits
>> for
>> cross compile support.
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
>
> This patch generates few "make check-package" errors. Running:
>
> utils/docker-run make check-package
>
> Shows:
>
> package/vkmark/Config.in:7: should be indented with one tab
> (https://nightly.buildroot.org/#_config_files)
> package/vkmark/Config.in:17: should be indented with one tab
> (https://nightly.buildroot.org/#_config_files)
> package/vkmark/Config.in:26: attributes order: type, default,
> depends on, select, help
> (https://nightly.buildroot.org/#_config_files)
> package/vkmark/Config.in:26: should be indented with one tab
> (https://nightly.buildroot.org/#_config_files)
> package/vkmark/Config.in:27: should be indented with one tab
> (https://nightly.buildroot.org/#_config_files)
> package/vkmark/Config.in:29: attributes order: type, default,
> depends on, select, help
> (https://nightly.buildroot.org/#_config_files)
> package/vkmark/Config.in:29: should be indented with one tab
> (https://nightly.buildroot.org/#_config_files)
> package/vkmark/Config.in:30: should be indented with one tab
> (https://nightly.buildroot.org/#_config_files)
>
> Could you fix those, please?
This was already fixed in:
Subject: [PATCH 0/2] Enable venus and add vkmark
Date: Mon, 2 Dec 2024 18:20:59 +0000
Message-Id: <20241202182101.410320-1-alex.bennee@linaro.org>
>
> Best regards,
>
> Julien.
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread[parent not found: <87ldwwbc1j.fsf__10394.9673286238$1733267303$gmane$org@draig.linaro.org>]
* Re: [Buildroot] [PATCH 8/8] package/vkmark: add vkmark benchmarking tool
[not found] ` <87ldwwbc1j.fsf__10394.9673286238$1733267303$gmane$org@draig.linaro.org>
@ 2024-12-04 7:42 ` Bernd Kuhls
2024-12-04 14:36 ` Alex Bennée
0 siblings, 1 reply; 13+ messages in thread
From: Bernd Kuhls @ 2024-12-04 7:42 UTC (permalink / raw)
To: buildroot
Am Tue, 03 Dec 2024 23:07:52 +0000 schrieb Alex Bennée:
> This was already fixed in:
>
> Subject: [PATCH 0/2] Enable venus and add vkmark Date: Mon, 2 Dec
> 2024 18:20:59 +0000 Message-Id:
> <20241202182101.410320-1-alex.bennee@linaro.org>
Hi Alex,
these errors were not fixed by your updated patch:
package/vkmark/Config.in:26: attributes order: type, default,
depends on, select, help (https://nightly.buildroot.org/#_config_files)
package/vkmark/Config.in:29: attributes order: type, default,
depends on, select, help (https://nightly.buildroot.org/#_config_files)
Also the dependency
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
can be dropped because
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # assimp
exists.
The dependency
depends on BR2_INSTALL_LIBSTDCPP
is present twice.
Should !BR2_USE_WCHAR be added to the comment?
Regards, Bernd
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [Buildroot] [PATCH 8/8] package/vkmark: add vkmark benchmarking tool
2024-12-04 7:42 ` Bernd Kuhls
@ 2024-12-04 14:36 ` Alex Bennée
0 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2024-12-04 14:36 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
Bernd Kuhls <bernd@kuhls.net> writes:
> Am Tue, 03 Dec 2024 23:07:52 +0000 schrieb Alex Bennée:
>
>> This was already fixed in:
>>
>> Subject: [PATCH 0/2] Enable venus and add vkmark Date: Mon, 2 Dec
>> 2024 18:20:59 +0000 Message-Id:
>> <20241202182101.410320-1-alex.bennee@linaro.org>
>
> Hi Alex,
>
> these errors were not fixed by your updated patch:
>
> package/vkmark/Config.in:26: attributes order: type, default,
> depends on, select, help (https://nightly.buildroot.org/#_config_files)
>
> package/vkmark/Config.in:29: attributes order: type, default,
> depends on, select, help
> (https://nightly.buildroot.org/#_config_files)
What test detects these?
I ran:
utils/docker-run make check-package
and that was clean.
>
> Also the dependency
>
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
>
> can be dropped because
>
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # assimp
>
> exists.
>
> The dependency
>
> depends on BR2_INSTALL_LIBSTDCPP
>
> is present twice.
Fixed.
> Should !BR2_USE_WCHAR be added to the comment?
How do you mean? We need wchar.
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread