blender-2.59.diff

blender-2.59.diff (text/plain), 10.10 KB, created by (RETIRED) on 2011-09-07 00:50:45 UTC

--- /usr/portage/media-gfx/blender/blender-2.57-r1.ebuild	2011-07-08 07:31:16.000000000 -0300
+++ /home/andre/Shared/blender/blender-2.59.ebuild	2011-09-06 21:28:57.763361241 -0300
@@ -1,44 +1,24 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.3 2011/07/08 10:22:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.59.ebuild,v 1.3 2011/08/13 19:45:13 Oicraman Exp $
 
 PYTHON_DEPEND="3:3.2"
-
 EAPI=3
 
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit eutils python versionator flag-o-matic toolchain-funcs ${SCM}
+inherit eutils python versionator flag-o-matic toolchain-funcs
 
 IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
 	+dds debug fftw jack apidoc sndfile lcms tweak-mode sdl sse \
-	redcode +zlib iconv contrib collada verse"
-
-# not complete/working features
-#IUSE="verse collada test"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
+	redcode +zlib iconv contrib"
+#	redcode +zlib iconv contrib collada test"
 
 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
+SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
-#SLOT="$(get_version_component_range 1-2)"
 SLOT="2.5"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~amd64-fbsd ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 RDEPEND="virtual/jpeg
 	media-libs/libpng
@@ -57,8 +37,8 @@
 	sdl? ( media-libs/libsdl[audio,joystick] )
 	openexr? ( media-libs/openexr )
 	ffmpeg? (
-		virtual/ffmpeg[x264,mp3,encode,theora]
-		jpeg2k? ( virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k] )
+		>=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 )
@@ -74,17 +54,10 @@
 	x11-base/xorg-server
 	${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
+	if useq $1; then
 		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
 			>> "${S}"/user-config.py
 	else
@@ -93,18 +66,6 @@
 	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
@@ -120,14 +81,11 @@
 }
 
 src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-${SLOT}-CVE-2008-1103.patch
-	#epatch "${FILESDIR}"/${PN}-${SLOT}-CVE-2008-4863.patch
-	#epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch
-	epatch "${FILESDIR}"/${P}-bmake.patch
-	epatch "${FILESDIR}"/${P}-doxygen.patch
-	epatch "${FILESDIR}"/${P}-libav-0.7.patch
-	epatch "${FILESDIR}"/${P}-CVE-2009-3850-v2.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${PN}-desktop.patch
+	epatch "${FILESDIR}"/${PN}-${SLOT}-doxyfile.patch
+
+	# TODO: write a proper Makefile to replace the borked bmake script
+	epatch "${FILESDIR}"/${PN}-${SLOT}-bmake.patch
 
 	# OpenJPEG
 	einfo "Removing bundled OpenJPEG ..."
@@ -136,22 +94,12 @@
 	# Glew
 	einfo "Removing bundled Glew ..."
 	rm -r extern/glew
-	epatch "${FILESDIR}"/${P}-glew.patch
-
-	# binreloc
-#	einfo "Removing bundled binreloc ..."
-#	rm -r extern/binreloc
-#	epatch "${FILESDIR}"/${PN}-${SLOT}-binreloc.patch
+	epatch "${FILESDIR}"/${PN}-${SLOT}-glew.patch
 
 	# Eigen2
 	einfo "Removing bundled Eigen2 ..."
 	rm -r extern/Eigen2
-	epatch "${FILESDIR}"/${P}-eigen.patch
-
-	# Bullet
-#	einfo "Removing bundled Bullet2 ..."
-#	rm -r extern/bullet2
-#	epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
+	epatch "${FILESDIR}"/${PN}-${SLOT}-eigen.patch
 }
 
 src_configure() {
@@ -187,10 +135,6 @@
 		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
-
 	# configure Elbeem fluid system
 	use elbeem || echo "BF_NO_ELBEEM=1" >> "${S}"/user-config.py
 
@@ -278,8 +222,7 @@
 		'collada' \
 		'sse rayoptimization' \
 		'redcode' \
-		'zlib' \
-		'verse' ; do
+		'zlib' ; do
 		blend_with ${arg}
 	done
 
@@ -294,8 +237,8 @@
 		to bugs.gentoo.org'
 
 	einfo "Building plugins ..."
-	cd "${WORKDIR}"/install/${PV}/plugins/ \
-		|| die "dir ${WORKDIR}/install/plugins/ do not exist"
+	cd "${WORKDIR}"/${P}/release/plugins \
+		|| die "dir ${WORKDIR}/${P}/release/plugins do not exist"
 	chmod 755 bmake
 
 	# FIX: plugins are built without respecting user's LDFLAGS
@@ -304,10 +247,6 @@
 		LDFLAGS="$(raw-ldflags) -Bshareable" \
 		> /dev/null \
 		|| die "plugins compilation failed"
-
-	# final cleanup
-	rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
 }
 
 src_install() {
@@ -325,45 +264,41 @@
 		fi
 
 		export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${SLOT}/scripts"
-		export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${SLOT}/datafiles"
+        export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${SLOT}/datafiles" 
 			exec /usr/bin/blender-bin-${SLOT} \$*
 	EOF
 
 	# install binaries
 	exeinto /usr/bin/
-	cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${SLOT}"
+	mv "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${SLOT}"
 	doexe "${WORKDIR}/install/blender-bin-${SLOT}"
 	doexe "${WORKDIR}/install/blender-${SLOT}"
 	if use player; then
-		cp "${WORKDIR}/install/blenderplayer" \
+		mv "${WORKDIR}/install/blenderplayer" \
 			"${WORKDIR}/install/blenderplayer-${SLOT}"
 		doexe "${WORKDIR}/install/blenderplayer-${SLOT}"
 	fi
-	if use verse; then
-		cp "${WORKDIR}"/install/bin/verse_server \
-			"${WORKDIR}/install/bin/verse_server-${SLOT}"
-		doexe "${WORKDIR}"/install/bin/verse_server-${SLOT}
-	fi
 
 	# install plugins
-	exeinto /usr/share/${PN}/${SLOT}/textures
-	doexe "${WORKDIR}"/install/${PV}/plugins/texture/*.so
-	exeinto /usr/share/${PN}/${SLOT}/sequences
-	doexe "${WORKDIR}"/install/${PV}/plugins/sequence/*.so
-	insinto /usr/include/${PN}/${SLOT}
-	doins "${WORKDIR}"/install/${PV}/plugins/include/*.h
-#	rm -r "${WORKDIR}"/install/${PV}/plugins || die
+#	exeinto /usr/share/${PN}/${SLOT}/textures
+#	doexe "${WORKDIR}"/${P}/release/plugins/texture/*.so
+#	exeinto /usr/share/${PN}/${SLOT}/sequences
+#	doexe "${WORKDIR}"/${P}/release/plugins/sequence/*.so
+#	insinto /usr/include/${PN}/${SLOT}
+#	doins "${WORKDIR}"/${P}/release/plugins/include/*.h
+#	rm -r "${WORKDIR}"/${P}/release/plugins || die
+
+
 
 	# install desktop file
 	insinto /usr/share/pixmaps
-	cp release/freedesktop/icons/scalable/blender.svg \
-		release/freedesktop/icons/scalable/blender-${SLOT}.svg
-	doins release/freedesktop/icons/scalable/blender-${SLOT}.svg
+	cp release/freedesktop/icons/scalable/apps/blender.svg \
+		release/freedesktop/icons/scalable/apps/blender-${SLOT}.svg
+	doins release/freedesktop/icons/scalable/apps/blender-${SLOT}.svg
 	insinto /usr/share/applications
 	cp release/freedesktop/blender.desktop \
 		release/freedesktop/blender-${SLOT}.desktop
-	doins release/freedesktop/blender-${SLOT}.desktop || die
-	newins "${FILESDIR}"/${P}-insecure.desktop ${PN}-${SLOT}-insecure.desktop || die
+	doins release/freedesktop/blender-${SLOT}.desktop
 
 	# install docs
 #	use doc && dodoc release/text/BlenderQuickStart.pdf
@@ -371,8 +306,7 @@
 
 		einfo "Generating (BGE) Blender Game Engine API docs ..."
 		docinto "API/BGE_API"
-		dohtml -r "${WORKDIR}"/blender/doc/*
-#		rm -r "${WORKDIR}"/blender/doc
+		dohtml -r "${WORKDIR}"/${P}/doc/*
 
 #		einfo "Generating (BPY) Blender Python API docs ..."
 #		epydoc source/blender/python/doc/*.py -v \
@@ -387,24 +321,28 @@
 #		dohtml -r doc/BPY_API/*
 
 		einfo "Generating Blender C/C++ API docs ..."
-		pushd "${WORKDIR}"/blender/doc/doxygen > /dev/null
+		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
+
+#		rm -r "${WORKDIR}"/${P}/doc
 	fi
 
+	# final cleanup
+	rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
+
 	# installing blender
 	insinto /usr/share/${PN}/${SLOT}
-	doins -r "${WORKDIR}"/install/${PV}/*
-#        doins -r "${WORKDIR}"/install/${SLOT}/*
+	doins -r "${WORKDIR}"/install/2.59/* || die
 
 	# 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 750 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
+	chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
+	chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
 }
 
 pkg_preinst() {
@@ -419,15 +357,6 @@
 	elog "Blender uses python integration. As such, may have some"
 	elog "inherit risks with running unknown python scripting."
 	elog
-#	elog "CVE-2008-1103-1.patch has been removed as it interferes"
-#	elog "with autosave undo features. Up stream blender coders"
-#	elog "have not addressed the CVE issue as the status is still"
-#	elog "a CANDIDATE and not CONFIRMED."
-#	elog
-#	elog "CVE-2008-4863.patch has been remove as it interferes"
-#	elog "with the load of bpy_ops.py and all the UI python"
-#	elog "scripts."
-#	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"