Updated ffmpeg in blender

(Portage version: 2.1.2_rc1-r5)

4 files changed, 149 insertions, 3 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 250160538bbd..371f37ac253e 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.97 2006/10/23 20:10:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.98 2006/11/11 13:44:48 lu_zero Exp $
+
+*blender-2.42a-r1 (11 Nov 2006)
+
+  11 Nov 2006; Luca Barbato <lu_zero@gentoo.org> blender-2.42a.ebuild,
+  +blender-2.42a-r1.ebuild:
+  Updated internal ffmpeg due x264 update, the next release won't need such hacks
 
   23 Oct 2006; Luca Barbato <lu_zero@gentoo.org> blender-2.42a.ebuild:
   Always install scripts, fixes bug #150279
diff --git a/media-gfx/blender/blender-2.42a-r1.ebuild b/media-gfx/blender/blender-2.42a-r1.ebuild
new file mode 100644
index 000000000000..3a76a09d4062
--- /dev/null
+++ b/media-gfx/blender/blender-2.42a-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42a-r1.ebuild,v 1.1 2006/11/11 13:44:48 lu_zero Exp $
+
+inherit multilib flag-o-matic eutils python
+
+#IUSE="sdl jpeg png mozilla truetype static fmod"
+IUSE="openal sdl openexr jpeg png nls iconv blender-game ffmpeg"
+FFMPEG_SNAP="0.4.9-p20061016"
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org/"
+SRC_URI="http://download.blender.org/source/${P}.tar.gz
+		 mirror://gentoo/ffmpeg-${FFMPEG_SNAP}.tar.bz2"
+
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+
+RDEPEND="
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	media-libs/tiff
+	nls? ( >=media-libs/freetype-2.0
+			virtual/libintl )
+	iconv? ( virtual/libiconv )
+	openal? ( ~media-libs/openal-0.0.8
+			   media-libs/freealut )
+	sdl? ( >=media-libs/libsdl-1.2 )
+	ffmpeg? ( ~media-video/ffmpeg-${FFMPEG_SNAP/-/_}
+			  ~media-libs/x264-svn-20061014 )
+	>=dev-libs/openssl-0.9.6
+	>=media-gfx/yafray-0.0.7
+	nls? ( >=media-libs/ftgl-2.1 )
+	openexr? ( media-libs/openexr )
+	virtual/opengl"
+
+DEPEND="dev-util/scons
+	|| ( x11-libs/libXt virtual/x11 )
+	${RDEPEND}"
+
+blend_with() {
+local UWORD="$2"
+	if [ -z "${UWORD}" ]; then
+		UWORD="$1"
+	fi
+
+	if useq $1; then
+		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]'
+	else
+		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]'
+	fi
+
+return 0
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mkdir -p ${WORKDIR}/install/linux2/plugins/
+#	chmod 755 bmake
+#	rm -fR include
+	cd ${WORKDIR}/install/linux2/plugins/
+	cp -pPR ${S}/source/blender/blenpluginapi include
+	cd ${S}
+	epatch ${FILESDIR}/blender-2.37-dirs.patch
+#	mkdir -p ${WORKDIR}/build/linux2/{extern,intern,source}
+
+	#ffmpeg update!
+	cd ${S}/extern
+	cp ffmpeg/Makefile ffmpeg/common.mak ${T}
+	unpack ffmpeg-${FFMPEG_SNAP}.tar.bz2
+	cp ${T}/Makefile ${T}/common.mak ffmpeg
+}
+
+
+src_compile() {
+	local myconf=""
+
+	myconf="${myconf} $(blend_with openal)"
+	myconf="${myconf} $(blend_with sdl)"
+	myconf="${myconf} $(blend_with openexr)"
+	myconf="${myconf} $(blend_with jpeg)"
+	myconf="${myconf} $(blend_with ffmpeg)"
+	myconf="${myconf} $(blend_with png)"
+	myconf="${myconf} $(blend_with nls international)"
+	myconf="${myconf} $(blend_with iconv)"
+	myconf="${myconf} $(blend_with blender-game gameengine)"
+
+	scons ${MAKEOPTS} ${myconf} \
+			WITH_BF_PLAYER=0 || die
+
+#	sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
+#	scons ${MAKEOPTS} || die
+	cd ${WORKDIR}/install/linux2/plugins/
+	chmod 755 bmake
+	emake || die
+
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe ${WORKDIR}/install/linux2/blender
+
+	dodir /usr/share/${PN}
+
+	exeinto /usr/$(get_libdir)/${PN}/textures
+	doexe ${WORKDIR}/install/linux2/plugins/texture/*.so
+	exeinto /usr/$(get_libdir)/${PN}/sequences
+	doexe ${WORKDIR}/install/linux2/plugins/sequence/*.so
+	insinto /usr/include/blender/
+	doins ${WORKDIR}/install/linux2/plugins/include/*.h
+	use nls && \
+	cp -pPR ${WORKDIR}/install/linux2/.blender/{.Blanguages,.bfont.ttf,locale}\
+		${D}/usr/share/${PN}
+	cp -pPR ${WORKDIR}/install/linux2/.blender/scripts ${D}/usr/share/${PN}
+
+	mv ${D}/usr/share/${PN}/locale ${D}/usr/share
+
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/${PN}.png
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${PN}.desktop
+
+	dodoc COPYING INSTALL README
+
+}
+
+pkg_preinst(){
+	if [ -h "/usr/$(get_libdir)/blender/plugins/include" ];
+	then
+		rm -f /usr/$(get_libdir)/blender/plugins/include
+	fi
+}
diff --git a/media-gfx/blender/blender-2.42a.ebuild b/media-gfx/blender/blender-2.42a.ebuild
index 0fd2b941306e..ea9051b80f58 100644
--- a/media-gfx/blender/blender-2.42a.ebuild
+++ b/media-gfx/blender/blender-2.42a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42a.ebuild,v 1.5 2006/10/23 20:10:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42a.ebuild,v 1.6 2006/11/11 13:44:48 lu_zero Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -35,7 +35,7 @@ RDEPEND="
 	openexr? ( media-libs/openexr )
 	virtual/opengl"
 
-DEPEND="=dev-util/scons-0.96.1
+DEPEND="dev-util/scons
 	|| ( x11-libs/libXt virtual/x11 )
 	${RDEPEND}"
 
diff --git a/media-gfx/blender/files/digest-blender-2.42a-r1 b/media-gfx/blender/files/digest-blender-2.42a-r1
new file mode 100644
index 000000000000..b56e4d3b0549
--- /dev/null
+++ b/media-gfx/blender/files/digest-blender-2.42a-r1
@@ -0,0 +1,6 @@
+MD5 3d60b7ebe0dea47da12744fe2462d96c blender-2.42a.tar.gz 12295244
+RMD160 3178191ec9565c92f0b381fef2ad69c88873aadb blender-2.42a.tar.gz 12295244
+SHA256 f046a66abe2e9a93a17ef1538f43642d2b6a6e48b55b804899fea59279dacd52 blender-2.42a.tar.gz 12295244
+MD5 22c3020ade666258044cfe5b69cbf135 ffmpeg-0.4.9-p20061016.tar.bz2 2009859
+RMD160 b41eeb50ef91e5f7a44f725d29d3b9f8104dd62c ffmpeg-0.4.9-p20061016.tar.bz2 2009859
+SHA256 99d18860b5db8f3218481c3c977ad63dcff285f193740f31ae5c8e3cac79d531 ffmpeg-0.4.9-p20061016.tar.bz2 2009859