Complete Yocto mirror with license table for TQMa6UL (2038-compliance)
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
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(-)
|
||||
|
||||
--- a/framework/platform/CMakeLists.txt
|
||||
+++ b/framework/platform/CMakeLists.txt
|
||||
@@ -73,8 +73,9 @@ 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)
|
||||
-
|
||||
+ if (NOT WAYLAND_PROTOCOLS_DIR)
|
||||
+ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
|
||||
+ endif()
|
||||
if (NOT WAYLAND_SCANNER)
|
||||
pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
|
||||
endif()
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
--- 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
|
||||
};
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
--- 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)
|
||||
@@ -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"))
|
||||
@@ -0,0 +1,83 @@
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
|
||||
SRC_URI = "\
|
||||
git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \
|
||||
git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \
|
||||
git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=main \
|
||||
git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=main \
|
||||
git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=main \
|
||||
git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \
|
||||
git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \
|
||||
https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \
|
||||
git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;branch=main \
|
||||
git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_vulkan-docs"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit pkgconfig cmake features_check python3native qemu
|
||||
|
||||
ANY_OF_DISTRO_FEATURES += "opengl vulkan"
|
||||
|
||||
DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-vulkancts-Include-missing-cstdint.patch \
|
||||
file://0001-use-library-sonames-for-linking.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:libc-musl = "\
|
||||
file://fix-musl.patch \
|
||||
"
|
||||
DEPENDS:append:libc-musl = " libexecinfo"
|
||||
|
||||
SRC_URI:append:toolchain-clang = "\
|
||||
file://fix-clang-private-operator.patch \
|
||||
"
|
||||
|
||||
EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON"
|
||||
|
||||
# The best thing for the user to do is to not specify any of the following
|
||||
# PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its own
|
||||
# probing and build what it thinks is appropriate.
|
||||
# However, if you want, you can specify one of the following PACKAGECONFIGs
|
||||
# to override this behaviour.
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,,,,,wayland x11_egl x11_glx x11_egl_glx"
|
||||
PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland-native wayland wayland-protocols,,,surfaceless x11_egl x11_glx x11_egl_glx"
|
||||
PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_glx x11_egl_glx"
|
||||
PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless wayland x11_egl x11_egl_glx"
|
||||
PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_egl x11_glx"
|
||||
|
||||
do_configure:append() {
|
||||
# Write out a qemu wrapper that will be used by cmake
|
||||
# so that it can run target helper binaries through that.
|
||||
qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
|
||||
cat > ${WORKDIR}/qemuwrapper << EOF
|
||||
#!/bin/sh
|
||||
$qemu_binary "\$@"
|
||||
EOF
|
||||
chmod +x ${WORKDIR}/qemuwrapper
|
||||
}
|
||||
|
||||
python __anonymous() {
|
||||
# if the user doesn't specify any PACKAGECONFIG then the cts build system
|
||||
# is going to probe the sysroot to try to figure out what to build
|
||||
# in this case we try to guess whether the user is building for wayland
|
||||
# or x11 and add the required dependencies automatically
|
||||
distrofeatures = (d.getVar("DISTRO_FEATURES") or "")
|
||||
if not bb.utils.contains_any("PACKAGECONFIG", ["surfaceless", "wayland", "x11_egl", "x11_glx", "x11_egl_glx"], True, False, d):
|
||||
if "wayland" in distrofeatures:
|
||||
d.appendVar("DEPENDS", " wayland-native ${MLPREFIX}wayland ${MLPREFIX}wayland-protocols")
|
||||
if "x11" in distrofeatures:
|
||||
d.appendVar("DEPENDS", " virtual/${MLPREFIX}libx11 virtual/${MLPREFIX}egl ")
|
||||
}
|
||||
|
||||
CTSDIR = "/usr/lib/${BPN}"
|
||||
|
||||
FILES:${PN} += "${CTSDIR}"
|
||||
@@ -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)
|
||||
@@ -0,0 +1,40 @@
|
||||
DESCRIPTION = "OpenGL CTS"
|
||||
|
||||
require khronos-cts.inc
|
||||
# opengl-es-cts-3.2.9.3
|
||||
SRCREV_vk-gl-cts = "7f5fb62245d535a1fc0bf50b2c7e5a342dc551fe"
|
||||
SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273"
|
||||
SRCREV_glslang = "a0ad0d7067521fff880e36acfb8ce453421c3f25"
|
||||
SRCREV_spirv-headers = "87d5b782bec60822aa878941e6b13c0a9a954c9b"
|
||||
SRCREV_spirv-tools = "f98473ceeb1d33700d01e20910433583e5256030"
|
||||
SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4"
|
||||
# Not yet needed
|
||||
SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1"
|
||||
SRCREV_vulkan-docs = "9a2e576a052a1e65a5d41b593e693ff02745604b"
|
||||
SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904"
|
||||
SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e"
|
||||
|
||||
SRC_URI += "\
|
||||
git://github.com/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \
|
||||
file://gen-framework-path.patch \
|
||||
"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}/${CTSDIR}
|
||||
cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR}
|
||||
|
||||
install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR}
|
||||
install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR}
|
||||
install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR}
|
||||
install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR}
|
||||
install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR}
|
||||
|
||||
rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles
|
||||
rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles
|
||||
rm -rf ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles
|
||||
}
|
||||
|
||||
SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}"
|
||||
LTO = ""
|
||||
|
||||
@@ -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)
|
||||
@@ -237,7 +237,7 @@ glu::RenderContext* ContextFactory::crea
|
||||
}
|
||||
|
||||
EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine, const glu::RenderContext *sharedContext)
|
||||
- : m_egl("libEGL.so")
|
||||
+ : m_egl("libEGL.so.1")
|
||||
, m_contextType(config.type)
|
||||
, m_eglDisplay(EGL_NO_DISPLAY)
|
||||
, m_eglContext(EGL_NO_CONTEXT)
|
||||
@@ -0,0 +1,41 @@
|
||||
DESCRIPTION = "Vulkan CTS"
|
||||
|
||||
require khronos-cts.inc
|
||||
|
||||
SRC_URI += "git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1"
|
||||
|
||||
# vulkan-cts-1.3.7.3
|
||||
SRCREV_vk-gl-cts = "d71a36db16d98313c431829432a136dbda692a08"
|
||||
SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273"
|
||||
SRCREV_glslang = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3"
|
||||
SRCREV_spirv-headers = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c"
|
||||
SRCREV_spirv-tools = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0"
|
||||
SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1"
|
||||
SRCREV_vulkan-docs = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0"
|
||||
SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e"
|
||||
# Not yet needed
|
||||
SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f"
|
||||
SRCREV_video-parser = "138bbe048221d315962ddf8413aa6a08cc62a381"
|
||||
|
||||
SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \
|
||||
file://0001-vulkan-cts-include-missing-cstdint.patch \
|
||||
"
|
||||
|
||||
TOOLCHAIN = "gcc"
|
||||
|
||||
# Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT
|
||||
OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "vulkan"
|
||||
inherit features_check
|
||||
|
||||
DEPENDS += " vulkan-loader"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}/${CTSDIR}
|
||||
cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/
|
||||
rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles
|
||||
rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles
|
||||
}
|
||||
Reference in New Issue
Block a user