commit: 50ffc95029fda3fb390b63015b846e0434c61076
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 23:56:27 2015 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 23:57:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ffc950
x11-apps/mesa-progs: Remove USE=gles1.
x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 14 ++------------
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 14 ++------------
x11-apps/mesa-progs/metadata.xml | 1 -
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index d3c9bbf..359aad5 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -27,15 +27,14 @@ fi
LICENSE="LGPL-2"
SLOT="0"
-IUSE="egl gles1 gles2"
+IUSE="egl gles2"
RDEPEND="
- media-libs/mesa[egl?,gles1?,gles2?]
+ media-libs/mesa[egl?,gles2?]
virtual/opengl
x11-libs/libX11"
DEPEND="${RDEPEND}
egl? ( media-libs/glew )
- gles1? ( media-libs/glew )
gles2? ( media-libs/glew )
virtual/glu
x11-proto/xproto"
@@ -62,10 +61,6 @@ src_compile() {
emake -C src/egl/eglut/ libeglut_x11.la
emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/
eglgears_x11
- if use gles1; then
- emake LDLIBS="-lGLESv1_CM -lEGL -lX11" -C
src/egl/opengles1/ es1_info
- emake LDLIBS="-lGLESv1_CM -lEGL -lX11 -lm" -C
src/egl/opengles1/ gears_x11
- fi
if use gles2; then
emake LDLIBS="-lGLESv2 -lEGL -lX11" -C
src/egl/opengles2/ es2_info
emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C
src/egl/opengles2/ es2gears_x11
@@ -78,11 +73,6 @@ src_install() {
if use egl; then
dobin src/egl/opengl/egl{info,gears_x11}
- if use gles1; then
- dobin src/egl/opengles1/es1_info
- newbin src/egl/opengles1/gears_x11 es1gears_x11
- fi
-
use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
fi
}
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 778c907..d07df30 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -27,15 +27,14 @@ fi
LICENSE="LGPL-2"
SLOT="0"
-IUSE="egl gles1 gles2"
+IUSE="egl gles2"
RDEPEND="
- media-libs/mesa[egl?,gles1?,gles2?]
+ media-libs/mesa[egl?,gles2?]
virtual/opengl
x11-libs/libX11"
DEPEND="${RDEPEND}
egl? ( media-libs/glew )
- gles1? ( media-libs/glew )
gles2? ( media-libs/glew )
virtual/glu
x11-proto/xproto"
@@ -62,10 +61,6 @@ src_compile() {
emake -C src/egl/eglut/ libeglut_x11.la
emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/
eglgears_x11
- if use gles1; then
- emake LDLIBS="-lGLESv1_CM -lEGL -lX11" -C
src/egl/opengles1/ es1_info
- emake LDLIBS="-lGLESv1_CM -lEGL -lX11 -lm" -C
src/egl/opengles1/ gears_x11
- fi
if use gles2; then
emake LDLIBS="-lGLESv2 -lEGL -lX11" -C
src/egl/opengles2/ es2_info
emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C
src/egl/opengles2/ es2gears_x11
@@ -78,11 +73,6 @@ src_install() {
if use egl; then
dobin src/egl/opengl/egl{info,gears_x11}
- if use gles1; then
- dobin src/egl/opengles1/es1_info
- newbin src/egl/opengles1/gears_x11 es1gears_x11
- fi
-
use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
fi
}
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
index f9f35a8..1aa96b1 100644
--- a/x11-apps/mesa-progs/metadata.xml
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -4,7 +4,6 @@
<herd>x11</herd>
<use>
<flag name='egl'>Build EGL utilities</flag>
- <flag name='gles1'>Build OpenGL ES 1 utilities</flag>
<flag name='gles2'>Build OpenGL ES 2 utilities</flag>
</use>
</pkgmetadata>
