summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2009-04-03 12:39:42 +0000
committerTony Vroon <chainsaw@gentoo.org>2009-04-03 12:39:42 +0000
commite0863044d47f25e21fa7c2b58bf9d1e7c005232e (patch)
tree40db9e95d5bc77649594c1384de33ca0d1bba575 /x11-apps
parentAdd dependency on libtool-2, fixes bug 264745. (diff)
downloadgentoo-2-e0863044d47f25e21fa7c2b58bf9d1e7c005232e.tar.gz
gentoo-2-e0863044d47f25e21fa7c2b58bf9d1e7c005232e.tar.bz2
gentoo-2-e0863044d47f25e21fa7c2b58bf9d1e7c005232e.zip
Version bump, as requested by Dmitry Karasik in bug #264753.
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/mesa-progs/ChangeLog7
-rw-r--r--x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild12
-rw-r--r--x11-apps/mesa-progs/mesa-progs-7.4.ebuild81
3 files changed, 93 insertions, 7 deletions
diff --git a/x11-apps/mesa-progs/ChangeLog b/x11-apps/mesa-progs/ChangeLog
index e5176e521974..91d952814cc9 100644
--- a/x11-apps/mesa-progs/ChangeLog
+++ b/x11-apps/mesa-progs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-apps/mesa-progs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.52 2009/03/06 21:53:11 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.53 2009/04/03 12:39:42 chainsaw Exp $
+
+*mesa-progs-7.4 (03 Apr 2009)
+
+ 03 Apr 2009; <chainsaw@gentoo.org> +mesa-progs-7.4.ebuild:
+ Version bump, as requested by Dmitry Karasik in bug #264753.
06 Mar 2009; Donnie Berkholz <dberkholz@gentoo.org>;
mesa-progs-7.3.ebuild:
diff --git a/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild b/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild
index b1b1eb9a2918..5d3e6b259caf 100644
--- a/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild,v 1.11 2007/08/07 13:23:01 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-6.5.2.ebuild,v 1.12 2009/04/03 12:39:42 chainsaw Exp $
inherit toolchain-funcs
@@ -45,7 +45,7 @@ src_unpack() {
HOSTCONF="${S}/configs/${CONFIG}"
unpack ${A}
- cd ${S}
+ cd "${S}"
# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
# build.
@@ -60,10 +60,10 @@ src_unpack() {
}
src_compile() {
- cd ${S}/configs
- ln -s ${CONFIG} current
+ cd "${S}/configs"
+ ln -s "${CONFIG}" current
- cd ${S}/progs/xdemos
+ cd "${S}/progs/xdemos"
emake glxinfo || die "glxinfo failed"
emake glxgears || die "glxgears failed"
diff --git a/x11-apps/mesa-progs/mesa-progs-7.4.ebuild b/x11-apps/mesa-progs/mesa-progs-7.4.ebuild
new file mode 100644
index 000000000000..bb8b56cadbf6
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-7.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-7.4.ebuild,v 1.1 2009/04/03 12:39:42 chainsaw Exp $
+
+inherit toolchain-funcs
+
+MY_PN="${PN/m/M}"
+MY_PN="${MY_PN/-progs}"
+MY_P="${MY_PN}-${PV/_/-}"
+LIB_P="${MY_PN}Lib-${PV/_/-}"
+PROG_P="${MY_PN}Demos-${PV/_/-}"
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+if [[ $PV = *_rc* ]]; then
+ SRC_URI="http://www.mesa3d.org/beta/${LIB_P}.tar.gz
+ http://www.mesa3d.org/beta/${PROG_P}.tar.gz"
+elif [[ $PV = 9999 ]]; then
+ SRC_URI=""
+else
+ SRC_URI="mirror://sourceforge/mesa3d/${LIB_P}.tar.bz2
+ mirror://sourceforge/mesa3d/${PROG_P}.tar.bz2"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/glut
+ virtual/opengl
+ virtual/glu"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if [[ ${KERNEL} == "FreeBSD" ]]; then
+ CONFIG="freebsd"
+ elif use x86; then
+ CONFIG="linux-dri-x86"
+ elif use amd64; then
+ CONFIG="linux-dri-x86-64"
+ elif use ppc; then
+ CONFIG="linux-dri-ppc"
+ else
+ CONFIG="linux-dri"
+ fi
+}
+
+src_unpack() {
+ HOSTCONF="${S}/configs/${CONFIG}"
+
+ unpack ${A}
+ cd "${S}"
+
+ # Kill this; we don't want /usr/X11R6/lib ever to be searched in this
+ # build.
+ echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
+
+ echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
+ echo "CC = $(tc-getCC)" >> ${HOSTCONF}
+ echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+ echo "LDFLAGS = ${LDFLAGS}" >> ${HOSTCONF}
+
+ # Just executables here, no need to compile with -fPIC
+ echo "PIC_FLAGS =" >> ${HOSTCONF}
+}
+
+src_compile() {
+ cd "${S}"/configs
+ ln -s ${CONFIG} current
+
+ cd "${S}"/progs/xdemos
+
+ emake glxinfo || die "glxinfo failed"
+ emake glxgears || die "glxgears failed"
+}
+
+src_install() {
+ dobin "${S}"/progs/xdemos/{glxgears,glxinfo} || die
+}