diff options
Diffstat (limited to 'dev-util/apitrace')
| -rw-r--r-- | dev-util/apitrace/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/apitrace/apitrace-9.0-r3.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch | 29 |
3 files changed, 34 insertions, 3 deletions
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest index 0df83918b8d4..ab8e77f19093 100644 --- a/dev-util/apitrace/Manifest +++ b/dev-util/apitrace/Manifest @@ -1,5 +1,6 @@ AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33dfcd39fd36356691722f593f7ce0fa615279c0e440077b3e29c5a643bf5be8a2406a656bfa91fb9f128c2afa922b3ad832a35 SHA512 0690f8d178fd7a5ca11b26d1e23c9c26e984214cef2e3619a22fc6cf58a7ee96fe0b046dd038c202cd6f60b9175dbdd346813c53ca85932f9a4d9dd40e9bdba1 AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278 +AUX apitrace-9.0-libc-dlopen-glibc-2.34.patch 785 BLAKE2B 0339c808f83ecb18e42fe643a0de01b3f8566251e805bc5eace16f7d77571cde85d9cd2eef24e408202591a7b7ad0f1ec2c090b4ce8525b54057dd55cf08009c SHA512 54a7cf81370de87b28e18840b7644aa764d67096268d49324cc25b2f0cf256eb44e4da10cd63fc5fae8b8fcfac4d9eccb840b24778accb3e76c992eda06e2af7 DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c -EBUILD apitrace-9.0-r3.ebuild 2292 BLAKE2B f0b6b5034afd50a347b2273584c05aa449f85981675fe84c8427d2c842fdb56ceeda5a1fd27eee4314bcedb2051eea4921af4c2dee88d3c02e3c17e3cd086dc9 SHA512 06498772bfd0e7cee0ac286d3db864bd18b20b708faae68634fd00e43113282808a0e25ea8ab60846d496e5ee7e61bd8f97fd7385eb4ec9a6621fb273f3249a3 +EBUILD apitrace-9.0-r3.ebuild 2350 BLAKE2B a088ac691d216414b0e7eaa352eb5ed54db1ddbac4fded595f7e8a9f691e1f1b0b82f64eae85d61e7599726760cd96931d858cd14a084f106ca1658af616442d SHA512 17fc2b8fc90102324e913cbde54f194cca247dfaf977a42c9d2f082ea02d87bc1fd9a876a9205508b89e877a32665024c03c9adfddb5b2b3e61828a1bee8bfe3 MISC metadata.xml 250 BLAKE2B a9437881337420620edfaa0a3f4e7660a47100479c9d360dfb3b8304eaa085d5f2bb97ea8d823fc6be282fd4f2964cf12d189ec0e6d18a09ea513809e5bd5cde SHA512 284c9edd2a7f91f48402414ec05379f5a9a40ca67f02ddc4dbf3bbc45f83cfe01aa54442af0016dcf8495bb6291423def988f0bba616c5a5024011c4e97fde57 diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild b/dev-util/apitrace/apitrace-9.0-r3.ebuild index 7c0a0190acac..f558e102537c 100644 --- a/dev-util/apitrace/apitrace-9.0-r3.ebuild +++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{7..10} ) -inherit cmake-multilib python-single-r1 +inherit cmake-multilib multilib python-single-r1 DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" HOMEPAGE="https://github.com/apitrace/apitrace" @@ -40,6 +40,7 @@ PATCHES=( # TODO: upstream "${FILESDIR}"/${P}-disable-multiarch.patch "${FILESDIR}"/${P}-brotli-unbundle.patch + "${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch ) src_prepare() { diff --git a/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch new file mode 100644 index 000000000000..6c1aff4bcb31 --- /dev/null +++ b/dev-util/apitrace/files/apitrace-9.0-libc-dlopen-glibc-2.34.patch @@ -0,0 +1,29 @@ +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> + |