aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/apitrace
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-devtools/apitrace')
-rw-r--r--meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch33
-rw-r--r--meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb (renamed from meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb)12
2 files changed, 7 insertions, 38 deletions
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
deleted file mode 100644
index 87fb4992d4..0000000000
--- a/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bdd5f0834d95a9598b0d87a18e7e96afade9d418 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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 <config.h>
- #include <stddef.h>
- #include <stdio.h>
-
---
-2.31.1
-
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb b/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
index e42b891d46..d872c4dbb5 100644
--- a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb
+++ b/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
@@ -5,9 +5,9 @@ LICENSE = "MIT & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \
file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c"
-SRCREV = "9d42f667e2a36a6624d92b9bd697de097cc4e619"
-PV .= "+10.0.1+git${SRCPV}"
-SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git \
+SRCREV = "9352fc02bba106fbbeef9e8452ef34643c0d0764"
+PV .= "+11.1+git"
+SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
"
S = "${WORKDIR}/git"
@@ -16,9 +16,11 @@ DEPENDS += "zlib libpng python3-native"
inherit cmake
+PACKAGECONFIG ??= " ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11', '', d)} "
+PACKAGECONFIG[x11] = "-DENABLE_X11=ON,-DENABLE_X11=OFF,libx11"
+
EXTRA_OECMAKE += "\
-DENABLE_GUI=OFF \
- -DENABLE_X11=OFF \
-DENABLE_STATIC_LIBGCC=OFF \
-DENABLE_STATIC_LIBSTDCXX=OFF \
-DPython3_ROOT_DIR=/usr/bin/python3-native \
@@ -29,4 +31,4 @@ EXTRA_OECMAKE += "\
-DENABLE_STATIC_SNAPPY=ON \
"
-SECURITY_CFLAGS_toolchain-clang = ""
+SECURITY_CFLAGS:toolchain-clang = ""