* [gentoo-commits] gentoo-x86 commit in media-gfx/blender: ChangeLog metadata.xml blender-2.63a.ebuild
@ 2012-07-13 23:56 Luca Barbato (lu_zero)
0 siblings, 0 replies; only message in thread
From: Luca Barbato (lu_zero) @ 2012-07-13 23:56 UTC (permalink / raw
To: gentoo-commits
lu_zero 12/07/13 23:56:11
Modified: ChangeLog metadata.xml
Added: blender-2.63a.ebuild
Log:
New version, thanks to Simone Scanzoni <nonno.cicala@libero.it> for the updated ebuild
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Revision Changes Path
1.227 media-gfx/blender/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.226&r2=1.227
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ChangeLog 27 Jun 2012 21:25:30 -0000 1.226
+++ ChangeLog 13 Jul 2012 23:56:11 -0000 1.227
@@ -1,6 +1,19 @@
# ChangeLog for media-gfx/blender
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.226 2012/06/27 21:25:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.227 2012/07/13 23:56:11 lu_zero Exp $
+
+*blender-2.63a (13 Jul 2012)
+
+ 13 Jul 2012; Luca Barbato <lu_zero@gentoo.org>
+ +files/blender-2.63-CVE-2009-3850-v5.patch,
+ +files/blender-2.63-doxyfile.patch,
+ +files/blender-2.63-enable_site_module.patch, +files/blender-2.63-glew.patch,
+ +files/blender-2.63-opencollada-debug.patch, +blender-2.63a.ebuild,
+ +files/blender-2.63a-bullet.patch, +files/blender-2.63a-colamd.patch,
+ +files/blender-2.63a-desktop.patch, +files/blender-2.63a-eigen.patch,
+ +files/blender-2.63a-insecure.desktop, +files/blender-2.63a-libav-0.8.patch:
+ New version, thanks to Simone Scanzoni <nonno.cicala@libero.it> for the
+ updated ebuild
27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.48a-r3.ebuild,
-files/blender.png:
@@ -842,7 +855,7 @@
adding categorie. see 45110 for details
07 Mar 2004; Jon Portnoy <avenj@gentoo.org> :
- Removed AMD64 keywords from all versions prior to 2.32.
+ Removed AMD64 keywords from all versions prior to 2.32.
Added !amd64() contruct for dev-games/ode.
18 Feb 2004; <augustus@gentoo.org> blender-2.32.ebuild:
@@ -879,10 +892,10 @@
*blender-2.30 (07 Nov 2003)
- 07 Nov 2003; Philip Walls <malverian@gentoo.org> blender-2.30.ebuild
+ 07 Nov 2003; Philip Walls <malverian@gentoo.org> blender-2.30.ebuild
files/configure-fix-2.30.patch metadata.xml:
- Version bump, changed to "use foo && ..." instead of ifs. Thanks to
- Dan Bryant <dan@omega.blackdaemon.net> in bug #32585 for configure
+ Version bump, changed to "use foo && ..." instead of ifs. Thanks to
+ Dan Bryant <dan@omega.blackdaemon.net> in bug #32585 for configure
patch. Cleaned up ChangeLog.
*blender-2.28c (11 Oct 2003)
@@ -890,7 +903,7 @@
30 Oct 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild:
Moved to stable
- 11 Oct 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild,
+ 11 Oct 2003; Luca Barbato <lu_zero@gentoo.org> blender-2.28c.ebuild,
blender-2.27.ebuild :
Minor fixes, blender-2.27 bumped to stable for ppc and x86
@@ -939,9 +952,9 @@
for me on PPC and x86. Testers wanted.
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
+
*blender-2.23-r1 (13 Feb 2003)
-
+
12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
Added missing changelog entry.
1.13 media-gfx/blender/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?r1=1.12&r2=1.13
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml 6 Feb 2012 21:48:17 -0000 1.12
+++ metadata.xml 13 Jul 2012 23:56:11 -0000 1.13
@@ -31,6 +31,9 @@
<flag name='collada'>
Add support for Collada interchange format through <pkg>media-libs/opencollada</pkg>.
</flag>
+ <flag name='cycles'>
+ Build cycles renderer.
+ </flag>
<flag name='verse'>
Adds verse clustering features to Blender.
</flag>
1.1 media-gfx/blender/blender-2.63a.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.63a.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.63a.ebuild?rev=1.1&content-type=text/plain
Index: blender-2.63a.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a.ebuild,v 1.1 2012/07/13 23:56:11 lu_zero Exp $
EAPI=4
PYTHON_DEPEND="3:3.2"
if [[ ${PV} == *9999 ]] ; then
SCM="subversion"
ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
fi
inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
+dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
redcode iconv contrib collada 3dmouse"
LANGS="en ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt ru sr sr@latin sv tr uk zh_CN zh_TW"
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="http://www.blender.org"
if [[ ${PV} == *9999 ]] ; then
SRC_URI=""
elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
SRC_URI="mirror://gentoo/${P}.tar.xz"
else # Official release
SRC_URI="http://download.blender.org/source/${P}.tar.gz"
fi
#SLOT="$(get_version_component_range 1-2)"
SLOT="2.60"
LICENSE="|| ( GPL-2 BL )"
KEYWORDS="~amd64 ~x86"
RDEPEND="virtual/jpeg
media-libs/libpng:0
x11-libs/libXi
x11-libs/libX11
media-libs/tiff:0
media-libs/libsamplerate
virtual/opengl
>=media-libs/freetype-2.0
virtual/libintl
media-libs/glew
>=sci-physics/bullet-2.78[-double-precision]
dev-cpp/eigen:3
sci-libs/colamd
sys-libs/zlib
cycles? (
media-libs/openimageio
dev-libs/boost
)
iconv? ( virtual/libiconv )
sdl? ( media-libs/libsdl[audio,joystick] )
openexr? ( media-libs/openexr )
ffmpeg? (
>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
)
openal? ( >=media-libs/openal-1.6.372 )
fftw? ( sci-libs/fftw:3.0 )
jack? ( media-sound/jack-audio-connection-kit )
sndfile? ( media-libs/libsndfile )
collada? ( media-libs/opencollada )
3dmouse? ( dev-libs/libspnav )"
DEPEND="dev-util/scons
apidoc? (
dev-python/sphinx
app-doc/doxygen[-nodot]
game-engine? ( dev-python/epydoc )
)
${RDEPEND}"
# configure internationalization only if LINGUAS have more
# languages than 'en', otherwise must be disabled
if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
DEPEND="${DEPEND}
sys-devel/gettext"
fi
blend_with() {
local UWORD="$2"
[ -z "${UWORD}" ] && UWORD="$1"
if use $1; then
echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
>> "${S}"/user-config.py
else
echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
>> "${S}"/user-config.py
fi
}
src_unpack() {
if [[ ${PV} == *9999 ]] ; then
subversion_fetch
if use contrib; then
S="${S}"/release/scripts/addons_contrib subversion_fetch \
"https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
fi
else
unpack ${A}
fi
}
pkg_setup() {
enable_openmp=0
if use openmp; then
if tc-has-openmp; then
enable_openmp=1
else
ewarn "You are using gcc built without 'openmp' USE."
ewarn "Switch CXX to an OpenMP capable compiler."
die "Need openmp"
fi
fi
python_set_active_version 3
}
src_prepare() {
epatch "${FILESDIR}"/${P}-desktop.patch
epatch "${FILESDIR}"/${PN}-${SLOT}a-collada.patch
epatch "${FILESDIR}"/${P/a}-doxyfile.patch
# OpenJPEG
einfo "Removing bundled OpenJPEG ..."
rm -r extern/libopenjpeg
epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
# Glew
einfo "Removing bundled Glew ..."
rm -r extern/glew
epatch "${FILESDIR}"/${P/a}-glew.patch
# Eigen3
einfo "Removing bundled Eigen3 ..."
rm -r extern/Eigen3
epatch "${FILESDIR}"/${P}-eigen.patch
# Bullet2
einfo "Removing bundled Bullet2 ..."
rm -r extern/bullet2
epatch "${FILESDIR}"/${P}-bullet.patch
# Colamd
einfo "Removing bundled Colamd ..."
rm -r extern/colamd
epatch "${FILESDIR}"/${P}-colamd.patch
ewarn "$(echo "Remaining bundled dependencies:";
find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
epatch "${FILESDIR}"/${P}-libav-0.8.patch
epatch "${FILESDIR}"/${P/a}-CVE-2009-3850-v5.patch
epatch "${FILESDIR}"/${P/a}-enable_site_module.patch
epatch "${FILESDIR}"/${P/a}-opencollada-debug.patch
}
src_configure() {
# add system openjpeg into Scons build options.
cat <<- EOF >> "${S}"/user-config.py
BF_OPENJPEG="/usr"
BF_OPENJPEG_INC="/usr/include"
BF_OPENJPEG_LIB="openjpeg"
EOF
# add system sci-physic/bullet into Scons build options.
cat <<- EOF >> "${S}"/user-config.py
WITH_BF_BULLET=1
BF_BULLET="/usr/include"
BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
EOF
# add system sci-libs/colamd into Scons build options.
cat <<- EOF >> "${S}"/user-config.py
WITH_BF_COLAMD=1
BF_COLAMD="/usr"
BF_COLAMD_INC="/usr/include"
BF_COLAMD_LIB="colamd"
EOF
#add iconv into Scons build options.
if use !elibc_glibc && use !elibc_uclibc && use iconv; then
cat <<- EOF >> "${S}"/user-config.py
WITH_BF_ICONV=1
BF_ICONV="/usr"
EOF
fi
# configure internationalization only if LINGUAS have more
# languages than 'en', otherwise must be disabled
[[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
# Ocean sim system needs fftw
use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
# configure Tweak Mode
use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
# FIX: Game Engine module needs to be active to build the Blender Player
if ! use game-engine && use player; then
elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
else
blend_with game-engine gameengine
fi
# set CFLAGS used in /etc/make.conf correctly
echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
| sed -e "s:,]: ]:" >> "${S}"/user-config.py
# set CXXFLAGS used in /etc/make.conf correctly
local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
# reset general options passed to the C/C++ compilers (useless hardcoded flags)
# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
# shadows, see bug #276338 for reference
echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
# set LDFLAGS used in /etc/make.conf correctly
local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
# reset REL_* variables (useless hardcoded flags)
cat <<- EOF >> "${S}"/user-config.py
REL_CFLAGS=[]
REL_CXXFLAGS=[]
REL_CCFLAGS=[]
EOF
# reset warning flags (useless for NON blender developers)
cat <<- EOF >> "${S}"/user-config.py
C_WARN =[ '-w', '-g0' ]
CC_WARN =[ '-w', '-g0' ]
CXX_WARN=[ '-w', '-g0' ]
EOF
# detecting -j value from MAKEOPTS
local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
[[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
# generic settings which differ from the defaults from linux2-config.py
cat <<- EOF >> "${S}"/user-config.py
BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
BF_INSTALLDIR="../install"
WITH_PYTHON_SECURITY=1
WITHOUT_BF_PYTHON_INSTALL=1
BF_PYTHON="/usr"
BF_PYTHON_VERSION="3.2"
BF_PYTHON_ABI_FLAGS=""
BF_BUILDINFO=0
BF_QUIET=1
BF_NUMJOBS=${NUMJOBS}
BF_LINE_OVERWRITE=0
WITH_BF_FHS=1
WITH_BF_BINRELOC=0
WITH_BF_STATICOPENGL=0
WITH_BF_OPENMP=${enable_openmp}
EOF
# configure WITH_BF* Scons build options
for arg in \
'elbeem fluid' \
'sdl' \
'apidoc docs' \
'jack' \
'sndfile' \
'openexr' \
'dds' \
'fftw fftw3' \
'jpeg2k openjpeg' \
'openal'\
'ffmpeg' \
'ffmpeg ogg' \
'player' \
'sse rayoptimization' \
'redcode' \
'collada' \
'3dmouse' ; do
blend_with ${arg}
done
# add system media-libs/opencollada into Scons build options.
echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
# enable debugging/testing support
is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
#use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
# enables Cycles render engine
if use cycles; then
cat <<- EOF >> "${S}"/user-config.py
WITH_BF_CYCLES=1
WITH_BF_OIIO=1
BF_OIIO="/usr"
BF_OIIO_INC="/usr/include"
BF_OIIO_LIB="OpenImageIO"
WITH_BF_BOOST=1
BF_BOOST="/usr"
BF_BOOST_INC="/usr/include/boost"
EOF
fi
}
src_compile() {
escons || die \
'!!! Please add "${S}/scons.config" when filing bugs reports \
to bugs.gentoo.org'
}
src_install() {
# creating binary wrapper
cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
#!/bin/sh
# stop this script if the local blender path is a symlink
if [ -L \${HOME}/.blender ]; then
echo "Detected a symbolic link for \${HOME}/.blender"
echo "Sorry, to avoid dangerous situations, the Blender binary can"
echo "not be started until you have removed the symbolic link:"
echo " # rm -i \${HOME}/.blender"
exit 1
fi
export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV/a}/scripts"
export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV/a}/datafiles"
export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV/a}/plugins"
exec /usr/bin/blender-bin-${PV} \$*
EOF
# Pax mark blender for hardened support.
pax-mark m "${WORKDIR}/install/blender"
# install binaries
exeinto /usr/bin/
cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
doexe "${WORKDIR}/install/blender-bin-${PV}"
doexe "${WORKDIR}/install/blender-${PV}"
if use player; then
cp "${WORKDIR}/install/blenderplayer" \
"${WORKDIR}/install/blenderplayer-${PV}"
doexe "${WORKDIR}/install/blenderplayer-${PV}"
fi
# install plugin headers
insinto /usr/include/${PN}/${PV/a}
doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
# install contrib scripts addons
insinto /usr/share/${PN}/${PV/a}/scripts
use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
# install desktop file
insinto /usr/share/pixmaps
cp release/freedesktop/icons/scalable/apps/blender.svg \
release/freedesktop/icons/scalable/apps/blender-${PV}.svg
doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
insinto /usr/share/applications
cp release/freedesktop/blender.desktop \
release/freedesktop/blender-${PV}.desktop
doins release/freedesktop/blender-${PV}.desktop
newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
# install docs
doman "${WORKDIR}"/${P}/doc/manpage/blender.1
use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
if use apidoc; then
einfo "Generating (BGE) Blender Game Engine API docs ..."
epydoc source/gameengine/PyDoc/*.py -v \
-o doc/BGE_API \
--quiet --quiet --quiet \
--simple-term \
--url "http://www.blender.org" \
--top API_intro \
--name "Blender GameEngine" \
--no-private --no-sourcecode \
--inheritance=included \
--graph=all \
--dotpath /usr/bin/dot \
|| die "epydoc failed."
docinto "API/gameengine"
dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
#einfo "Generating (BPY) Blender Python API docs ..."
"${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py --noaudio || die "blender failed."
pushd doc/python_api > /dev/null
sphinx-build sphinx-in BPY_API || die "sphinx failed."
popd > /dev/null
docinto "API/python"
dohtml -r doc/python_api/BPY_API/*
einfo "Generating Blender C/C++ API docs ..."
pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
doxygen -u Doxyfile
doxygen || die "doxygen failed to build API docs."
docinto "API/blender"
dohtml -r html/*
popd > /dev/null
fi
# final cleanup
rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
rm -r "${WORKDIR}/install/${PV/a}/datafiles/locale"
else
for x in "${WORKDIR}"/install/${PV/a}/datafiles/locale/* ; do
mylang=${x##*/}
has ${mylang} ${LINGUAS} || rm -r ${x}
done
fi
# installing blender
insinto /usr/share/${PN}/${PV/a}
doins -r "${WORKDIR}"/install/${PV/a}/*
# FIX: making all python scripts readable only by group 'users',
# so nobody can modify scripts apart root user, but python
# cache (*.pyc) can be written and shared across the users.
# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
}
pkg_postinst() {
echo
elog "Blender uses python integration. As such, may have some"
elog "inherit risks with running unknown python scripting."
elog
elog "It is recommended to change your blender temp directory"
elog "from /tmp to /home/user/tmp or another tmp file under your"
elog "home directory. This can be done by starting blender, then"
elog "dragging the main menu down do display all paths."
elog
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-07-13 23:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-13 23:56 [gentoo-commits] gentoo-x86 commit in media-gfx/blender: ChangeLog metadata.xml blender-2.63a.ebuild Luca Barbato (lu_zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox