Updated ffmpeg in blender

Package-Manager: portage-2.1.2_rc1-r5

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 250160538bbd08a3731b1ff1a7be689e15a759c3..371f37ac253ed20af963ac413d80a2a4feef8219 100644 (file)
--- 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/Manifest b/media-gfx/blender/Manifest
index 6546e45855918342b1645ccbddcf9dae01c8d69a..164c025ebf90c08f9626acb67fe81d8a22d63494 100644 (file)
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -13,6 +13,7 @@ SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad files/bl
 DIST blender-2.41.tar.gz 9464385 RMD160 7857eac2acda18ee24db4bb147bcf780025e2c12 SHA1 839dfece3b6efbf10694ac535d88e3745c3253ec SHA256 743a78648773619d3153a16c0a5b67f960b2fec026bcb75d0175e52e8e8aadd1
 DIST blender-2.42.tar.gz 12195054 RMD160 c3a1aa1080d122867f116dd05564c77d41d55194 SHA1 a8fa45b0f032d992b20762bada931da18b716368 SHA256 c0f5f0c3d9cfbf661bba153ebbcafed21bc34524c02096050626194c9345af93
 DIST blender-2.42a.tar.gz 12295244 RMD160 3178191ec9565c92f0b381fef2ad69c88873aadb SHA1 242dd751a0cc851c7436eafa73475a11be1aa453 SHA256 f046a66abe2e9a93a17ef1538f43642d2b6a6e48b55b804899fea59279dacd52
+DIST ffmpeg-0.4.9-p20061016.tar.bz2 2009859 RMD160 b41eeb50ef91e5f7a44f725d29d3b9f8104dd62c SHA1 2e15183755378b4089264be3f8865e24eeaa39dc SHA256 99d18860b5db8f3218481c3c977ad63dcff285f193740f31ae5c8e3cac79d531
 EBUILD blender-2.41-r1.ebuild 3536 RMD160 921b571849043792638347c9bd18657bc9483ab7 SHA1 2ba90514d3d8bca6160491b72bec6c0cdf99c328 SHA256 88cbc465b8b3d79ef2593cc3f9dd2484db5fe828ff10903af97937d4da21e795
 MD5 507c059cdc01fc06b11af89c247c746c blender-2.41-r1.ebuild 3536
 RMD160 921b571849043792638347c9bd18657bc9483ab7 blender-2.41-r1.ebuild 3536
@@ -25,14 +26,18 @@ EBUILD blender-2.42.ebuild 3136 RMD160 b09bbc17178b398de37e581692560f0a5be24a24
 MD5 3c5901f27d691378995c755be03ab363 blender-2.42.ebuild 3136
 RMD160 b09bbc17178b398de37e581692560f0a5be24a24 blender-2.42.ebuild 3136
 SHA256 e0a34a60add4314dbe93e4b4822de5341a38bfd0f972f3f2b58500c0acff16e7 blender-2.42.ebuild 3136
-EBUILD blender-2.42a.ebuild 3275 RMD160 8d422d0bd8e695378e85d23a8940d725bb98c8c1 SHA1 048d6135088cb1cd3cfea29ef4395f48e7796b0d SHA256 81611161cf9f940c43e95b9c9abe5b7e0eab2f2dac47aeec48048df6ece14e54
-MD5 5540927869e1bd3931b35a6e95ac5e1c blender-2.42a.ebuild 3275
-RMD160 8d422d0bd8e695378e85d23a8940d725bb98c8c1 blender-2.42a.ebuild 3275
-SHA256 81611161cf9f940c43e95b9c9abe5b7e0eab2f2dac47aeec48048df6ece14e54 blender-2.42a.ebuild 3275
-MISC ChangeLog 13688 RMD160 e9c03d1c89ec96cbfd8642bda70825b4b94f7d52 SHA1 d751c9dac7f7c88a13a472443efcd8a19181638e SHA256 f1c891a30d3437d50accb53bb411f840004d2489d2fd2dfe8a1f249892079ee4
-MD5 82087ec1d3be4779c42da4560c54c170 ChangeLog 13688
-RMD160 e9c03d1c89ec96cbfd8642bda70825b4b94f7d52 ChangeLog 13688
-SHA256 f1c891a30d3437d50accb53bb411f840004d2489d2fd2dfe8a1f249892079ee4 ChangeLog 13688
+EBUILD blender-2.42a-r1.ebuild 3504 RMD160 ecf5b28e78a0bb35b0179f940cfcc4f221d3f5e6 SHA1 6f75f32408d69170f12d14911c07f6f3a4231e5e SHA256 caa7d169d9ae2b72bf1b4a1155d9749dd9fb3e494513f3a7f20dcc52365e9d4f
+MD5 dd53048b43e442d80ce586b2dd611c61 blender-2.42a-r1.ebuild 3504
+RMD160 ecf5b28e78a0bb35b0179f940cfcc4f221d3f5e6 blender-2.42a-r1.ebuild 3504
+SHA256 caa7d169d9ae2b72bf1b4a1155d9749dd9fb3e494513f3a7f20dcc52365e9d4f blender-2.42a-r1.ebuild 3504
+EBUILD blender-2.42a.ebuild 3267 RMD160 161cccc5a31b00fa384320dc7aa4248864c34718 SHA1 e4ed5e31956cdb7c78e02c6f1f0ef078ddd369bd SHA256 62705f1fe89c6dc1597d48cdf8ec52e315d57d753f546afd4d924f95cbc58c14
+MD5 5255d35221df3cf7ba2e0783e546c006 blender-2.42a.ebuild 3267
+RMD160 161cccc5a31b00fa384320dc7aa4248864c34718 blender-2.42a.ebuild 3267
+SHA256 62705f1fe89c6dc1597d48cdf8ec52e315d57d753f546afd4d924f95cbc58c14 blender-2.42a.ebuild 3267
+MISC ChangeLog 13903 RMD160 98462b82fcbd3e37710eba28e62c8fb4cd4a9860 SHA1 5f35aeadc33262cf26b743282f66186710690d5c SHA256 cc5856ee078da6f4412e1942d7dc43eb83b1309314d0fcde1bf9215657adb597
+MD5 53ae6b762380bf6f5265f487316182ff ChangeLog 13903
+RMD160 98462b82fcbd3e37710eba28e62c8fb4cd4a9860 ChangeLog 13903
+SHA256 cc5856ee078da6f4412e1942d7dc43eb83b1309314d0fcde1bf9215657adb597 ChangeLog 13903
 MISC metadata.xml 587 RMD160 925b5c3bcf2d4f21fc82f760aad723541088bca4 SHA1 9060e32f277a506f2bbdfb7b0a9ed89ae13612b7 SHA256 4a2974916837cada500d7a764a285fa29a0471b242dff4717d60c4a7113dd45e
 MD5 493f38fb63d60a1ce275fdd2ea43d6e9 metadata.xml 587
 RMD160 925b5c3bcf2d4f21fc82f760aad723541088bca4 metadata.xml 587
@@ -49,3 +54,6 @@ SHA256 81385a4f674d43c047eeadd3b65956475dffab2e10c1f820db2076c32a712374 files/di
 MD5 f54a3a7abac166235de1a9d8a0c4674d files/digest-blender-2.42a 247
 RMD160 23d052a2086d9f6f17a9c1224b6c68782da66cc2 files/digest-blender-2.42a 247
 SHA256 cac4e18c76afbd32b8de6a3d17e23f5d834f87cf8ab122e7a93c90b71ea4406b files/digest-blender-2.42a 247
+MD5 ca68c22db3c4fd246ce043b3de0112ee files/digest-blender-2.42a-r1 521
+RMD160 b6cfe1ec330ec0e62551df0afa84435ac4b70abf files/digest-blender-2.42a-r1 521
+SHA256 46499abfc93e30703937df62bbef32ae82b32b403e97858e875c00e1c2a06961 files/digest-blender-2.42a-r1 521

diff --git a/media-gfx/blender/blender-2.42a-r1.ebuild b/media-gfx/blender/blender-2.42a-r1.ebuild
new file mode 100644 (file)
index 0000000..3a76a09
--- /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 0fd2b941306eb65476ae7dd7dad104a6e47fd884..ea9051b80f583722d5cc279f594ca5fc3f199a8e 100644 (file)
--- 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 (file)
index 0000000..b56e4d3
--- /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