| 1 |
maekke 08/10/25 11:36:56 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: blender-2.48a-r1.ebuild blender-2.48a.ebuild |
| 5 |
Log: |
| 6 |
bump to blender-2.48a (bugfix release); fix files/blender-2.37-dirs.patch reported in bug #242904 |
| 7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27.3 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.157 media-gfx/blender/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.157&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.157&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.156&r2=1.157 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v |
| 19 |
retrieving revision 1.156 |
| 20 |
retrieving revision 1.157 |
| 21 |
diff -u -r1.156 -r1.157 |
| 22 |
--- ChangeLog 19 Oct 2008 21:32:27 -0000 1.156 |
| 23 |
+++ ChangeLog 25 Oct 2008 11:36:56 -0000 1.157 |
| 24 |
@@ -1,6 +1,15 @@ |
| 25 |
# ChangeLog for media-gfx/blender |
| 26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.156 2008/10/19 21:32:27 maekke Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.157 2008/10/25 11:36:56 maekke Exp $ |
| 29 |
+ |
| 30 |
+*blender-2.48a-r1 (25 Oct 2008) |
| 31 |
+*blender-2.48a (25 Oct 2008) |
| 32 |
+ |
| 33 |
+ 25 Oct 2008; Markus Meier <maekke@g.o> |
| 34 |
+ files/blender-2.37-dirs.patch, +blender-2.48a.ebuild, |
| 35 |
+ +blender-2.48a-r1.ebuild: |
| 36 |
+ bump to blender-2.48a (bugfix release); fix files/blender-2.37-dirs.patch |
| 37 |
+ reported in bug #242904 |
| 38 |
|
| 39 |
19 Oct 2008; Markus Meier <maekke@g.o> blender-2.48-r1.ebuild: |
| 40 |
downgrade EAPI to 0 as this seems to cause troubles to some users (bug |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 media-gfx/blender/blender-2.48a-r1.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48a-r1.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48a-r1.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: blender-2.48a-r1.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2008 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r1.ebuild,v 1.1 2008/10/25 11:36:56 maekke Exp $ |
| 54 |
|
| 55 |
inherit multilib flag-o-matic eutils python |
| 56 |
|
| 57 |
#IUSE="jpeg mozilla png sdl static truetype" |
| 58 |
IUSE="blender-game ffmpeg jpeg nls openal openexr openmp |
| 59 |
player png quicktime verse" |
| 60 |
DESCRIPTION="3D Creation/Animation/Publishing System" |
| 61 |
HOMEPAGE="http://www.blender.org/" |
| 62 |
SRC_URI="http://download.blender.org/source/${P}.tar.gz" |
| 63 |
|
| 64 |
SLOT="0" |
| 65 |
LICENSE="|| ( GPL-2 BL )" |
| 66 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" |
| 67 |
|
| 68 |
RDEPEND=">=dev-libs/openssl-0.9.6 |
| 69 |
ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 ) |
| 70 |
jpeg? ( media-libs/jpeg ) |
| 71 |
media-libs/tiff |
| 72 |
>=dev-lang/python-2.4 |
| 73 |
nls? ( >=media-libs/freetype-2.0 |
| 74 |
virtual/libintl |
| 75 |
>=media-libs/ftgl-2.1 ) |
| 76 |
openal? ( media-libs/openal |
| 77 |
media-libs/freealut ) |
| 78 |
openexr? ( media-libs/openexr ) |
| 79 |
png? ( media-libs/libpng ) |
| 80 |
quicktime? ( media-libs/libquicktime ) |
| 81 |
>=media-libs/libsdl-1.2 |
| 82 |
virtual/opengl" |
| 83 |
|
| 84 |
DEPEND=">=dev-util/scons-0.98 |
| 85 |
x11-libs/libXt |
| 86 |
x11-proto/inputproto |
| 87 |
${RDEPEND}" |
| 88 |
|
| 89 |
blend_with() { |
| 90 |
local UWORD="$2" |
| 91 |
if [ -z "${UWORD}" ]; then |
| 92 |
UWORD="$1" |
| 93 |
fi |
| 94 |
if useq $1; then |
| 95 |
echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \ |
| 96 |
>> "${S}"/user-config.py |
| 97 |
else |
| 98 |
echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \ |
| 99 |
>> "${S}"/user-config.py |
| 100 |
fi |
| 101 |
} |
| 102 |
|
| 103 |
src_unpack() { |
| 104 |
unpack ${A} |
| 105 |
|
| 106 |
cd "${S}" |
| 107 |
epatch "${FILESDIR}"/${PN}-2.37-dirs.patch |
| 108 |
epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch |
| 109 |
epatch "${FILESDIR}"/${PN}-2.46-ffmpeg.patch |
| 110 |
epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch |
| 111 |
epatch "${FILESDIR}"/${PN}-2.48-ffmpeg-20081014.patch |
| 112 |
|
| 113 |
if use ffmpeg ; then |
| 114 |
# cd "${S}"/extern |
| 115 |
# rm -rf ffmpeg libmp3lame x264 |
| 116 |
cat <<- EOF >> "${S}"/user-config.py |
| 117 |
BF_FFMPEG="/usr" |
| 118 |
BF_FFMPEG_LIB="avformat avcodec swscale avutil" |
| 119 |
EOF |
| 120 |
fi |
| 121 |
# pass compiler flags to the scons build system |
| 122 |
# and set python version to current version in use |
| 123 |
python_version |
| 124 |
cat <<- EOF >> "${S}"/user-config.py |
| 125 |
CFLAGS += '${CFLAGS}' |
| 126 |
BF_PYTHON_VERSION="${PYVER}" |
| 127 |
BF_PYTHON_INC="/usr/include/python${PYVER}" |
| 128 |
BF_PYTHON_BINARY="/usr/bin/python${PYVER}" |
| 129 |
BF_PYTHON_LIB="python${PYVER}" |
| 130 |
EOF |
| 131 |
|
| 132 |
if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then |
| 133 |
echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py |
| 134 |
elog "enabling openmp" |
| 135 |
else |
| 136 |
echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py |
| 137 |
elog "disabling openmp" |
| 138 |
fi |
| 139 |
} |
| 140 |
|
| 141 |
src_compile() { |
| 142 |
for arg in \ |
| 143 |
'blender-game gameengine' \ |
| 144 |
'ffmpeg' \ |
| 145 |
'jpeg' \ |
| 146 |
'nls international' \ |
| 147 |
'openal' \ |
| 148 |
'openexr' \ |
| 149 |
'player' \ |
| 150 |
'png' \ |
| 151 |
'verse' ; do |
| 152 |
blend_with ${arg} |
| 153 |
done |
| 154 |
|
| 155 |
# scons uses -l differently -> remove it |
| 156 |
scons ${MAKEOPTS/-l[0-9]} || die \ |
| 157 |
"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" |
| 158 |
|
| 159 |
cd "${WORKDIR}"/install/linux2/plugins |
| 160 |
chmod 755 bmake |
| 161 |
emake || die |
| 162 |
} |
| 163 |
|
| 164 |
src_install() { |
| 165 |
exeinto /usr/bin/ |
| 166 |
doexe "${WORKDIR}"/install/linux2/blender |
| 167 |
use player && doexe "${WORKDIR}"/install/linux2/blenderplayer |
| 168 |
|
| 169 |
dodir /usr/share/${PN} |
| 170 |
|
| 171 |
exeinto /usr/$(get_libdir)/${PN}/textures |
| 172 |
doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so |
| 173 |
exeinto /usr/$(get_libdir)/${PN}/sequences |
| 174 |
doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so |
| 175 |
insinto /usr/include/${PN} |
| 176 |
doins "${WORKDIR}"/install/linux2/plugins/include/*.h |
| 177 |
|
| 178 |
if use nls ; then |
| 179 |
mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \ |
| 180 |
"${D}"/usr/share/${PN} |
| 181 |
mv "${WORKDIR}"/install/linux2/.blender/locale \ |
| 182 |
"${D}"/usr/share/locale |
| 183 |
fi |
| 184 |
|
| 185 |
mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN} |
| 186 |
|
| 187 |
insinto /usr/share/pixmaps |
| 188 |
doins "${FILESDIR}"/${PN}.png |
| 189 |
insinto /usr/share/applications |
| 190 |
doins "${FILESDIR}"/${PN}.desktop |
| 191 |
|
| 192 |
dodoc INSTALL README |
| 193 |
dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf |
| 194 |
} |
| 195 |
|
| 196 |
pkg_preinst(){ |
| 197 |
if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ]; |
| 198 |
then |
| 199 |
rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include |
| 200 |
fi |
| 201 |
} |
| 202 |
|
| 203 |
|
| 204 |
|
| 205 |
1.1 media-gfx/blender/blender-2.48a.ebuild |
| 206 |
|
| 207 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48a.ebuild?rev=1.1&view=markup |
| 208 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48a.ebuild?rev=1.1&content-type=text/plain |
| 209 |
|
| 210 |
Index: blender-2.48a.ebuild |
| 211 |
=================================================================== |
| 212 |
# Copyright 1999-2008 Gentoo Foundation |
| 213 |
# Distributed under the terms of the GNU General Public License v2 |
| 214 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a.ebuild,v 1.1 2008/10/25 11:36:56 maekke Exp $ |
| 215 |
|
| 216 |
inherit multilib flag-o-matic eutils python |
| 217 |
|
| 218 |
#IUSE="jpeg mozilla png sdl static truetype" |
| 219 |
IUSE="blender-game ffmpeg jpeg nls openal openexr openmp |
| 220 |
player png quicktime verse" |
| 221 |
DESCRIPTION="3D Creation/Animation/Publishing System" |
| 222 |
HOMEPAGE="http://www.blender.org/" |
| 223 |
SRC_URI="http://download.blender.org/source/${P}.tar.gz" |
| 224 |
|
| 225 |
SLOT="0" |
| 226 |
LICENSE="|| ( GPL-2 BL )" |
| 227 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" |
| 228 |
|
| 229 |
RDEPEND=">=dev-libs/openssl-0.9.6 |
| 230 |
ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r1 |
| 231 |
media-libs/x264 ) |
| 232 |
jpeg? ( media-libs/jpeg ) |
| 233 |
media-libs/tiff |
| 234 |
>=dev-lang/python-2.4 |
| 235 |
nls? ( >=media-libs/freetype-2.0 |
| 236 |
virtual/libintl |
| 237 |
>=media-libs/ftgl-2.1 ) |
| 238 |
openal? ( media-libs/openal |
| 239 |
media-libs/freealut ) |
| 240 |
openexr? ( media-libs/openexr ) |
| 241 |
png? ( media-libs/libpng ) |
| 242 |
quicktime? ( media-libs/libquicktime ) |
| 243 |
>=media-libs/libsdl-1.2 |
| 244 |
virtual/opengl" |
| 245 |
|
| 246 |
DEPEND=">=dev-util/scons-0.98 |
| 247 |
x11-libs/libXt |
| 248 |
x11-proto/inputproto |
| 249 |
${RDEPEND}" |
| 250 |
|
| 251 |
blend_with() { |
| 252 |
local UWORD="$2" |
| 253 |
if [ -z "${UWORD}" ]; then |
| 254 |
UWORD="$1" |
| 255 |
fi |
| 256 |
if useq $1; then |
| 257 |
echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \ |
| 258 |
>> "${S}"/user-config.py |
| 259 |
else |
| 260 |
echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \ |
| 261 |
>> "${S}"/user-config.py |
| 262 |
fi |
| 263 |
} |
| 264 |
|
| 265 |
src_unpack() { |
| 266 |
unpack ${A} |
| 267 |
|
| 268 |
cd "${S}" |
| 269 |
epatch "${FILESDIR}"/${PN}-2.37-dirs.patch |
| 270 |
epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch |
| 271 |
epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch |
| 272 |
|
| 273 |
if use ffmpeg ; then |
| 274 |
# cd "${S}"/extern |
| 275 |
# rm -rf ffmpeg libmp3lame x264 |
| 276 |
cat <<- EOF >> "${S}"/user-config.py |
| 277 |
BF_FFMPEG="/usr" |
| 278 |
BF_FFMPEG_LIB="avformat avcodec swscale avutil" |
| 279 |
EOF |
| 280 |
fi |
| 281 |
# pass compiler flags to the scons build system |
| 282 |
# and set python version to current version in use |
| 283 |
python_version |
| 284 |
cat <<- EOF >> "${S}"/user-config.py |
| 285 |
CFLAGS += '${CFLAGS}' |
| 286 |
BF_PYTHON_VERSION="${PYVER}" |
| 287 |
BF_PYTHON_INC="/usr/include/python${PYVER}" |
| 288 |
BF_PYTHON_BINARY="/usr/bin/python${PYVER}" |
| 289 |
BF_PYTHON_LIB="python${PYVER}" |
| 290 |
EOF |
| 291 |
|
| 292 |
if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then |
| 293 |
echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py |
| 294 |
elog "enabling openmp" |
| 295 |
else |
| 296 |
echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py |
| 297 |
elog "disabling openmp" |
| 298 |
fi |
| 299 |
} |
| 300 |
|
| 301 |
src_compile() { |
| 302 |
for arg in \ |
| 303 |
'blender-game gameengine' \ |
| 304 |
'ffmpeg' \ |
| 305 |
'jpeg' \ |
| 306 |
'nls international' \ |
| 307 |
'openal' \ |
| 308 |
'openexr' \ |
| 309 |
'player' \ |
| 310 |
'png' \ |
| 311 |
'verse' ; do |
| 312 |
blend_with ${arg} |
| 313 |
done |
| 314 |
|
| 315 |
# scons uses -l differently -> remove it |
| 316 |
scons ${MAKEOPTS/-l[0-9]} || die \ |
| 317 |
"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" |
| 318 |
|
| 319 |
cd "${WORKDIR}"/install/linux2/plugins |
| 320 |
chmod 755 bmake |
| 321 |
emake || die |
| 322 |
} |
| 323 |
|
| 324 |
src_install() { |
| 325 |
exeinto /usr/bin/ |
| 326 |
doexe "${WORKDIR}"/install/linux2/blender |
| 327 |
use player && doexe "${WORKDIR}"/install/linux2/blenderplayer |
| 328 |
|
| 329 |
dodir /usr/share/${PN} |
| 330 |
|
| 331 |
exeinto /usr/$(get_libdir)/${PN}/textures |
| 332 |
doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so |
| 333 |
exeinto /usr/$(get_libdir)/${PN}/sequences |
| 334 |
doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so |
| 335 |
insinto /usr/include/${PN} |
| 336 |
doins "${WORKDIR}"/install/linux2/plugins/include/*.h |
| 337 |
|
| 338 |
if use nls ; then |
| 339 |
mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \ |
| 340 |
"${D}"/usr/share/${PN} |
| 341 |
mv "${WORKDIR}"/install/linux2/.blender/locale \ |
| 342 |
"${D}"/usr/share/locale |
| 343 |
fi |
| 344 |
|
| 345 |
mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN} |
| 346 |
|
| 347 |
insinto /usr/share/pixmaps |
| 348 |
doins "${FILESDIR}"/${PN}.png |
| 349 |
insinto /usr/share/applications |
| 350 |
doins "${FILESDIR}"/${PN}.desktop |
| 351 |
|
| 352 |
dodoc INSTALL README |
| 353 |
dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf |
| 354 |
} |
| 355 |
|
| 356 |
pkg_preinst(){ |
| 357 |
if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ]; |
| 358 |
then |
| 359 |
rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include |
| 360 |
fi |
| 361 |
} |
Archives