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

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/blender: blender-2.49b-r2.ebuild blender-2.49a.ebuild ChangeLog blender-2.60a.ebuild blender-2.57-r1.ebuild blender-2.48a-r3.ebuild
Date: Mon, 02 Apr 2012 13:29:08
Message-Id: 20120402132858.36FCE2004B@flycatcher.gentoo.org
1 ssuominen 12/04/02 13:28:58
2
3 Modified: blender-2.49b-r2.ebuild blender-2.49a.ebuild
4 ChangeLog blender-2.60a.ebuild
5 blender-2.57-r1.ebuild blender-2.48a-r3.ebuild
6 Log:
7 Fix building with media-libs/openjpeg >= 1.5.0 wrt #409283. Every version has source/blender/imbuf/intern/jp2.c with parameters->tile_size_on set to false.
8
9 (Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.13 media-gfx/blender/blender-2.49b-r2.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?rev=1.13&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?rev=1.13&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?r1=1.12&r2=1.13
17
18 Index: blender-2.49b-r2.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v
21 retrieving revision 1.12
22 retrieving revision 1.13
23 diff -u -r1.12 -r1.13
24 --- blender-2.49b-r2.ebuild 13 Nov 2011 07:19:54 -0000 1.12
25 +++ blender-2.49b-r2.ebuild 2 Apr 2012 13:28:58 -0000 1.13
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2011 Gentoo Foundation
28 +# Copyright 1999-2012 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.12 2011/11/13 07:19:54 lu_zero Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.13 2012/04/02 13:28:58 ssuominen Exp $
32
33 EAPI=2
34
35 @@ -61,6 +61,11 @@
36 epatch "${FILESDIR}"/${PN}-2.49b-subversion-1.7.patch
37 epatch "${FILESDIR}"/${P}-libav-0.7.patch
38 rm -f "${S}/release/scripts/bpymodules/"*.pyc
39 +
40 + # Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
41 + sed -i \
42 + -e '/parameters.*tile_size_on/s:false:FALSE:' \
43 + source/blender/imbuf/intern/jp2.c || die
44 }
45
46 src_configure() {
47
48
49
50 1.18 media-gfx/blender/blender-2.49a.ebuild
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.18&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.18&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?r1=1.17&r2=1.18
55
56 Index: blender-2.49a.ebuild
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v
59 retrieving revision 1.17
60 retrieving revision 1.18
61 diff -u -r1.17 -r1.18
62 --- blender-2.49a.ebuild 30 Oct 2011 12:59:41 -0000 1.17
63 +++ blender-2.49a.ebuild 2 Apr 2012 13:28:58 -0000 1.18
64 @@ -1,6 +1,6 @@
65 -# Copyright 1999-2011 Gentoo Foundation
66 +# Copyright 1999-2012 Gentoo Foundation
67 # Distributed under the terms of the GNU General Public License v2
68 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $
69 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $
70
71 EAPI=2
72
73 @@ -58,6 +58,11 @@
74 epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch
75 epatch "${FILESDIR}"/${PN}-2.49a-bake.patch
76 rm -f "${S}/release/scripts/bpymodules/"*.pyc
77 +
78 + # Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
79 + sed -i \
80 + -e '/parameters.*tile_size_on/s:false:FALSE:' \
81 + source/blender/imbuf/intern/jp2.c || die
82 }
83
84 src_configure() {
85
86
87
88 1.222 media-gfx/blender/ChangeLog
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.222&view=markup
91 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.222&content-type=text/plain
92 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.221&r2=1.222
93
94 Index: ChangeLog
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v
97 retrieving revision 1.221
98 retrieving revision 1.222
99 diff -u -r1.221 -r1.222
100 --- ChangeLog 23 Feb 2012 16:57:16 -0000 1.221
101 +++ ChangeLog 2 Apr 2012 13:28:58 -0000 1.222
102 @@ -1,6 +1,12 @@
103 # ChangeLog for media-gfx/blender
104 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
105 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.221 2012/02/23 16:57:16 xarthisius Exp $
106 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.222 2012/04/02 13:28:58 ssuominen Exp $
107 +
108 + 02 Apr 2012; Samuli Suominen <ssuominen@g.o> blender-2.48a-r3.ebuild,
109 + blender-2.49a.ebuild, blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild,
110 + blender-2.60a.ebuild:
111 + Fix building with media-libs/openjpeg >= 1.5.0 wrt #409283. Every version has
112 + source/blender/imbuf/intern/jp2.c with parameters->tile_size_on set to false.
113
114 23 Feb 2012; Kacper Kowalik <xarthisius@g.o> blender-2.57-r1.ebuild,
115 blender-2.60a.ebuild:
116
117
118
119 1.10 media-gfx/blender/blender-2.60a.ebuild
120
121 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.10&view=markup
122 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.10&content-type=text/plain
123 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?r1=1.9&r2=1.10
124
125 Index: blender-2.60a.ebuild
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v
128 retrieving revision 1.9
129 retrieving revision 1.10
130 diff -u -r1.9 -r1.10
131 --- blender-2.60a.ebuild 23 Feb 2012 16:57:16 -0000 1.9
132 +++ blender-2.60a.ebuild 2 Apr 2012 13:28:58 -0000 1.10
133 @@ -1,6 +1,6 @@
134 # Copyright 1999-2012 Gentoo Foundation
135 # Distributed under the terms of the GNU General Public License v2
136 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.9 2012/02/23 16:57:16 xarthisius Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.10 2012/04/02 13:28:58 ssuominen Exp $
138
139 PYTHON_DEPEND="3:3.2"
140 EAPI=4
141 @@ -148,6 +148,11 @@
142 epatch "${FILESDIR}"/${P}-libav-0.7.patch
143 epatch "${FILESDIR}"/${P}-CVE-2009-3850-v3.patch
144 epatch "${FILESDIR}"/${P}-enable_site_module.patch
145 +
146 + # Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
147 + sed -i \
148 + -e '/parameters.*tile_size_on/s:false:FALSE:' \
149 + source/blender/imbuf/intern/jp2.c || die
150 }
151
152 src_configure() {
153
154
155
156 1.12 media-gfx/blender/blender-2.57-r1.ebuild
157
158 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?rev=1.12&view=markup
159 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?rev=1.12&content-type=text/plain
160 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?r1=1.11&r2=1.12
161
162 Index: blender-2.57-r1.ebuild
163 ===================================================================
164 RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v
165 retrieving revision 1.11
166 retrieving revision 1.12
167 diff -u -r1.11 -r1.12
168 --- blender-2.57-r1.ebuild 23 Feb 2012 16:57:16 -0000 1.11
169 +++ blender-2.57-r1.ebuild 2 Apr 2012 13:28:58 -0000 1.12
170 @@ -1,6 +1,6 @@
171 # Copyright 1999-2012 Gentoo Foundation
172 # Distributed under the terms of the GNU General Public License v2
173 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.11 2012/02/23 16:57:16 xarthisius Exp $
174 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.12 2012/04/02 13:28:58 ssuominen Exp $
175
176 PYTHON_DEPEND="3:3.2"
177
178 @@ -156,6 +156,11 @@
179
180 # Linux 3.x (bug #381099)
181 epatch "${FILESDIR}"/${P}-linux-3.patch
182 +
183 + # Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
184 + sed -i \
185 + -e '/parameters.*tile_size_on/s:false:FALSE:' \
186 + source/blender/imbuf/intern/jp2.c || die
187 }
188
189 src_configure() {
190
191
192
193 1.18 media-gfx/blender/blender-2.48a-r3.ebuild
194
195 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?rev=1.18&view=markup
196 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?rev=1.18&content-type=text/plain
197 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?r1=1.17&r2=1.18
198
199 Index: blender-2.48a-r3.ebuild
200 ===================================================================
201 RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v
202 retrieving revision 1.17
203 retrieving revision 1.18
204 diff -u -r1.17 -r1.18
205 --- blender-2.48a-r3.ebuild 30 Oct 2011 12:59:41 -0000 1.17
206 +++ blender-2.48a-r3.ebuild 2 Apr 2012 13:28:58 -0000 1.18
207 @@ -1,6 +1,6 @@
208 -# Copyright 1999-2011 Gentoo Foundation
209 +# Copyright 1999-2012 Gentoo Foundation
210 # Distributed under the terms of the GNU General Public License v2
211 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $
212 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $
213
214 EAPI=2
215
216 @@ -60,6 +60,11 @@
217 epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch
218 epatch "${FILESDIR}"/${PN}-2.48-ffmpeg-20081014.patch
219 epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch
220 +
221 + # Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
222 + sed -i \
223 + -e '/parameters.*tile_size_on/s:false:FALSE:' \
224 + source/blender/imbuf/intern/jp2.c || die
225 }
226
227 src_configure() {
Report Message
Find on MARC Find on Google Groups