From 9fd461a067ece989a7517dee8ba7100c73e8233a Mon Sep 17 00:00:00 2001
From: Alper Ak <alperyasinak1@gmail.com>
Date: Tue, 8 Jul 2025 01:54:05 +0300
Subject: [PATCH] apitrace: Upgrade 11.1 -> 13.0 to allow CMake 4+
 compatibility

- Drop 0001-Explicit-header-stdint.patch because already fixed in newer version.

Changelog:

https://github.com/apitrace/apitrace/releases/tag/13.0
https://github.com/apitrace/apitrace/releases/tag/12.0

Fix:

| CMake Error at thirdparty/libbacktrace.cmake:32 (cmake_minimum_required):
|   Compatibility with CMake < 3.5 has been removed from CMake.
|
|   Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
|   to tell CMake that the project requires at least <min> but has been updated
|   to work with policies introduced by <max> or earlier.
|
|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
| Call Stack (most recent call first):
|   thirdparty/CMakeLists.txt:13 (include)
|   thirdparty/CMakeLists.txt:55 (include_with_scope)

Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-Explicit-header-stdint.patch         | 42 -------------------
 .../{apitrace_11.1.bb => apitrace_13.0.bb}    |  8 +---
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
 rename meta-oe/recipes-devtools/apitrace/{apitrace_11.1.bb => apitrace_13.0.bb} (85%)

diff --git a/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch b/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
deleted file mode 100644
index 9ce6693061..0000000000
--- a/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 952bad1469ea747012bdc48c48993bd5f13eec04 Mon Sep 17 00:00:00 2001
-From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
-Date: Fri, 21 Mar 2025 05:02:23 +0000
-Subject: [PATCH] Explicit header: stdint
-
-Fix building with GCC-15. It no longer includes it by default.
-
-Upstream-Status: Backport [https://github.com/apitrace/apitrace/commit/952bad1469ea747012bdc48c48993bd5f13eec04]
-
-Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
----
- frametrim/ft_dependecyobject.hpp | 1 +
- retrace/metric_writer.cpp        | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/frametrim/ft_dependecyobject.hpp b/frametrim/ft_dependecyobject.hpp
-index 2cd0b768..0f17b601 100644
---- a/frametrim/ft_dependecyobject.hpp
-+++ b/frametrim/ft_dependecyobject.hpp
-@@ -28,6 +28,7 @@
- #pragma once
- 
- #include "ft_tracecall.hpp"
-+#include <stdint.h>
- 
- namespace frametrim {
- 
-diff --git a/retrace/metric_writer.cpp b/retrace/metric_writer.cpp
-index e923ed1d..4e4ce748 100644
---- a/retrace/metric_writer.cpp
-+++ b/retrace/metric_writer.cpp
-@@ -24,6 +24,7 @@
-  **************************************************************************/
- 
- #include <iostream>
-+#include <stdint.h>
- 
- #include "metric_writer.hpp"
- 
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb b/meta-oe/recipes-devtools/apitrace/apitrace_13.0.bb
similarity index 85%
rename from meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
rename to meta-oe/recipes-devtools/apitrace/apitrace_13.0.bb
index 244d9a3c6f..1e41548c9b 100644
--- a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
+++ b/meta-oe/recipes-devtools/apitrace/apitrace_13.0.bb
@@ -5,12 +5,8 @@ LICENSE = "MIT & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \
                     file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c"
 
-SRCREV = "9352fc02bba106fbbeef9e8452ef34643c0d0764"
-PV .= "+11.1+git"
-SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
-           file://0001-Explicit-header-stdint.patch \
-          "
-
+SRCREV = "ed44bd4c6cce224e2d64533d197bea6ca4fee266"
+SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https"
 
 DEPENDS += "zlib libpng python3-native"