markus.lehr/yoctor-layers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added my Recipes

Browse Source
This commit is contained in:
Markus Lehr
2024-07-11 14:16:35 +02:00
parent 38bc4f53ac
commit 09b621d929
7118 changed files with 525762 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Remove-dead-variable-984.patch Normal file
View File

@@ -0,0 +1,34 @@
From 0d863b444c9a54a92dab176b1b656c116923e1ca Mon Sep 17 00:00:00 2001
From: alan-baker <alanbaker@google.com>
Date: Wed, 30 Mar 2022 12:59:28 -0400
Subject: [PATCH] Remove dead variable (#984)
Upstream-Status: Backport [https://github.com/google/amber/commit/627ee453d6047ced0e2dd13cde983b341d0615e3]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/vkscript/command_parser.cc | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/vkscript/command_parser.cc b/src/vkscript/command_parser.cc
index 610c7e6..3429d4d 100644
--- a/src/vkscript/command_parser.cc
+++ b/src/vkscript/command_parser.cc
@@ -486,7 +486,6 @@ Result CommandParser::ParseValues(const std::string& name,
std::vector<Value>* values) {
assert(values);
- uint32_t row_index = 0;
auto token = tokenizer_->NextToken();
size_t seen = 0;
while (!token->IsEOL() && !token->IsEOS()) {
@@ -515,7 +514,6 @@ Result CommandParser::ParseValues(const std::string& name,
values->push_back(v);
token = tokenizer_->NextToken();
- ++row_index;
++seen;
}
--
2.37.3

37
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch Normal file
View File

@@ -0,0 +1,37 @@
From ec12bb7bda60cdf2c848e13df67452a7d30a42be Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 3 Sep 2022 18:52:42 -0700
Subject: [PATCH] cmake: Define WAYLAND_SCANNER and WAYLAND_PROTOCOLS_DIR if
not already defined
This helps with cross compiling and providing these knobs from cmake
cmdline
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
framework/platform/CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt
index c3ac463e4..030163f6c 100644
--- a/framework/platform/CMakeLists.txt
+++ b/framework/platform/CMakeLists.txt
@@ -73,8 +73,12 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
add_definitions(-DDEQP_SUPPORT_WAYLAND=1)
include_directories(lnx/wayland)
- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
- pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
+ if (NOT DEFINED WAYLAND_PROTOCOLS_DIR)
+ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+ endif()
+ if (NOT DEFINED WAYLAND_SCANNER)
+ pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
+ endif()
set(DEQP_XDG_SHELL_PROTOCOL ${WAYLAND_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml)
set(DEQP_XDG_SHELL_GEN_OUTPUTS_DIR ${PROJECT_BINARY_DIR}/framework/platform)
--
2.37.3

61
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch Normal file
View File

@@ -0,0 +1,61 @@
From 74cf53d89529902ecdef5b230421bc4d30fd089b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 25 Jan 2023 15:36:14 -0800
Subject: [PATCH] include missing <cstdint>
gcc-13 exposed errors like below due to it removing indirect includes of
these headers in libstdc++ [1]
../git/external/amber/src/include/amber/shader_info.h:60:15: error: 'uint32_t' was not declared in this scope
60 | std::vector<uint32_t> shader_data;
| ^~~~~~~~
[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
Upstream-Status: Submitted [https://github.com/google/amber/pull/1016]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/amber/recipe.h | 1 +
include/amber/shader_info.h | 1 +
src/descriptor_set_and_binding_parser.h | 1 +
3 files changed, 3 insertions(+)
diff --git a/include/amber/recipe.h b/include/amber/recipe.h
index 310a86a..1b83213 100644
--- a/include/amber/recipe.h
+++ b/include/amber/recipe.h
@@ -15,6 +15,7 @@
#ifndef AMBER_RECIPE_H_
#define AMBER_RECIPE_H_
+#include <cstdint>
#include <string>
#include <utility>
#include <vector>
diff --git a/include/amber/shader_info.h b/include/amber/shader_info.h
index 6c9126a..b5ce751 100644
--- a/include/amber/shader_info.h
+++ b/include/amber/shader_info.h
@@ -15,6 +15,7 @@
#ifndef AMBER_SHADER_INFO_H_
#define AMBER_SHADER_INFO_H_
+#include <cstdint>
#include <string>
#include <vector>
diff --git a/src/descriptor_set_and_binding_parser.h b/src/descriptor_set_and_binding_parser.h
index 145aa42..4b0d774 100644
--- a/src/descriptor_set_and_binding_parser.h
+++ b/src/descriptor_set_and_binding_parser.h
@@ -15,6 +15,7 @@
#ifndef SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_
#define SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_
+#include <cstdint>
#include <string>
#include "amber/result.h"
--
2.39.1

114
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch Normal file
View File

@@ -0,0 +1,114 @@
From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001
From: Trevor Woerner <twoerner@gmail.com>
Date: Thu, 23 Sep 2021 19:36:43 -0400
Subject: [PATCH] use library sonames for linking
The recommended "best practices" for applications is to link to library
sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This
ensures that applications don't try to use libraries if an incompatible ABI
change occurs.
Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288]
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
framework/egl/egluGLContextFactory.cpp | 4 ++--
framework/egl/wrapper/eglwLibrary.cpp | 2 +-
framework/platform/android/tcuAndroidPlatform.cpp | 2 +-
framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +-
.../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +-
framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
--- a/framework/egl/egluGLContextFactory.cpp
+++ b/framework/egl/egluGLContextFactory.cpp
@@ -63,7 +63,7 @@ using std::vector;
# if (DE_OS == DE_OS_WIN32)
# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll"
# else
-# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so"
+# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2"
# endif
#endif
@@ -75,7 +75,7 @@ using std::vector;
# if (DE_OS == DE_OS_WIN32)
# define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll"
# else
-# define DEQP_OPENGL_LIBRARY_PATH "libGL.so"
+# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1"
# endif
#endif
--- a/framework/egl/wrapper/eglwLibrary.cpp
+++ b/framework/egl/wrapper/eglwLibrary.cpp
@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void)
const char* DefaultLibrary::getLibraryFileName (void)
{
#if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX)
- return "libEGL.so";
+ return "libEGL.so.1";
#elif (DE_OS == DE_OS_WIN32)
return "libEGL.dll";
#else
--- a/framework/platform/android/tcuAndroidPlatform.cpp
+++ b/framework/platform/android/tcuAndroidPlatform.cpp
@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil
class NativeDisplay : public eglu::NativeDisplay
{
public:
- NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {}
+ NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {}
virtual ~NativeDisplay (void) {}
virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; }
--- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
+++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr
{
public:
Library (void)
- : eglw::DefaultLibrary("libEGL.so")
+ : eglw::DefaultLibrary("libEGL.so.1")
{
}
--- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
+++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
@@ -66,7 +66,7 @@ public:
EGL_PLATFORM_WAYLAND_KHR,
"EGL_KHR_platform_wayland")
, m_display (waylandDisplay)
- , m_library ("libEGL.so") {}
+ , m_library ("libEGL.so.1") {}
~Display(void) {}
wayland::Display& getWaylandDisplay (void) { return *m_display; }
--- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
+++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
@@ -69,7 +69,7 @@ using std::vector;
// Default library names
#if !defined(DEQP_GLES2_LIBRARY_PATH)
-# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so"
+# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2"
#endif
#if !defined(DEQP_GLES3_LIBRARY_PATH)
@@ -77,7 +77,7 @@ using std::vector;
#endif
#if !defined(DEQP_OPENGL_LIBRARY_PATH)
-# define DEQP_OPENGL_LIBRARY_PATH "libGL.so"
+# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1"
#endif
#if !defined(DEQP_VULKAN_LIBRARY_PATH)
@@ -234,7 +234,7 @@ glu::RenderContext* ContextFactory::crea
}
EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine)
- : m_egl("libEGL.so")
+ : m_egl("libEGL.so.1")
, m_contextType(config.type)
, m_eglDisplay(EGL_NO_DISPLAY)
, m_eglContext(EGL_NO_CONTEXT)

34
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch Normal file
View File

@@ -0,0 +1,34 @@
From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 25 Jan 2023 19:19:34 -0800
Subject: [PATCH] Include missing <cstdint>
This error is seen with gcc-13 where include headers are not implicitly
included [1]
Fixes errors e.g.
error: 'uint32_t' does not name a type
[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
framework/common/tcuDefs.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp
index ad3d0736d..6dfac10fb 100644
--- a/framework/common/tcuDefs.hpp
+++ b/framework/common/tcuDefs.hpp
@@ -26,6 +26,7 @@
#include "deDefs.hpp"
#include "qpTestLog.h"
+#include <cstdint>
#include <string>
#include <stdexcept>
--
2.39.1

32
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch Normal file
View File

@@ -0,0 +1,32 @@
From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 31 May 2021 17:31:33 -0700
Subject: [PATCH] vulkancts: Include missing <cstdint>
Fixes build with gcc-13
../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type
2798 | BufferDataType type = static_cast<BufferDataType>(reinterpret_cast<std::uintptr_t>(expectedOutputs[resultIndex].getUserData()));
| ^~~~~~~~~
Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
index ab02be1dc..3d3ee4829 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
@@ -33,6 +33,7 @@
#include "deFloat16.h"
#include "vkQueryUtil.hpp"
#include "vkRefUtil.hpp"
+#include <cstdint>
#include <cstring>
#include <vector>
#include <limits>
--
2.39.1

13
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch Normal file
View File

@@ -0,0 +1,13 @@
--- a/external/glslang/src/glslang/Include/PoolAlloc.h
+++ b/external/glslang/src/glslang/Include/PoolAlloc.h
@@ -240,8 +240,9 @@ protected:
int numCalls; // just an interesting statistic
size_t totalBytes; // just an interesting statistic
-private:
+public:
TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator
+private:
TPoolAllocator(const TPoolAllocator&); // don't allow default copy constructor
};

20
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch Normal file
View File

@@ -0,0 +1,20 @@
--- a/framework/delibs/dethread/CMakeLists.txt
+++ b/framework/delibs/dethread/CMakeLists.txt
@@ -42,6 +42,7 @@ if (DE_OS_IS_UNIX)
add_definitions(-D__BSD_VISIBLE)
add_definitions(-D_XOPEN_SOURCE=600)
endif ()
+ add_definitions(-D_XOPEN_SOURCE=600)
add_definitions(-D_GNU_SOURCE)
set(DETHREAD_LIBS ${DETHREAD_LIBS} pthread)
--- a/framework/qphelper/CMakeLists.txt
+++ b/framework/qphelper/CMakeLists.txt
@@ -28,6 +28,7 @@ set(QPHELPER_LIBS
if (DE_OS_IS_UNIX OR DE_OS_IS_QNX)
# For vsnprintf()
add_definitions(-D_XOPEN_SOURCE=600)
+ set(QPHELPER_LIBS ${QPHELPER_LIBS} execinfo)
endif ()
if (DE_OS_IS_WIN32 AND DE_COMPILER_IS_MSC)

20
meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch Normal file
View File

@@ -0,0 +1,20 @@
Prepend instead of append to the module search path, as this script needs to use
the local module build, not the host module build.
Upstream-Status: Submitted
Signed-off-by: Ross Burton <ross.burton@arm.com>
diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py
index 83c5329ce..10e720910 100755
--- a/external/vulkancts/scripts/gen_framework.py
+++ b/external/vulkancts/scripts/gen_framework.py
@@ -33 +33 @@ from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
diff --git a/external/vulkancts/scripts/gen_framework_c.py b/external/vulkancts/scripts/gen_framework_c.py
index 95587e642..84b878cb2 100644
--- a/external/vulkancts/scripts/gen_framework_c.py
+++ b/external/vulkancts/scripts/gen_framework_c.py
@@ -28 +28 @@ import re
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))