diff options
Diffstat (limited to 'dev-debug/apitrace')
| -rw-r--r-- | dev-debug/apitrace/Manifest | 12 | ||||
| -rw-r--r-- | dev-debug/apitrace/apitrace-12.0.ebuild | 113 | ||||
| -rw-r--r-- | dev-debug/apitrace/apitrace-9.0-r5.ebuild | 89 | ||||
| -rw-r--r-- | dev-debug/apitrace/files/apitrace-12.0-include-stdint.patch | 25 | ||||
| -rw-r--r-- | dev-debug/apitrace/files/apitrace-12.0-no_qtnetwork.patch | 25 | ||||
| -rw-r--r-- | dev-debug/apitrace/files/apitrace-12.0-tests.patch | 21 | ||||
| -rw-r--r-- | dev-debug/apitrace/files/apitrace-12.0-unbundle.patch | 30 | ||||
| -rw-r--r-- | dev-debug/apitrace/files/apitrace-9.0-brotli-unbundle.patch | 158 | ||||
| -rw-r--r-- | dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch | 37 | ||||
| -rw-r--r-- | dev-debug/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch | 29 |
10 files changed, 221 insertions, 318 deletions
diff --git a/dev-debug/apitrace/Manifest b/dev-debug/apitrace/Manifest index a31f87690d51..3698b57d8955 100644 --- a/dev-debug/apitrace/Manifest +++ b/dev-debug/apitrace/Manifest @@ -1,8 +1,10 @@ -AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33dfcd39fd36356691722f593f7ce0fa615279c0e440077b3e29c5a643bf5be8a2406a656bfa91fb9f128c2afa922b3ad832a35 SHA512 0690f8d178fd7a5ca11b26d1e23c9c26e984214cef2e3619a22fc6cf58a7ee96fe0b046dd038c202cd6f60b9175dbdd346813c53ca85932f9a4d9dd40e9bdba1 +AUX apitrace-12.0-include-stdint.patch 699 BLAKE2B 954e2b38a27049ca058ffe45d70381b99725dc76a14171b2f19770f571041bb3b89fa881fb416cc7386002edd89d663a55614248ab00016d4185bf95d6bafdc3 SHA512 1529191d703e5d0aa8072a5449dc166b27a5d448890bf2033056b4ea500ce21c655642a96a9b3ea58968c6da82999c9d87b85240da35107cc7a003825840ba6a +AUX apitrace-12.0-no_qtnetwork.patch 782 BLAKE2B ecc597aef4adf6f209b12843e58cb3d6fe80cc544df3b468aec38551997491e1c342be922630e988baf775219034077fd170186fbf8a2fbaea41776d6fc482ee SHA512 9eb10dd1f5a09356058f5047105ea5240072796b1aa6b55e73a17ebb999dd3a15c077c796aa425d9e6003e73a29b9806461c2b9f6ea9fcedb2617548f7b29cf6 +AUX apitrace-12.0-tests.patch 709 BLAKE2B c4784f88411db3be9ae1dc7c4392c1a436a7ad6f2cd06aa10d5dfd99db71c2431c4340bb1a4e622ff2b653bbc17a29060780f1e793290d59c9336117433a3815 SHA512 07eb5315f00b9f01455e3c8c1c128fc1681f64d52179be67ef2065cbe8db75adea6edcab11c25115e1a149d55b1fac72c60a8859727c887e6af00ae46789fc52 +AUX apitrace-12.0-unbundle.patch 955 BLAKE2B 2642d13fdbdaefe053178b838b531a2430d8afbe1ca15fde39db47ba269c4e9dd1633dbcb8c1b90d7c91cc3ea024f93f4dca643c7ee09b362d9745d9092f7006 SHA512 04c529533fc4c6d5f1c5080542f792f1c71dc315cf1410293b823a6ae7eab070b975b8c460580c59882203937a8593cab84e5844f5c5f19fede1291fa01465ee AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278 -AUX apitrace-9.0-include-cstdint.patch 1467 BLAKE2B 3ea475ac063709f8a89c63a469b9ef1f4bd211eeb68fba445a519862dcb241fb4b62d82ae7934577c66d8a830bf786f8a6a031843624673445b7c45dd17d8894 SHA512 af2d18a58ebab7eccc5032436ed24b11bbeb4a76b054d9ab9397d5f8724b4fe2ae4a7f40f7369845bb0aa1b29b2cf57e2f58f24e1d230e20909cb6919a0f374e -AUX apitrace-9.0-libc-dlopen-glibc-2.34.patch 785 BLAKE2B 0339c808f83ecb18e42fe643a0de01b3f8566251e805bc5eace16f7d77571cde85d9cd2eef24e408202591a7b7ad0f1ec2c090b4ce8525b54057dd55cf08009c SHA512 54a7cf81370de87b28e18840b7644aa764d67096268d49324cc25b2f0cf256eb44e4da10cd63fc5fae8b8fcfac4d9eccb840b24778accb3e76c992eda06e2af7 AUX apitrace-9.0-pkgconfig-waffle.patch 542 BLAKE2B a547dc8e71d6e6e781c685fad942bda6799d3d98c0e29a83ad65b0659c50d5ae81f35fee3e6abf1fb36f970db426785b0bcd15f30308ed3bad8b6ff5f4f152cd SHA512 1f3ef8e15a17f7684d6768e16656aef5ce32b173c8420ed2ccb29dd831f18bcee23189a6738ed0e89a990ca04303f1c16d024f429fba90836d967f1fc8486834 -DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c -EBUILD apitrace-9.0-r5.ebuild 2411 BLAKE2B 75cf7400ea50b00e406222c2e39d2dfcda5af6d1f766b6b3048a23b867b16185360a2332beb9810694c80a6f6b6027e2a0b846079783e8ec7e5d1c10f544375f SHA512 49ad8bb8df4c4dfaeba88b384531c7b47b3a808fddef890f089f8cf693b368fa58b00fac4137f380e77ed800bade55e53b6070db024c1ea91ae79c74443b6e47 +DIST apitrace-12.0-libbacktrace-8602fda64e78f1f46563220f2ee9f7e70819c51d.tar.gz 666166 BLAKE2B 1b35e0dafe31bc5d4fcc826f87f2e8200c27a4194719ee22d278b25fe081ec604e579aee72ebd7ea6d401b1a5bbc4b496b1083e3d761117bc3ccf23aabe046eb SHA512 8f303ff11250cbc644c91a07a55ffb1c6d52ca5eb76e3ea9405645bdd00715a25f57d1f39c7af16efbbe5b008ec76890f7fb3bca95eb89e7cd9a55c14a211643 +DIST apitrace-12.0.tar.gz 2273615 BLAKE2B a58f4d7bc607858e3080d56c739da356c169b25c139ca253f0b15d248a850ede54179776a500321f15e5f389271ad69f5c8c8dec47e0d0b3d4ae9afcea8bda41 SHA512 2af33aec39f43556765455662c69ee22bf3ff5d5fe8b0ca58fe3d555ab1571eab5ddbd4f0011b0c1669043314c8d5166b886ac2825f85d74ebadd9f848598698 +EBUILD apitrace-12.0.ebuild 3162 BLAKE2B ed506b86f172e9723581bc0b7b74d8059af36e5fdd71e86c62dcb17858b1591a92adae620caf7abee3fd1ad803d538017bfc57cd77fd7fc619d9d4676aaea70e SHA512 88b126f00b4bd0984658bd4e6962bf7448edb7aad40e7e1b6a66d64114080fb5301cd66dbff0c09b5eb78d1c81ef1713d7e4fc3a19e4d57fb6dcdddf8ee824db MISC metadata.xml 250 BLAKE2B a9437881337420620edfaa0a3f4e7660a47100479c9d360dfb3b8304eaa085d5f2bb97ea8d823fc6be282fd4f2964cf12d189ec0e6d18a09ea513809e5bd5cde SHA512 284c9edd2a7f91f48402414ec05379f5a9a40ca67f02ddc4dbf3bbc45f83cfe01aa54442af0016dcf8495bb6291423def988f0bba616c5a5024011c4e97fde57 diff --git a/dev-debug/apitrace/apitrace-12.0.ebuild b/dev-debug/apitrace/apitrace-12.0.ebuild new file mode 100644 index 000000000000..a42ec871ba6a --- /dev/null +++ b/dev-debug/apitrace/apitrace-12.0.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake-multilib multilib optfeature python-single-r1 + +DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" +HOMEPAGE="https://github.com/apitrace/apitrace" +BACKTRACE_COMMIT="8602fda64e78f1f46563220f2ee9f7e70819c51d" +SRC_URI=" + https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/ianlancetaylor/libbacktrace/archive/${BACKTRACE_COMMIT}.tar.gz + -> ${P}-libbacktrace-${BACKTRACE_COMMIT}.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="gui test X" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +DEPEND="${PYTHON_DEPS} + app-arch/brotli:=[${MULTILIB_USEDEP}] + app-arch/snappy:=[${MULTILIB_USEDEP}] + media-libs/libpng:0= + media-libs/waffle[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + gui? ( dev-qt/qtbase:6[-gles2-only,gui,widgets] ) + X? ( x11-libs/libX11 ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-9.0-disable-multiarch.patch + "${FILESDIR}"/${PN}-9.0-pkgconfig-waffle.patch + "${FILESDIR}"/${PN}-12.0-no_qtnetwork.patch + "${FILESDIR}"/${PN}-12.0-tests.patch + "${FILESDIR}"/${PN}-12.0-unbundle.patch + # merged, to be removed for the next version + "${FILESDIR}"/${PN}-12.0-include-stdint.patch +) + +src_prepare() { + sed -e "s:0.0-unknown:${PV}:" -i cmake/GenerateVersion.cmake || die + + # still 3rd libs: khronos, crc32c and md5-compat + rm -r $(find thirdparty -mindepth 1 -maxdepth 1 \ + ! -name crc32c \ + ! -name khronos \ + ! -name md5 \ + ! -name support \ + -type d -print) || die + + mv "${WORKDIR}"/libbacktrace-${BACKTRACE_COMMIT} thirdparty/libbacktrace || die + + cmake_src_prepare +} + +src_configure() { + my_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} + -DENABLE_X11=$(usex X) + -DENABLE_EGL=ON + -DENABLE_CLI=ON + -DENABLE_GUI=$(multilib_native_usex gui) + -DENABLE_QT6=$(multilib_native_usex gui) + -DENABLE_STATIC_SNAPPY=OFF + -DENABLE_WAFFLE=ON + -DPython3_EXECUTABLE="${PYTHON}" + ) + cmake_src_configure + } + + multilib_foreach_abi my_configure +} + +src_install() { + MULTILIB_CHOST_TOOLS=( + /usr/bin/apitrace$(get_exeext) + /usr/bin/eglretrace$(get_exeext) + /usr/bin/gltrim$(get_exeext) + ) + use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) ) + + cmake-multilib_src_install + + make_libegl_symlinks() { + dosym egltrace.so /usr/$(get_libdir)/${PN}/wrappers/libEGL.so + dosym egltrace.so /usr/$(get_libdir)/${PN}/wrappers/libEGL.so.1 + } + multilib_foreach_abi make_libegl_symlinks + + make_libgl_symlinks() { + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 + } + use X && multilib_foreach_abi make_libgl_symlinks +} + +pkg_postinst() { + optfeature "retracediff.py: side by side retracing" "dev-python/pillow" "dev-python/numpy" + optfeature "snapdiff.py: image comparison scripts" "dev-python/pillow" +} diff --git a/dev-debug/apitrace/apitrace-9.0-r5.ebuild b/dev-debug/apitrace/apitrace-9.0-r5.ebuild deleted file mode 100644 index c66387dc172f..000000000000 --- a/dev-debug/apitrace/apitrace-9.0-r5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake-multilib multilib python-single-r1 - -DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" -HOMEPAGE="https://github.com/apitrace/apitrace" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="qt5 X" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - app-arch/brotli:=[${MULTILIB_USEDEP}] - >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] - media-libs/libpng:0= - media-libs/libglvnd[X?,${MULTILIB_USEDEP}] - >=media-libs/waffle-1.6.0-r1[egl(+),${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - sys-process/procps:=[${MULTILIB_USEDEP}] - X? ( x11-libs/libX11 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5[-gles2-only] - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - # TODO: upstream - "${FILESDIR}"/${P}-disable-multiarch.patch - "${FILESDIR}"/${P}-brotli-unbundle.patch - "${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch - "${FILESDIR}"/${P}-pkgconfig-waffle.patch - "${FILESDIR}/${PN}-9.0-include-cstdint.patch" -) - -src_prepare() { - cmake_src_prepare - - # The apitrace code grubs around in the internal zlib structures. - # We have to extract this header and clean it up to keep that working. - # Do not be surprised if a zlib upgrade breaks things ... - rm -rf thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die -} - -src_configure() { - my_configure() { - local mycmakeargs=( - -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} - -DENABLE_X11=$(usex X) - -DENABLE_EGL=ON - -DENABLE_CLI=ON - -DENABLE_GUI=$(multilib_native_usex qt5) - -DENABLE_STATIC_SNAPPY=OFF - -DENABLE_WAFFLE=ON - -DPython3_EXECUTABLE="${PYTHON}" - ) - cmake_src_configure - } - - multilib_foreach_abi my_configure -} - -src_install() { - MULTILIB_CHOST_TOOLS=( - /usr/bin/apitrace$(get_exeext) - /usr/bin/eglretrace$(get_exeext) - ) - use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) ) - - cmake-multilib_src_install - - make_libgl_symlinks() { - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 - } - use X && multilib_foreach_abi make_libgl_symlinks -} diff --git a/dev-debug/apitrace/files/apitrace-12.0-include-stdint.patch b/dev-debug/apitrace/files/apitrace-12.0-include-stdint.patch new file mode 100644 index 000000000000..0a663e712d1b --- /dev/null +++ b/dev-debug/apitrace/files/apitrace-12.0-include-stdint.patch @@ -0,0 +1,25 @@ +https://github.com/apitrace/apitrace/pull/941.patch +diff --git a/frametrim/ft_dependecyobject.hpp b/frametrim/ft_dependecyobject.hpp +index 2cd0b76879..0f17b601a3 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 e923ed1d3b..4e4ce74833 100644 +--- a/retrace/metric_writer.cpp ++++ b/retrace/metric_writer.cpp +@@ -24,6 +24,7 @@ + **************************************************************************/ + + #include <iostream> ++#include <stdint.h> + + #include "metric_writer.hpp" + diff --git a/dev-debug/apitrace/files/apitrace-12.0-no_qtnetwork.patch b/dev-debug/apitrace/files/apitrace-12.0-no_qtnetwork.patch new file mode 100644 index 000000000000..39a07eaf182c --- /dev/null +++ b/dev-debug/apitrace/files/apitrace-12.0-no_qtnetwork.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34123b3..9d4aefb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -182,7 +182,7 @@ if (ENABLE_GUI) + cmake_policy (SET CMP0020 NEW) + endif() + if (ENABLE_QT6) +- find_package (Qt6 COMPONENTS Widgets Network ${REQUIRE_GUI}) ++ find_package (Qt6 COMPONENTS Widgets ${REQUIRE_GUI}) + else () + find_package (Qt5 5.15 COMPONENTS Widgets Network ${REQUIRE_GUI}) + endif () +diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt +index 99ae918..afb740c 100644 +--- a/gui/CMakeLists.txt ++++ b/gui/CMakeLists.txt +@@ -99,7 +99,6 @@ add_executable (qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H}) + + target_link_libraries (qapitrace + Qt::Widgets +- Qt::Network + qubjson + image + common diff --git a/dev-debug/apitrace/files/apitrace-12.0-tests.patch b/dev-debug/apitrace/files/apitrace-12.0-tests.patch new file mode 100644 index 000000000000..8d4a18533635 --- /dev/null +++ b/dev-debug/apitrace/files/apitrace-12.0-tests.patch @@ -0,0 +1,21 @@ +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index 34eb7f7..7ca30a1 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -59,10 +59,12 @@ if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF") + include_with_scope (libbacktrace.cmake) + endif () + +-# We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt +-if (NOT GTEST_FOUND) +- message (STATUS "Using bundled GTest") +- include_with_scope (gtest.cmake) ++if (BUILD_TESTING) ++ # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt ++ if (NOT GTEST_FOUND) ++ message (STATUS "Using bundled GTest") ++ include_with_scope (gtest.cmake) ++ endif () + endif () + + if (MSVC) diff --git a/dev-debug/apitrace/files/apitrace-12.0-unbundle.patch b/dev-debug/apitrace/files/apitrace-12.0-unbundle.patch new file mode 100644 index 000000000000..03467714e2c8 --- /dev/null +++ b/dev-debug/apitrace/files/apitrace-12.0-unbundle.patch @@ -0,0 +1,30 @@ +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index 34eb7f7..5fbd073 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -16,25 +16,6 @@ function (include_with_scope) + include (${ARGV}) + endfunction () + +-set (SUBMODULES_MISSING FALSE) +-foreach (path IN ITEMS +- brotli/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") +- set (SUBMODULES_MISSING TRUE) +- endif () +-endforeach () +-if (SUBMODULES_MISSING) +- message (FATAL_ERROR "Update Git submodules by running\ngit submodule update --init --depth 1 --recursive") +-endif () +- + if (ENABLE_STATIC_SNAPPY OR NOT Snappy_FOUND) + message (STATUS "Using bundled Snappy") + include_with_scope (snappy.cmake) diff --git a/dev-debug/apitrace/files/apitrace-9.0-brotli-unbundle.patch b/dev-debug/apitrace/files/apitrace-9.0-brotli-unbundle.patch deleted file mode 100644 index 5715edaec3f0..000000000000 --- a/dev-debug/apitrace/files/apitrace-9.0-brotli-unbundle.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 3a07d551949ff488d1d669600a07d9c73ff4cc55 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 29 Apr 2019 21:08:02 +0200 -Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from - Igalia S.L. - -MIT License, which fits well. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++ - cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 70 insertions(+) - create mode 100644 cmake/FindBrotliDec.cmake - create mode 100644 cmake/FindBrotliEnc.cmake - -diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake -new file mode 100644 -index 00000000..abb06f44 ---- /dev/null -+++ b/cmake/FindBrotliDec.cmake -@@ -0,0 +1,35 @@ -+# Copyright 2017 Igalia S.L. All Rights Reserved. -+# -+# Distributed under MIT license. -+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT -+ -+# Try to find BrotliDec. Once done, this will define -+# -+# BROTLIDEC_FOUND - system has BrotliDec. -+# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories -+# BROTLIDEC_LIBRARIES - link these to use BrotliDec. -+ -+find_package(PkgConfig) -+ -+pkg_check_modules(PC_BROTLIDEC libbrotlidec) -+ -+find_path(BROTLIDEC_INCLUDE_DIRS -+ NAMES brotli/decode.h -+ HINTS ${PC_BROTLIDEC_INCLUDEDIR} -+) -+ -+find_library(BROTLIDEC_LIBRARIES -+ NAMES brotlidec -+ HINTS ${PC_BROTLIDEC_LIBDIR} -+) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(BrotliDec -+ REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES -+ FOUND_VAR BROTLIDEC_FOUND -+ VERSION_VAR PC_BROTLIDEC_VERSION) -+ -+mark_as_advanced( -+ BROTLIDEC_INCLUDE_DIRS -+ BROTLIDEC_LIBRARIES -+) -diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake -new file mode 100644 -index 00000000..4be347db ---- /dev/null -+++ b/cmake/FindBrotliEnc.cmake -@@ -0,0 +1,35 @@ -+# Copyright 2017 Igalia S.L. All Rights Reserved. -+# -+# Distributed under MIT license. -+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT -+ -+# Try to find BrotliEnc. Once done, this will define -+# -+# BROTLIENC_FOUND - system has BrotliEnc. -+# BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories -+# BROTLIENC_LIBRARIES - link these to use BrotliEnc. -+ -+find_package(PkgConfig) -+ -+pkg_check_modules(PC_BROTLIENC libbrotlienc) -+ -+find_path(BROTLIENC_INCLUDE_DIRS -+ NAMES brotli/encode.h -+ HINTS ${PC_BROTLIENC_INCLUDEDIR} -+) -+ -+find_library(BROTLIENC_LIBRARIES -+ NAMES brotlienc -+ HINTS ${PC_BROTLIENC_LIBDIR} -+) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(BrotliEnc -+ REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES -+ FOUND_VAR BROTLIENC_FOUND -+ VERSION_VAR PC_BROTLIENC_VERSION) -+ -+mark_as_advanced( -+ BROTLIENC_INCLUDE_DIRS -+ BROTLIENC_LIBRARIES -+) --- -2.24.1 - -From 08a410f238aaf6488759e023b66d16cbbd7f6d66 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 29 Apr 2019 21:11:57 +0200 -Subject: [PATCH 2/2] Find system brotli instead of bundled - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 5 +++-- - cli/CMakeLists.txt | 2 +- - lib/trace/CMakeLists.txt | 2 +- - 3 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c71d24e6..88e6b156 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -491,8 +491,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND) - endif () - include_directories (${SNAPPY_INCLUDE_DIRS}) - --include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include) --add_subdirectory (thirdparty/brotli) -+find_package(BrotliDec REQUIRED) -+find_package(BrotliEnc REQUIRED) -+include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS}) - - if (NOT WIN32 AND NOT ENABLE_STATIC_EXE) - # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete -diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt -index 3a3c127e..0b33ddb5 100644 ---- a/cli/CMakeLists.txt -+++ b/cli/CMakeLists.txt -@@ -39,7 +39,7 @@ add_executable (apitrace - - target_link_libraries (apitrace - common -- brotli_dec brotli_enc brotli_common -+ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES} - ${ZLIB_LIBRARIES} - ${SNAPPY_LIBRARIES} - ${GETOPT_LIBRARIES} -diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt -index c68bd00f..ce2e469e 100644 ---- a/lib/trace/CMakeLists.txt -+++ b/lib/trace/CMakeLists.txt -@@ -31,7 +31,7 @@ target_link_libraries (common - guids - highlight - os -- brotli_dec brotli_common -+ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES} - ) - - add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp) --- -2.24.1 - diff --git a/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch b/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch deleted file mode 100644 index 45f7f2bd0f81..000000000000 --- a/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> -Date: Wed, 21 Aug 2024 14:53:50 +0200 -Subject: [PATCH] apitrace: Explicitly include <cstdint> - -GCC 15 will no longer include it by default, resulting in build failures in projects that do not explicitly include it. - -Error: -apitrace-9.0/retrace/metric_writer.cpp: In static member function ‘static void ProfilerQuery::writeMetricEntryCallback(Metric*, int, void*, int, void*)’: -apitrace-9.0/retrace/metric_writer.cpp:50:70: error: ‘uint64_t’ does not name a type -50 | case CNT_NUM_UINT64: std::cout << "\t" << -*(reinterpret_cast<uint64_t*>(data)); break; -| -^~~~~~~~ -apitrace-9.0/retrace/metric_writer.cpp:29:1: note: ‘uint64_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’ - 28 | #include "metric_writer.hpp" - +++ |+#include <cstdint> - 29 | -apitrace-9.0/retrace/metric_writer.cpp:50:78: error: expected ‘>’ before ‘*’ token -50 | case CNT_NUM_UINT64: std::cout << "\t" << -*(reinterpret_cast<uint64_t*>(data)); break; -| -^ - -See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html -See-also: https://bugs.gentoo.org/937722 -Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> - ---- a/retrace/metric_writer.cpp -+++ b/retrace/metric_writer.cpp -@@ -24,6 +24,7 @@ - **************************************************************************/ - - #include <iostream> -+#include <cstdint> - - #include "metric_writer.hpp" - diff --git a/dev-debug/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch b/dev-debug/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch deleted file mode 100644 index 6c1aff4bcb31..000000000000 --- a/dev-debug/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb.patch -https://bugs.gentoo.org/812155 - -(rebased by sam) - -From: Jose Fonseca <jfonseca@vmware.com> -Date: Wed, 1 Sep 2021 16:34:54 +0100 -Subject: [PATCH] gltrace: Avoid __libc_dlsym and __libc_dlopen_mode on GLIBC - 2.34. - -These GLIBC_PRIVATE symbols are gone from GLIBC 2.34 due to the merge of -libdl.so onto libc.so. - -This means apitrace can't defend against infinite recursion when -used with Steam Overlay, but at least it should work otherwise. - -Fixes https://github.com/apitrace/apitrace/issues/756 ---- a/wrappers/dlsym.cpp -+++ b/wrappers/dlsym.cpp -@@ -34,7 +34,7 @@ - #include "os.hpp" - - --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34 - - - #include <dlfcn.h> - |