commit: 0122b2f482775a7da0d84e47db5579713958db6e Author: Gerhard Bräunlich <g.braeunlich <AT> disroot <DOT> org> AuthorDate: Sun Jun 2 11:49:32 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Jul 1 16:17:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0122b2f4
media-libs/libepoxy: Make egl configurable Signed-off-by: Gerhard Bräunlich <g.braeunlich <AT> disroot.org> Closes: https://github.com/gentoo/gentoo/pull/12169 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../{libepoxy-9999.ebuild => libepoxy-1.5.3-r1.ebuild} | 10 +++++----- media-libs/libepoxy/libepoxy-9999.ebuild | 8 ++++---- media-libs/libepoxy/metadata.xml | 3 +++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild similarity index 86% copy from media-libs/libepoxy/libepoxy-9999.ebuild copy to media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild index 1bac611c62b..300f6338c93 100644 --- a/media-libs/libepoxy/libepoxy-9999.ebuild +++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,15 +18,15 @@ HOMEPAGE="https://github.com/anholt/libepoxy"; if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" fi LICENSE="MIT" SLOT="0" -IUSE="test +X" +IUSE="+egl test +X" -RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]" +RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )" DEPEND="${PYTHON_DEPS} ${RDEPEND} >=dev-util/meson-0.47.0 @@ -40,7 +40,7 @@ src_unpack() { multilib_src_configure() { local emesonargs=( - -Degl=yes + -Degl=$(usex egl) -Dglx=$(usex X) -Dx11=$(usex X true false) ) diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild index 1bac611c62b..4bdbc19dd23 100644 --- a/media-libs/libepoxy/libepoxy-9999.ebuild +++ b/media-libs/libepoxy/libepoxy-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,9 +24,9 @@ fi LICENSE="MIT" SLOT="0" -IUSE="test +X" +IUSE="+egl test +X" -RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]" +RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )" DEPEND="${PYTHON_DEPS} ${RDEPEND} >=dev-util/meson-0.47.0 @@ -40,7 +40,7 @@ src_unpack() { multilib_src_configure() { local emesonargs=( - -Degl=yes + -Degl=$(usex egl) -Dglx=$(usex X) -Dx11=$(usex X true false) ) diff --git a/media-libs/libepoxy/metadata.xml b/media-libs/libepoxy/metadata.xml index 1065cad0271..1162de9ab55 100644 --- a/media-libs/libepoxy/metadata.xml +++ b/media-libs/libepoxy/metadata.xml @@ -5,6 +5,9 @@ <email>[email protected]</email> <name>X11</name> </maintainer> + <use> + <flag name="egl">Enable EGL support.</flag> + </use> <upstream> <remote-id type="github">anholt/libepoxy</remote-id> </upstream>
