| 1 |
ssuominen 12/04/02 13:34:47 |
| 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 deps to match the change, revert commit to 2.48 |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.14 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.14&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?rev=1.14&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?r1=1.13&r2=1.14 |
| 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.13 |
| 22 |
retrieving revision 1.14 |
| 23 |
diff -u -r1.13 -r1.14 |
| 24 |
--- blender-2.49b-r2.ebuild 2 Apr 2012 13:28:58 -0000 1.13 |
| 25 |
+++ blender-2.49b-r2.ebuild 2 Apr 2012 13:34:47 -0000 1.14 |
| 26 |
@@ -1,6 +1,6 @@ |
| 27 |
# Copyright 1999-2012 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.13 2012/04/02 13:28:58 ssuominen Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.14 2012/04/02 13:34:47 ssuominen Exp $ |
| 31 |
|
| 32 |
EAPI=2 |
| 33 |
|
| 34 |
@@ -17,7 +17,7 @@ |
| 35 |
KEYWORDS="amd64 ppc ppc64 x86" |
| 36 |
|
| 37 |
RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] ) |
| 38 |
- media-libs/openjpeg |
| 39 |
+ >=media-libs/openjpeg-1.5.0 |
| 40 |
media-libs/tiff |
| 41 |
>=dev-lang/python-2.5 |
| 42 |
nls? ( >=media-libs/freetype-2.0 |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.19 media-gfx/blender/blender-2.49a.ebuild |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.19&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.19&content-type=text/plain |
| 50 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?r1=1.18&r2=1.19 |
| 51 |
|
| 52 |
Index: blender-2.49a.ebuild |
| 53 |
=================================================================== |
| 54 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v |
| 55 |
retrieving revision 1.18 |
| 56 |
retrieving revision 1.19 |
| 57 |
diff -u -r1.18 -r1.19 |
| 58 |
--- blender-2.49a.ebuild 2 Apr 2012 13:28:58 -0000 1.18 |
| 59 |
+++ blender-2.49a.ebuild 2 Apr 2012 13:34:47 -0000 1.19 |
| 60 |
@@ -1,6 +1,6 @@ |
| 61 |
# Copyright 1999-2012 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $ |
| 64 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $ |
| 65 |
|
| 66 |
EAPI=2 |
| 67 |
|
| 68 |
@@ -17,7 +17,7 @@ |
| 69 |
KEYWORDS="amd64 ppc ppc64 x86" |
| 70 |
|
| 71 |
RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] ) |
| 72 |
- media-libs/openjpeg |
| 73 |
+ >=media-libs/openjpeg-1.5.0 |
| 74 |
media-libs/tiff |
| 75 |
>=dev-lang/python-2.5 |
| 76 |
nls? ( >=media-libs/freetype-2.0 |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.223 media-gfx/blender/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.223&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.223&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.222&r2=1.223 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v |
| 89 |
retrieving revision 1.222 |
| 90 |
retrieving revision 1.223 |
| 91 |
diff -u -r1.222 -r1.223 |
| 92 |
--- ChangeLog 2 Apr 2012 13:28:58 -0000 1.222 |
| 93 |
+++ ChangeLog 2 Apr 2012 13:34:47 -0000 1.223 |
| 94 |
@@ -1,10 +1,9 @@ |
| 95 |
# ChangeLog for media-gfx/blender |
| 96 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.222 2012/04/02 13:28:58 ssuominen Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.223 2012/04/02 13:34:47 ssuominen Exp $ |
| 99 |
|
| 100 |
- 02 Apr 2012; Samuli Suominen <ssuominen@g.o> blender-2.48a-r3.ebuild, |
| 101 |
- blender-2.49a.ebuild, blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild, |
| 102 |
- blender-2.60a.ebuild: |
| 103 |
+ 02 Apr 2012; Samuli Suominen <ssuominen@g.o> blender-2.49a.ebuild, |
| 104 |
+ blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild, blender-2.60a.ebuild: |
| 105 |
Fix building with media-libs/openjpeg >= 1.5.0 wrt #409283. Every version has |
| 106 |
source/blender/imbuf/intern/jp2.c with parameters->tile_size_on set to false. |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
1.11 media-gfx/blender/blender-2.60a.ebuild |
| 112 |
|
| 113 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.11&view=markup |
| 114 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.11&content-type=text/plain |
| 115 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?r1=1.10&r2=1.11 |
| 116 |
|
| 117 |
Index: blender-2.60a.ebuild |
| 118 |
=================================================================== |
| 119 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v |
| 120 |
retrieving revision 1.10 |
| 121 |
retrieving revision 1.11 |
| 122 |
diff -u -r1.10 -r1.11 |
| 123 |
--- blender-2.60a.ebuild 2 Apr 2012 13:28:58 -0000 1.10 |
| 124 |
+++ blender-2.60a.ebuild 2 Apr 2012 13:34:47 -0000 1.11 |
| 125 |
@@ -1,6 +1,6 @@ |
| 126 |
# Copyright 1999-2012 Gentoo Foundation |
| 127 |
# Distributed under the terms of the GNU General Public License v2 |
| 128 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.10 2012/04/02 13:28:58 ssuominen Exp $ |
| 129 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.11 2012/04/02 13:34:47 ssuominen Exp $ |
| 130 |
|
| 131 |
PYTHON_DEPEND="3:3.2" |
| 132 |
EAPI=4 |
| 133 |
@@ -54,7 +54,10 @@ |
| 134 |
openexr? ( media-libs/openexr ) |
| 135 |
ffmpeg? ( |
| 136 |
>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora] |
| 137 |
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] ) |
| 138 |
+ jpeg2k? ( |
| 139 |
+ !<media-libs/openjpeg-1.5.0 |
| 140 |
+ >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] |
| 141 |
+ ) |
| 142 |
) |
| 143 |
openal? ( >=media-libs/openal-1.6.372 ) |
| 144 |
fftw? ( sci-libs/fftw:3.0 ) |
| 145 |
|
| 146 |
|
| 147 |
|
| 148 |
1.13 media-gfx/blender/blender-2.57-r1.ebuild |
| 149 |
|
| 150 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?rev=1.13&view=markup |
| 151 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?rev=1.13&content-type=text/plain |
| 152 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?r1=1.12&r2=1.13 |
| 153 |
|
| 154 |
Index: blender-2.57-r1.ebuild |
| 155 |
=================================================================== |
| 156 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v |
| 157 |
retrieving revision 1.12 |
| 158 |
retrieving revision 1.13 |
| 159 |
diff -u -r1.12 -r1.13 |
| 160 |
--- blender-2.57-r1.ebuild 2 Apr 2012 13:28:58 -0000 1.12 |
| 161 |
+++ blender-2.57-r1.ebuild 2 Apr 2012 13:34:47 -0000 1.13 |
| 162 |
@@ -1,6 +1,6 @@ |
| 163 |
# Copyright 1999-2012 Gentoo Foundation |
| 164 |
# Distributed under the terms of the GNU General Public License v2 |
| 165 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.12 2012/04/02 13:28:58 ssuominen Exp $ |
| 166 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.13 2012/04/02 13:34:47 ssuominen Exp $ |
| 167 |
|
| 168 |
PYTHON_DEPEND="3:3.2" |
| 169 |
|
| 170 |
@@ -58,7 +58,10 @@ |
| 171 |
openexr? ( media-libs/openexr ) |
| 172 |
ffmpeg? ( |
| 173 |
virtual/ffmpeg[x264,mp3,encode,theora] |
| 174 |
- jpeg2k? ( virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k] ) |
| 175 |
+ jpeg2k? ( |
| 176 |
+ !<media-libs/openjpeg-1.5.0 |
| 177 |
+ virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k] |
| 178 |
+ ) |
| 179 |
) |
| 180 |
openal? ( >=media-libs/openal-1.6.372 ) |
| 181 |
fftw? ( sci-libs/fftw:3.0 ) |
| 182 |
|
| 183 |
|
| 184 |
|
| 185 |
1.19 media-gfx/blender/blender-2.48a-r3.ebuild |
| 186 |
|
| 187 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?rev=1.19&view=markup |
| 188 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?rev=1.19&content-type=text/plain |
| 189 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?r1=1.18&r2=1.19 |
| 190 |
|
| 191 |
Index: blender-2.48a-r3.ebuild |
| 192 |
=================================================================== |
| 193 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v |
| 194 |
retrieving revision 1.18 |
| 195 |
retrieving revision 1.19 |
| 196 |
diff -u -r1.18 -r1.19 |
| 197 |
--- blender-2.48a-r3.ebuild 2 Apr 2012 13:28:58 -0000 1.18 |
| 198 |
+++ blender-2.48a-r3.ebuild 2 Apr 2012 13:34:47 -0000 1.19 |
| 199 |
@@ -1,6 +1,6 @@ |
| 200 |
# Copyright 1999-2012 Gentoo Foundation |
| 201 |
# Distributed under the terms of the GNU General Public License v2 |
| 202 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $ |
| 203 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $ |
| 204 |
|
| 205 |
EAPI=2 |
| 206 |
|
| 207 |
@@ -60,11 +60,6 @@ |
| 208 |
epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch |
| 209 |
epatch "${FILESDIR}"/${PN}-2.48-ffmpeg-20081014.patch |
| 210 |
epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch |
| 211 |
- |
| 212 |
- # Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283) |
| 213 |
- sed -i \ |
| 214 |
- -e '/parameters.*tile_size_on/s:false:FALSE:' \ |
| 215 |
- source/blender/imbuf/intern/jp2.c || die |
| 216 |
} |
| 217 |
|
| 218 |
src_configure() { |
Archives