diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2013-04-06 14:33:30 +0400 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2013-04-06 14:33:30 +0400 |
| commit | 4f15ee97eea258c3d96d05db57b59c846d8f9aca (patch) | |
| tree | a525497f49642730a752af5c0cdf8bda788dc700 /x11-apps/mesa-progs/mesa-progs-9999.ebuild | |
| parent | Drop deprecated libclc option (diff) | |
| parent | x11-libs/glamor: No longer needs Makefile patching (diff) | |
| download | x11-4f15ee97eea258c3d96d05db57b59c846d8f9aca.tar.gz x11-4f15ee97eea258c3d96d05db57b59c846d8f9aca.tar.bz2 x11-4f15ee97eea258c3d96d05db57b59c846d8f9aca.zip | |
Merge branch 'master' into opencl
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
Conflicts:
media-libs/mesa/mesa-9999.ebuild
Diffstat (limited to 'x11-apps/mesa-progs/mesa-progs-9999.ebuild')
| -rw-r--r-- | x11-apps/mesa-progs/mesa-progs-9999.ebuild | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 5b6fb3e3..95e23bed 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -37,10 +37,8 @@ RDEPEND=" # when building EGL/GLESv1/GLESv2 programs. They are not actually required # by the installed programs. DEPEND="${RDEPEND} - egl? ( - media-libs/glew - virtual/glu - ) + media-libs/glew + virtual/glu x11-proto/xproto" S=${WORKDIR}/${MY_P} |