From 65e0dcea13ad9678949126d561fb7188a2ebdee6 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Tue, 14 Feb 2006 23:53:43 +0000 Subject: (#122851) Die on errors, reported by Christophe . Also update to 6.4.2 tarball to reduce downloads. (Portage version: 2.1_pre4-r1) --- x11-apps/mesa-progs/ChangeLog | 9 ++- x11-apps/mesa-progs/files/digest-mesa-progs-6.4.1 | 2 - x11-apps/mesa-progs/files/digest-mesa-progs-6.4.2 | 6 ++ x11-apps/mesa-progs/mesa-progs-6.4.1.ebuild | 74 ----------------------- x11-apps/mesa-progs/mesa-progs-6.4.2.ebuild | 74 +++++++++++++++++++++++ 5 files changed, 88 insertions(+), 77 deletions(-) delete mode 100644 x11-apps/mesa-progs/files/digest-mesa-progs-6.4.1 create mode 100644 x11-apps/mesa-progs/files/digest-mesa-progs-6.4.2 delete mode 100644 x11-apps/mesa-progs/mesa-progs-6.4.1.ebuild create mode 100644 x11-apps/mesa-progs/mesa-progs-6.4.2.ebuild (limited to 'x11-apps') diff --git a/x11-apps/mesa-progs/ChangeLog b/x11-apps/mesa-progs/ChangeLog index b754c55cf328..c1a1fee64824 100644 --- a/x11-apps/mesa-progs/ChangeLog +++ b/x11-apps/mesa-progs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-apps/mesa-progs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.9 2006/02/14 20:40:14 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.10 2006/02/14 23:53:43 spyderous Exp $ + +*mesa-progs-6.4.2 (14 Feb 2006) + + 14 Feb 2006; Donnie Berkholz ; + -mesa-progs-6.4.1.ebuild, +mesa-progs-6.4.2.ebuild: + (#122851) Die on errors, reported by Christophe . Also + update to 6.4.2 tarball to reduce downloads. 14 Feb 2006; Markus Rothe mesa-progs-6.4.1.ebuild: Added ~ppc64 diff --git a/x11-apps/mesa-progs/files/digest-mesa-progs-6.4.1 b/x11-apps/mesa-progs/files/digest-mesa-progs-6.4.1 deleted file mode 100644 index d4bdd98046cf..000000000000 --- a/x11-apps/mesa-progs/files/digest-mesa-progs-6.4.1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 99df1fdcb98d391666b476ca6f1dda8a MesaDemos-6.4.1.tar.bz2 819391 -MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887 diff --git a/x11-apps/mesa-progs/files/digest-mesa-progs-6.4.2 b/x11-apps/mesa-progs/files/digest-mesa-progs-6.4.2 new file mode 100644 index 000000000000..452f565ebb76 --- /dev/null +++ b/x11-apps/mesa-progs/files/digest-mesa-progs-6.4.2 @@ -0,0 +1,6 @@ +MD5 9cae1ab874af533ce356bd7dfe2e0bb0 MesaDemos-6.4.2.tar.bz2 814178 +RMD160 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a MesaDemos-6.4.2.tar.bz2 814178 +SHA256 2b3a2487672a28c90509d5f095e62d96cc520d7e1788f4a77cd1412e21ec5605 MesaDemos-6.4.2.tar.bz2 814178 +MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009 +RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009 +SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009 diff --git a/x11-apps/mesa-progs/mesa-progs-6.4.1.ebuild b/x11-apps/mesa-progs/mesa-progs-6.4.1.ebuild deleted file mode 100644 index 6e96d5f7fbc7..000000000000 --- a/x11-apps/mesa-progs/mesa-progs-6.4.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2006 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.4.1.ebuild,v 1.10 2006/02/14 20:40:14 corsair 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" -HOMEPAGE="http://mesa3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/mesa3d/${LIB_P}.tar.bz2 - mirror://sourceforge/mesa3d/${PROG_P}.tar.bz2" -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="" - -RDEPEND="virtual/glut - virtual/opengl - virtual/glu" - -DEPEND="${DEPEND}" - -S=${WORKDIR}/Mesa-${PV} - -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} - - # 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 - emake glxgears -} - -src_install() { - dobin ${S}/progs/xdemos/glxgears - dobin ${S}/progs/xdemos/glxinfo -} diff --git a/x11-apps/mesa-progs/mesa-progs-6.4.2.ebuild b/x11-apps/mesa-progs/mesa-progs-6.4.2.ebuild new file mode 100644 index 000000000000..c68026981ad7 --- /dev/null +++ b/x11-apps/mesa-progs/mesa-progs-6.4.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2006 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.4.2.ebuild,v 1.1 2006/02/14 23:53:43 spyderous 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" +HOMEPAGE="http://mesa3d.sourceforge.net/" +SRC_URI="mirror://sourceforge/mesa3d/${LIB_P}.tar.bz2 + mirror://sourceforge/mesa3d/${PROG_P}.tar.bz2" +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="" + +RDEPEND="virtual/glut + virtual/opengl + virtual/glu" + +DEPEND="${DEPEND}" + +S=${WORKDIR}/Mesa-${PV} + +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} + + # 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 + dobin ${S}/progs/xdemos/glxinfo +} -- cgit v1.2.3-65-gdbad