| 1 |
commit: a2d728ad45686976b7857170316c1aa9578f3c7d |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 28 23:46:47 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=a2d728ad |
| 7 |
|
| 8 |
x11-apps/mesa-progs: Sync ebuilds. |
| 9 |
|
| 10 |
x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 10 ++++++---- |
| 11 |
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 24 +++++------------------- |
| 12 |
2 files changed, 11 insertions(+), 23 deletions(-) |
| 13 |
|
| 14 |
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 15 |
index 0b5692d..81090ed 100644 |
| 16 |
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 17 |
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 18 |
@@ -19,22 +19,24 @@ DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" |
| 19 |
HOMEPAGE="http://mesa3d.sourceforge.net/" |
| 20 |
if [[ ${PV} == 9999* ]]; then |
| 21 |
SRC_URI="" |
| 22 |
+ KEYWORDS="" |
| 23 |
else |
| 24 |
SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2" |
| 25 |
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" |
| 26 |
fi |
| 27 |
|
| 28 |
LICENSE="LGPL-2" |
| 29 |
SLOT="0" |
| 30 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" |
| 31 |
IUSE="egl gles1 gles2" |
| 32 |
|
| 33 |
RDEPEND=" |
| 34 |
- media-libs/freeglut |
| 35 |
- media-libs/glew |
| 36 |
media-libs/mesa[egl?,gles1?,gles2?] |
| 37 |
virtual/opengl |
| 38 |
x11-libs/libX11" |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
+ egl? ( media-libs/glew ) |
| 41 |
+ gles1? ( media-libs/glew ) |
| 42 |
+ gles2? ( media-libs/glew ) |
| 43 |
virtual/glu |
| 44 |
x11-proto/xproto" |
| 45 |
|
| 46 |
@@ -49,7 +51,7 @@ src_unpack() { |
| 47 |
src_prepare() { |
| 48 |
base_src_prepare |
| 49 |
|
| 50 |
- eautoreconf |
| 51 |
+ [[ $PV = 9999* ]] && eautoreconf |
| 52 |
} |
| 53 |
|
| 54 |
src_compile() { |
| 55 |
|
| 56 |
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
| 57 |
index 4ecd9ec..657291f 100644 |
| 58 |
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
| 59 |
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild |
| 60 |
@@ -30,13 +30,13 @@ SLOT="0" |
| 61 |
IUSE="egl gles1 gles2" |
| 62 |
|
| 63 |
RDEPEND=" |
| 64 |
- egl? ( media-libs/glew ) |
| 65 |
- gles1? ( media-libs/glew ) |
| 66 |
- gles2? ( media-libs/glew ) |
| 67 |
media-libs/mesa[egl?,gles1?,gles2?] |
| 68 |
virtual/opengl |
| 69 |
x11-libs/libX11" |
| 70 |
DEPEND="${RDEPEND} |
| 71 |
+ egl? ( media-libs/glew ) |
| 72 |
+ gles1? ( media-libs/glew ) |
| 73 |
+ gles2? ( media-libs/glew ) |
| 74 |
virtual/glu |
| 75 |
x11-proto/xproto" |
| 76 |
|
| 77 |
@@ -51,25 +51,11 @@ src_unpack() { |
| 78 |
src_prepare() { |
| 79 |
base_src_prepare |
| 80 |
|
| 81 |
- eautoreconf |
| 82 |
-} |
| 83 |
- |
| 84 |
-src_configure() { |
| 85 |
- # We're not using the complete buildsystem if we only want to build |
| 86 |
- # glxinfo and glxgears. |
| 87 |
- if use egl || use gles1 || use gles2; then |
| 88 |
- default_src_configure |
| 89 |
- fi |
| 90 |
+ [[ $PV = 9999* ]] && eautoreconf |
| 91 |
} |
| 92 |
|
| 93 |
src_compile() { |
| 94 |
- if ! use egl && ! use gles1 && ! use gles2; then |
| 95 |
- tc-export CC |
| 96 |
- emake LDLIBS='-lX11 -lGL' src/xdemos/glxinfo |
| 97 |
- emake LDLIBS='-lX11 -lGL -lm' src/xdemos/glxgears |
| 98 |
- else |
| 99 |
- emake -C src/xdemos glxgears glxinfo |
| 100 |
- fi |
| 101 |
+ emake -C src/xdemos glxgears glxinfo |
| 102 |
|
| 103 |
if use egl; then |
| 104 |
emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo |
Archives