Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/tachyon: metadata.xml tachyon-0.99_beta6.ebuild tachyon-0.98.9-r2.ebuild ChangeLog
Date: Fri, 06 Mar 2015 08:17:04
Message-Id: 20150306080142.9931F1326D@oystercatcher.gentoo.org
1 jlec 15/03/06 08:01:42
2
3 Modified: metadata.xml tachyon-0.98.9-r2.ebuild ChangeLog
4 Added: tachyon-0.99_beta6.ebuild
5 Log:
6 Version BUmp
7
8 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
9
10 Revision Changes Path
11 1.3 media-gfx/tachyon/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/metadata.xml?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/metadata.xml?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/metadata.xml?r1=1.2&r2=1.3
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/tachyon/metadata.xml,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- metadata.xml 6 Dec 2012 15:56:25 -0000 1.2
24 +++ metadata.xml 6 Mar 2015 08:01:42 -0000 1.3
25 @@ -1,8 +1,8 @@
26 <?xml version="1.0" encoding="UTF-8"?>
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 - <herd>sci</herd>
30 - <maintainer>
31 - <email>alexxy@g.o</email>
32 - </maintainer>
33 + <herd>sci</herd>
34 + <maintainer>
35 + <email>alexxy@g.o</email>
36 + </maintainer>
37 </pkgmetadata>
38
39
40
41 1.5 media-gfx/tachyon/tachyon-0.98.9-r2.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild?rev=1.5&view=markup
44 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
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild?r1=1.4&r2=1.5
46
47 Index: tachyon-0.98.9-r2.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild,v
50 retrieving revision 1.4
51 retrieving revision 1.5
52 diff -u -r1.4 -r1.5
53 --- tachyon-0.98.9-r2.ebuild 6 Dec 2012 15:56:25 -0000 1.4
54 +++ tachyon-0.98.9-r2.ebuild 6 Mar 2015 08:01:42 -0000 1.5
55 @@ -1,6 +1,6 @@
56 -# Copyright 1999-2012 Gentoo Foundation
57 +# Copyright 1999-2015 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $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 $
60 +# $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 $
61
62 EAPI="4"
63
64 @@ -16,12 +16,12 @@
65 IUSE="doc examples jpeg mpi +opengl png threads"
66
67 CDEPEND="
68 - jpeg? ( virtual/jpeg )
69 + jpeg? ( virtual/jpeg:0 )
70 mpi? ( virtual/mpi )
71 opengl? (
72 virtual/glu
73 virtual/opengl )
74 - png? ( media-libs/libpng )"
75 + png? ( media-libs/libpng:0 )"
76 DEPEND="${CDEPEND}
77 virtual/pkgconfig"
78 RDEPEND="${CDEPEND}"
79
80
81
82 1.9 media-gfx/tachyon/ChangeLog
83
84 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/ChangeLog?rev=1.9&view=markup
85 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/ChangeLog?rev=1.9&content-type=text/plain
86 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/ChangeLog?r1=1.8&r2=1.9
87
88 Index: ChangeLog
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v
91 retrieving revision 1.8
92 retrieving revision 1.9
93 diff -u -r1.8 -r1.9
94 --- ChangeLog 6 Dec 2012 15:56:25 -0000 1.8
95 +++ ChangeLog 6 Mar 2015 08:01:42 -0000 1.9
96 @@ -1,6 +1,14 @@
97 # ChangeLog for media-gfx/tachyon
98 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
99 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.8 2012/12/06 15:56:25 jlec Exp $
100 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
101 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.9 2015/03/06 08:01:42 jlec Exp $
102 +
103 +*tachyon-0.99_beta6 (06 Mar 2015)
104 +
105 + 06 Mar 2015; Justin Lecher <jlec@g.o>
106 + +files/tachyon-0.99_beta6-ldflags.patch,
107 + +files/tachyon-0.99_beta6-shared.patch, +tachyon-0.99_beta6.ebuild,
108 + metadata.xml, tachyon-0.98.9-r2.ebuild:
109 + Version BUmp
110
111 06 Dec 2012; Justin Lecher <jlec@g.o> tachyon-0.98.9-r2.ebuild,
112 metadata.xml:
113 @@ -39,4 +47,3 @@
114 23 Feb 2010; Alexey Shvetsov <alexxy@g.o> +tachyon-0.98.9.ebuild,
115 +metadata.xml:
116 Initial import per bug #293969
117 -
118
119
120
121 1.1 media-gfx/tachyon/tachyon-0.99_beta6.ebuild
122
123 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.99_beta6.ebuild?rev=1.1&view=markup
124 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/tachyon/tachyon-0.99_beta6.ebuild?rev=1.1&content-type=text/plain
125
126 Index: tachyon-0.99_beta6.ebuild
127 ===================================================================
128 # Copyright 1999-2015 Gentoo Foundation
129 # Distributed under the terms of the GNU General Public License v2
130 # $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.99_beta6.ebuild,v 1.1 2015/03/06 08:01:42 jlec Exp $
131
132 EAPI=5
133
134 inherit eutils toolchain-funcs
135
136 MY_PV=${PV/_beta/b}
137 MY_P="${PN}-${MY_PV}"
138
139 DESCRIPTION="A portable, high performance parallel ray tracing system"
140 HOMEPAGE="http://jedi.ks.uiuc.edu/~johns/raytracer/"
141 SRC_URI="http://jedi.ks.uiuc.edu/~johns/raytracer/files/${MY_PV}/${MY_P}.tar.gz"
142
143 SLOT="0"
144 LICENSE="BSD"
145 KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos ~x86-macos"
146 IUSE="doc examples jpeg mpi +opengl png threads"
147
148 CDEPEND="
149 jpeg? ( virtual/jpeg:0= )
150 mpi? ( virtual/mpi )
151 opengl? (
152 virtual/glu
153 virtual/opengl
154 )
155 png? ( media-libs/libpng:0= )"
156 DEPEND="${CDEPEND}
157 virtual/pkgconfig"
158 RDEPEND="${CDEPEND}"
159
160 REQUIRED_USE="^^ ( opengl mpi )"
161
162 S="${WORKDIR}/${PN}/unix"
163
164 pkg_setup() {
165 local ostarget
166
167 # TODO: Test on alpha, ia64
168 # TODO: add other architectures
169 # TODO: X, Motif, MBOX, Open Media Framework, Spaceball I/O, MGF ?
170 TACHYON_MAKE_TARGET=
171
172 case ${CHOST} in
173 powerpc*-darwin*) ostarget=macosx ;;
174 *86*-darwin*) ostarget=macosx-x86 ;;
175 *) ostarget=linux ;;
176 esac
177
178 if use threads ; then
179 if use opengl ; then
180 TACHYON_MAKE_TARGET=${ostarget}-thr-ogl
181 elif use mpi ; then
182 TACHYON_MAKE_TARGET=${ostarget}-mpi-thr
183 else
184 TACHYON_MAKE_TARGET=${ostarget}-thr
185 fi
186
187 # TODO: Support for linux-athlon-thr ?
188 else
189 if use mpi ; then
190 TACHYON_MAKE_TARGET=${ostarget}-mpi
191 else
192 TACHYON_MAKE_TARGET=${ostarget}
193 fi
194 fi
195
196 if [[ -z "${TACHYON_MAKE_TARGET}" ]]; then
197 die "No target found, check use flags"
198 else
199 einfo "Using target: ${TACHYON_MAKE_TARGET}"
200 fi
201 }
202
203 src_prepare() {
204 emakeconf=()
205 use jpeg && \
206 emakeconf+=(
207 USEJPEG=-DUSEJPEG
208 JPEGLIB=-ljpeg
209 )
210
211 use png && \
212 emakeconf+=(
213 USEPNG=-DUSEPNG
214 PNGINC="$($(tc-getPKG_CONFIG) --cflags libpng)"
215 PNGLIB="$($(tc-getPKG_CONFIG) --libs libpng)"
216 )
217
218 if use mpi ; then
219 sed \
220 -e "s:MPIDIR=:MPIDIR=/usr:g" \
221 -e "s:linux-lam:linux-mpi:g" \
222 -i Make-config || die "sed failed"
223 fi
224 sed -i \
225 -e "s:-O3::g;s:-g::g;s:-pg::g" \
226 -e "s:-m32:${CFLAGS}:g" \
227 -e "s:-m64:${CFLAGS}:g" \
228 -e "s:-ffast-math::g" \
229 -e "s:STRIP = strip:STRIP = touch:g" \
230 -e "s:CC = *cc:CC = $(tc-getCC):g" \
231 -e "s:-fomit-frame-pointer::g" Make-arch || die "sed failed"
232
233 epatch \
234 "${FILESDIR}"/${P}-ldflags.patch \
235 "${FILESDIR}"/${P}-shared.patch
236 }
237
238 src_compile() {
239 emake ${TACHYON_MAKE_TARGET} ${emakeconf[@]} VERSION=${PV}
240 }
241
242 src_install() {
243 cd .. || die
244 dodoc Changes README
245
246 insinto /usr/include/${PN}
247 doheader src/*.h
248
249 use doc && dohtml docs/tachyon/*
250
251 cd compile/${TACHYON_MAKE_TARGET} || die
252
253 dobin ${PN}
254 dolib.so lib${PN}.so*
255
256 if use examples; then
257 cd "${S}/../scenes" || die
258 insinto "/usr/share/${PN}/examples"
259 doins *
260 fi
261 }
Report Message
Find on MARC Find on Google Groups