gentoo auto-resync : 27:02:2023 - 22:02:09

6 files changed, 124 insertions, 13 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index ff5a3c434619..bf0aa8db0c9f 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index ad5372ed53a3..ec5b38d250d3 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,5 +1,7 @@
 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
+DIST igt-gpu-tools-1.27.1.tar.xz 2321940 BLAKE2B b6c4fee31c97cd5005c1f2cd5c18c181582adfb27e92444a8e78d1c105acb78a424bd4e4af8d13333776c81531fbfd24dc4b7db0da9858f5b803f64962d6269d SHA512 20923505e9afe6e5064bf8f4056e027ff0321cd29d8982157a608369aea6fbef24c93756de96ef6296e09d539957fc6cdad4097cbab5af33f8828f762da0d8c0
 EBUILD igt-gpu-tools-1.26-r2.ebuild 2568 BLAKE2B 14425a6e0be90888df624ae8ec40d285966faa98f71a17c1f33c49b806b2d844bba916644ba68970c07eb473238e5083bd3e5a49a21824800b0c1e1c9636fb2d SHA512 27a11f4d634ee2b19701c1c1bf40b775c304aac8db8ca7152da48c3883243af199bd89bc2eb4e892591008303cf0e652f3defa72a76f3de8af747475b662d9ed
-EBUILD igt-gpu-tools-9999.ebuild 2469 BLAKE2B f53d8c06c6939ee22430cd757aca13e09ce432de78a66a07f145abf4456ed26f0825c64144886dbdc63b566a24f61044d0a44fb6bceea88b1bd1751bec6f64fc SHA512 eff0258ee84cdc173c6c69e0e36f00bfaf3cda4cc2ba84d9a4ad1ec82e96c9d0c180b50907489155b8869acd9bfc14280cf42698e409888fd260d9356d28064f
+EBUILD igt-gpu-tools-1.27.1.ebuild 2488 BLAKE2B 0ffc74f842b0ce7bd2611f2e0f907882da4ddf70e08efddb2876dd315098012902b9c78b995bd89d8538ee6ed07dc8b019bbeaf549cae9331c8483c8d8258a89 SHA512 3c08c9c2e344b11da22ac5c77d5f0e43c6bdade2ca7faff72f61a8238a294d88f310d03472543450ca980a627b228502526ed2435e9b3a5200200a54d98f3440
+EBUILD igt-gpu-tools-9999.ebuild 2488 BLAKE2B 0ffc74f842b0ce7bd2611f2e0f907882da4ddf70e08efddb2876dd315098012902b9c78b995bd89d8538ee6ed07dc8b019bbeaf549cae9331c8483c8d8258a89 SHA512 3c08c9c2e344b11da22ac5c77d5f0e43c6bdade2ca7faff72f61a8238a294d88f310d03472543450ca980a627b228502526ed2435e9b3a5200200a54d98f3440
 MISC metadata.xml 805 BLAKE2B aba787b25bee30e978d8af424f9f604f8220ec0541b184f0a11d122b28e52979a55709efdf34cc97e3ef9b7477951adf1e75e34372530720cb7aa88fe023a483 SHA512 d2cd65759e6239926ff053c1f677868fdd57c46655ffb9b4e67c7a2f0482ed8d6950efce3cc6270ee1fe9e4ba4d6105fec25b8c26f6478737ff3492ebac12ccd
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1.ebuild
new file mode 100644
index 000000000000..e5263c2dbe35
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+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 )
+	runner? ( 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
+	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 7bc5bd711ea5..e5263c2dbe35 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
 if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit ${GIT_ECLASS} meson python-any-r1
 
 DESCRIPTION="Intel GPU userland tools"
@@ -29,6 +29,7 @@ REQUIRED_USE="
 		|| ( X xv )
 	)
 	doc? ( tests )
+	runner? ( tests )
 "
 RESTRICT="test"
 
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 0ef676de1c37..58117457427e 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,5 @@
 AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945
-AUX 9999-Disable-things-we-don-t-want.patch 5468 BLAKE2B f1fa7d7edeb81856cb57ddf1eaad100df337011ae5f63a9c14e2e6c3d2eeb085cc48c20926b2a56ecb44b7a160a4078e57f1d83684b77276e4f8096191b6849a SHA512 6e2e4329e6d32b43a058e96d6cec62a41e3d2754b753a72f5e9713d3e8862ac74055e1e9a25062d5ca7f25bde7329339b644b591aa01d69622bfcacb3a3e4b3b
+AUX 9999-Disable-things-we-don-t-want.patch 5566 BLAKE2B cdfda3732d7a0998b634d00b073492bb085d93c15af3a448219d2e3cead6224656c7f9200f340361c6ef549eff42e38751b1e5b6db31632854218aa56e6e8724 SHA512 e46f08a3dc8ea24d24cd1eacc7ff5156889457dde4091593951334d3d07d8b3df441b24cc57ad749ac40f7d395cb2d8b2877b2e66bfe9c0721cbd7db84a29cf2
 DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
 EBUILD mesa-progs-8.5.0.ebuild 1804 BLAKE2B c453575100a78f7b5599698e6eb13b538314e189e892cfef3670e10b9aa6f7de83995046131e7002352176cf1c10b6a05ddd44d5df01d5dc29171ef78ca99d56 SHA512 f388241bbabd38ec926cfa71d12ba8c5d4e494ca3aa33c7f38786df59c8fd870be198096e7e619353ae1e979b379a8a784d84573e8432738172afa7a45df096a
 EBUILD mesa-progs-9999.ebuild 1802 BLAKE2B f5d8f4d122a13362068a130dc96e737ef2c47a54b14279f3b797a0a06a640530dc4060ee05ee754057cfda161858d63d2b7e6698fdb993da3ffdb15e777ba9ea SHA512 7a2d94de70119c1f77f287e0947c3f9ca5eddfa5c7766dba11f0cadd2c6c28170eacb0dd39b0e0a93e51e9a41c0dcb073717497fcf096039f1837afc57fadbc5
diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
index e2f12ba51f8a..fd625c5baf89 100644
--- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From aeb01fb49314017aa70b63531f728e61c983d4b9 Mon Sep 17 00:00:00 2001
+From f687e1297c9a26b219fc8b5a1faa6c1e3d1d6d16 Mon Sep 17 00:00:00 2001
 From: Matt Turner <mattst88@gmail.com>
 Date: Fri, 27 Jan 2023 06:40:05 -0800
 Subject: [PATCH] Disable things we don't want
@@ -6,36 +6,38 @@ Subject: [PATCH] Disable things we don't want
 v2: Enable libglad to satisfy egl dependencies
 v3: Enable most of libutil to fix undefined references in es2gears
 ---
- meson.build                   | 11 +++--------
+ meson.build                   | 13 +++----------
  src/egl/opengl/meson.build    | 33 --------------------------------
  src/egl/opengles2/meson.build |  5 -----
  src/meson.build               |  2 --
  src/util/gl_wrap.h            |  2 --
  src/util/meson.build          |  7 +------
  src/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 4 insertions(+), 92 deletions(-)
+ 7 files changed, 4 insertions(+), 94 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index f93a731d..245d1655 100644
+index 6ad6ea7a..1c46da4f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -81,14 +81,7 @@ endif
+@@ -87,16 +87,7 @@ endif
  
  dep_threads = dependency('threads')
  
--dep_glu = dependency('glu', required : dep_x11.found())
--if not dep_glu.found()
+-dep_glu = dependency('glu', required : false)
+-# GLU is part of OpenGL.Framework
+-if not dep_glu.found() and host_machine.system() != 'darwin'
 -  _glu_name = 'GLU'
 -  if host_machine.system() == 'windows'
 -    _glu_name = 'glu32'
 -  endif
--  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h')
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
+-    required : dep_x11.found())
 -endif
 +dep_glu = disabler()
  
  # GBM is needed for EGL on KMS
  dep_gbm = dependency('gbm', required : false, disabler : true)
-@@ -127,6 +120,8 @@ else
+@@ -135,6 +126,8 @@ else
    dep_glut = dependency('', required : false)
  endif