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 7D8DF138010 for ; Wed, 29 Aug 2012 05:38:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B15EE0138; Wed, 29 Aug 2012 05:38:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 31F8CE0138 for ; Wed, 29 Aug 2012 05:38:42 +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 500B933D8D2 for ; Wed, 29 Aug 2012 05:38:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 061FCE543C for ; Wed, 29 Aug 2012 05:38:40 +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: <1346218621.45393659907d842e0c29addefe7cdb92da78e5e3.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 x11-apps/mesa-progs/metadata.xml X-VCS-Directories: x11-apps/mesa-progs/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 45393659907d842e0c29addefe7cdb92da78e5e3 X-VCS-Branch: master Date: Wed, 29 Aug 2012 05:38:40 +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: 16a99ac1-f2c4-4ccd-a1c6-2618cc087966 X-Archives-Hash: b2f8680752097a1ffeb88e5005ceaba3 commit: 45393659907d842e0c29addefe7cdb92da78e5e3 Author: Matt Turner gmail com> AuthorDate: Wed Aug 29 05:37:01 2012 +0000 Commit: Matt Turner gmail com> CommitDate: Wed Aug 29 05:37:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=45393659 x11-apps/mesa-progs: Add support for building egl/gles1/gles2 demos https://bugs.gentoo.org/show_bug.cgi?id=430954 needs to be fixed before we can add proper dependencies. I have a hard time caring at the moment. --- x11-apps/mesa-progs/mesa-progs-9999.ebuild | 58 ++++++++++++++++++++------- x11-apps/mesa-progs/metadata.xml | 5 ++ 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 551e45d..89ddd94 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -6,40 +6,68 @@ EAPI=4 MY_PN=${PN/progs/demos} MY_P=${MY_PN}-${PV} -EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//} - http://anongit.freedesktop.org/${MY_PN/-//}" -[[ ${PV} = 9999* ]] && GIT_ECLASS="git-2" +EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git" +fi + inherit toolchain-funcs ${GIT_ECLASS} DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" HOMEPAGE="http://mesa3d.sourceforge.net/" -[[ ${PV} == 9999* ]] || SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2" +if [[ ${PV} == 9999* ]]; then + SRC_URI="" +else + SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2" +fi LICENSE="LGPL-2" 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="" +IUSE="egl gles1 gles2" RDEPEND="virtual/opengl" -DEPEND="${RDEPEND} - dev-util/pkgconfig" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} src_configure() { - # We're not using the complete buildsystem to avoid dependencies - # unnecessary for our two little tools. - : + # We're not using the complete buildsystem if we only want to build + # glxinfo and glxgears. + if use egl || use gles1 || use gles2; then + default_src_configure + fi } src_compile() { - local pkgs='gl x11' - tc-export CC - emake \ - CPPFLAGS="$(pkg-config --cflags ${pkgs}) -Isrc/util" \ - LDLIBS="$(pkg-config --libs ${pkgs}) -lm" src/xdemos/{glxgears,glxinfo} + if ! use egl && ! use gles1 && ! use gles2; then + tc-export CC + emake LDLIBS='-lX11 -lGL -lm' src/xdemos/{glxgears,glxinfo} + else + emake -C src/xdemos glxgears glxinfo + fi + + if use egl; then + emake -C src/egl/eglut/ libeglut_screen.la libeglut_x11.la + emake -C src/egl/opengl/ eglgears_screen eglgears_x11 + + 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 + fi } src_install() { dobin src/xdemos/{glxgears,glxinfo} + if use egl; then + dobin src/egl/opengl/eglgears_{screen,x11} + + if use gles1; then + dobin src/egl/opengles1/es1_info + newbin src/egl/opengles1/gears_screen es1gears_screen + newbin src/egl/opengles1/gears_x11 es1gears_x11 + fi + + use gles2 && dobin src/egl/opengles2/es2{_info,gears_{screen,x11}} + fi } diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml index 01c4c00..c679837 100644 --- a/x11-apps/mesa-progs/metadata.xml +++ b/x11-apps/mesa-progs/metadata.xml @@ -2,4 +2,9 @@ x11 + + Enable EGL support. + Enable GLESv1 support. + Enable GLESv2 support. +