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 1D65F1384C0 for ; Fri, 28 Aug 2015 23:53:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79913141A8; Fri, 28 Aug 2015 23:53:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92E45141A8 for ; Fri, 28 Aug 2015 23:53:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99907340B9B for ; Fri, 28 Aug 2015 23:53:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EC8E171 for ; Fri, 28 Aug 2015 23:53:46 +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: <1440806264.a2d728ad45686976b7857170316c1aa9578f3c7d.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild 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: a2d728ad45686976b7857170316c1aa9578f3c7d X-VCS-Branch: master Date: Fri, 28 Aug 2015 23:53:46 +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: 71abdff9-3a8e-4b52-8af7-a11554fa8ac6 X-Archives-Hash: b79a3b9853e3c9392b9890e78e1188cf commit: a2d728ad45686976b7857170316c1aa9578f3c7d Author: Matt Turner gentoo org> AuthorDate: Fri Aug 28 23:46:47 2015 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Aug 28 23:57:44 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2d728ad x11-apps/mesa-progs: Sync ebuilds. x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 10 ++++++---- x11-apps/mesa-progs/mesa-progs-9999.ebuild | 24 +++++------------------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild index 0b5692d..81090ed 100644 --- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild @@ -19,22 +19,24 @@ DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" HOMEPAGE="http://mesa3d.sourceforge.net/" if [[ ${PV} == 9999* ]]; then SRC_URI="" + KEYWORDS="" else SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" fi LICENSE="LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" IUSE="egl gles1 gles2" RDEPEND=" - media-libs/freeglut - media-libs/glew media-libs/mesa[egl?,gles1?,gles2?] virtual/opengl x11-libs/libX11" DEPEND="${RDEPEND} + egl? ( media-libs/glew ) + gles1? ( media-libs/glew ) + gles2? ( media-libs/glew ) virtual/glu x11-proto/xproto" @@ -49,7 +51,7 @@ src_unpack() { src_prepare() { base_src_prepare - eautoreconf + [[ $PV = 9999* ]] && eautoreconf } src_compile() { diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 4ecd9ec..657291f 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -30,13 +30,13 @@ SLOT="0" IUSE="egl gles1 gles2" RDEPEND=" - egl? ( media-libs/glew ) - gles1? ( media-libs/glew ) - gles2? ( media-libs/glew ) media-libs/mesa[egl?,gles1?,gles2?] virtual/opengl x11-libs/libX11" DEPEND="${RDEPEND} + egl? ( media-libs/glew ) + gles1? ( media-libs/glew ) + gles2? ( media-libs/glew ) virtual/glu x11-proto/xproto" @@ -51,25 +51,11 @@ src_unpack() { src_prepare() { base_src_prepare - eautoreconf -} - -src_configure() { - # 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 + [[ $PV = 9999* ]] && eautoreconf } src_compile() { - if ! use egl && ! use gles1 && ! use gles2; then - tc-export CC - emake LDLIBS='-lX11 -lGL' src/xdemos/glxinfo - emake LDLIBS='-lX11 -lGL -lm' src/xdemos/glxgears - else - emake -C src/xdemos glxgears glxinfo - fi + emake -C src/xdemos glxgears glxinfo if use egl; then emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo