From 1d94e97e5826eb0164ed2840d80b97ce19fa9b10 Mon Sep 17 00:00:00 2001 From: cions Date: Sun, 10 Apr 2022 13:42:11 +0900 Subject: x11-apps/igt-gpu-tools: Fix libunwind dependency Signed-off-by: Joh Matsuura Closes: https://github.com/gentoo/gentoo/pull/24968 Signed-off-by: Sam James --- .../igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild | 109 --------------------- .../igt-gpu-tools/igt-gpu-tools-1.26-r2.ebuild | 108 ++++++++++++++++++++ x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild | 3 +- 3 files changed, 109 insertions(+), 111 deletions(-) delete mode 100644 x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild create mode 100644 x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r2.ebuild (limited to 'x11-apps/igt-gpu-tools') 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 deleted file mode 100644 index 17c026cd7d0e..000000000000 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2021 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 - -PYTHON_COMPAT=( python3_{7..10} ) -inherit ${GIT_ECLASS} meson python-any-r1 - -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 - ) -" -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 -} - -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/igt-gpu-tools-1.26-r2.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r2.ebuild new file mode 100644 index 000000000000..1f77ad260810 --- /dev/null +++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r2.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2021 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 + +PYTHON_COMPAT=( python3_{7..10} ) +inherit ${GIT_ECLASS} meson python-any-r1 + +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/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 + ) +" +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 +} + +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/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild index e165a87a6c39..94cc65a0d5ce 100644 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild +++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild @@ -36,7 +36,6 @@ RDEPEND=" dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= - sys-libs/libunwind:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= @@ -58,7 +57,7 @@ RDEPEND=" ) ) runner? ( dev-libs/json-c:= ) - unwind? ( sys-libs/libunwind ) + unwind? ( sys-libs/libunwind:= ) valgrind? ( dev-util/valgrind ) " DEPEND="${RDEPEND} -- cgit v1.2.3-65-gdbad