diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
| commit | e9d044d4b9b71200a96adfa280848858c0f468c9 (patch) | |
| tree | 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /x11-apps/igt-gpu-tools | |
| parent | fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff) | |
gentoo resync : 13.11.2021
Diffstat (limited to 'x11-apps/igt-gpu-tools')
3 files changed, 41 insertions, 1 deletions
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest index 896ffaf3e0a6..4bb5d25ef0dc 100644 --- a/x11-apps/igt-gpu-tools/Manifest +++ b/x11-apps/igt-gpu-tools/Manifest @@ -1,4 +1,5 @@ +AUX igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch 1215 BLAKE2B 217ce5b204a3db597e7423fdeb99220a76f943e04feeed5dd35db2333188c88f397d05a0ba87791a0e01a098ee1040712e72848b87db5a32d5c94b3e1458f09c SHA512 f843466a5a48229a420ef2df665bf97ad3af120bb50d1de9cab8ad5390f5d2a80df1346f59b90c8e6fc6a211271e56e5dee67c09c42901b1eeb7370d7feff7ca DIST igt-gpu-tools-1.26.tar.xz 1573468 BLAKE2B 31fa9cd61fd9a120c72e78cb5ecbc686477ae82572c702bdd6bbc11ba49dc052b7cf52fa486b93e51c87389d73f892577c1d22ebe71d6f50b1565f32355021d1 SHA512 6eb67f68da1c79fac61e5abd57433ef51dbeb2b6f0923dc84aefb81d7059fbc94378fadcd7321a8f059edd9bac640032bf53c3aa058cf570fe5c31924396af8f -EBUILD igt-gpu-tools-1.26-r1.ebuild 2489 BLAKE2B 768e86dede939ecb1abd954a655789461d26904f7b2df19d12b86a8ccf521bca715fc253e69dfb5d198a11d3a993d6ef27d9ed96ed3910f21a15f8fdbfdbe1e0 SHA512 e6f345dc0b5b59dc853442167ee166747857c6395221105bffd784f395c20b9ead84f65452efd1f79fa29b4f663b0757ec47916a92e52ab97e9985b664aa7919 +EBUILD igt-gpu-tools-1.26-r1.ebuild 2588 BLAKE2B ac2c38858bb311e105ec9670938f4a24c5617426885137a0e3ab24e81ede4e45a2c17ba0e069e6b929fdd974aed7443dfdc25bb9765b8f473d9beff8a97ca596 SHA512 57fc8b22920155e9df9cc47961b1ab9c9df05f5225285da80acea4882dcd91f25e00a9b6e8eb5a15e268ff1d62a9c130464278badf95e4d6604a5ce96089af4e EBUILD igt-gpu-tools-9999.ebuild 2489 BLAKE2B 768e86dede939ecb1abd954a655789461d26904f7b2df19d12b86a8ccf521bca715fc253e69dfb5d198a11d3a993d6ef27d9ed96ed3910f21a15f8fdbfdbe1e0 SHA512 e6f345dc0b5b59dc853442167ee166747857c6395221105bffd784f395c20b9ead84f65452efd1f79fa29b4f663b0757ec47916a92e52ab97e9985b664aa7919 MISC metadata.xml 672 BLAKE2B 00c8c12ec3f3edb3aa57947b00ffd68dcc3f13901e2fb090e217cc954557d1e13802f71dec233d07501ea88e24a5fa9c84e669b0bb5f5d36d4649ea99727991b SHA512 24f16d407f48f21d85cbf38337573fb711ded60283b6766de02923ebe5f4e86e6ff044629518bfaba64a9f66c87c6597233a7227145f7a827934c72754224fb8 diff --git a/x11-apps/igt-gpu-tools/files/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch b/x11-apps/igt-gpu-tools/files/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch new file mode 100644 index 000000000000..142e2fa44fb6 --- /dev/null +++ b/x11-apps/igt-gpu-tools/files/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch @@ -0,0 +1,36 @@ +From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001 +From: Petri Latvala <petri.latvala@intel.com> +Date: Thu, 28 Oct 2021 11:05:31 +0300 +Subject: [PATCH] lib/meson.build: Fix underscorify call +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +f.underscorify() is correct, f.underscorify(f) is an error that later +meson versions don't like at all. + +Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107 +Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities") +Cc: Arkadiusz Hiler <arek@hiler.eu> +Signed-off-by: Petri Latvala <petri.latvala@intel.com> +Reviewed-by: José Roberto de Souza <jose.souza@intel.com> +--- + lib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/meson.build b/lib/meson.build +index c3080fc8..297b0ad2 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', + + lib_intermediates = [] + foreach f: lib_sources +- name = f.underscorify(f) ++ name = f.underscorify() + lib = static_library('igt-' + name, + [ f, lib_version ], + include_directories: inc, +-- +GitLab + diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild index e165a87a6c39..17c026cd7d0e 100644 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild +++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild @@ -77,6 +77,9 @@ BDEPEND="${PYTHON_DEPS}" src_prepare() { sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build + local PATCHES=( + "${FILESDIR}"/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch + ) default_src_prepare } |