jlec        15/03/06 08:01:42

  Modified:             metadata.xml tachyon-0.98.9-r2.ebuild ChangeLog
  Added:                tachyon-0.99_beta6.ebuild
  Log:
  Version BUmp
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.3                  media-gfx/tachyon/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/metadata.xml?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/metadata.xml?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/tachyon/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml        6 Dec 2012 15:56:25 -0000       1.2
+++ metadata.xml        6 Mar 2015 08:01:42 -0000       1.3
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>sci</herd>
-       <maintainer>
-               <email>[email protected]</email>
-       </maintainer>
+  <herd>sci</herd>
+  <maintainer>
+    <email>[email protected]</email>
+  </maintainer>
 </pkgmetadata>



1.5                  media-gfx/tachyon/tachyon-0.98.9-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild?r1=1.4&r2=1.5

Index: tachyon-0.98.9-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tachyon-0.98.9-r2.ebuild    6 Dec 2012 15:56:25 -0000       1.4
+++ tachyon-0.98.9-r2.ebuild    6 Mar 2015 08:01:42 -0000       1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild,v 1.4 
2012/12/06 15:56:25 jlec Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild,v 1.5 
2015/03/06 08:01:42 jlec Exp $
 
 EAPI="4"
 
@@ -16,12 +16,12 @@
 IUSE="doc examples jpeg mpi +opengl png threads"
 
 CDEPEND="
-       jpeg? ( virtual/jpeg )
+       jpeg? ( virtual/jpeg:0 )
        mpi? ( virtual/mpi )
        opengl? (
                virtual/glu
                virtual/opengl )
-       png? ( media-libs/libpng )"
+       png? ( media-libs/libpng:0 )"
 DEPEND="${CDEPEND}
        virtual/pkgconfig"
 RDEPEND="${CDEPEND}"



1.9                  media-gfx/tachyon/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/ChangeLog?rev=1.9&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/ChangeLog?rev=1.9&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog   6 Dec 2012 15:56:25 -0000       1.8
+++ ChangeLog   6 Mar 2015 08:01:42 -0000       1.9
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/tachyon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.8 
2012/12/06 15:56:25 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.9 
2015/03/06 08:01:42 jlec Exp $
+
+*tachyon-0.99_beta6 (06 Mar 2015)
+
+  06 Mar 2015; Justin Lecher <[email protected]>
+  +files/tachyon-0.99_beta6-ldflags.patch,
+  +files/tachyon-0.99_beta6-shared.patch, +tachyon-0.99_beta6.ebuild,
+  metadata.xml, tachyon-0.98.9-r2.ebuild:
+  Version BUmp
 
   06 Dec 2012; Justin Lecher <[email protected]> tachyon-0.98.9-r2.ebuild,
   metadata.xml:
@@ -39,4 +47,3 @@
   23 Feb 2010; Alexey Shvetsov <[email protected]> +tachyon-0.98.9.ebuild,
   +metadata.xml:
   Initial import per bug #293969
-



1.1                  media-gfx/tachyon/tachyon-0.99_beta6.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.99_beta6.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.99_beta6.ebuild?rev=1.1&content-type=text/plain

Index: tachyon-0.99_beta6.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.99_beta6.ebuild,v 1.1 
2015/03/06 08:01:42 jlec Exp $

EAPI=5

inherit eutils toolchain-funcs

MY_PV=${PV/_beta/b}
MY_P="${PN}-${MY_PV}"

DESCRIPTION="A portable, high performance parallel ray tracing system"
HOMEPAGE="http://jedi.ks.uiuc.edu/~johns/raytracer/";
SRC_URI="http://jedi.ks.uiuc.edu/~johns/raytracer/files/${MY_PV}/${MY_P}.tar.gz";

SLOT="0"
LICENSE="BSD"
KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos ~x86-macos"
IUSE="doc examples jpeg mpi +opengl png threads"

CDEPEND="
        jpeg? ( virtual/jpeg:0= )
        mpi? ( virtual/mpi )
        opengl? (
                virtual/glu
                virtual/opengl
                )
        png? ( media-libs/libpng:0= )"
DEPEND="${CDEPEND}
        virtual/pkgconfig"
RDEPEND="${CDEPEND}"

REQUIRED_USE="^^ ( opengl mpi )"

S="${WORKDIR}/${PN}/unix"

pkg_setup() {
        local ostarget

        # TODO: Test on alpha, ia64
        # TODO: add other architectures
        # TODO: X, Motif, MBOX, Open Media Framework, Spaceball I/O, MGF ?
        TACHYON_MAKE_TARGET=

        case ${CHOST} in
                powerpc*-darwin*)   ostarget=macosx      ;;
                *86*-darwin*)       ostarget=macosx-x86  ;;
                *)                                      ostarget=linux       ;;
        esac

        if use threads ; then
                if use opengl ; then
                        TACHYON_MAKE_TARGET=${ostarget}-thr-ogl
                elif use mpi ; then
                        TACHYON_MAKE_TARGET=${ostarget}-mpi-thr
                else
                        TACHYON_MAKE_TARGET=${ostarget}-thr
                fi

                # TODO: Support for linux-athlon-thr ?
        else
                if use mpi ; then
                        TACHYON_MAKE_TARGET=${ostarget}-mpi
                else
                        TACHYON_MAKE_TARGET=${ostarget}
                fi
        fi

        if [[ -z "${TACHYON_MAKE_TARGET}" ]]; then
                die "No target found, check use flags"
        else
                einfo "Using target: ${TACHYON_MAKE_TARGET}"
        fi
}

src_prepare() {
        emakeconf=()
        use jpeg && \
                emakeconf+=(
                        USEJPEG=-DUSEJPEG
                        JPEGLIB=-ljpeg
                )

        use png && \
                emakeconf+=(
                        USEPNG=-DUSEPNG
                        PNGINC="$($(tc-getPKG_CONFIG) --cflags libpng)"
                        PNGLIB="$($(tc-getPKG_CONFIG) --libs libpng)"
                        )

        if use mpi ; then
                sed \
                        -e "s:MPIDIR=:MPIDIR=/usr:g" \
                        -e "s:linux-lam:linux-mpi:g" \
                        -i Make-config || die "sed failed"
        fi
        sed -i \
                -e "s:-O3::g;s:-g::g;s:-pg::g" \
                -e "s:-m32:${CFLAGS}:g" \
                -e "s:-m64:${CFLAGS}:g" \
                -e "s:-ffast-math::g" \
                -e "s:STRIP = strip:STRIP = touch:g" \
                -e "s:CC = *cc:CC = $(tc-getCC):g" \
                -e "s:-fomit-frame-pointer::g" Make-arch || die "sed failed"

        epatch \
                "${FILESDIR}"/${P}-ldflags.patch \
                "${FILESDIR}"/${P}-shared.patch
}

src_compile() {
        emake ${TACHYON_MAKE_TARGET} ${emakeconf[@]} VERSION=${PV}
}

src_install() {
        cd .. || die
        dodoc Changes README

        insinto /usr/include/${PN}
        doheader src/*.h

        use doc && dohtml docs/tachyon/*

        cd compile/${TACHYON_MAKE_TARGET} || die

        dobin ${PN}
        dolib.so lib${PN}.so*

        if use examples; then
                cd "${S}/../scenes" || die
                insinto "/usr/share/${PN}/examples"
                doins *
        fi
}




Reply via email to