From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11F65138334 for ; Mon, 1 Jul 2019 16:18:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BE7BE086A; Mon, 1 Jul 2019 16:18:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1372E086A for ; Mon, 1 Jul 2019 16:18:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22D7D346D88 for ; Mon, 1 Jul 2019 16:18:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1CC6626 for ; Mon, 1 Jul 2019 16:18:05 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1561997874.0122b2f482775a7da0d84e47db5579713958db6e.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libepoxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild media-libs/libepoxy/libepoxy-9999.ebuild media-libs/libepoxy/metadata.xml X-VCS-Directories: media-libs/libepoxy/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0122b2f482775a7da0d84e47db5579713958db6e X-VCS-Branch: master Date: Mon, 1 Jul 2019 16:18:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f6ce418d-3387-4ab4-ac95-3cab21939ac4 X-Archives-Hash: b80d5f1b98b7e03a3c40b82fa527c47b commit: 0122b2f482775a7da0d84e47db5579713958db6e Author: Gerhard Bräunlich disroot org> AuthorDate: Sun Jun 2 11:49:32 2019 +0000 Commit: Matt Turner gentoo 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 disroot.org> Closes: https://github.com/gentoo/gentoo/pull/12169 Signed-off-by: Matt Turner 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 @@ x11@gentoo.org X11 + + Enable EGL support. + anholt/libepoxy