From: Alexander Kanavin <[email protected]> Drop patch as issue fixed upstream.
Signed-off-by: Alexander Kanavin <[email protected]> --- ...ce-FORCE_INLINE_TEMPLATE-with-inline.patch | 52 ------------------- .../vulkan/vulkan-samples_git.bb | 3 +- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch deleted file mode 100644 index 22538d41194..00000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a7bfe82a311c713b12bb83b8488574ad5c784f89 Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Tue, 9 Jul 2024 04:29:11 +0000 -Subject: [PATCH] zstd.c: replace FORCE_INLINE_TEMPLATE with inline - -Refer [1], always-inline is not suggested to be used if you have indirect -+calls. so replace FORCE_INLINE_TEMPLATE with inline to fix error: -In function 'ZSTD_compressBlock_lazy_generic', - inlined from 'ZSTD_compressBlock_greedy' at TOPDIR/tmp-glibc/work/core2-32-wrs-linux/vulkan-samples/git/git/third_party/ktx/lib/basisu/zstd/zstd.c:21914:12: -TOPDIR/tmp-glibc/work/core2-32-wrs-linux/vulkan-samples/git/git/third_party/ktx/lib/basisu/zstd/zstd.c:21551:30: error: inlining failed in call to 'always_inline' 'ZSTD_HcFindBestMatch_selectMLS': function not considered for inlining - | FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_selectMLS ( - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -TOPDIR/tmp-glibc/work/core2-32-wrs-linux/vulkan-samples/git/git/third_party/ktx/lib/basisu/zstd/zstd.c:21736:32: note: called from here -| size_t const ml2 = searchMax(ms, ip, iend, &offsetFound); - -Upstream-Status: Inappropriate [ Latest upstream ktx don't have this part code ] - -Has report this issue to upstream Vulkan-Samples, refer [2] - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107931 -[2] https://github.com/KhronosGroup/Vulkan-Samples/issues/1089 - -Signed-off-by: Changqing Li <[email protected]> ---- - lib/basisu/zstd/zstd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/basisu/zstd/zstd.c b/lib/basisu/zstd/zstd.c -index eaf13738..423f149e 100644 ---- a/lib/basisu/zstd/zstd.c -+++ b/lib/basisu/zstd/zstd.c -@@ -21548,7 +21548,7 @@ size_t ZSTD_HcFindBestMatch_generic ( - } - - --FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_selectMLS ( -+static inline size_t ZSTD_HcFindBestMatch_selectMLS ( - ZSTD_matchState_t* ms, - const BYTE* ip, const BYTE* const iLimit, - size_t* offsetPtr) -@@ -21596,7 +21596,7 @@ static size_t ZSTD_HcFindBestMatch_dedicatedDictSearch_selectMLS ( - } - - --FORCE_INLINE_TEMPLATE size_t ZSTD_HcFindBestMatch_extDict_selectMLS ( -+static inline size_t ZSTD_HcFindBestMatch_extDict_selectMLS ( - ZSTD_matchState_t* ms, - const BYTE* ip, const BYTE* const iLimit, - size_t* offsetPtr) --- -2.44.0 - diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 06e996d2435..2dd4bba5230 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ file://0001-vulkan-samples-Fix-reproducibility-issue.patch \ - file://0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch;patchdir=third_party/ktx \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "fdce530c029514e2f66296288f9ee26a05058ec1" +SRCREV = "4838e02a4b08236931bec0532fc26ee3871b466a" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" -- 2.39.5
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#208257): https://lists.openembedded.org/g/openembedded-core/message/208257 Mute This Topic: https://lists.openembedded.org/mt/109915760/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
