| 1 |
commit: 0122b2f482775a7da0d84e47db5579713958db6e |
| 2 |
Author: Gerhard Bräunlich <g.braeunlich <AT> disroot <DOT> org> |
| 3 |
AuthorDate: Sun Jun 2 11:49:32 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 1 16:17:54 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0122b2f4 |
| 7 |
|
| 8 |
media-libs/libepoxy: Make egl configurable |
| 9 |
|
| 10 |
Signed-off-by: Gerhard Bräunlich <g.braeunlich <AT> disroot.org> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/12169 |
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{libepoxy-9999.ebuild => libepoxy-1.5.3-r1.ebuild} | 10 +++++----- |
| 15 |
media-libs/libepoxy/libepoxy-9999.ebuild | 8 ++++---- |
| 16 |
media-libs/libepoxy/metadata.xml | 3 +++ |
| 17 |
3 files changed, 12 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild |
| 20 |
similarity index 86% |
| 21 |
copy from media-libs/libepoxy/libepoxy-9999.ebuild |
| 22 |
copy to media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild |
| 23 |
index 1bac611c62b..300f6338c93 100644 |
| 24 |
--- a/media-libs/libepoxy/libepoxy-9999.ebuild |
| 25 |
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2018 Gentoo Authors |
| 28 |
+# Copyright 1999-2019 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
@@ -18,15 +18,15 @@ HOMEPAGE="https://github.com/anholt/libepoxy" |
| 33 |
if [[ ${PV} = 9999* ]]; then |
| 34 |
SRC_URI="" |
| 35 |
else |
| 36 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
| 37 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" |
| 38 |
SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 39 |
fi |
| 40 |
|
| 41 |
LICENSE="MIT" |
| 42 |
SLOT="0" |
| 43 |
-IUSE="test +X" |
| 44 |
+IUSE="+egl test +X" |
| 45 |
|
| 46 |
-RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]" |
| 47 |
+RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )" |
| 48 |
DEPEND="${PYTHON_DEPS} |
| 49 |
${RDEPEND} |
| 50 |
>=dev-util/meson-0.47.0 |
| 51 |
@@ -40,7 +40,7 @@ src_unpack() { |
| 52 |
|
| 53 |
multilib_src_configure() { |
| 54 |
local emesonargs=( |
| 55 |
- -Degl=yes |
| 56 |
+ -Degl=$(usex egl) |
| 57 |
-Dglx=$(usex X) |
| 58 |
-Dx11=$(usex X true false) |
| 59 |
) |
| 60 |
|
| 61 |
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild |
| 62 |
index 1bac611c62b..4bdbc19dd23 100644 |
| 63 |
--- a/media-libs/libepoxy/libepoxy-9999.ebuild |
| 64 |
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2018 Gentoo Authors |
| 67 |
+# Copyright 1999-2019 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=6 |
| 71 |
@@ -24,9 +24,9 @@ fi |
| 72 |
|
| 73 |
LICENSE="MIT" |
| 74 |
SLOT="0" |
| 75 |
-IUSE="test +X" |
| 76 |
+IUSE="+egl test +X" |
| 77 |
|
| 78 |
-RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]" |
| 79 |
+RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )" |
| 80 |
DEPEND="${PYTHON_DEPS} |
| 81 |
${RDEPEND} |
| 82 |
>=dev-util/meson-0.47.0 |
| 83 |
@@ -40,7 +40,7 @@ src_unpack() { |
| 84 |
|
| 85 |
multilib_src_configure() { |
| 86 |
local emesonargs=( |
| 87 |
- -Degl=yes |
| 88 |
+ -Degl=$(usex egl) |
| 89 |
-Dglx=$(usex X) |
| 90 |
-Dx11=$(usex X true false) |
| 91 |
) |
| 92 |
|
| 93 |
diff --git a/media-libs/libepoxy/metadata.xml b/media-libs/libepoxy/metadata.xml |
| 94 |
index 1065cad0271..1162de9ab55 100644 |
| 95 |
--- a/media-libs/libepoxy/metadata.xml |
| 96 |
+++ b/media-libs/libepoxy/metadata.xml |
| 97 |
@@ -5,6 +5,9 @@ |
| 98 |
<email>x11@g.o</email> |
| 99 |
<name>X11</name> |
| 100 |
</maintainer> |
| 101 |
+ <use> |
| 102 |
+ <flag name="egl">Enable EGL support.</flag> |
| 103 |
+ </use> |
| 104 |
<upstream> |
| 105 |
<remote-id type="github">anholt/libepoxy</remote-id> |
| 106 |
</upstream> |
Archives