From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Lucas Stach <l.stach@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] apitrace: version bump 11.1 -> 13.0
Date: Thu, 15 Jan 2026 16:12:00 +0100 [thread overview]
Message-ID: <20260115151200.230695-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20251214131043.75281-1-l.stach@pengutronix.de>
Thanks, applied as eb46a636a74b855e0ce2324c68705650852dced0.
Michael
[sent from post-receive hook]
On Thu, 15 Jan 2026 16:12:00 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20251214131043.75281-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/apitrace-11.1/0003-Allow-building-without-GTest-when-BUILD_TESTING-is-n.patch b/patches/apitrace-11.1/0003-Allow-building-without-GTest-when-BUILD_TESTING-is-n.patch
> deleted file mode 100644
> index 6141bc92fea6..000000000000
> --- a/patches/apitrace-11.1/0003-Allow-building-without-GTest-when-BUILD_TESTING-is-n.patch
> +++ /dev/null
> @@ -1,60 +0,0 @@
> -From: Brent Spillner <spillner@acm.org>
> -Date: Sat, 23 Sep 2023 00:07:25 +1000
> -Subject: [PATCH] Allow building without GTest when BUILD_TESTING is not set
> -
> -Link: https://github.com/apitrace/apitrace/pull/894
> ----
> - CMakeLists.txt | 19 ++++++++++++-------
> - thirdparty/CMakeLists.txt | 2 +-
> - 2 files changed, 13 insertions(+), 8 deletions(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 3d8b5811ebe2..ecdf8a0f0b0b 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -483,7 +483,9 @@ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
> - pkg_check_modules (BROTLIENC IMPORTED_TARGET libbrotlienc>=1.0.7)
> - endif ()
> -
> -- find_package (GTest)
> -+ if (BUILD_TESTING)
> -+ find_package (GTest)
> -+ endif ()
> - endif ()
> -
> - add_subdirectory (thirdparty)
> -@@ -495,12 +497,15 @@ add_subdirectory (thirdparty)
> - include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos)
> -
> - # Convenience macro for adding unit tests
> --macro (add_gtest)
> -- add_executable (${ARGV})
> -- target_link_libraries (${ARGV0} GTest::GTest)
> -- add_dependencies (check ${ARGV0})
> -- add_test (NAME ${ARGV0} COMMAND ${ARGV0})
> --endmacro ()
> -+# Should only be invoked when BUILD_TESTING is enabled
> -+if (BUILD_TESTING)
> -+ macro (add_gtest)
> -+ add_executable (${ARGV})
> -+ target_link_libraries (${ARGV0} GTest::GTest)
> -+ add_dependencies (check ${ARGV0})
> -+ add_test (NAME ${ARGV0} COMMAND ${ARGV0})
> -+ endmacro ()
> -+endif ()
> -
> -
> - ##############################################################################
> -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
> -index ceb9305b44a4..4aca96c7e860 100644
> ---- a/thirdparty/CMakeLists.txt
> -+++ b/thirdparty/CMakeLists.txt
> -@@ -52,7 +52,7 @@ if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
> - endif ()
> -
> - # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt
> --if (NOT GTEST_FOUND)
> -+if (BUILD_TESTING AND NOT GTEST_FOUND)
> - message (STATUS "Using bundled GTest")
> - include_with_scope (gtest.cmake)
> - endif ()
> diff --git a/patches/apitrace-11.1/0001-HACK-don-t-check-for-submodules-for-external-depende.patch b/patches/apitrace-13.0/0001-HACK-don-t-check-for-submodules-for-external-depende.patch
> similarity index 78%
> rename from patches/apitrace-11.1/0001-HACK-don-t-check-for-submodules-for-external-depende.patch
> rename to patches/apitrace-13.0/0001-HACK-don-t-check-for-submodules-for-external-depende.patch
> index e174b143954a..0ff02c5e3032 100644
> --- a/patches/apitrace-11.1/0001-HACK-don-t-check-for-submodules-for-external-depende.patch
> +++ b/patches/apitrace-13.0/0001-HACK-don-t-check-for-submodules-for-external-depende.patch
> @@ -4,23 +4,24 @@ Subject: [PATCH] HACK: don't check for submodules for external dependencies
>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
> - thirdparty/CMakeLists.txt | 4 ----
> - 1 file changed, 4 deletions(-)
> + thirdparty/CMakeLists.txt | 5 -----
> + 1 file changed, 5 deletions(-)
>
> diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
> -index 7eae7e55da3e..ceb9305b44a4 100644
> +index 722899bc3c40..91251f7e2134 100644
> --- a/thirdparty/CMakeLists.txt
> +++ b/thirdparty/CMakeLists.txt
> -@@ -15,12 +15,8 @@ endfunction ()
> +@@ -18,13 +18,8 @@ endfunction ()
>
> set (SUBMODULES_MISSING FALSE)
> foreach (path IN ITEMS
> - brotli/LICENSE
> -- gtest/googletest/LICENSE
> +- gtest/LICENSE
> libbacktrace/LICENSE
> - libpng/LICENSE
> snappy/COPYING
> - zlib/README
> +- directxmath/LICENSE
> )
> if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${path}")
> message (SEND_ERROR "error: ${CMAKE_CURRENT_SOURCE_DIR}/${path} does not exist")
> diff --git a/patches/apitrace-11.1/0002-HACK-don-t-do-dpkg-architecture-magic.patch b/patches/apitrace-13.0/0002-HACK-don-t-do-dpkg-architecture-magic.patch
> similarity index 93%
> rename from patches/apitrace-11.1/0002-HACK-don-t-do-dpkg-architecture-magic.patch
> rename to patches/apitrace-13.0/0002-HACK-don-t-do-dpkg-architecture-magic.patch
> index 0a456973b361..e2f7f7ed8136 100644
> --- a/patches/apitrace-11.1/0002-HACK-don-t-do-dpkg-architecture-magic.patch
> +++ b/patches/apitrace-13.0/0002-HACK-don-t-do-dpkg-architecture-magic.patch
> @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 9 deletions(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index a863b47cabcf..3d8b5811ebe2 100644
> +index 6d88987adefd..b30eae43fa71 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> -@@ -425,15 +425,6 @@ endif ()
> +@@ -499,15 +499,6 @@ endif ()
> ##############################################################################
> # Installation directories
>
> diff --git a/patches/apitrace-11.1/series b/patches/apitrace-13.0/series
> similarity index 57%
> rename from patches/apitrace-11.1/series
> rename to patches/apitrace-13.0/series
> index 3ec6151405e2..d4c24c91730e 100644
> --- a/patches/apitrace-11.1/series
> +++ b/patches/apitrace-13.0/series
> @@ -2,5 +2,4 @@
> #tag:base --start-number 1
> 0001-HACK-don-t-check-for-submodules-for-external-depende.patch
> 0002-HACK-don-t-do-dpkg-architecture-magic.patch
> -0003-Allow-building-without-GTest-when-BUILD_TESTING-is-n.patch
> -# b2c22b5a761a53785691516d94cb19c1 - git-ptx-patches magic
> +# d781b7ce7b411ab6ab663c32f56ed491 - git-ptx-patches magic
> diff --git a/rules/apitrace.in b/rules/apitrace.in
> index 5a8b3e596828..9aefad123e46 100644
> --- a/rules/apitrace.in
> +++ b/rules/apitrace.in
> @@ -3,6 +3,7 @@
> config APITRACE
> tristate
> select HOST_CMAKE
> + select HOST_NINJA
> select HOST_SYSTEM_PYTHON3
> select ZLIB
> select LIBPNG
> diff --git a/rules/apitrace.make b/rules/apitrace.make
> index 6be996408be9..494050f258cb 100644
> --- a/rules/apitrace.make
> +++ b/rules/apitrace.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_APITRACE) += apitrace
> #
> # Paths and names
> #
> -APITRACE_VERSION := 11.1
> -APITRACE_MD5 := 28a1eb4a7b69dd7c419378cd00d73e2b
> +APITRACE_VERSION := 13.0
> +APITRACE_MD5 := 6adbb46c84361511d4954875ff045e28
> APITRACE := apitrace-$(APITRACE_VERSION)
> APITRACE_SUFFIX := tar.gz
> APITRACE_URL := https://github.com/apitrace/apitrace/archive/$(APITRACE_VERSION).$(APITRACE_SUFFIX)
> @@ -25,8 +25,8 @@ APITRACE_LICENSE := MIT AND BSD-3-Clause
> APITRACE_LICENSE_FILES := \
> file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50
>
> -APITRACE_BACKTRACE_VERSION := 2021-01-18-gdedbe13fda00
> -APITRACE_BACKTRACE_MD5 := d3fa1299e74dba1c129d9fcee235c5d3
> +APITRACE_BACKTRACE_VERSION := 2022-09-22-g8602fda64e78
> +APITRACE_BACKTRACE_MD5 := e69451fcbc31d5c96439e1abc8b3129d
> APITRACE_BACKTRACE := apitrace-backtrace-$(APITRACE_BACKTRACE_VERSION)
> APITRACE_BACKTRACE_SUFFIX := tar.gz
> APITRACE_BACKTRACE_URL := https://github.com/ianlancetaylor/libbacktrace/archive/$(APITRACE_BACKTRACE_VERSION).$(APITRACE_BACKTRACE_SUFFIX)
> @@ -35,8 +35,8 @@ APITRACE_BACKTRACE_DIR := $(APITRACE_DIR)/thirdparty/libbacktrace
> APITRACE_LICENSE_FILES += \
> file://thirdparty/libbacktrace/LICENSE;md5=24b5b3feec63c4be0975e1fea5100440
>
> -APITRACE_SNAPPY_VERSION := 2020-01-14-g537f4ad6240e
> -APITRACE_SNAPPY_MD5 := ac7cc4b35483ae055b6396ebcc34af01
> +APITRACE_SNAPPY_VERSION := 2022-09-26-g2b63814b15a2
> +APITRACE_SNAPPY_MD5 := 5177d6bef0eccc7c78e9e27b9d5b761c
> APITRACE_SNAPPY := apitrace-snappy-$(APITRACE_SNAPPY_VERSION)
> APITRACE_SNAPPY_SUFFIX := tar.gz
> APITRACE_SNAPPY_URL := https://github.com/google/snappy/archive/$(APITRACE_SNAPPY_VERSION).$(APITRACE_SNAPPY_SUFFIX)
> @@ -54,6 +54,7 @@ APITRACE_PARTS += APITRACE_BACKTRACE APITRACE_SNAPPY
> APITRACE_CONF_TOOL := cmake
> APITRACE_CONF_OPT := \
> $(CROSS_CMAKE_USR) \
> + -G Ninja \
> -DWRAPPER_INSTALL_DIR=/usr/lib/apitrace/wrappers \
> -DBUILD_TESTING=OFF \
> -DENABLE_ASAN=OFF \
prev parent reply other threads:[~2026-01-15 15:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-14 13:10 [ptxdist] [PATCH 1/2] " Lucas Stach
2025-12-14 13:10 ` [ptxdist] [PATCH 2/2] apitrace: add replay support Lucas Stach
2026-01-15 15:12 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-01-15 15:12 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260115151200.230695-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox