From 259e6d305adfa3adcd34e36b855e01c824b5d588 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 May 2021 08:32:14 -0700 Subject: apitrace: Upgrade to 0.10 apitrace: Fix build with musl Changes are here [1] which fixed musl build [1] https://github.com/apitrace/apitrace/releases/tag/10.0 Signed-off-by: Khem Raj --- .../0001-libbacktrace-include-config.h.patch | 33 ++++++++++++++++++++++ meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb | 32 +++++++++++++++++++++ meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb | 30 -------------------- 3 files changed, 65 insertions(+), 30 deletions(-) create mode 100644 meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch create mode 100644 meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb delete mode 100644 meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch b/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch new file mode 100644 index 0000000000..87fb4992d4 --- /dev/null +++ b/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch @@ -0,0 +1,33 @@ +From bdd5f0834d95a9598b0d87a18e7e96afade9d418 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 10 May 2021 15:28:05 -0700 +Subject: [PATCH] libbacktrace: include config.h + +Fixes +thirdparty/libbacktrace/backtrace.h:53:10: fatal error: gstdint.h: No such file or directory + 53 | #include "gstdint.h" + | ^~~~~~~~~~~ +compilation terminated. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + thirdparty/libbacktrace/backtrace.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/thirdparty/libbacktrace/backtrace.h b/thirdparty/libbacktrace/backtrace.h +index 2814763f..802cf989 100644 +--- a/thirdparty/libbacktrace/backtrace.h ++++ b/thirdparty/libbacktrace/backtrace.h +@@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. */ + #ifndef BACKTRACE_H + #define BACKTRACE_H + ++#include + #include + #include + +-- +2.31.1 + diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb new file mode 100644 index 0000000000..616d56daa1 --- /dev/null +++ b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "Tools for tracing OpenGL, Direct3D, and other graphics APIs" +HOMEPAGE = "http://apitrace.github.io/" +SECTION = "console/tools" +LICENSE = "MIT & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ + file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" + +SRCREV = "03e4e9d2cab4f1a61d3f589785641a73dff027c5" +SRC_URI = "git://github.com/${BPN}/${BPN}.git \ + file://0001-libbacktrace-include-config.h.patch \ + " + +S = "${WORKDIR}/git" + +DEPENDS += "zlib libpng python3-native" + +inherit cmake + +EXTRA_OECMAKE += "\ + -DENABLE_GUI=OFF \ + -DENABLE_X11=OFF \ + -DENABLE_STATIC_LIBGCC=OFF \ + -DENABLE_STATIC_LIBSTDCXX=OFF \ + -DPython3_ROOT_DIR=/usr/bin/python3-native \ +" + +# Use the bundled snappy library +EXTRA_OECMAKE += "\ + -DENABLE_STATIC_SNAPPY=ON \ +" + +SECURITY_CFLAGS_toolchain-clang = "" diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb b/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb deleted file mode 100644 index 826291a5e4..0000000000 --- a/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Tools for tracing OpenGL, Direct3D, and other graphics APIs" -HOMEPAGE = "http://apitrace.github.io/" -SECTION = "console/tools" -LICENSE = "MIT & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ - file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" - -SRCREV = "cae55f54c53449fd07f8a917dcd0874db2c15032" -SRC_URI = "git://github.com/${BPN}/${BPN}.git" - -S = "${WORKDIR}/git" - -DEPENDS += "zlib libpng python3-native" - -inherit cmake - -EXTRA_OECMAKE += "\ - -DENABLE_GUI=OFF \ - -DENABLE_X11=OFF \ - -DENABLE_STATIC_LIBGCC=OFF \ - -DENABLE_STATIC_LIBSTDCXX=OFF \ - -DPython3_ROOT_DIR=/usr/bin/python3-native \ -" - -# Use the bundled snappy library -EXTRA_OECMAKE += "\ - -DENABLE_STATIC_SNAPPY=ON \ -" - -SECURITY_CFLAGS_toolchain-clang = "" -- cgit v1.2.3-54-g00ecf