commit: d822dedd15925fcf6201dd8f7f443d7cd0d12894 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Mon Oct 6 20:28:24 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Mon Oct 6 20:28:24 2025 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d822dedd
x11-apps/igt-gpu-tools: treeclean Works in ::gentoo Link: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b980233 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> x11-apps/igt-gpu-tools/Manifest | 1 - .../files/0001-igt-gpu-tools-1.25-musl.patch | 172 --------------------- x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch | 25 --- x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild | 109 ------------- x11-apps/igt-gpu-tools/metadata.xml | 18 --- 5 files changed, 325 deletions(-) diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest deleted file mode 100644 index cdfc2905..00000000 --- a/x11-apps/igt-gpu-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST igt-gpu-tools-1.25.tar.xz 1425652 BLAKE2B 1dd17e8542c126d356478acd07344d8732013a24fd180064d6f2277be76170924e7031fd2529b2aa054b40d5093d9cd95271e156bc6b97a75158c84de142f1ba SHA512 a24ee46092241da26fc2dac2b9b54c9f16f7a408c8740c9c7209e876929e2908a36261ba258ca4a4a4e4a21c1e9c919457bf98d514f81d8b7dbfcf5f89a74daf diff --git a/x11-apps/igt-gpu-tools/files/0001-igt-gpu-tools-1.25-musl.patch b/x11-apps/igt-gpu-tools/files/0001-igt-gpu-tools-1.25-musl.patch deleted file mode 100644 index adb676be..00000000 --- a/x11-apps/igt-gpu-tools/files/0001-igt-gpu-tools-1.25-musl.patch +++ /dev/null @@ -1,172 +0,0 @@ ---- a/benchmarks/gem_syslatency.c -+++ b/benchmarks/gem_syslatency.c -@@ -41,10 +41,10 @@ - #include <time.h> - #include <limits.h> - #include "drm.h" -- -+#include "signal_compat.h" - #include <linux/unistd.h> - --#define sigev_notify_thread_id _sigev_un._tid -+#define sigev_notify_thread_id sigev_notify_function - - static volatile int done; - ---- a/lib/igt_aux.c -+++ b/lib/igt_aux.c -@@ -31,6 +31,7 @@ - #endif - #include <stdio.h> - #include <fcntl.h> -+#include <limits.h> - #include <sys/stat.h> - #include <sys/ioctl.h> - #include <string.h> -@@ -73,6 +74,8 @@ - #include <libgen.h> /* for dirname() */ - #endif - -+#include "signal_compat.h" -+ - /** - * SECTION:igt_aux - * @short_description: Auxiliary libraries and support functions - ---- a/lib/igt_aux.h -+++ b/lib/igt_aux.h -@@ -46,7 +46,7 @@ - # define gettid() (pid_t)(syscall(__NR_gettid)) - # endif - #endif --#define sigev_notify_thread_id _sigev_un._tid -+#define sigev_notify_thread_id sigev_notify_function - - /* auxialiary igt helpers from igt_aux.c */ - /* generally useful helpers */ - ---- a/lib/igt_halffloat.c -+++ b/lib/igt_halffloat.c -@@ -162,7 +162,7 @@ - return fi.f; - } - --#if defined(__x86_64__) && !defined(__clang__) -+#if defined(__x86_64__) && !defined(__clang__) && defined(__GLIBC__) - #pragma GCC push_options - #pragma GCC target("f16c") - ---- a/lib/igt_x86.c -+++ b/lib/igt_x86.c -@@ -190,7 +190,7 @@ - } - #endif - --#if defined(__x86_64__) && !defined(__clang__) -+#if defined(__x86_64__) && !defined(__clang__) && defined(__GLIBC__) - #pragma GCC push_options - #pragma GCC target("sse4.1") - #pragma GCC diagnostic ignored "-Wpointer-arith" - ---- /dev/null -+++ b/lib/signal_compat.h -@@ -0,0 +1,8 @@ -+#define SIGEV_SIGNAL 0 -+#define SIGEV_NONE 1 -+#define SIGEV_THREAD 2 -+ -+#define SIGEV_SIGNAL 0 /* notify via signal */ -+#define SIGEV_NONE 1 /* other notification: meaningless */ -+#define SIGEV_THREAD 2 /* deliver via thread creation */ -+#define SIGEV_THREAD_ID 4 /* deliver to thread */ - ---- a/tests/drm_read.c -+++ b/tests/drm_read.c -@@ -220,7 +220,7 @@ - pthread_mutex_unlock(&w.mutex); - - /* Give each thread a chance to sleep in drm_read() */ -- pthread_yield(); -+ sched_yield(); - - /* One event should wake all threads as none consume */ - generate_event(w.fd, pipe); - ---- a/tests/kms_hdmi_inject.c -+++ b/tests/kms_hdmi_inject.c -@@ -26,6 +26,7 @@ - - #include <dirent.h> - -+#include <limits.h> - #include "igt.h" - #include "igt_edid.h" - #include "igt_eld.h" - ---- a/tests/kms_sysfs_edid_timing.c -+++ b/tests/kms_sysfs_edid_timing.c -@@ -24,6 +24,7 @@ - - #include <dirent.h> - #include <fcntl.h> -+#include <limits.h> - #include <sys/stat.h> - - #define THRESHOLD_PER_CONNECTOR 10 - ---- a/tests/i915/gem_close_race.c -+++ b/tests/i915/gem_close_race.c -@@ -42,6 +42,10 @@ - #include <sys/syscall.h> - #include "drm.h" - -+#ifndef __GLIBC__ -+#include "signal_compat.h" -+#endif -+ - #define OBJECT_SIZE (256 * 1024) - - #define COPY_BLT_CMD (2<<29|0x53<<22|0x6) -@@ -51,7 +55,7 @@ - static uint32_t devid; - static bool has_64bit_relocations; - --#define sigev_notify_thread_id _sigev_un._tid -+#define sigev_notify_thread_id sigev_notify_function - - static void selfcopy(int fd, uint32_t handle, int loops) - { - ---- a/tests/panfrost_submit.c -+++ b/tests/panfrost_submit.c -@@ -68,7 +68,7 @@ - static void check_fb(int fd, struct panfrost_bo *bo) - { - int gpu_prod_id = igt_panfrost_get_param(fd, DRM_PANFROST_PARAM_GPU_PROD_ID); -- __uint32_t *fbo; -+ uint32_t *fbo; - int i; - - fbo = bo->map; - ---- a/tests/kms_atomic.c -+++ b/tests/kms_atomic.c -@@ -683,7 +683,6 @@ - { - int timeline, fence_fd; - void *map; -- const ptrdiff_t PAGE_SIZE = sysconf(_SC_PAGE_SIZE); - uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID]; - - igt_require_sw_sync(); - ---- a/lib/igt_eld.c -+++ b/lib/igt_eld.c -@@ -26,6 +26,7 @@ - #include "config.h" - - #include <dirent.h> -+#include <limits.h> - #include <errno.h> - #include <glob.h> - #include <stdint.h> 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 deleted file mode 100644 index 689dca41..00000000 --- a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild deleted file mode 100644 index b6dd9364..00000000 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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 tests 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 ) - ) - doc? ( tests ) -" -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 - ) -" - -PATCHES=( - "${FILESDIR}/${PV}-python-3.9.patch" - "${FILESDIR}"/0001-${PN}-1.25-musl.patch -) - -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) - $(meson_feature doc docs) - $(meson_feature man) - $(meson_feature overlay) - $(meson_feature runner) - $(meson_feature tests) - $(meson_feature valgrind) - $(meson_feature unwind libunwind) - -Doverlay_backends=${overlay_backends%?} - -Dlibdrm_drivers=${gpus%?} - ) - meson_src_configure -} diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml deleted file mode 100644 index e6464be0..00000000 --- a/x11-apps/igt-gpu-tools/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>X11</name> -</maintainer> -<use> - <flag name="chamelium">Enables support for building Chamelium tests</flag> - <flag name="man">Build and install man pages</flag> - <flag name="overlay">Build the intel-gpu-overlay utility</flag> - <flag name="runner">Build the test runner</flag> - <flag name="tests">Enable tests</flag> - <flag name="valgrind">Support valgrind annotations</flag> - <flag name="xv">Enable intel-gpu-overlay xv backend</flag> - <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag> -</use> -</pkgmetadata>
