diff options
Diffstat (limited to 'meta-oe/recipes-graphics')
| -rw-r--r-- | meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch | 57 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb | 35 |
2 files changed, 92 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch new file mode 100644 index 0000000000..e96dedfc39 --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch @@ -0,0 +1,57 @@ +From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu <adrian.ratiu@collabora.com> +Date: Tue, 24 Sep 2019 16:07:18 +0300 +Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary + +Renderdoc's attempt to cross compile an xxd replacement by directly +calling a host cross-compiler breaks under OE's recipe specific +sysroots protection because this is not a native recipe, so we just +use xxd-native instead. + +Upstream-Status: Inappropriate [embedded-specific] + +--- + renderdoc/CMakeLists.txt | 23 +---------------------- + 1 file changed, 1 insertion(+), 22 deletions(-) + +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt +index 5cb7440a4..453a034ba 100644 +--- a/renderdoc/CMakeLists.txt ++++ b/renderdoc/CMakeLists.txt +@@ -370,26 +370,6 @@ set(data + set(data_objects) + + if(UNIX) +- # If we're cross-compiling, include-bin will get built for the target and we +- # then can't execute it. Instead, we force calling c++ (which we can safely +- # assume is present) directly to build the binary +- +- if(CMAKE_CROSSCOMPILING) +- set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++") +- +- add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} +- COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin +- DEPENDS 3rdparty/include-bin/main.cpp) +- set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") +- set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") +- else() +- add_executable(include-bin 3rdparty/include-bin/main.cpp) +- set(INCLUDE_BIN_EXE $<TARGET_FILE:include-bin>) +- set(INCLUDE_BIN_DEP include-bin) +- endif() +- + foreach(res ${data}) + set(in ${res}) + set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -399,8 +379,7 @@ if(UNIX) + add_custom_command(OUTPUT ${out_src} + WORKING_DIRECTORY ${working_dir} + COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} +- COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} +- DEPENDS ${INCLUDE_BIN_DEP} ++ COMMAND xxd -i ${in} ${out_src} + DEPENDS ${res}) + + list(APPEND data_objects ${out_src}) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb new file mode 100644 index 0000000000..b6e0c92f6d --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb @@ -0,0 +1,35 @@ +SUMMARY = "RenderDoc recipe providing renderdoccmd" +DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" +HOMEPAGE = "https://github.com/baldurk/renderdoc" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9753b1b4fba3261c27d1ce5c1acef667" + +SRCREV = "214d85228538e71cc63a0d7fa11dd75b1d56cc81" +SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ + file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ +" +S = "${WORKDIR}/git" + +DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native" + +RDEPENDS_${PN} = "libxcb xcb-util-keysyms" + +inherit cmake python3native + +python __anonymous () { + # only works on glibc systems + if d.getVar('TCLIBC') != "glibc": + raise bb.parse.SkipRecipe("incompatible with %s C library" % d.getVar('TCLIBC')) +} + +COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64).*-linux" + +EXTRA_OECMAKE += "\ + -DENABLE_QRENDERDOC=OFF \ + -DENABLE_PYRENDERDOC=OFF \ + -DENABLE_RENDERDOCCMD=ON \ + -DCMAKE_BUILD_TYPE=Release \ +" + +FILES_${PN} += "${libdir}" +FILES_${PN}-dev = "${includedir}" |