From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- x11-apps/igt-gpu-tools/Manifest | 5 +- x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch | 25 +++++ x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild | 103 --------------------- x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild | 2 + 4 files changed, 29 insertions(+), 106 deletions(-) create mode 100644 x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch delete mode 100644 x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild (limited to 'x11-apps/igt-gpu-tools') diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest index a24c13b489ca..b2d4ebb00093 100644 --- a/x11-apps/igt-gpu-tools/Manifest +++ b/x11-apps/igt-gpu-tools/Manifest @@ -1,6 +1,5 @@ -DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190 +AUX 1.25-python-3.9.patch 687 BLAKE2B b0abe02391df5bff2e1de47f1fea220a5dc3b9b9b0e8cd0bf7f17a7b96bd4879412c95daf2e824cb18a46ca95fae403050db4ec9054affe0a8bb10fb805383f5 SHA512 55aec8584771723fb96d5361f4588d2a1d9da1ed30832bf77a85862d5030e5a2c0e6149e3c899e2a536b7b1a252a6537fd91d1d0298eef3affa08696c220776f DIST igt-gpu-tools-1.25.tar.xz 1425652 BLAKE2B 1dd17e8542c126d356478acd07344d8732013a24fd180064d6f2277be76170924e7031fd2529b2aa054b40d5093d9cd95271e156bc6b97a75158c84de142f1ba SHA512 a24ee46092241da26fc2dac2b9b54c9f16f7a408c8740c9c7209e876929e2908a36261ba258ca4a4a4e4a21c1e9c919457bf98d514f81d8b7dbfcf5f89a74daf -EBUILD igt-gpu-tools-1.24.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff -EBUILD igt-gpu-tools-1.25.ebuild 2412 BLAKE2B 4c39dd0e40dc0fee05a6ca778b99fd81c1841192944323b85703182d91778e9220448c6a9883a1f6ce812801c84e152cc632115be52197536cbb67bdf09b6c94 SHA512 e9f77e2cb65a3a09cf7f3e1d6b460fa24c34b16ada0c439b6d6c2b0e183055b8f13c6ef0bc7b0280186e791e6e5e33488ee222ad484db5e5c07276e0170f83fd +EBUILD igt-gpu-tools-1.25.ebuild 2462 BLAKE2B 1e43a538ff075d43501d925d4eb5ce8ff4968ec8d1aa98cd2444fa7f68cee117239c1fe289e62587012e8ec3ebdf495d66f202c1daa89b866cb80d068008b66b SHA512 aebf56bb749808b8e76d9d4282c18606ba5a6d595473a5b7e71a03233f874807d2563006c37fea6a9d31176421cd554c5affe84a8159ea05f18d32ba8e8dcac4 EBUILD igt-gpu-tools-9999.ebuild 2412 BLAKE2B 4c39dd0e40dc0fee05a6ca778b99fd81c1841192944323b85703182d91778e9220448c6a9883a1f6ce812801c84e152cc632115be52197536cbb67bdf09b6c94 SHA512 e9f77e2cb65a3a09cf7f3e1d6b460fa24c34b16ada0c439b6d6c2b0e183055b8f13c6ef0bc7b0280186e791e6e5e33488ee222ad484db5e5c07276e0170f83fd MISC metadata.xml 724 BLAKE2B 8fc5c9e95c807af441d821433a598a79aafeb8438f04f7b1d4e6399f02f30b17c11e8a047bd29d2c1e92b2b988367202d2c1617e121c4f300d5cd3d9dc6ed9f1 SHA512 98ba85c21823801e84229fa1c0435b8bfd10c40213b52e2892dcdd958f9a52cf737fe8541b10feaf8fef1c68d96f7abacf5d1e91aa773f69182800e9da52ba7a diff --git a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch new file mode 100644 index 000000000000..689dca411e5b --- /dev/null +++ b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch @@ -0,0 +1,25 @@ +manual backport of upstream commit +https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/201da47cb57b8fadd9bc45be16b82617b32a2c01 + +--- a/docs/reference/igt-gpu-tools/generate_description_xml.py ++++ b/docs/reference/igt-gpu-tools/generate_description_xml.py +@@ -4,7 +4,7 @@ import re + import sys + import os.path + import subprocess +-import xml.etree.cElementTree as ET ++import xml.etree.ElementTree as ET + + from collections import namedtuple + +--- a/lib/i915/perf-configs/perf-codegen.py ++++ b/lib/i915/perf-configs/perf-codegen.py +@@ -26,7 +26,7 @@ import os + import sys + import textwrap + +-import xml.etree.cElementTree as et ++import xml.etree.ElementTree as et + + import codegen + diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild deleted file mode 100644 index 8662c0102ba5..000000000000 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git" -if [[ ${PV} = *9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson - -DESCRIPTION="Intel GPU userland tools" - -HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz" -fi -LICENSE="MIT" -SLOT="0" -IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv" -REQUIRED_USE=" - || ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) - overlay? ( - video_cards_intel - || ( X xv ) - ) -" -RESTRICT="test" - -RDEPEND=" - dev-libs/elfutils - dev-libs/glib:2 - sys-apps/kmod:= - sys-libs/libunwind:= - sys-libs/zlib:= - sys-process/procps:= - virtual/libudev:= - >=x11-libs/cairo-1.12.0[X?] - >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] - >=x11-libs/libpciaccess-0.10 - x11-libs/pixman - chamelium? ( - dev-libs/xmlrpc-c[curl] - sci-libs/gsl - media-libs/alsa-lib:= - ) - overlay? ( - >=x11-libs/libXrandr-1.3 - xv? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXv - ) - ) - runner? ( dev-libs/json-c:= ) - unwind? ( sys-libs/libunwind ) - valgrind? ( dev-util/valgrind ) - " -DEPEND="${RDEPEND} - doc? ( >=dev-util/gtk-doc-1.25-r1 ) - man? ( dev-python/docutils ) - overlay? ( - >=dev-util/peg-0.1.18 - x11-base/xorg-proto - ) - video_cards_intel? ( - sys-devel/bison - sys-devel/flex - ) -" - -src_prepare() { - sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build - default_src_prepare -} - -src_configure() { - local gpus="" - use video_cards_amdgpu && gpus+="amdgpu," - use video_cards_intel && gpus+="intel," - use video_cards_nouveau && gpus+="nouveau," - - local overlay_backends="" - use overlay && use xv && overlay_backends+="xv," - use overlay && use X && overlay_backends+="x," - - local emesonargs=( - $(meson_feature chamelium build_chamelium) - $(meson_feature doc build_docs) - $(meson_feature man build_man) - $(meson_feature overlay build_overlay) - $(meson_feature runner build_runner) - $(meson_feature doc build_tests) # Test build is required for docs - $(meson_feature valgrind with_valgrind) - $(meson_feature unwind with_libunwind) - -Doverlay_backends=${overlay_backends%?} - -Dwith_libdrm=${gpus%?} - ) - meson_src_configure -} diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild index b202d340de99..6bb31b86e9f1 100644 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild +++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild @@ -73,6 +73,8 @@ DEPEND="${RDEPEND} ) " +PATCHES=( "${FILESDIR}/${PV}-python-3.9.patch" ) + src_prepare() { sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build default_src_prepare -- cgit v1.2.3