diff options
| author | Khem Raj <raj.khem@gmail.com> | 2025-05-02 17:20:15 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-05-04 23:18:20 -0700 |
| commit | 44028db0542a16796a3fb3b6de846be058c58560 (patch) | |
| tree | 7f648ac326a059063967ddacc307232d389a50fa /meta-oe | |
| parent | 2464c020bb95df0511690302e4058f1d538c75fa (diff) | |
| download | meta-openembedded-44028db0542a16796a3fb3b6de846be058c58560.tar.gz | |
renderdoc: Upgrade to 1.38
License-Upgrade: Copyright year changed
Drop the upstream denied patch, its not needed with clang-20 either
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch | 43 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb (renamed from meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb) | 5 |
2 files changed, 2 insertions, 46 deletions
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch deleted file mode 100644 index 1c714f84dc..0000000000 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From 4eb26927eebebfc4df8789ba69f60f3c28b8ba33 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 2 Jul 2024 23:36:23 -0700 | ||
| 4 | Subject: [PATCH] jpeg-compressor: Reorder stdio.h include location | ||
| 5 | |||
| 6 | Current, location ends up with compile errors with clang and glibc 2.40 | ||
| 7 | fortified headers | ||
| 8 | |||
| 9 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:13: error: use of undeclared identifier '__builtin___vfprintf_chk'; did you mean '__builtin___sprintf_chk'? | ||
| 10 | | 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, | ||
| 11 | | | ^ | ||
| 12 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:39: error: cannot initialize a parameter of type 'char *' with an lvalue of type 'FILE *const __restrict' (aka 'jpge::_IO_FILE *const __restrict') | ||
| 13 | | 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, | ||
| 14 | | | ^~~~~~~~ | ||
| 15 | |||
| 16 | This re-ordering ensures that fortified function prototypes are used correctly. | ||
| 17 | |||
| 18 | Upstream-Status: Submitted [https://github.com/baldurk/renderdoc/pull/3369] | ||
| 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 20 | --- | ||
| 21 | renderdoc/3rdparty/jpeg-compressor/jpge.cpp | 2 +- | ||
| 22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 23 | |||
| 24 | diff --git a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp | ||
| 25 | index 74d9d1006..d58e41664 100644 | ||
| 26 | --- a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp | ||
| 27 | +++ b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp | ||
| 28 | @@ -10,6 +10,7 @@ | ||
| 29 | |||
| 30 | #include "jpge.h" | ||
| 31 | |||
| 32 | +#include <stdio.h> | ||
| 33 | #include <stdlib.h> | ||
| 34 | #include <string.h> | ||
| 35 | |||
| 36 | @@ -897,7 +898,6 @@ bool jpeg_encoder::process_scanline(const void* pScanline) | ||
| 37 | } | ||
| 38 | |||
| 39 | // Higher level wrappers/examples (optional). | ||
| 40 | -#include <stdio.h> | ||
| 41 | |||
| 42 | class cfile_stream : public output_stream | ||
| 43 | { | ||
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb index 833845b5a3..8aab26c824 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb | |||
| @@ -2,12 +2,11 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" | |||
| 2 | DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" | 2 | DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" |
| 3 | HOMEPAGE = "https://github.com/baldurk/renderdoc" | 3 | HOMEPAGE = "https://github.com/baldurk/renderdoc" |
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5536c2b72eeed14bafaf4d2a6c032b87" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=963d134bd809d24547253120513346d3" |
| 6 | 6 | ||
| 7 | SRCREV = "cae289323847ce0a84a0deca4958183567eee17e" | 7 | SRCREV = "34c3c40787f440da9c2947cd63a41e6c4d1f95b9" |
| 8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
| 9 | git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ | 9 | git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ |
| 10 | file://0001-jpeg-compressor-Reorder-stdio.h-include-location.patch \ | ||
| 11 | " | 10 | " |
| 12 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
| 13 | 12 | ||
