1 |
maekke 08/10/19 21:32:27 |
2 |
|
3 |
Modified: ChangeLog blender-2.48-r1.ebuild |
4 |
Log: |
5 |
downgrade EAPI to 0 as this seems to cause troubles to some users (bug #242502 and bug #242664) |
6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27.1 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.156 media-gfx/blender/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.156&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.156&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.155&r2=1.156 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v |
18 |
retrieving revision 1.155 |
19 |
retrieving revision 1.156 |
20 |
diff -u -r1.155 -r1.156 |
21 |
--- ChangeLog 19 Oct 2008 14:15:04 -0000 1.155 |
22 |
+++ ChangeLog 19 Oct 2008 21:32:27 -0000 1.156 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for media-gfx/blender |
25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.155 2008/10/19 14:15:04 maekke Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.156 2008/10/19 21:32:27 maekke Exp $ |
28 |
+ |
29 |
+ 19 Oct 2008; Markus Meier <maekke@g.o> blender-2.48-r1.ebuild: |
30 |
+ downgrade EAPI to 0 as this seems to cause troubles to some users (bug |
31 |
+ #242502 and bug #242664) |
32 |
|
33 |
19 Oct 2008; Markus Meier <maekke@g.o> blender-2.48.ebuild, |
34 |
blender-2.48-r1.ebuild: |
35 |
|
36 |
|
37 |
|
38 |
1.4 media-gfx/blender/blender-2.48-r1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild?rev=1.4&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild?rev=1.4&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild?r1=1.3&r2=1.4 |
43 |
|
44 |
Index: blender-2.48-r1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild,v |
47 |
retrieving revision 1.3 |
48 |
retrieving revision 1.4 |
49 |
diff -u -r1.3 -r1.4 |
50 |
--- blender-2.48-r1.ebuild 19 Oct 2008 14:15:04 -0000 1.3 |
51 |
+++ blender-2.48-r1.ebuild 19 Oct 2008 21:32:27 -0000 1.4 |
52 |
@@ -1,8 +1,6 @@ |
53 |
# Copyright 1999-2008 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild,v 1.3 2008/10/19 14:15:04 maekke Exp $ |
56 |
- |
57 |
-EAPI="2" |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild,v 1.4 2008/10/19 21:32:27 maekke Exp $ |
59 |
|
60 |
inherit multilib flag-o-matic eutils python |
61 |
|
62 |
@@ -52,15 +50,16 @@ |
63 |
fi |
64 |
} |
65 |
|
66 |
-src_prepare() { |
67 |
+src_unpack() { |
68 |
+ unpack ${A} |
69 |
+ |
70 |
+ cd "${S}" |
71 |
epatch "${FILESDIR}"/blender-2.37-dirs.patch |
72 |
epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch |
73 |
epatch "${FILESDIR}"/blender-2.46-ffmpeg.patch |
74 |
epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch |
75 |
epatch "${FILESDIR}"/${P}-ffmpeg-20081014.patch |
76 |
-} |
77 |
|
78 |
-src_configure() { |
79 |
if use ffmpeg ; then |
80 |
# cd "${S}"/extern |
81 |
# rm -rf ffmpeg libmp3lame x264 |
82 |
@@ -87,7 +86,9 @@ |
83 |
echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py |
84 |
elog "disabling openmp" |
85 |
fi |
86 |
+} |
87 |
|
88 |
+src_compile() { |
89 |
for arg in \ |
90 |
'blender-game gameengine' \ |
91 |
'ffmpeg' \ |
92 |
@@ -100,9 +101,7 @@ |
93 |
'verse' ; do |
94 |
blend_with ${arg} |
95 |
done |
96 |
-} |
97 |
|
98 |
-src_compile() { |
99 |
# scons uses -l differently -> remove it |
100 |
scons ${MAKEOPTS/-l[0-9]} || die \ |
101 |
"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" |