From 254e1645e62e7f72e92f9d91254d4cd9fc55200b Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Wed, 21 Jul 2021 22:37:47 -0700
Subject: dev-util/apitrace: Set USE-defaults for mesa[egl,gbm]

Signed-off-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-util/apitrace/apitrace-9.0-r2.ebuild | 87 --------------------------------
 dev-util/apitrace/apitrace-9.0-r3.ebuild | 87 ++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 87 deletions(-)
 delete mode 100644 dev-util/apitrace/apitrace-9.0-r2.ebuild
 create mode 100644 dev-util/apitrace/apitrace-9.0-r3.ebuild

(limited to 'dev-util')

diff --git a/dev-util/apitrace/apitrace-9.0-r2.ebuild b/dev-util/apitrace/apitrace-9.0-r2.ebuild
deleted file mode 100644
index cc8535b0a0a3..000000000000
--- a/dev-util/apitrace/apitrace-9.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..10} )
-inherit cmake-multilib python-single-r1
-
-DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="qt5 X"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-arch/brotli:=[${MULTILIB_USEDEP}]
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=
-	media-libs/mesa[egl,gles1,gles2,X?,${MULTILIB_USEDEP}]
-	>=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	sys-process/procps:=[${MULTILIB_USEDEP}]
-	X? ( x11-libs/libX11 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5[-gles2-only]
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# TODO: upstream
-	"${FILESDIR}"/${P}-disable-multiarch.patch
-	"${FILESDIR}"/${P}-brotli-unbundle.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	rm -rf thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
-}
-
-src_configure() {
-	my_configure() {
-		local mycmakeargs=(
-			-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-			-DENABLE_X11=$(usex X)
-			-DENABLE_EGL=ON
-			-DENABLE_CLI=ON
-			-DENABLE_GUI=$(multilib_native_usex qt5)
-			-DENABLE_STATIC_SNAPPY=OFF
-			-DENABLE_WAFFLE=ON
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-		)
-		cmake_src_configure
-	}
-
-	multilib_foreach_abi my_configure
-}
-
-src_install() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/apitrace$(get_exeext)
-		/usr/bin/eglretrace$(get_exeext)
-	)
-	use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) )
-
-	cmake-multilib_src_install
-
-	make_libgl_symlinks() {
-		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-	}
-	use X && multilib_foreach_abi make_libgl_symlinks
-}
diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild b/dev-util/apitrace/apitrace-9.0-r3.ebuild
new file mode 100644
index 000000000000..7c0a0190acac
--- /dev/null
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7..10} )
+inherit cmake-multilib python-single-r1
+
+DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt5 X"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/mesa[egl(+),gles1,gles2,X?,${MULTILIB_USEDEP}]
+	>=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	sys-process/procps:=[${MULTILIB_USEDEP}]
+	X? ( x11-libs/libX11 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5[-gles2-only]
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}"/${P}-disable-multiarch.patch
+	"${FILESDIR}"/${P}-brotli-unbundle.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# The apitrace code grubs around in the internal zlib structures.
+	# We have to extract this header and clean it up to keep that working.
+	# Do not be surprised if a zlib upgrade breaks things ...
+	rm -rf thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
+}
+
+src_configure() {
+	my_configure() {
+		local mycmakeargs=(
+			-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+			-DENABLE_X11=$(usex X)
+			-DENABLE_EGL=ON
+			-DENABLE_CLI=ON
+			-DENABLE_GUI=$(multilib_native_usex qt5)
+			-DENABLE_STATIC_SNAPPY=OFF
+			-DENABLE_WAFFLE=ON
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+		)
+		cmake_src_configure
+	}
+
+	multilib_foreach_abi my_configure
+}
+
+src_install() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/apitrace$(get_exeext)
+		/usr/bin/eglretrace$(get_exeext)
+	)
+	use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) )
+
+	cmake-multilib_src_install
+
+	make_libgl_symlinks() {
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+	}
+	use X && multilib_foreach_abi make_libgl_symlinks
+}
-- 
cgit v1.2.3-65-gdbad