summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2006-06-30 10:10:18 +0000
committerLuca Barbato <lu_zero@gentoo.org>2006-06-30 10:10:18 +0000
commitc5030eab615e941120b989aa7e69f3a3ec5e1e00 (patch)
treee7a4eda375dc04e5381c3936498efdae036fb921 /media-gfx/blender
parentCleanup (diff)
downloadgentoo-2-c5030eab615e941120b989aa7e69f3a3ec5e1e00.tar.gz
gentoo-2-c5030eab615e941120b989aa7e69f3a3ec5e1e00.tar.bz2
gentoo-2-c5030eab615e941120b989aa7e69f3a3ec5e1e00.zip
Cleanup
(Portage version: 2.1.1_pre1-r5) (Unsigned Manifest commit)
Diffstat (limited to 'media-gfx/blender')
-rw-r--r--media-gfx/blender/Manifest50
-rw-r--r--media-gfx/blender/blender-2.36-r1.ebuild132
-rw-r--r--media-gfx/blender/files/blender-2.32.patch69
-rw-r--r--media-gfx/blender/files/blender-2.36-dirs.patch62
-rw-r--r--media-gfx/blender/files/blender-2.37a-dirs.patch16
-rw-r--r--media-gfx/blender/files/blender-2.37a-gcc-4.0.patch120
-rw-r--r--media-gfx/blender/files/blender-2.37a-x86_64.patch120
-rw-r--r--media-gfx/blender/files/configure-fix.patch23
-rw-r--r--media-gfx/blender/files/digest-blender-2.36-r11
9 files changed, 9 insertions, 584 deletions
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b9e31ef2c594..7836449ce2c8 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,27 +1,7 @@
-AUX blender-2.32.patch 2562 RMD160 bbd0dbf4395628317fcbed7423a810d5133ffaeb SHA1 b3c97056b7579ac3eff9604c77bc204bae9fe325 SHA256 4c93d5ebcfeebd4f00b5f42f3daac4ea530eb6125c7eb1f26c82e278ded588d1
-MD5 705b95605426ad9d562457fdbbff5460 files/blender-2.32.patch 2562
-RMD160 bbd0dbf4395628317fcbed7423a810d5133ffaeb files/blender-2.32.patch 2562
-SHA256 4c93d5ebcfeebd4f00b5f42f3daac4ea530eb6125c7eb1f26c82e278ded588d1 files/blender-2.32.patch 2562
-AUX blender-2.36-dirs.patch 1970 RMD160 2a70062f1fda86cb302bf3580559db29645d047f SHA1 2f82e538ba86a043b6f872dbf14902b3b1ba31bc SHA256 b761fa799760638e549851980fc024274d429bfd8acdc9ffb5b398989267848e
-MD5 ee3557021be75082093de0d643b32260 files/blender-2.36-dirs.patch 1970
-RMD160 2a70062f1fda86cb302bf3580559db29645d047f files/blender-2.36-dirs.patch 1970
-SHA256 b761fa799760638e549851980fc024274d429bfd8acdc9ffb5b398989267848e files/blender-2.36-dirs.patch 1970
AUX blender-2.37-dirs.patch 725 RMD160 3496386616f3066e1a237921f8ecc695a21b142e SHA1 905181caae8193d212a783e4c4c938e87e136752 SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7
MD5 bcc3b86202d4c6bb85ef9cef08bfcf9e files/blender-2.37-dirs.patch 725
RMD160 3496386616f3066e1a237921f8ecc695a21b142e files/blender-2.37-dirs.patch 725
SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7 files/blender-2.37-dirs.patch 725
-AUX blender-2.37a-dirs.patch 725 RMD160 3496386616f3066e1a237921f8ecc695a21b142e SHA1 905181caae8193d212a783e4c4c938e87e136752 SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7
-MD5 bcc3b86202d4c6bb85ef9cef08bfcf9e files/blender-2.37a-dirs.patch 725
-RMD160 3496386616f3066e1a237921f8ecc695a21b142e files/blender-2.37a-dirs.patch 725
-SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7 files/blender-2.37a-dirs.patch 725
-AUX blender-2.37a-gcc-4.0.patch 5059 RMD160 fa06f151ea95b073270a9c74682d53c2cca51cb5 SHA1 2cdabdb99f1236c0339a50f64f9a4ec5f1d0050a SHA256 85ec94b43982b2e01ab2b2d1d0ae848b37fa6de045228b31595b695b9051e4ba
-MD5 3cab957d0ff2afbbbd4f47b95aec94c8 files/blender-2.37a-gcc-4.0.patch 5059
-RMD160 fa06f151ea95b073270a9c74682d53c2cca51cb5 files/blender-2.37a-gcc-4.0.patch 5059
-SHA256 85ec94b43982b2e01ab2b2d1d0ae848b37fa6de045228b31595b695b9051e4ba files/blender-2.37a-gcc-4.0.patch 5059
-AUX blender-2.37a-x86_64.patch 5059 RMD160 fa06f151ea95b073270a9c74682d53c2cca51cb5 SHA1 2cdabdb99f1236c0339a50f64f9a4ec5f1d0050a SHA256 85ec94b43982b2e01ab2b2d1d0ae848b37fa6de045228b31595b695b9051e4ba
-MD5 3cab957d0ff2afbbbd4f47b95aec94c8 files/blender-2.37a-x86_64.patch 5059
-RMD160 fa06f151ea95b073270a9c74682d53c2cca51cb5 files/blender-2.37a-x86_64.patch 5059
-SHA256 85ec94b43982b2e01ab2b2d1d0ae848b37fa6de045228b31595b695b9051e4ba files/blender-2.37a-x86_64.patch 5059
AUX blender.desktop 197 RMD160 6d5bf65f7cdce71123f193b0912c42e212832af7 SHA1 d0387c8e525a7c24b1a150a36fc6152874d0136e SHA256 dff04dfaa1c1105099717a04af9c6ad028c7cd5a2e21d72f6dc7182ca703cff1
MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
RMD160 6d5bf65f7cdce71123f193b0912c42e212832af7 files/blender.desktop 197
@@ -30,40 +10,28 @@ AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d71
MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
RMD160 e06574002001f41198dc9408ef1bba45493fcc27 files/blender.png 2119
SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad files/blender.png 2119
-AUX configure-fix.patch 754 RMD160 49cc26401148311e87c254c5e23b4c4f035142ad SHA1 389b43eb15482bec9a901211667d8b651bf73d63 SHA256 80f7030c8d6670c434643faa2d3a649cf42d047354bdc908ffb240c59d526bd4
-MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
-RMD160 49cc26401148311e87c254c5e23b4c4f035142ad files/configure-fix.patch 754
-SHA256 80f7030c8d6670c434643faa2d3a649cf42d047354bdc908ffb240c59d526bd4 files/configure-fix.patch 754
-DIST blender-2.36.tar.gz 6912828
DIST blender-2.40.tar.gz 9298365
-DIST blender-2.41.tar.gz 9464385 RMD160 7857eac2acda18ee24db4bb147bcf780025e2c12 SHA256 743a78648773619d3153a16c0a5b67f960b2fec026bcb75d0175e52e8e8aadd1
-EBUILD blender-2.36-r1.ebuild 3314 RMD160 c8ef8f8de4590c04f04c31857606d5e8e0d3ea10 SHA1 9c74defd60ee873593af6562b688fa0d0dc50003 SHA256 3a274410cb40ceaef68fd7bf4f321b20c1cb4da3ebb27cedce5fcdf77e02cf66
-MD5 f36308ba7cbae244f796a734dda27867 blender-2.36-r1.ebuild 3314
-RMD160 c8ef8f8de4590c04f04c31857606d5e8e0d3ea10 blender-2.36-r1.ebuild 3314
-SHA256 3a274410cb40ceaef68fd7bf4f321b20c1cb4da3ebb27cedce5fcdf77e02cf66 blender-2.36-r1.ebuild 3314
+DIST blender-2.41.tar.gz 9464385 RMD160 7857eac2acda18ee24db4bb147bcf780025e2c12 SHA1 839dfece3b6efbf10694ac535d88e3745c3253ec SHA256 743a78648773619d3153a16c0a5b67f960b2fec026bcb75d0175e52e8e8aadd1
EBUILD blender-2.40.ebuild 3476 RMD160 5bc4396d473ff41d37a97cfaca7dfe91b0d5ef79 SHA1 baf3e86b4aaac904577ff4c4d098ede5572b1c72 SHA256 7df4ecb59c15dcce4fa2a0c042853fda8594ee03839cde4a63bddb933598fd44
MD5 b5a58d9d575fd848b622a33952550d3a blender-2.40.ebuild 3476
RMD160 5bc4396d473ff41d37a97cfaca7dfe91b0d5ef79 blender-2.40.ebuild 3476
SHA256 7df4ecb59c15dcce4fa2a0c042853fda8594ee03839cde4a63bddb933598fd44 blender-2.40.ebuild 3476
-EBUILD blender-2.41-r1.ebuild 3581 RMD160 61c515d73df60d5557bf7506c46f61f004c067f8 SHA1 d5e49e5f73747c9afdbdaf7910643ab21ff73345 SHA256 0c0a5949b0f79dcd5af1d0e8f2b949e533e598c84994dc246407f388cdfb9ce2
-MD5 6c7f3e5c51a51701b5d1cd3863992c41 blender-2.41-r1.ebuild 3581
-RMD160 61c515d73df60d5557bf7506c46f61f004c067f8 blender-2.41-r1.ebuild 3581
-SHA256 0c0a5949b0f79dcd5af1d0e8f2b949e533e598c84994dc246407f388cdfb9ce2 blender-2.41-r1.ebuild 3581
+EBUILD blender-2.41-r1.ebuild 3541 RMD160 758aef27912ae88c69c185370ce67aa69ab82b2f SHA1 9c15a0cbc5e7a10754fdcdc0caf215e9d321a83f SHA256 aa5f624cf99c8f6a5c6ddc3418b500544eb19daeddf6df1cf5ea87abc377870a
+MD5 b32aeaa5050a15a06fb63b57649ecddf blender-2.41-r1.ebuild 3541
+RMD160 758aef27912ae88c69c185370ce67aa69ab82b2f blender-2.41-r1.ebuild 3541
+SHA256 aa5f624cf99c8f6a5c6ddc3418b500544eb19daeddf6df1cf5ea87abc377870a blender-2.41-r1.ebuild 3541
EBUILD blender-2.41.ebuild 3496 RMD160 4f625ef74b1ea3efa9c81b881564b43ba766517e SHA1 8e82ca35774fed7bac2a95478b4290d8e262b323 SHA256 ab2428dd971682d2eb2e6dd357f457f47bbbe9fb610e8a6dae68e3d37493aa7f
MD5 20db7db1f5b20cf77ab877dce9d2ffa6 blender-2.41.ebuild 3496
RMD160 4f625ef74b1ea3efa9c81b881564b43ba766517e blender-2.41.ebuild 3496
SHA256 ab2428dd971682d2eb2e6dd357f457f47bbbe9fb610e8a6dae68e3d37493aa7f blender-2.41.ebuild 3496
-MISC ChangeLog 11383 RMD160 c8133cb3f49e0e88aed561283b922c6feeb142b4 SHA1 279e5f3997d7572ce551f306aa3856c7bc3db4cb SHA256 941abbbb7211a8dc14462532f11e8fcce1695c85e45dd71c41dd6ab4371dc1ab
-MD5 2dc62e888da09eec8193891e36b444f7 ChangeLog 11383
-RMD160 c8133cb3f49e0e88aed561283b922c6feeb142b4 ChangeLog 11383
-SHA256 941abbbb7211a8dc14462532f11e8fcce1695c85e45dd71c41dd6ab4371dc1ab ChangeLog 11383
+MISC ChangeLog 11691 RMD160 e4f434626d428d46cbf1d64fb65bec69102982c9 SHA1 6518a7b7d3382b00fb69960be7d628ee35cd4e47 SHA256 cbf5a672c99a0955dac26d14efffab35fc081f1b77d5f2efa9d452e0f563b576
+MD5 90bb5f451b1198013c90e6c96d64b0c5 ChangeLog 11691
+RMD160 e4f434626d428d46cbf1d64fb65bec69102982c9 ChangeLog 11691
+SHA256 cbf5a672c99a0955dac26d14efffab35fc081f1b77d5f2efa9d452e0f563b576 ChangeLog 11691
MISC metadata.xml 587 RMD160 925b5c3bcf2d4f21fc82f760aad723541088bca4 SHA1 9060e32f277a506f2bbdfb7b0a9ed89ae13612b7 SHA256 4a2974916837cada500d7a764a285fa29a0471b242dff4717d60c4a7113dd45e
MD5 493f38fb63d60a1ce275fdd2ea43d6e9 metadata.xml 587
RMD160 925b5c3bcf2d4f21fc82f760aad723541088bca4 metadata.xml 587
SHA256 4a2974916837cada500d7a764a285fa29a0471b242dff4717d60c4a7113dd45e metadata.xml 587
-MD5 f65e9e32429f06fd611b9902f9d7852b files/digest-blender-2.36-r1 65
-RMD160 94175f5320727216088ae1cc9891aa20e0db563e files/digest-blender-2.36-r1 65
-SHA256 b64314a746cfd9123885bc2aa87a1252948782ee493db465904ebad4faf17dd2 files/digest-blender-2.36-r1 65
MD5 8637d60394b1e58d4f4c0fe4b71865fa files/digest-blender-2.40 65
RMD160 e0de57a73fe2ac15bf3129a67ee8de4d0ca0b226 files/digest-blender-2.40 65
SHA256 635cbfc2eb8791811f8e0154f77ca8709fd2d58ee4e27cde0f5404e01dba5f1c files/digest-blender-2.40 65
diff --git a/media-gfx/blender/blender-2.36-r1.ebuild b/media-gfx/blender/blender-2.36-r1.ebuild
deleted file mode 100644
index f7dbdeede362..000000000000
--- a/media-gfx/blender/blender-2.36-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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.36-r1.ebuild,v 1.10 2006/01/07 16:09:31 lu_zero Exp $
-
-inherit flag-o-matic eutils python
-
-#IUSE="sdl jpeg png mozilla truetype static fmod"
-IUSE="nls" #blender-game" # blender-plugin"
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="virtual/x11
- media-libs/libsdl
- media-libs/jpeg
- media-libs/libpng
- >=media-libs/freetype-2.0
- >=media-libs/openal-20020127
- >=media-libs/libsdl-1.2
- >=media-libs/libvorbis-1.0
- >=dev-libs/openssl-0.9.6
- >=media-gfx/yafray-0.0.6
- nls? ( >=media-libs/ftgl-2.1 )"
-
-DEPEND="dev-util/scons
- ${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
- unpack ${A}
- cd ${S}/release/plugins
- chmod 755 bmake
- rm -fR include
- cp -a ${S}/source/blender/blenpluginapi include
- cd ${S}
- epatch ${FILESDIR}/${P}-dirs.patch
-}
-
-
-src_compile() {
- local myconf=""
-
- replace-flags -march=pentium4 -march=pentium3
- scons -q
-
- # SDL Support
- #use sdl && myconf="${myconf} --with-sdl=/usr"
- # || myconf="${myconf} --without-sdl"
-
- # Jpeg support
- #use jpeg && myconf="${myconf} --with-libjpeg=/usr"
-
- # PNG Support
- #use png && myconf="${myconf} --with-libpng=/usr"
-
- # ./configure points at the wrong mozilla directories and will fail
- # with this enabled. (A simple patch should take care of this)
- #use mozilla && myconf="${myconf} --with-mozilla=/usr"
-
- # TrueType support (For text objects)
- #use truetype && myconf="${myconf} --with-freetype2=/usr"
-
- # Build Staticly
- #use static && myconf="${myconf} --enable-blenderstatic"
-
- # Build the game engine
-# use blender-game && \
- einfo "enabling game engine"
- sed -i -e "s:BUILD_GAMEENGINE.*$:BUILD_GAMEENGINE = 'true':" \
- config.opts
-
- if use nls ;
- then
- einfo "enabling internationalization"
- sed -i -e "s:USE_INTERNATIONAL.*$:USE_INTERNATIONAL = 'true':" \
- -e "s:FTGL_INCLUDE.*$:FTGL_INCLUDE = ['/usr/include/FTGL']:" \
- -e "s:FTGL_LIBPATH.*$:FTGL_LIBPATH = ['/usr/lib']:" \
- config.opts
- fi
-
-# use blender-game || \
-# ( einfo "disabling game engine"
-# sed -i -e "s:BUILD_GAMEENGINE = 'true':BUILD_GAMEENGINE = 'false':" \
-# ${S}/config.opts )
-
- # Build the plugin
-# use blender-plugin && \
-# ( einfo "enabling mozilla plugin"
-# sed -i -e "s:BUILD_BLENDER_PLUGIN.*$:BUILD_BLENDER_PLUGIN = 'true':" \
-# config.opts )
-
- sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct
- scons ${MAKEOPTS} || die
- cd ${S}/release/plugins
- emake || die
-
-}
-
-src_install() {
- exeinto /usr/bin/
- doexe ${S}/blender
- doexe ${S}/blenderplayer
-
-
- exeinto /usr/lib/${PN}/textures
- doexe ${S}/release/plugins/texture/*.so
- exeinto /usr/lib/${PN}/sequences
- doexe ${S}/release/plugins/sequence/*.so
- cp -a ${S}/release/{bpydata,plugins,scripts} ${D}/usr/lib/${PN}
- use nls && \
- cp -a ${S}/bin/.blender/{.Blanguages,.bfont.ttf,locale} ${D}/usr/lib/${PN}
- 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/lib/blender/plugins/include" ];
- then
- rm -f /usr/lib/blender/plugins/include
- fi
-}
diff --git a/media-gfx/blender/files/blender-2.32.patch b/media-gfx/blender/files/blender-2.32.patch
deleted file mode 100644
index 687870268e06..000000000000
--- a/media-gfx/blender/files/blender-2.32.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ruN blender-2.32.orig/configure blender-2.32/configure
---- blender-2.32.orig/configure 2004-02-04 00:40:04.233004048 +0100
-+++ blender-2.32/configure 2004-02-04 00:44:13.789065760 +0100
-@@ -22221,8 +22221,8 @@
- with_mozilla =$withval
- fi
- if test x$with_mozilla != "yes"; then
-- LDFLAGS="$LDFLAGS -L$withval/lib/mozilla-$MOZVER -lnspr"
-- CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla-$MOZVER/nspr"
-+ LDFLAGS="$LDFLAGS -L$withval/lib/mozilla -lnspr4"
-+ CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla/nspr"
- fi
-
- fi;
-@@ -26003,7 +26003,6 @@
- fi
-
-
-- rm -f conf.sdltest
-
-
- echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
-diff -ruN blender-2.32.orig/release/plugins/bmake blender-2.32/release/plugins/bmake
---- blender-2.32.orig/release/plugins/bmake 2004-02-04 00:40:02.213311088 +0100
-+++ blender-2.32/release/plugins/bmake 2004-02-04 00:43:52.975229944 +0100
-@@ -60,7 +60,7 @@
- LDFLAGS="-Bshareable";
- elif ( test $UNAME = "Linux" ) then
- CC="gcc";
-- CFLAGS="-fPIC -funsigned-char -O2";
-+# CFLAGS="-fPIC -funsigned-char -O2";
-
- LD="ld";
- LDFLAGS="-Bshareable";
-@@ -112,6 +112,8 @@
- INCLUDES=-I..;
- elif ( test -f "../include/plugin.h" ) then
- INCLUDES=-I../include
-+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
-+ INCLUDES=-I../../../source/blender/blenpluginapi
- else
- echo "Couldn't find plugin.h";
- exit;
-diff -ruN blender-2.32.orig/source/blender/blenlib/Makefile.am blender-2.32/source/blender/blenlib/Makefile.am
---- blender-2.32.orig/source/blender/blenlib/Makefile.am 2004-02-04 01:25:28.052920480 +0100
-+++ blender-2.32/source/blender/blenlib/Makefile.am 2004-02-04 01:33:59.561159408 +0100
-@@ -47,7 +47,8 @@
-
- INCLUDES = -I$(top_srcdir)/source/blender/makesdna \
- -I$(top_srcdir)/intern/guardedalloc \
-- -I$(top_srcdir)/source/blender/include
-+ -I$(top_srcdir)/source/blender/include \
-+ -I$(top_srcdir)/source/blender/blenkernel
-
- EXTRA_DIST = \
- Makefile \
-diff -ruN blender-2.32.orig/source/blender/blenlib/Makefile.in blender-2.32/source/blender/blenlib/Makefile.in
---- blender-2.32.orig/source/blender/blenlib/Makefile.in 2004-02-04 01:25:28.074917136 +0100
-+++ blender-2.32/source/blender/blenlib/Makefile.in 2004-02-04 01:34:28.189807192 +0100
-@@ -240,7 +240,8 @@
-
- INCLUDES = -I$(top_srcdir)/source/blender/makesdna \
- -I$(top_srcdir)/intern/guardedalloc \
-- -I$(top_srcdir)/source/blender/include
-+ -I$(top_srcdir)/source/blender/include \
-+ -I$(top_srcdir)/source/blender/blenkernel
-
-
- EXTRA_DIST = \
diff --git a/media-gfx/blender/files/blender-2.36-dirs.patch b/media-gfx/blender/files/blender-2.36-dirs.patch
deleted file mode 100644
index 875b0ca8a326..000000000000
--- a/media-gfx/blender/files/blender-2.36-dirs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- ./source.orig/blender/python/BPY_interface.c 2004-11-27 19:32:25.000000000 +0100
-+++ ./source/blender/python/BPY_interface.c 2004-12-29 17:35:50.000000000 +0100
-@@ -1373,14 +1373,8 @@
- if( BLI_exists( homedir ) )
- return homedir;
-
-- /* otherwise, use argv[0] (bprogname) to get .blender/ in
-- * Blender's installation dir */
-- s = BLI_last_slash( bprogname );
--
-- i = s - bprogname + 1;
--
-- PyOS_snprintf( bprogdir, i, bprogname );
-- BLI_make_file_string( "/", homedir, bprogdir, ".blender/" );
-+ /* otherwise, use /usr/lib/blender */
-+ BLI_make_file_string( "/", homedir, "/usr/lib", "blender/" );
-
- return homedir;
- }
---- source.orig/blender/src/language.c 2004-11-08 16:46:57.000000000 +0100
-+++ source/blender/src/language.c 2005-01-02 21:25:53.302585856 +0100
-@@ -317,23 +317,30 @@
- strcpy(name, bundlePath);
- strcat(name, "/Contents/Resources/.Blanguages");
- #else
-- /* Check the CWD. Takes care of the case where users
-- * unpack blender tarball; cd blender-dir; ./blender */
-- strcpy(name, ".blender/.Blanguages");
--#endif
-+ /* Check the standar location. Takes care of the case
-+ * in which the distribution installs blender */
-+ strcpy(name, "/usr/lib/blender/.Blanguages");
-+
- lines= BLI_read_file_as_lines(name);
--
-+
- if(lines == NULL) {
-- /* If not found in .blender, try current dir */
-- strcpy(name, ".Blanguages");
-+ /* Check the CWD. Takes care of the case where users
-+ * unpack blender tarball; cd blender-dir; ./blender */
-+ strcpy(name, ".blender/.Blanguages");
-+#endif
- lines= BLI_read_file_as_lines(name);
-+
- if(lines == NULL) {
-- error("File \".Blanguages\" not found");
-- return 0;
-+ /* If not found in .blender, try current dir */
-+ strcpy(name, ".Blanguages");
-+ lines= BLI_read_file_as_lines(name);
-+ if(lines == NULL) {
-+ error("File \".Blanguages\" not found");
-+ return 0;
-+ }
- }
- }
- }
--
- for (l= lines; l; l= l->next) {
- char *line= l->link;
-
diff --git a/media-gfx/blender/files/blender-2.37a-dirs.patch b/media-gfx/blender/files/blender-2.37a-dirs.patch
deleted file mode 100644
index 3ac7b9242a7b..000000000000
--- a/media-gfx/blender/files/blender-2.37a-dirs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN blender.orig/source/blender/src/language.c blender/source/blender/src/language.c
---- blender.orig/source/blender/src/language.c 2005-06-01 10:59:36.000000000 +0200
-+++ blender/source/blender/src/language.c 2005-06-01 11:07:15.000000000 +0200
-@@ -358,9 +358,9 @@
- strcpy(name, bundlePath);
- strcat(name, "/Contents/Resources/.Blanguages");
- #else
-- /* Check the CWD. Takes care of the case where users
-- * unpack blender tarball; cd blender-dir; ./blender */
-- strcpy(name, ".blender/.Blanguages");
-+ /* Check the standar location. Takes care of the case
-+ * in which the distribution installs blender */
-+ strcpy(name, "/usr/lib/blender/.Blanguages");
- #endif
- lines= BLI_read_file_as_lines(name);
-
diff --git a/media-gfx/blender/files/blender-2.37a-gcc-4.0.patch b/media-gfx/blender/files/blender-2.37a-gcc-4.0.patch
deleted file mode 100644
index 73bd42b16858..000000000000
--- a/media-gfx/blender/files/blender-2.37a-gcc-4.0.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- blender/source/gameengine/Expressions/KX_HashedPtr.cpp.x86_64 2004-03-22 17:01:28.000000000 -0500
-+++ blender/source/gameengine/Expressions/KX_HashedPtr.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -57,5 +57,5 @@
-
- unsigned int CHashedPtr::hash() const
- {
-- return KX_Hash((unsigned int) m_valptr);
-+ return KX_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));
- }
---- blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp.x86_64 2005-03-09 14:45:59.000000000 -0500
-+++ blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -92,10 +92,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)this;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)iporeplica + offset;
-+ long orgbase = (long)this;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)iporeplica + offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
- }
---- blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp.x86_64 2004-03-22 17:01:52.000000000 -0500
-+++ blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -87,10 +87,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)this;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)iporeplica + offset;
-+ long orgbase = (long)this;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)iporeplica + offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
- }
---- blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp.x86_64 2004-03-22 17:01:52.000000000 -0500
-+++ blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -97,10 +97,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)this;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)iporeplica + offset;
-+ long orgbase = (long)this;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)iporeplica + offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
- }
---- blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp.x86_64 2005-03-25 05:33:37.000000000 -0500
-+++ blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -168,10 +168,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)&m_ipo_xform;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)&iporeplica->m_ipo_xform;
-+ long orgbase = (long)&m_ipo_xform;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)&iporeplica->m_ipo_xform;
- newaddrbase += offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
---- blender/source/gameengine/Ketsji/KX_GameObject.cpp.x86_64 2005-04-18 07:44:21.000000000 -0400
-+++ blender/source/gameengine/Ketsji/KX_GameObject.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -1069,10 +1069,10 @@
- PyObject* kwds)
- {
- KX_IPhysicsController* ctrl = GetPhysicsController();
-- int physid=0;
-+ long physid=0;
- if (ctrl)
- {
-- physid= (int)ctrl->GetUserData();
-+ physid= (long)ctrl->GetUserData();
- }
- return PyInt_FromLong(physid);
- }
---- blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp.x86_64 2004-07-21 20:26:34.000000000 -0400
-+++ blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -92,10 +92,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)this;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)iporeplica + offset;
-+ long orgbase = (long)this;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)iporeplica + offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
- }
---- blender/source/kernel/gen_system/GEN_HashedPtr.h.x86_64 2002-12-27 08:11:00.000000000 -0500
-+++ blender/source/kernel/gen_system/GEN_HashedPtr.h 2005-06-05 10:09:48.000000000 -0400
-@@ -40,7 +40,7 @@
- void* m_valptr;
- public:
- GEN_HashedPtr(void* val) : m_valptr(val) {};
-- unsigned int hash() const { return GEN_Hash((unsigned int) m_valptr);};
-+ unsigned int hash() const { return GEN_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));};
- inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
- };
-
diff --git a/media-gfx/blender/files/blender-2.37a-x86_64.patch b/media-gfx/blender/files/blender-2.37a-x86_64.patch
deleted file mode 100644
index 73bd42b16858..000000000000
--- a/media-gfx/blender/files/blender-2.37a-x86_64.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- blender/source/gameengine/Expressions/KX_HashedPtr.cpp.x86_64 2004-03-22 17:01:28.000000000 -0500
-+++ blender/source/gameengine/Expressions/KX_HashedPtr.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -57,5 +57,5 @@
-
- unsigned int CHashedPtr::hash() const
- {
-- return KX_Hash((unsigned int) m_valptr);
-+ return KX_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));
- }
---- blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp.x86_64 2005-03-09 14:45:59.000000000 -0500
-+++ blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -92,10 +92,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)this;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)iporeplica + offset;
-+ long orgbase = (long)this;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)iporeplica + offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
- }
---- blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp.x86_64 2004-03-22 17:01:52.000000000 -0500
-+++ blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -87,10 +87,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)this;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)iporeplica + offset;
-+ long orgbase = (long)this;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)iporeplica + offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
- }
---- blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp.x86_64 2004-03-22 17:01:52.000000000 -0500
-+++ blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -97,10 +97,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)this;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)iporeplica + offset;
-+ long orgbase = (long)this;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)iporeplica + offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
- }
---- blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp.x86_64 2005-03-25 05:33:37.000000000 -0500
-+++ blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -168,10 +168,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)&m_ipo_xform;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)&iporeplica->m_ipo_xform;
-+ long orgbase = (long)&m_ipo_xform;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)&iporeplica->m_ipo_xform;
- newaddrbase += offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
---- blender/source/gameengine/Ketsji/KX_GameObject.cpp.x86_64 2005-04-18 07:44:21.000000000 -0400
-+++ blender/source/gameengine/Ketsji/KX_GameObject.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -1069,10 +1069,10 @@
- PyObject* kwds)
- {
- KX_IPhysicsController* ctrl = GetPhysicsController();
-- int physid=0;
-+ long physid=0;
- if (ctrl)
- {
-- physid= (int)ctrl->GetUserData();
-+ physid= (long)ctrl->GetUserData();
- }
- return PyInt_FromLong(physid);
- }
---- blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp.x86_64 2004-07-21 20:26:34.000000000 -0400
-+++ blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp 2005-06-05 10:09:48.000000000 -0400
-@@ -92,10 +92,10 @@
- iporeplica->AddInterpolator(copyipo);
-
- MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-- int orgbase = (int)this;
-- int orgloc = (int)scaal;
-- int offset = orgloc-orgbase;
-- int newaddrbase = (int)iporeplica + offset;
-+ long orgbase = (long)this;
-+ long orgloc = (long)scaal;
-+ long offset = orgloc-orgbase;
-+ long newaddrbase = (long)iporeplica + offset;
- MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
- copyipo->SetNewTarget((MT_Scalar*)blaptr);
- }
---- blender/source/kernel/gen_system/GEN_HashedPtr.h.x86_64 2002-12-27 08:11:00.000000000 -0500
-+++ blender/source/kernel/gen_system/GEN_HashedPtr.h 2005-06-05 10:09:48.000000000 -0400
-@@ -40,7 +40,7 @@
- void* m_valptr;
- public:
- GEN_HashedPtr(void* val) : m_valptr(val) {};
-- unsigned int hash() const { return GEN_Hash((unsigned int) m_valptr);};
-+ unsigned int hash() const { return GEN_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));};
- inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
- };
-
diff --git a/media-gfx/blender/files/configure-fix.patch b/media-gfx/blender/files/configure-fix.patch
deleted file mode 100644
index 5f8ea6ef1f40..000000000000
--- a/media-gfx/blender/files/configure-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN blender-2.28c.orig/configure blender-2.28c/configure
---- blender-2.28c.orig/configure 2003-10-11 18:55:18.000000000 +0200
-+++ blender-2.28c/configure 2003-10-11 17:51:30.000000000 +0200
-@@ -21144,8 +21144,8 @@
- with_mozilla =$withval
- fi
- if test x$with_mozilla != "yes"; then
-- LDFLAGS="$LDFLAGS -L$withval/lib/mozilla-$MOZVER -lnspr"
-- CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla-$MOZVER/nspr",
-+ LDFLAGS="$LDFLAGS -L$withval/lib/mozilla -lnspr4"
-+ CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla/nspr",
- fi
-
- fi;
-@@ -22030,8 +22030,6 @@
- fi
-
-
-- rm -f conf.sdltest
-- (1.0)
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CPP_FLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$SDL_LIBS"
diff --git a/media-gfx/blender/files/digest-blender-2.36-r1 b/media-gfx/blender/files/digest-blender-2.36-r1
deleted file mode 100644
index bd39cfb8ea55..000000000000
--- a/media-gfx/blender/files/digest-blender-2.36-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e2237c86b12e6061935632495aec875 blender-2.36.tar.gz 6912828