From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 091DF138010 for ; Mon, 17 Sep 2012 18:08:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A66FBE04EB; Mon, 17 Sep 2012 18:08:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 64E66E04EB for ; Mon, 17 Sep 2012 18:08:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50E5C33D1B4 for ; Mon, 17 Sep 2012 18:08:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D5C04E5444 for ; Mon, 17 Sep 2012 18:08:03 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1347905339.d25e7fad715365834a0110dbade589e1ce44b72e.mattst88@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-apps/mesa-progs/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-apps/mesa-progs/mesa-progs-9999.ebuild X-VCS-Directories: x11-apps/mesa-progs/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: d25e7fad715365834a0110dbade589e1ce44b72e X-VCS-Branch: master Date: Mon, 17 Sep 2012 18:08:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 35ae4d87-61c7-44fe-a4ce-6c7368d93212 X-Archives-Hash: fcf8050491cdfa98306a72abc2b68588 commit: d25e7fad715365834a0110dbade589e1ce44b72e Author: Matt Turner gmail com> AuthorDate: Mon Sep 17 18:08:59 2012 +0000 Commit: Matt Turner gmail com> CommitDate: Mon Sep 17 18:08:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d25e7fad x11-apps/mesa-progs: Fix dependencies (bug 435330) and install eglinfo --- x11-apps/mesa-progs/mesa-progs-9999.ebuild | 36 ++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 63efdba..d87c13d 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -29,8 +29,19 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" IUSE="egl gles1 gles2" -RDEPEND="virtual/opengl" -DEPEND="${RDEPEND}" +RDEPEND=" + media-libs/mesa[egl?,gles1?,gles2?] + virtual/opengl + x11-libs/libX11" +# glew and glu are only needed by the configure script which is only used +# when building EGL/GLESv1/GLESv2 programs. They are not actually required +# by the installed programs. +DEPEND="${RDEPEND} + egl? ( + media-libs/glew + media-libs/glu + ) + x11-proto/xproto" S=${WORKDIR}/${MY_P} @@ -56,24 +67,35 @@ src_configure() { src_compile() { if ! use egl && ! use gles1 && ! use gles2; then tc-export CC - emake LDLIBS='-lX11 -lGL -lm' src/xdemos/{glxgears,glxinfo} + emake LDLIBS='-lX11 -lGL' src/xdemos/glxinfo + emake LDLIBS='-lX11 -lGL -lm' src/xdemos/glxgears else emake -C src/xdemos glxgears glxinfo fi if use egl; then + emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo emake -C src/egl/eglut/ libeglut_screen.la libeglut_x11.la - emake -C src/egl/opengl/ eglgears_screen eglgears_x11 + emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11 + emake LDLIBS="-lGL -lEGL -lm" -C src/egl/opengl/ eglgears_screen - use gles1 && emake -C src/egl/opengles1/ es1_info gears_screen gears_x11 - use gles2 && emake -C src/egl/opengles2/ es2_info es2gears_screen es2gears_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 + emake LDLIBS="-lGLESv1_CM -lEGL -lm" -C src/egl/opengles1/ gears_screen + 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 + emake LDLIBS="-lGLESv2 -lEGL -lm" -C src/egl/opengles2/ es2gears_screen + fi fi } src_install() { dobin src/xdemos/{glxgears,glxinfo} if use egl; then - dobin src/egl/opengl/eglgears_{screen,x11} + dobin src/egl/opengl/egl{info,gears_{screen,x11}} if use gles1; then dobin src/egl/opengles1/es1_info