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

Gentoo Archives: gentoo-commits

From: "Markus Meier (maekke)" <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/blender: ChangeLog blender-2.43-r1.ebuild blender-2.45-r2.ebuild blender-2.45-r3.ebuild
Date: Sun, 27 Apr 2008 12:19:56
Message-Id: E1Jq5rF-0002CW-2z@stork.gentoo.org
1 maekke 08/04/27 12:19:53
2
3 Modified: ChangeLog
4 Added: blender-2.43-r1.ebuild blender-2.45-r2.ebuild
5 blender-2.45-r3.ebuild
6 Log:
7 revision bumps for security bug #219008
8 (Portage version: 2.1.5_rc6)
9
10 Revision Changes Path
11 1.133 media-gfx/blender/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.133&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.133&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.132&r2=1.133
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v
20 retrieving revision 1.132
21 retrieving revision 1.133
22 diff -u -r1.132 -r1.133
23 --- ChangeLog 12 Apr 2008 10:22:13 -0000 1.132
24 +++ ChangeLog 27 Apr 2008 12:19:52 -0000 1.133
25 @@ -1,6 +1,15 @@
26 # ChangeLog for media-gfx/blender
27 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.132 2008/04/12 10:22:13 dev-zero Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.133 2008/04/27 12:19:52 maekke Exp $
30 +
31 +*blender-2.45-r3 (27 Apr 2008)
32 +*blender-2.45-r2 (27 Apr 2008)
33 +*blender-2.43-r1 (27 Apr 2008)
34 +
35 + 27 Apr 2008; Markus Meier <maekke@g.o>
36 + +files/blender-2.45-cve-2008-1102.patch, +blender-2.43-r1.ebuild,
37 + +blender-2.45-r2.ebuild, +blender-2.45-r3.ebuild:
38 + revision bumps for security bug #219008
39
40 12 Apr 2008; Tiziano Müller <dev-zero@g.o>
41 +files/blender-2.45-missing_includes.patch, blender-2.45.ebuild,
42
43
44
45 1.1 media-gfx/blender/blender-2.43-r1.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.43-r1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.43-r1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: blender-2.43-r1.ebuild
51 ===================================================================
52 # Copyright 1999-2008 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.43-r1.ebuild,v 1.1 2008/04/27 12:19:52 maekke Exp $
55
56 inherit multilib flag-o-matic eutils python
57
58 #IUSE="jpeg mozilla png sdl static truetype"
59 IUSE="blender-game ffmpeg jpeg nls openal openexr png"
60 FFMPEG_SNAP="0.4.9-p20070330"
61 DESCRIPTION="3D Creation/Animation/Publishing System"
62 HOMEPAGE="http://www.blender.org/"
63 SRC_URI="http://download.blender.org/source/${P}.tar.gz
64 ffmpeg? ( mirror://gentoo/ffmpeg-${FFMPEG_SNAP}.tar.bz2 )"
65
66 SLOT="0"
67 LICENSE="|| ( GPL-2 BL )"
68 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
69
70 RDEPEND=">=dev-libs/openssl-0.9.6
71 ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_SNAP/-/_}
72 media-libs/x264 )
73 jpeg? ( media-libs/jpeg )
74 media-libs/tiff
75 nls? ( >=media-libs/freetype-2.0
76 virtual/libintl
77 >=media-libs/ftgl-2.1 )
78 openal? ( media-libs/openal
79 media-libs/freealut )
80 openexr? ( media-libs/openexr )
81 png? ( media-libs/libpng )
82 >=media-libs/libsdl-1.2
83 virtual/opengl"
84
85 DEPEND="dev-util/scons
86 x11-libs/libXt
87 x11-proto/inputproto
88 ${RDEPEND}"
89
90 blend_with() {
91 local UWORD="$2"
92 if [ -z "${UWORD}" ]; then
93 UWORD="$1"
94 fi
95 if useq $1; then
96 echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
97 >> "${S}"/user-config.py
98 else
99 echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
100 >> "${S}"/user-config.py
101 fi
102 return 0
103 }
104
105 src_unpack() {
106 unpack ${A}
107 cd "${S}"/release/plugins
108 chmod 755 bmake
109 rmdir include
110 cp -pPR "${S}"/source/blender/blenpluginapi include
111
112 cd "${S}"
113 epatch "${FILESDIR}"/blender-2.37-dirs.patch
114 epatch "${FILESDIR}"/blender-2.45-cve-2008-1102.patch
115
116 if use ffmpeg ; then
117 cd "${S}"/extern
118 mv ffmpeg/Makefile ffmpeg/common.mak "${T}"
119 unpack ffmpeg-${FFMPEG_SNAP}.tar.bz2
120 mv "${T}"/Makefile "${T}"/common.mak ffmpeg
121 fi
122 # pass compiler flags to the scons build system
123 echo "CFLAGS += '${CFLAGS}'" >> "${S}"/user-config.py
124 echo "CCFLAGS += ['${CXXFLAGS//' '/','}','-DYESIAMSTUPID']" \
125 >> "${S}"/user-config.py
126 # disable blender-player and iconv
127 # echo "WITH_BF_PLAYER=0" >> ${S}/user-config.py
128 # echo "WITH_BF_ICONV=0" >> ${S}/user-config.py
129 }
130
131 src_compile() {
132 myconf="${myconf} $(blend_with openal)"
133 myconf="${myconf} $(blend_with openexr)"
134 myconf="${myconf} $(blend_with jpeg)"
135 myconf="${myconf} $(blend_with ffmpeg)"
136 myconf="${myconf} $(blend_with png)"
137 myconf="${myconf} $(blend_with nls international)"
138 myconf="${myconf} $(blend_with blender-game gameengine)"
139
140 # scons uses -l differently -> remove it
141 scons ${MAKEOPTS/-l[0-9]} -h > scons.config
142 scons ${MAKEOPTS/-l[0-9]} || die \
143 "!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
144
145 cd "${S}"/release/plugins
146 emake || die
147 }
148
149 src_install() {
150 exeinto /usr/bin/
151 doexe "${WORKDIR}"/install/linux2/blender
152
153 dodir /usr/share/${PN}
154
155 exeinto /usr/$(get_libdir)/${PN}/textures
156 doexe "${S}"/release/plugins/texture/*.so
157 exeinto /usr/$(get_libdir)/${PN}/sequences
158 doexe "${S}"/release/plugins/sequence/*.so
159 insinto /usr/include/${PN}
160 doins "${S}"/release/plugins/include/*.h
161
162 if use nls ; then
163 mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
164 "${D}"/usr/share/${PN}
165 mv "${WORKDIR}"/install/linux2/.blender/locale \
166 "${D}"/usr/share/locale
167 fi
168
169 mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
170
171 insinto /usr/share/pixmaps
172 doins "${FILESDIR}"/${PN}.png
173 insinto /usr/share/applications
174 doins "${FILESDIR}"/${PN}.desktop
175
176 dodoc INSTALL README
177 }
178
179 pkg_preinst(){
180 if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
181 then
182 rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
183 fi
184 }
185
186
187
188 1.1 media-gfx/blender/blender-2.45-r2.ebuild
189
190 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.45-r2.ebuild?rev=1.1&view=markup
191 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.45-r2.ebuild?rev=1.1&content-type=text/plain
192
193 Index: blender-2.45-r2.ebuild
194 ===================================================================
195 # Copyright 1999-2008 Gentoo Foundation
196 # Distributed under the terms of the GNU General Public License v2
197 # $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r2.ebuild,v 1.1 2008/04/27 12:19:52 maekke Exp $
198
199 inherit multilib flag-o-matic eutils python
200
201 #IUSE="jpeg mozilla png sdl static truetype"
202 IUSE="blender-game ffmpeg jpeg nls openal openexr png verse"
203 DESCRIPTION="3D Creation/Animation/Publishing System"
204 HOMEPAGE="http://www.blender.org/"
205 SRC_URI="http://download.blender.org/source/${P}.tar.gz"
206
207 SLOT="0"
208 LICENSE="|| ( GPL-2 BL )"
209 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
210
211 RDEPEND=">=dev-libs/openssl-0.9.6
212 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r1
213 media-libs/x264 )
214 jpeg? ( media-libs/jpeg )
215 media-libs/tiff
216 >=dev-lang/python-2.4
217 nls? ( >=media-libs/freetype-2.0
218 virtual/libintl
219 >=media-libs/ftgl-2.1 )
220 openal? ( media-libs/openal
221 media-libs/freealut )
222 openexr? ( media-libs/openexr )
223 png? ( media-libs/libpng )
224 >=media-libs/libsdl-1.2
225 virtual/opengl"
226
227 DEPEND="dev-util/scons
228 x11-libs/libXt
229 x11-proto/inputproto
230 ${RDEPEND}"
231
232 blend_with() {
233 local UWORD="$2"
234 if [ -z "${UWORD}" ]; then
235 UWORD="$1"
236 fi
237 if useq $1; then
238 echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
239 >> "${S}"/user-config.py
240 else
241 echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
242 >> "${S}"/user-config.py
243 fi
244 }
245
246 src_unpack() {
247 unpack ${A}
248 cd "${S}"/release/plugins
249 chmod 755 bmake
250 cp -pPR "${S}"/source/blender/blenpluginapi include
251
252 cd "${S}"
253 epatch "${FILESDIR}"/blender-2.37-dirs.patch
254 epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
255 epatch "${FILESDIR}"/blender-2.44-swscale.patch
256 epatch "${FILESDIR}"/${P}-missing_includes.patch
257 epatch "${FILESDIR}"/${P}-cve-2008-1102.patch
258
259 if use ffmpeg ; then
260 cd "${S}"/extern
261 rm -rf ffmpeg
262 fi
263 # pass compiler flags to the scons build system
264 # and set python version to current version in use
265 python_version
266 cat <<- EOF >> "${S}"/user-config.py
267 CFLAGS += '${CFLAGS}'
268 BF_PYTHON_VERSION="${PYVER}"
269 BF_PYTHON_INC="/usr/include/python${PYVER}"
270 BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
271 BF_PYTHON_LIB="python${PYVER}"
272 EOF
273
274 }
275
276 src_compile() {
277 for arg in 'openal' \
278 'openexr' \
279 'jpeg' \
280 'ffmpeg' \
281 'png' \
282 'verse' \
283 'nls international' \
284 'blender-game gameengine'; do
285 blend_with ${arg}
286 done
287
288 # scons uses -l differently -> remove it
289 scons ${MAKEOPTS/-l[0-9]} -h > scons.config
290 scons ${MAKEOPTS/-l[0-9]} || die \
291 "!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
292
293 cd "${S}"/release/plugins
294 emake || die
295 }
296
297 src_install() {
298 exeinto /usr/bin/
299 doexe "${WORKDIR}"/install/linux2/blender
300
301 dodir /usr/share/${PN}
302
303 exeinto /usr/$(get_libdir)/${PN}/textures
304 doexe "${S}"/release/plugins/texture/*.so
305 exeinto /usr/$(get_libdir)/${PN}/sequences
306 doexe "${S}"/release/plugins/sequence/*.so
307 insinto /usr/include/${PN}
308 doins "${S}"/release/plugins/include/*.h
309
310 if use nls ; then
311 mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
312 "${D}"/usr/share/${PN}
313 mv "${WORKDIR}"/install/linux2/.blender/locale \
314 "${D}"/usr/share/locale
315 fi
316
317 mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
318
319 insinto /usr/share/pixmaps
320 doins "${FILESDIR}"/${PN}.png
321 insinto /usr/share/applications
322 doins "${FILESDIR}"/${PN}.desktop
323
324 dodoc INSTALL README
325 }
326
327 pkg_preinst(){
328 if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
329 then
330 rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
331 fi
332 }
333
334
335
336 1.1 media-gfx/blender/blender-2.45-r3.ebuild
337
338 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.45-r3.ebuild?rev=1.1&view=markup
339 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.45-r3.ebuild?rev=1.1&content-type=text/plain
340
341 Index: blender-2.45-r3.ebuild
342 ===================================================================
343 # Copyright 1999-2008 Gentoo Foundation
344 # Distributed under the terms of the GNU General Public License v2
345 # $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r3.ebuild,v 1.1 2008/04/27 12:19:52 maekke Exp $
346
347 inherit multilib flag-o-matic eutils python
348
349 #IUSE="jpeg mozilla png sdl static truetype"
350 IUSE="blender-game ffmpeg jpeg nls openal openexr png verse"
351 DESCRIPTION="3D Creation/Animation/Publishing System"
352 HOMEPAGE="http://www.blender.org/"
353 SRC_URI="http://download.blender.org/source/${P}.tar.gz"
354
355 SLOT="0"
356 LICENSE="|| ( GPL-2 BL )"
357 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
358
359 RDEPEND=">=dev-libs/openssl-0.9.6
360 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
361 jpeg? ( media-libs/jpeg )
362 media-libs/tiff
363 >=dev-lang/python-2.4
364 nls? ( >=media-libs/freetype-2.0
365 virtual/libintl
366 >=media-libs/ftgl-2.1 )
367 openal? ( media-libs/openal
368 media-libs/freealut )
369 openexr? ( media-libs/openexr )
370 png? ( media-libs/libpng )
371 >=media-libs/libsdl-1.2
372 virtual/opengl"
373
374 DEPEND="dev-util/scons
375 x11-libs/libXt
376 x11-proto/inputproto
377 ${RDEPEND}"
378
379 blend_with() {
380 local UWORD="$2"
381 if [ -z "${UWORD}" ]; then
382 UWORD="$1"
383 fi
384 if useq $1; then
385 echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
386 >> "${S}"/user-config.py
387 else
388 echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
389 >> "${S}"/user-config.py
390 fi
391 }
392
393 src_unpack() {
394 unpack ${A}
395 cd "${S}"/release/plugins
396 chmod 755 bmake
397 cp -pPR "${S}"/source/blender/blenpluginapi include
398
399 cd "${S}"
400 epatch "${FILESDIR}"/blender-2.37-dirs.patch
401 epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
402 epatch "${FILESDIR}"/blender-2.44-swscale.patch
403 epatch "${FILESDIR}"/${P}-missing_includes.patch
404 epatch "${FILESDIR}"/${P}-cve-2008-1102.patch
405
406 if use ffmpeg ; then
407 cd "${S}"/extern
408 rm -rf ffmpeg
409 fi
410 # pass compiler flags to the scons build system
411 # and set python version to current version in use
412 python_version
413 cat <<- EOF >> "${S}"/user-config.py
414 CFLAGS += '${CFLAGS}'
415 BF_PYTHON_VERSION="${PYVER}"
416 BF_PYTHON_INC="/usr/include/python${PYVER}"
417 BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
418 BF_PYTHON_LIB="python${PYVER}"
419 EOF
420
421 }
422
423 src_compile() {
424 for arg in 'openal' \
425 'openexr' \
426 'jpeg' \
427 'ffmpeg' \
428 'png' \
429 'verse' \
430 'nls international' \
431 'blender-game gameengine'; do
432 blend_with ${arg}
433 done
434
435 # scons uses -l differently -> remove it
436 scons ${MAKEOPTS/-l[0-9]} -h > scons.config
437 scons ${MAKEOPTS/-l[0-9]} || die \
438 "!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
439
440 cd "${S}"/release/plugins
441 emake || die
442 }
443
444 src_install() {
445 exeinto /usr/bin/
446 doexe "${WORKDIR}"/install/linux2/blender
447
448 dodir /usr/share/${PN}
449
450 exeinto /usr/$(get_libdir)/${PN}/textures
451 doexe "${S}"/release/plugins/texture/*.so
452 exeinto /usr/$(get_libdir)/${PN}/sequences
453 doexe "${S}"/release/plugins/sequence/*.so
454 insinto /usr/include/${PN}
455 doins "${S}"/release/plugins/include/*.h
456
457 if use nls ; then
458 mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
459 "${D}"/usr/share/${PN}
460 mv "${WORKDIR}"/install/linux2/.blender/locale \
461 "${D}"/usr/share/locale
462 fi
463
464 mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
465
466 insinto /usr/share/pixmaps
467 doins "${FILESDIR}"/${PN}.png
468 insinto /usr/share/applications
469 doins "${FILESDIR}"/${PN}.desktop
470
471 dodoc INSTALL README
472 }
473
474 pkg_preinst(){
475 if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
476 then
477 rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
478 fi
479 }
480
481
482
483 --
484 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups