igt-gpu-tools: upgraded package to upstream
Upgraded x11-apps/igt-gpu-tools to version 1.25 on amd64
BUG=b:153614925
TEST=emerge-<BOARD> x11-apps/igt-gpu-tools and cros deploy to BOARD
Change-Id: Iacc0eb36ed83bbc0a027dd89f829b9c116eea8a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2141751
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Commit-Queue: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Casey G Bowman <casey.g.bowman@intel.com>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
deleted file mode 100644
index 6a8eb56..0000000
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!x11-apps/intel-gpu-tools dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/llvm-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 ) 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 ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Intel GPU userland tools
-EAPI=6
-HOMEPAGE=https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools
-IUSE=chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=!x11-apps/intel-gpu-tools dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/llvm-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 )
-REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.24.tar.xz
-_eclasses_=meson b5ee7a05833ab91225acf30ffdeed006 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing e32940a7b2a9992ad217eccddb84d548 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 931c328767d245c08a16a3f87be9ce9c toolchain-funcs 209edad4a5c4812e7b2f8021650974f0
-_md5_=139d4d8c2a16cf11443be1732d2c0805
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
new file mode 100644
index 0000000..99014b7
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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/llvm-libunwind ) valgrind? ( dev-util/valgrind ) 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 )
+DESCRIPTION=Intel GPU userland tools
+EAPI=7
+HOMEPAGE=https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools
+IUSE=chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/llvm-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/llvm-libunwind ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.25.tar.xz
+_eclasses_=meson b5ee7a05833ab91225acf30ffdeed006 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing e32940a7b2a9992ad217eccddb84d548 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 931c328767d245c08a16a3f87be9ce9c toolchain-funcs 209edad4a5c4812e7b2f8021650974f0
+_md5_=1a869b58e9b5d6be7e07dc23a69699cb
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index da385bc..cdfc290 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1 +1 @@
-DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
+DIST igt-gpu-tools-1.25.tar.xz 1425652 BLAKE2B 1dd17e8542c126d356478acd07344d8732013a24fd180064d6f2277be76170924e7031fd2529b2aa054b40d5093d9cd95271e156bc6b97a75158c84de142f1ba SHA512 a24ee46092241da26fc2dac2b9b54c9f16f7a408c8740c9c7209e876929e2908a36261ba258ca4a4a4e4a21c1e9c919457bf98d514f81d8b7dbfcf5f89a74daf
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
similarity index 82%
rename from x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
rename to x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
index f1a0819..e30e631 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
if [[ ${PV} = *9999* ]]; then
GIT_ECLASS="git-r3"
@@ -31,7 +31,6 @@
RESTRICT="test"
RDEPEND="
- !x11-apps/intel-gpu-tools
dev-libs/elfutils
dev-libs/glib:2
sys-apps/kmod:=
@@ -89,16 +88,16 @@
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)
+ $(meson_feature chamelium)
+ $(meson_feature doc docs)
+ $(meson_feature man)
+ $(meson_feature overlay)
+ $(meson_feature runner)
+ $(meson_feature doc tests) # Test build is required for docs
+ $(meson_feature valgrind)
+ $(meson_feature unwind libunwind)
-Doverlay_backends=${overlay_backends%?}
- -Dwith_libdrm=${gpus%?}
+ -Dlibdrm_drivers=${gpus%?}
)
meson_src_configure
}
