diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics')
12 files changed, 224 insertions, 99 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch index 4e875ba82b..5a42e67d06 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch @@ -1,29 +1,30 @@ -From c3460d63f0b6cd50b9a64265f420f0439e12a1d5 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 25 Apr 2017 01:36:44 -0400 -Subject: [PATCH 2/4] do not build tests sub directory +From 076d0e12a7be6cd2108e4ca0dcde1cb658918fa5 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Mon, 19 Apr 2021 23:02:45 -0700 +Subject: [PATCH] do not build tests sub directory -Upstream-Status: Inappropriate [oe specific] +Upstream-Status: Inappropriate [OE Specific] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Hongxu Jia <Hongxu.Jia@windriver.com> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94ec2ef..fb72a00 100644 +index 7bf99441..bda80598 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -300,9 +300,6 @@ if(BUILD_VIEWER) +@@ -304,9 +304,6 @@ if(BUILD_VIEWER) add_subdirectory(media) endif() -add_subdirectory(tests) - - - include(cmake/BuildPackages.cmake) + add_subdirectory(release) # uninstall -- -2.7.4 +2.30.2 diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch index 97b0a388a2..5f14665b8d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch @@ -1,44 +1,34 @@ -From 9563b69640227da2220ee0c39077afb736cc96d1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 20 Jul 2017 17:12:17 +0800 -Subject: [PATCH 4/4] tigervnc: add fPIC option to COMPILE_FLAGS +From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Mon, 19 Apr 2021 23:14:28 -0700 +Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS -The static libraries in Xregion/network/rdr/rfb were linked by shared +The static libraries in network/rdr/rfb were linked by shared library libvnc.so, so we should add fPIC option to COMPILE_FLAGS to fix relocation issue. Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- - common/Xregion/CMakeLists.txt | 1 + common/network/CMakeLists.txt | 1 + common/rdr/CMakeLists.txt | 1 + common/rfb/CMakeLists.txt | 1 + - 4 files changed, 4 insertions(+) + 3 files changed, 3 insertions(+) -diff --git a/common/Xregion/CMakeLists.txt b/common/Xregion/CMakeLists.txt -index 40ca97e..9411328 100644 ---- a/common/Xregion/CMakeLists.txt -+++ b/common/Xregion/CMakeLists.txt -@@ -3,4 +3,5 @@ add_library(Xregion STATIC - - if(UNIX) - libtool_create_control_file(Xregion) -+ set_target_properties(Xregion PROPERTIES COMPILE_FLAGS -fPIC) - endif() diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt -index b624c8e..6c06ec9 100644 +index d00ca452..e84e0290 100644 --- a/common/network/CMakeLists.txt +++ b/common/network/CMakeLists.txt -@@ -9,4 +9,5 @@ endif() +@@ -16,4 +16,5 @@ endif() if(UNIX) libtool_create_control_file(network) + set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC) endif() diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt -index 989ba2f..20f6489 100644 +index 989ba2f4..20f6489d 100644 --- a/common/rdr/CMakeLists.txt +++ b/common/rdr/CMakeLists.txt @@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES}) @@ -48,15 +38,15 @@ index 989ba2f..20f6489 100644 + set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC) endif() diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt -index 5047e5e..88838ab 100644 +index fc5a37bf..7f5ce131 100644 --- a/common/rfb/CMakeLists.txt +++ b/common/rfb/CMakeLists.txt -@@ -98,4 +98,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES}) +@@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES}) if(UNIX) libtool_create_control_file(rfb) + set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC) endif() -- -2.7.4 +2.30.2 diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index f97c2b2d6c..c45fc028fc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -2,22 +2,22 @@ DESCRIPTION = "TigerVNC remote display system" HOMEPAGE = "http://www.tigervnc.com/" LICENSE = "GPLv2+" SECTION = "x11/utils" -DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk" -RDEPENDS_${PN} = "coreutils hicolor-icon-theme perl" +DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam" +RDEPENDS_${PN} = "coreutils hicolor-icon-theme perl bash" LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" S = "${WORKDIR}/git" inherit features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 pam" inherit autotools cmake B = "${S}" -SRCREV = "4739493b635372bd40a34640a719f79fa90e4dba" +SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca" -SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.10-branch \ +SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch \ file://0002-do-not-build-tests-sub-directory.patch \ file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ @@ -83,6 +83,8 @@ EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwayland \ " +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}" + do_configure_append () { olddir=`pwd` cd ${XSERVER_SOURCE_DIR} @@ -125,6 +127,7 @@ do_install_append() { FILES_${PN} += " \ ${libdir}/xorg/modules/extensions \ ${datadir}/icons \ + ${systemd_unitdir} \ " FILES_${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb index 5d35088572..326818eef0 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb @@ -23,9 +23,10 @@ UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" inherit autotools pkgconfig -PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" +PACKAGECONFIG ??= "debounce dejitter evthres iir linear median pthres skip lowpass invert variance input touchkit waveshare" PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" +PACKAGECONFIG[evthres] = "--enable-evthres,--disable-evthres" PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" PACKAGECONFIG[median] = "--enable-median,--disable-median" @@ -49,6 +50,7 @@ PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" +PACKAGECONFIG[one-wire-ts-input] = "--enable-one-wire-ts-input,--disable-one-wire-ts-input" PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" do_install_prepend() { diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch deleted file mode 100644 index 4f3c7554cf..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Do-not-error-on-uninitialized-warnings.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f9906a3a1b7f1ade7a6c4e1a8aa67cb3a5e663a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 3 Mar 2021 11:33:15 -0800 -Subject: [PATCH] Do not error on uninitialized warnings - -code in verifier.cc violates C/C++ aliasing rules so code should be -perhaps changed to use a union - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - external/amber/src/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/external/amber/src/CMakeLists.txt b/external/amber/src/CMakeLists.txt -index 80a0df7..4323c81 100644 ---- a/external/amber/src/CMakeLists.txt -+++ b/external/amber/src/CMakeLists.txt -@@ -133,6 +133,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - -Werror - -Wextra - -Wno-unknown-pragmas -+ -Wno-error=uninitialized - -Wpedantic - -pedantic-errors) - elseif(MSVC) --- -2.30.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch new file mode 100644 index 0000000000..746497d047 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch @@ -0,0 +1,88 @@ +From aec0be857ed3faef8802c7fd61f3d7798a565108 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Apr 2021 16:03:42 -0700 +Subject: [PATCH] Include <limits> header for numeric_limits + +Fixes +vulkancts/framework/vulkan/vkRayTracingUtil.hpp:116:32: error: 'numeric_limits' is not a member of 'std' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + framework/vulkan/vkRayTracingUtil.hpp | 1 + + modules/vulkan/api/vktApiBufferTests.cpp | 1 + + modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +--- a/framework/vulkan/vkRayTracingUtil.hpp ++++ b/framework/vulkan/vkRayTracingUtil.hpp +@@ -33,6 +33,7 @@ + #include "tcuVector.hpp" + #include "tcuVectorType.hpp" + ++#include <limits> + #include <vector> + + namespace vk +--- a/modules/vulkan/api/vktApiBufferTests.cpp ++++ b/modules/vulkan/api/vktApiBufferTests.cpp +@@ -35,6 +35,7 @@ + #include "tcuPlatform.hpp" + + #include <algorithm> ++#include <limits> + + namespace vkt + { +--- a/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp ++++ b/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp +@@ -28,6 +28,8 @@ + #include "vktSpvAsmComputeShaderCase.hpp" + #include "vktSpvAsmGraphicsShaderTestUtil.hpp" + ++#include <limits> ++ + namespace vkt + { + namespace SpirVAssembly +--- a/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp ++++ b/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp +@@ -40,6 +40,7 @@ + + #include "deSharedPtr.hpp" + ++#include <limits> + #include <set> + #include <vector> + +--- a/modules/vulkan/draw/vktDrawDepthClampTests.cpp ++++ b/modules/vulkan/draw/vktDrawDepthClampTests.cpp +@@ -38,6 +38,7 @@ + #include "vkQueryUtil.hpp" + #include "tcuTextureUtil.hpp" + ++#include <limits> + #include <cmath> + + namespace vkt +--- a/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp ++++ b/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp +@@ -39,6 +39,8 @@ + #include "tcuPlatform.hpp" + #include "tcuCommandLine.hpp" + ++#include <limits> ++ + #if ( DE_OS == DE_OS_WIN32 ) + #define NOMINMAX + #define WIN32_LEAN_AND_MEAN +--- a/modules/vulkan/synchronization/vktSynchronizationUtil.cpp ++++ b/modules/vulkan/synchronization/vktSynchronizationUtil.cpp +@@ -21,6 +21,7 @@ + * \brief Synchronization tests utilities + *//*--------------------------------------------------------------------*/ + ++#include <limits> + #include "vktSynchronizationUtil.hpp" + #include "vkTypeUtil.hpp" + #include "vkCmdUtil.hpp" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch new file mode 100644 index 0000000000..6c87cad0a6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch @@ -0,0 +1,73 @@ +From 9cd614dd5481a4fdf552effac4820f51a10092c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mika=20V=C3=A4in=C3=B6l=C3=A4?= + <33728696+mvainola@users.noreply.github.com> +Date: Wed, 7 Apr 2021 13:12:17 +0300 +Subject: [PATCH] Workaround for GCC 11 uninit variable warnings (#946) + +Building Amber with GCC 11.0.1 produces some uninitialized variable +warnings. This commit works around them by replacing +reinterpret_cast with memcpy when type punning unsigned integers to +floats. + +Upstream-Status: Backport [https://github.com/google/amber/commit/aa69a0ac23ea7f68dd32bbef210546a5d84c1734] +--- + src/float16_helper.cc | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/src/float16_helper.cc b/src/float16_helper.cc +index 617bd72..5cb35e7 100644 +--- a/src/float16_helper.cc ++++ b/src/float16_helper.cc +@@ -15,6 +15,7 @@ + #include "src/float16_helper.h" + + #include <cassert> ++#include <cstring> + + // Float10 + // | 9 8 7 6 5 | 4 3 2 1 0 | +@@ -75,8 +76,11 @@ float HexFloat16ToFloat(const uint8_t* value) { + } + + uint32_t hex = sign | exponent | mantissa; +- float* hex_float = reinterpret_cast<float*>(&hex); +- return *hex_float; ++ float hex_float; ++ static_assert((sizeof(uint32_t) == sizeof(float)), ++ "sizeof(uint32_t) != sizeof(float)"); ++ memcpy(&hex_float, &hex, sizeof(float)); ++ return hex_float; + } + + // Convert float |value| whose size is 11 bits to 32 bits float +@@ -89,8 +93,11 @@ float HexFloat11ToFloat(const uint8_t* value) { + uint32_t mantissa = (static_cast<uint32_t>(value[0]) & 0x3f) << 17U; + + uint32_t hex = exponent | mantissa; +- float* hex_float = reinterpret_cast<float*>(&hex); +- return *hex_float; ++ float hex_float; ++ static_assert((sizeof(uint32_t) == sizeof(float)), ++ "sizeof(uint32_t) != sizeof(float)"); ++ memcpy(&hex_float, &hex, sizeof(float)); ++ return hex_float; + } + + // Convert float |value| whose size is 10 bits to 32 bits float +@@ -103,8 +110,11 @@ float HexFloat10ToFloat(const uint8_t* value) { + uint32_t mantissa = (static_cast<uint32_t>(value[0]) & 0x1f) << 18U; + + uint32_t hex = exponent | mantissa; +- float* hex_float = reinterpret_cast<float*>(&hex); +- return *hex_float; ++ float hex_float; ++ static_assert((sizeof(uint32_t) == sizeof(float)), ++ "sizeof(uint32_t) != sizeof(float)"); ++ memcpy(&hex_float, &hex, sizeof(float)); ++ return hex_float; + } + + } // namespace +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch index b4573b38b5..ea7659c698 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch @@ -1,7 +1,5 @@ -Index: git/external/glslang/src/glslang/Include/PoolAlloc.h -=================================================================== ---- git.orig/external/glslang/src/glslang/Include/PoolAlloc.h -+++ git/external/glslang/src/glslang/Include/PoolAlloc.h +--- 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 diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch index 4116ae7d14..99cb87b301 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch @@ -1,19 +1,15 @@ -Index: git/framework/delibs/dethread/CMakeLists.txt -=================================================================== ---- git.orig/framework/delibs/dethread/CMakeLists.txt -+++ git/framework/delibs/dethread/CMakeLists.txt -@@ -39,6 +39,7 @@ include_directories( - - if (DE_OS_IS_UNIX) - add_definitions(-D_GNU_SOURCE) +--- 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) - set(DETHREAD_LIBS ${DETHREAD_LIBS} pthread) - endif () + add_definitions(-D_GNU_SOURCE) -Index: git/framework/qphelper/CMakeLists.txt -=================================================================== ---- git.orig/framework/qphelper/CMakeLists.txt -+++ git/framework/qphelper/CMakeLists.txt + 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() diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index e64a935dda..d0f0e23429 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -22,6 +22,10 @@ REQUIRED_DISTRO_FEATURES += "opengl" DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" +SRC_URI += "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src \ + file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts \ +" + SRC_URI_append_libc-musl = "\ file://fix-musl.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb index 184547aa76..a67992ee95 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb @@ -1,16 +1,14 @@ DESCRIPTION = "OpenGL CTS" require khronos-cts.inc -# opengl-es-cts-3.2.6.1 -SRCREV_vk-gl-cts = "7e023f81b4fff54b558882fe739d7c959d0a02a8" -SRCREV_amber = "d26ee22dd7faab1845a531d410f7ec1db407402a" -SRCREV_glslang = "c538b5d796fb24dd418fdd650c7f76e56bcc3dd8" -SRCREV_spirv-headers = "e4322e3be589e1ddd44afb20ea842a977c1319b8" -SRCREV_spirv-tools = "1eb89172a82b436d8037e8a8c29c80f7e1f7df74" +# opengl-es-cts-3.2.7.0 +SRCREV_vk-gl-cts = "7cba7113c40f2ff03573c8c2c90661b2249e04fa" +SRCREV_amber = "4d0115cccfcb3b73d20b6513b1c40748e6403c50" +SRCREV_glslang = "ffccefddfd9a02ec0c0b6dd04ef5e1042279c97f" +SRCREV_spirv-headers = "104ecc356c1bea4476320faca64440cd1df655a3" +SRCREV_spirv-tools = "cd590fa3341284cd6d1ee82366155786cfd44c96" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-Do-not-error-on-uninitialized-warnings.patch" - S = "${WORKDIR}/git" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.2.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb index f07b12decd..f816c1bd17 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Vulkan CTS" require khronos-cts.inc -# vulkan-cts-1.2.3.2 -SRCREV_vk-gl-cts = "5cd2240b60825fbbf6bd9ddda6af176ee3100c70" -SRCREV_amber = "a40bef4dba98d2d80b48e5a940d8574fbfceb197" -SRCREV_glslang = "b5f003d7a3ece37db45578a8a3140b370036fc64" -SRCREV_spirv-headers = "f8bf11a0253a32375c32cad92c841237b96696c0" -SRCREV_spirv-tools = "d2b486219495594f2e5d0e8d457fc234a3460b3b" +# vulkan-cts-1.2.6.0 +SRCREV_vk-gl-cts = "2cab49df5ad25a2d0061152367a21c6da83ed097" +SRCREV_amber = "dabae26164714abf951c6815a2b4513260f7c6a4" +SRCREV_glslang = "5c4f421121c4d24aad23a507e630dc5dc6c92c7c" +SRCREV_spirv-headers = "faa570afbc91ac73d594d787486bcf8f2df1ace0" +SRCREV_spirv-tools = "f11f7434815838bbad349124767b258ce7df41f0" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" S = "${WORKDIR}/git" |