| 1 |
commit: f493874fb34c5817081a0545f61be16165bfca50 |
| 2 |
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> |
| 3 |
AuthorDate: Mon Mar 29 15:35:00 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 10 07:44:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f493874f |
| 7 |
|
| 8 |
dev-util/apitrace: Put libX11/mesa[X] behind USE=X |
| 9 |
|
| 10 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/20179 |
| 12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/apitrace/apitrace-9.0-r1.ebuild | 13 +++++++------ |
| 15 |
1 file changed, 7 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/apitrace/apitrace-9.0-r1.ebuild b/dev-util/apitrace/apitrace-9.0-r1.ebuild |
| 18 |
index dde14319289..4834bd7b743 100644 |
| 19 |
--- a/dev-util/apitrace/apitrace-9.0-r1.ebuild |
| 20 |
+++ b/dev-util/apitrace/apitrace-9.0-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2020 Gentoo Authors |
| 23 |
+# Copyright 1999-2021 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 28 |
LICENSE="MIT" |
| 29 |
SLOT="0" |
| 30 |
KEYWORDS="~amd64 ~arm ~x86" |
| 31 |
-IUSE="qt5" |
| 32 |
+IUSE="qt5 X" |
| 33 |
|
| 34 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 35 |
|
| 36 |
@@ -22,11 +22,11 @@ DEPEND="${PYTHON_DEPS} |
| 37 |
app-arch/brotli:=[${MULTILIB_USEDEP}] |
| 38 |
>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] |
| 39 |
media-libs/libpng:0= |
| 40 |
- media-libs/mesa[egl,gles1,gles2,X(+),${MULTILIB_USEDEP}] |
| 41 |
+ media-libs/mesa[egl,gles1,gles2,X?,${MULTILIB_USEDEP}] |
| 42 |
>=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}] |
| 43 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 44 |
sys-process/procps:=[${MULTILIB_USEDEP}] |
| 45 |
- x11-libs/libX11 |
| 46 |
+ X? ( x11-libs/libX11 ) |
| 47 |
qt5? ( |
| 48 |
dev-qt/qtcore:5 |
| 49 |
dev-qt/qtgui:5[-gles2-only] |
| 50 |
@@ -55,6 +55,7 @@ src_configure() { |
| 51 |
my_configure() { |
| 52 |
local mycmakeargs=( |
| 53 |
-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} |
| 54 |
+ -DENABLE_X11=$(usex X) |
| 55 |
-DENABLE_EGL=ON |
| 56 |
-DENABLE_CLI=ON |
| 57 |
-DENABLE_GUI=$(multilib_native_usex qt5) |
| 58 |
@@ -71,8 +72,8 @@ src_install() { |
| 59 |
MULTILIB_CHOST_TOOLS=( |
| 60 |
/usr/bin/apitrace$(get_exeext) |
| 61 |
/usr/bin/eglretrace$(get_exeext) |
| 62 |
- /usr/bin/glretrace$(get_exeext) |
| 63 |
) |
| 64 |
+ use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) ) |
| 65 |
|
| 66 |
cmake-multilib_src_install |
| 67 |
|
| 68 |
@@ -81,5 +82,5 @@ src_install() { |
| 69 |
dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 |
| 70 |
dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 |
| 71 |
} |
| 72 |
- multilib_foreach_abi make_libgl_symlinks |
| 73 |
+ use X && multilib_foreach_abi make_libgl_symlinks |
| 74 |
} |
Archives