| 1 |
commit: 50ffc95029fda3fb390b63015b846e0434c61076 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 28 23:56:27 2015 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 28 23:57:44 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ffc950 |
| 7 |
|
| 8 |
x11-apps/mesa-progs: Remove USE=gles1. |
| 9 |
|
| 10 |
x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 14 ++------------ |
| 11 |
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 14 ++------------ |
| 12 |
x11-apps/mesa-progs/metadata.xml | 1 - |
| 13 |
3 files changed, 4 insertions(+), 25 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 16 |
index d3c9bbf..359aad5 100644 |
| 17 |
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 18 |
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 19 |
@@ -27,15 +27,14 @@ fi |
| 20 |
|
| 21 |
LICENSE="LGPL-2" |
| 22 |
SLOT="0" |
| 23 |
-IUSE="egl gles1 gles2" |
| 24 |
+IUSE="egl gles2" |
| 25 |
|
| 26 |
RDEPEND=" |
| 27 |
- media-libs/mesa[egl?,gles1?,gles2?] |
| 28 |
+ media-libs/mesa[egl?,gles2?] |
| 29 |
virtual/opengl |
| 30 |
x11-libs/libX11" |
| 31 |
DEPEND="${RDEPEND} |
| 32 |
egl? ( media-libs/glew ) |
| 33 |
- gles1? ( media-libs/glew ) |
| 34 |
gles2? ( media-libs/glew ) |
| 35 |
virtual/glu |
| 36 |
x11-proto/xproto" |
| 37 |
@@ -62,10 +61,6 @@ src_compile() { |
| 38 |
emake -C src/egl/eglut/ libeglut_x11.la |
| 39 |
emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11 |
| 40 |
|
| 41 |
- if use gles1; then |
| 42 |
- emake LDLIBS="-lGLESv1_CM -lEGL -lX11" -C src/egl/opengles1/ es1_info |
| 43 |
- emake LDLIBS="-lGLESv1_CM -lEGL -lX11 -lm" -C src/egl/opengles1/ gears_x11 |
| 44 |
- fi |
| 45 |
if use gles2; then |
| 46 |
emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info |
| 47 |
emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11 |
| 48 |
@@ -78,11 +73,6 @@ src_install() { |
| 49 |
if use egl; then |
| 50 |
dobin src/egl/opengl/egl{info,gears_x11} |
| 51 |
|
| 52 |
- if use gles1; then |
| 53 |
- dobin src/egl/opengles1/es1_info |
| 54 |
- newbin src/egl/opengles1/gears_x11 es1gears_x11 |
| 55 |
- fi |
| 56 |
- |
| 57 |
use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11} |
| 58 |
fi |
| 59 |
} |
| 60 |
|
| 61 |
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
| 62 |
index 778c907..d07df30 100644 |
| 63 |
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
| 64 |
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
| 65 |
@@ -27,15 +27,14 @@ fi |
| 66 |
|
| 67 |
LICENSE="LGPL-2" |
| 68 |
SLOT="0" |
| 69 |
-IUSE="egl gles1 gles2" |
| 70 |
+IUSE="egl gles2" |
| 71 |
|
| 72 |
RDEPEND=" |
| 73 |
- media-libs/mesa[egl?,gles1?,gles2?] |
| 74 |
+ media-libs/mesa[egl?,gles2?] |
| 75 |
virtual/opengl |
| 76 |
x11-libs/libX11" |
| 77 |
DEPEND="${RDEPEND} |
| 78 |
egl? ( media-libs/glew ) |
| 79 |
- gles1? ( media-libs/glew ) |
| 80 |
gles2? ( media-libs/glew ) |
| 81 |
virtual/glu |
| 82 |
x11-proto/xproto" |
| 83 |
@@ -62,10 +61,6 @@ src_compile() { |
| 84 |
emake -C src/egl/eglut/ libeglut_x11.la |
| 85 |
emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11 |
| 86 |
|
| 87 |
- if use gles1; then |
| 88 |
- emake LDLIBS="-lGLESv1_CM -lEGL -lX11" -C src/egl/opengles1/ es1_info |
| 89 |
- emake LDLIBS="-lGLESv1_CM -lEGL -lX11 -lm" -C src/egl/opengles1/ gears_x11 |
| 90 |
- fi |
| 91 |
if use gles2; then |
| 92 |
emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info |
| 93 |
emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11 |
| 94 |
@@ -78,11 +73,6 @@ src_install() { |
| 95 |
if use egl; then |
| 96 |
dobin src/egl/opengl/egl{info,gears_x11} |
| 97 |
|
| 98 |
- if use gles1; then |
| 99 |
- dobin src/egl/opengles1/es1_info |
| 100 |
- newbin src/egl/opengles1/gears_x11 es1gears_x11 |
| 101 |
- fi |
| 102 |
- |
| 103 |
use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11} |
| 104 |
fi |
| 105 |
} |
| 106 |
|
| 107 |
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml |
| 108 |
index f9f35a8..1aa96b1 100644 |
| 109 |
--- a/x11-apps/mesa-progs/metadata.xml |
| 110 |
+++ b/x11-apps/mesa-progs/metadata.xml |
| 111 |
@@ -4,7 +4,6 @@ |
| 112 |
<herd>x11</herd> |
| 113 |
<use> |
| 114 |
<flag name='egl'>Build EGL utilities</flag> |
| 115 |
- <flag name='gles1'>Build OpenGL ES 1 utilities</flag> |
| 116 |
<flag name='gles2'>Build OpenGL ES 2 utilities</flag> |
| 117 |
</use> |
| 118 |
</pkgmetadata> |
Archives