diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2008-12-21 15:04:19 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-12-21 15:04:19 +0000 |
commit | 1c2d5de2d676f990723c01c5ea6c571405380d61 (patch) | |
tree | 0350476fbd9aac8e5896c103d423f33fea532b5c /media-gfx/blender | |
parent | Stable on ppc wrt bug 245517 (diff) | |
download | historical-1c2d5de2d676f990723c01c5ea6c571405380d61.tar.gz historical-1c2d5de2d676f990723c01c5ea6c571405380d61.tar.bz2 historical-1c2d5de2d676f990723c01c5ea6c571405380d61.zip |
old
Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27.7 i686
RepoMan-Options: --force
Diffstat (limited to 'media-gfx/blender')
-rw-r--r-- | media-gfx/blender/Manifest | 10 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.43-r3.ebuild | 137 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.48a-r2.ebuild | 151 | ||||
-rw-r--r-- | media-gfx/blender/files/blender-2.43-CVE-2008-4863.patch | 15 | ||||
-rw-r--r-- | media-gfx/blender/files/blender-2.45-cve-2008-1102.patch | 13 | ||||
-rw-r--r-- | media-gfx/blender/files/blender-2.45-cve-2008-1103-1.patch | 12 | ||||
-rw-r--r-- | media-gfx/blender/files/blender-2.45-cve-2008-1103-2.patch | 18 | ||||
-rw-r--r-- | media-gfx/blender/files/blender-2.45-ffmpeg.patch | 88 | ||||
-rw-r--r-- | media-gfx/blender/files/blender-2.45-missing_includes.patch | 62 |
9 files changed, 0 insertions, 506 deletions
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 0da07f5ef8b4..1dd368632e87 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,22 +1,12 @@ AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e -AUX blender-2.43-CVE-2008-4863.patch 623 RMD160 98ddc3171c2b486c43b4c26c4241cf5aa9daaa71 SHA1 b179983b3e9e731426f58fce1325a675d2e3a401 SHA256 e412f99010b022b9235969b54c0fc1d44a4243e3a1e6b0cbb0a59f04f98f8798 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4 -AUX blender-2.45-cve-2008-1102.patch 737 RMD160 7f55e8850638d343197ef1a7e3987fd48d35617f SHA1 bd57987f0fdfa97b2649f82b7e944a9817ce4414 SHA256 7546a4133cc682b9ed35dc6350637e535cf032ffbaa668746fb2549bcedd7c84 -AUX blender-2.45-cve-2008-1103-1.patch 605 RMD160 e32bce6c420c537a8df0382660a77f2f00b15ebd SHA1 dcff3eda1905e4aea5943c26f16ce3291f465056 SHA256 28f4ae9c19a61f22f228810504afdb2fc7555a262eeae30d1ca87cc31da48d79 -AUX blender-2.45-cve-2008-1103-2.patch 771 RMD160 2f4b66432a54f2b017bed81fa4c07baa4b2279d0 SHA1 52cd1ad4955e208d238d110a5c7d17dc30ee0377 SHA256 3dbfb771cd7c4fe65e3ea788794933cdfd9f5e0318fddf609d9d5c63a3a2a637 -AUX blender-2.45-ffmpeg.patch 2807 RMD160 748fec0b51ee35b0524d678facecfaf91204ddb1 SHA1 2cd955967adc1bea42472a3bee8beff997cb53e5 SHA256 fe5ebbabf26544072dd44a4e952decb6e72dbc663e5cc7241527baf3b3a4ab82 -AUX blender-2.45-missing_includes.patch 2314 RMD160 7f9b7205569dccb357fc82754cbe1100ca946574 SHA1 4bfdde220c3e3508e6987f0bdff654a8ed54c8e3 SHA256 f3deb71358d7b5163a5d0ea52b7891a622d0419d06fa7c33d4c3d256d512ad7d AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96 AUX blender-2.46-ffmpeg.patch 3823 RMD160 33f41651b1a6bc6d497ba01ab710ca3d7a1559c0 SHA1 82ce585db15a3c88625b0c04e649bd08b3c35b41 SHA256 ad75babcc08ae41f2a7c71bc457bd56a0ef39b5ae1e92ede2cdb0a34d7cbcc85 AUX blender-2.48-ffmpeg-20081014.patch 839 RMD160 b1fbad04a890dcc1698d02f5351d6d79cae42d91 SHA1 e931f1a85c5c01918b960936d4da5888eacfd64c SHA256 d6114d2647758e39608fcfdb05da00811f062ea3fc4c41cef3a6e2977bc5b0c4 AUX blender-2.48a-CVE-2008-4863.patch 696 RMD160 b61dc085d0154be3850fa4b53985f670cd177adf SHA1 805f18290965c2e74778628c4e2a1888ea77d8ab SHA256 fee1896c791a623181ebf681f4ad67c610677e82575a95a46e896b747f980418 AUX blender.desktop 194 RMD160 5b154d86d52f46a3f1fcd29da90322e1727f1107 SHA1 a1b70789388f72f2a292939588365a0b845b83b7 SHA256 9d21fe8823f249f0720895107817854dd8ce64afe6586317af08805b94fe0fab AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad -DIST blender-2.43.tar.gz 13806334 RMD160 a43babbc816194ba3e4cfed3bd250d20406e2479 SHA1 de9ba15fb40d962e56deebdea13a3a68b3ae6532 SHA256 a48213b61302d03eb8db0cf42712b142d280d16ad111f6411cd8e43403e5e61b DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46 -DIST ffmpeg-0.4.9-p20070330.tar.bz2 2192476 RMD160 e52bf6abbf7c630aa3e76243987fb7dd6d9b84a1 SHA1 bcc18c88c64f6f941eb1ac94357e0d6dcbf99045 SHA256 58a7e7d909e02fda07856ea044ae0f5f9c174791f63a449f2f23f37a78b34f95 -EBUILD blender-2.43-r3.ebuild 3893 RMD160 325b2920f03bd356923b37019de8237a74ed20b6 SHA1 162ed1afb8936af593d57066d56bb9efd780a41e SHA256 0a3bb20aa6194287cb0bd11806bf06100ab61c11dd19c3d13d1fb65f86530477 -EBUILD blender-2.48a-r2.ebuild 3978 RMD160 ffba9e2d36a8e3e88ec33ad2baba8b460ec5d43f SHA1 5115bb15f19402d1c7b478c32bf218f51f8fdcec SHA256 10456813654f39c32fc72658c9e25bbc0764507cf5c1562ed9038e2519b5def2 EBUILD blender-2.48a-r3.ebuild 4090 RMD160 15ddf32bee7f8ac090f1163930e82f017d926826 SHA1 665c5141d713c4fa5f110c8749d61f804839c236 SHA256 40884434cc2f25910819e84d9f19f0e0ec02a9de836b9d15ad0c9bf8cff190a8 MISC ChangeLog 25607 RMD160 c1a12b6b8208c5e98d72e297443e4011902184e4 SHA1 99d8f377a0c6153f541a7376fc93e65b8cd9da3f SHA256 b1b3d8a030fdfa91947344cf49ac101b297f4299ca49ca02f673ccd7573168e6 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510 diff --git a/media-gfx/blender/blender-2.43-r3.ebuild b/media-gfx/blender/blender-2.43-r3.ebuild deleted file mode 100644 index e2fad8de4517..000000000000 --- a/media-gfx/blender/blender-2.43-r3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.43-r3.ebuild,v 1.4 2008/11/15 17:48:50 dertobi123 Exp $ - -inherit multilib flag-o-matic eutils python - -#IUSE="jpeg mozilla png sdl static truetype" -IUSE="blender-game ffmpeg jpeg nls openal openexr png" -FFMPEG_SNAP="0.4.9-p20070330" -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org/" -SRC_URI="http://download.blender.org/source/${P}.tar.gz - ffmpeg? ( mirror://gentoo/ffmpeg-${FFMPEG_SNAP}.tar.bz2 )" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ppc ppc64 ~sparc x86" - -RDEPEND="=dev-lang/python-2.4* - >=dev-libs/openssl-0.9.6 - ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_SNAP/-/_} - media-libs/x264 ) - jpeg? ( media-libs/jpeg ) - media-libs/tiff - nls? ( >=media-libs/freetype-2.0 - virtual/libintl - >=media-libs/ftgl-2.1 ) - openal? ( media-libs/openal - media-libs/freealut ) - openexr? ( media-libs/openexr ) - png? ( media-libs/libpng ) - >=media-libs/libsdl-1.2 - virtual/opengl" - -DEPEND="dev-util/scons - x11-libs/libXt - x11-proto/inputproto - ${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:]' \ - >> "${S}"/user-config.py - else - echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \ - >> "${S}"/user-config.py - fi - return 0 -} - -src_unpack() { - unpack ${A} - cd "${S}"/release/plugins - chmod 755 bmake - rmdir include - cp -pPR "${S}"/source/blender/blenpluginapi include - - cd "${S}" - epatch "${FILESDIR}"/blender-2.37-dirs.patch - epatch "${FILESDIR}"/blender-2.45-cve-2008-1102.patch - epatch "${FILESDIR}"/blender-2.45-cve-2008-1103-1.patch - epatch "${FILESDIR}"/blender-2.45-cve-2008-1103-2.patch - epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch - - if use ffmpeg ; then - cd "${S}"/extern - mv ffmpeg/Makefile ffmpeg/common.mak "${T}" - unpack ffmpeg-${FFMPEG_SNAP}.tar.bz2 - mv "${T}"/Makefile "${T}"/common.mak ffmpeg - fi - # pass compiler flags to the scons build system - echo "CFLAGS += '${CFLAGS}'" >> "${S}"/user-config.py - echo "CCFLAGS += ['${CXXFLAGS//' '/','}','-DYESIAMSTUPID']" \ - >> "${S}"/user-config.py - # disable blender-player and iconv - # echo "WITH_BF_PLAYER=0" >> ${S}/user-config.py - # echo "WITH_BF_ICONV=0" >> ${S}/user-config.py -} - -src_compile() { - myconf="${myconf} $(blend_with openal)" - 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 blender-game gameengine)" - - # scons uses -l differently -> remove it - scons ${MAKEOPTS/-l[0-9]} -h > scons.config - scons ${MAKEOPTS/-l[0-9]} || die \ - "!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" - - cd "${S}"/release/plugins - emake || die -} - -src_install() { - exeinto /usr/bin/ - doexe "${WORKDIR}"/install/linux2/blender - - dodir /usr/share/${PN} - - exeinto /usr/$(get_libdir)/${PN}/textures - doexe "${S}"/release/plugins/texture/*.so - exeinto /usr/$(get_libdir)/${PN}/sequences - doexe "${S}"/release/plugins/sequence/*.so - insinto /usr/include/${PN} - doins "${S}"/release/plugins/include/*.h - - if use nls ; then - mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \ - "${D}"/usr/share/${PN} - mv "${WORKDIR}"/install/linux2/.blender/locale \ - "${D}"/usr/share/locale - fi - - mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN} - - insinto /usr/share/pixmaps - doins "${FILESDIR}"/${PN}.png - insinto /usr/share/applications - doins "${FILESDIR}"/${PN}.desktop - - dodoc INSTALL README -} - -pkg_preinst(){ - if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ]; - then - rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include - fi -} diff --git a/media-gfx/blender/blender-2.48a-r2.ebuild b/media-gfx/blender/blender-2.48a-r2.ebuild deleted file mode 100644 index 7d32ce9fdf41..000000000000 --- a/media-gfx/blender/blender-2.48a-r2.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r2.ebuild,v 1.1 2008/11/03 22:22:24 maekke Exp $ - -inherit multilib flag-o-matic eutils python - -#IUSE="jpeg mozilla png sdl static truetype" -IUSE="blender-game ffmpeg jpeg nls openal openexr openmp - player png quicktime verse" -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 ~ppc64 ~sparc ~x86" - -RDEPEND=">=dev-libs/openssl-0.9.6 - ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r1 - media-libs/x264 ) - jpeg? ( media-libs/jpeg ) - media-libs/tiff - >=dev-lang/python-2.4 - nls? ( >=media-libs/freetype-2.0 - virtual/libintl - >=media-libs/ftgl-2.1 ) - openal? ( media-libs/openal - media-libs/freealut ) - openexr? ( media-libs/openexr ) - png? ( media-libs/libpng ) - quicktime? ( media-libs/libquicktime ) - >=media-libs/libsdl-1.2 - virtual/opengl" - -DEPEND=">=dev-util/scons-0.98 - x11-libs/libXt - x11-proto/inputproto - ${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:]' \ - >> "${S}"/user-config.py - else - echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \ - >> "${S}"/user-config.py - fi -} - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}"/${PN}-2.37-dirs.patch - epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch - epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch - epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch - - if use ffmpeg ; then -# cd "${S}"/extern -# rm -rf ffmpeg libmp3lame x264 - cat <<- EOF >> "${S}"/user-config.py - BF_FFMPEG="/usr" - BF_FFMPEG_LIB="avformat avcodec swscale avutil" - EOF - fi - # pass compiler flags to the scons build system - # and set python version to current version in use - python_version - cat <<- EOF >> "${S}"/user-config.py - CFLAGS += '${CFLAGS}' - BF_PYTHON_VERSION="${PYVER}" - BF_PYTHON_INC="/usr/include/python${PYVER}" - BF_PYTHON_BINARY="/usr/bin/python${PYVER}" - BF_PYTHON_LIB="python${PYVER}" - EOF - - if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then - echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py - elog "enabling openmp" - else - echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py - elog "disabling openmp" - fi -} - -src_compile() { - for arg in \ - 'blender-game gameengine' \ - 'ffmpeg' \ - 'jpeg' \ - 'nls international' \ - 'openal' \ - 'openexr' \ - 'player' \ - 'png' \ - 'verse' ; do - blend_with ${arg} - done - - # scons uses -l differently -> remove it - scons ${MAKEOPTS/-l[0-9]} || die \ - "!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org" - - cd "${WORKDIR}"/install/linux2/plugins - chmod 755 bmake - emake || die -} - -src_install() { - exeinto /usr/bin/ - doexe "${WORKDIR}"/install/linux2/blender - use player && doexe "${WORKDIR}"/install/linux2/blenderplayer - - 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/${PN} - doins "${WORKDIR}"/install/linux2/plugins/include/*.h - - if use nls ; then - mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \ - "${D}"/usr/share/${PN} - mv "${WORKDIR}"/install/linux2/.blender/locale \ - "${D}"/usr/share/locale - fi - - mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN} - - insinto /usr/share/pixmaps - doins "${FILESDIR}"/${PN}.png - insinto /usr/share/applications - doins "${FILESDIR}"/${PN}.desktop - - dodoc INSTALL README - dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf -} - -pkg_preinst(){ - if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ]; - then - rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include - fi -} diff --git a/media-gfx/blender/files/blender-2.43-CVE-2008-4863.patch b/media-gfx/blender/files/blender-2.43-CVE-2008-4863.patch deleted file mode 100644 index be19cc55fc91..000000000000 --- a/media-gfx/blender/files/blender-2.43-CVE-2008-4863.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru blender-2.43.orig/source/blender/python/BPY_interface.c blender-2.43/source/blender/python/BPY_interface.c ---- blender-2.43.orig/source/blender/python/BPY_interface.c 2008-11-03 21:39:45.000000000 +0100 -+++ blender-2.43/source/blender/python/BPY_interface.c 2008-11-03 21:41:29.000000000 +0100 -@@ -178,6 +178,11 @@ - - //Start the interpreter - Py_Initialize( ); -+ -+ /* Sanitize sys.path to prevent relative imports loading modules in -+ the current working directory */ -+ PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)"); -+ - PySys_SetArgv( argc_copy, argv_copy ); - - //Overrides __import__ diff --git a/media-gfx/blender/files/blender-2.45-cve-2008-1102.patch b/media-gfx/blender/files/blender-2.45-cve-2008-1102.patch deleted file mode 100644 index 43015b3c052b..000000000000 --- a/media-gfx/blender/files/blender-2.45-cve-2008-1102.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv blender-2.45/source/blender/imbuf/intern/radiance_hdr.c ---- blender-2.45/source/blender/imbuf/intern/radiance_hdr.c.csv 2008-04-24 16:22:36.000000000 +0200 -+++ blender-2.45/source/blender/imbuf/intern/radiance_hdr.c 2008-04-24 16:25:59.000000000 +0200 -@@ -191,7 +191,8 @@ struct ImBuf *imb_loadhdr(unsigned char - } - } - if (found) { -- sscanf((char*)&mem[x+1], "%s %d %s %d", (char*)&oriY, &height, (char*)&oriX, &width); -+ if (sscanf((char *)&mem[x+1], "%79s %d %79s %d", (char*)&oriY, &height, -+ (char*)&oriX, &width) != 4) return NULL; - - /* find end of this line, data right behind it */ - ptr = (unsigned char *)strchr((char*)&mem[x+1], '\n'); diff --git a/media-gfx/blender/files/blender-2.45-cve-2008-1103-1.patch b/media-gfx/blender/files/blender-2.45-cve-2008-1103-1.patch deleted file mode 100644 index b1c5a9dad275..000000000000 --- a/media-gfx/blender/files/blender-2.45-cve-2008-1103-1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN blender-2.36.orig/source/blender/blenkernel/intern/blender.c blender-2.36/source/blender/blenkernel/intern/blender.c ---- blender-2.36.orig/source/blender/blenkernel/intern/blender.c 2005-03-11 01:54:56.000000000 +0900 -+++ blender-2.36/source/blender/blenkernel/intern/blender.c 2005-03-11 01:57:26.000000000 +0900 -@@ -647,7 +647,7 @@ - - BLI_make_file_string("/", str, U.tempdir, "quit.blend"); - -- file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666); -+ file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC+O_EXCL, 0666); - if(file == -1) { - printf("Unable to save %s\n", str); - return; diff --git a/media-gfx/blender/files/blender-2.45-cve-2008-1103-2.patch b/media-gfx/blender/files/blender-2.45-cve-2008-1103-2.patch deleted file mode 100644 index 96cd097fcd22..000000000000 --- a/media-gfx/blender/files/blender-2.45-cve-2008-1103-2.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up blender-2.45/source/blender/src/usiblender.c.cve3 blender-2.45/source/blender/src/usiblender.c ---- blender-2.45/source/blender/src/usiblender.c.cve3 2007-09-18 06:58:42.000000000 +0200 -+++ blender-2.45/source/blender/src/usiblender.c 2008-05-07 17:32:10.000000000 +0200 -@@ -172,10 +172,12 @@ static void init_userdef_file(void) - U.tb_rightmouse= 5; - } - if(U.mixbufsize==0) U.mixbufsize= 2048; -- if (BLI_streq(U.tempdir, "/")) { -+ if (BLI_streq(U.tempdir, "/") || BLI_streq(U.tempdir, "/tmp/")) { - char *tmp= getenv("TEMP"); -+ char *home= getenv("HOME"); - -- strcpy(U.tempdir, tmp?tmp:"/tmp/"); -+ strcpy(U.tempdir, tmp?tmp:home); -+ if (!tmp) strcat(U.tempdir, "/.blender/"); - } - if (U.savetime <= 0) { - U.savetime = 1; diff --git a/media-gfx/blender/files/blender-2.45-ffmpeg.patch b/media-gfx/blender/files/blender-2.45-ffmpeg.patch deleted file mode 100644 index 085b9d938813..000000000000 --- a/media-gfx/blender/files/blender-2.45-ffmpeg.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- ./source/blender/blenkernel/intern/writeffmpeg.c.old 2008-03-25 13:26:11.000000000 +0100 -+++ ./source/blender/blenkernel/intern/writeffmpeg.c 2008-03-25 13:27:06.000000000 +0100 -@@ -29,10 +29,10 @@ - - #include <stdlib.h> - --#include <ffmpeg/avformat.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/rational.h> --#include <ffmpeg/swscale.h> -+#include <libavformat/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavutil/rational.h> -+#include <libswscale/swscale.h> - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 ---- source/blender/imbuf/intern/IMB_anim.h.old 2008-03-26 01:22:32.000000000 +0100 -+++ source/blender/imbuf/intern/IMB_anim.h 2008-03-26 01:22:01.000000000 +0100 -@@ -79,8 +79,8 @@ - #endif /* WITH_QUICKTIME */ - - #ifdef WITH_FFMPEG --#include <ffmpeg/avformat.h> --#include <ffmpeg/avcodec.h> -+#include <libavformat/avformat.h> -+#include <libavcodec/avcodec.h> - #endif - - #include "IMB_imbuf_types.h" ---- source/blender/imbuf/intern/anim.c.old 2008-03-26 01:28:44.000000000 +0100 -+++ source/blender/imbuf/intern/anim.c 2008-03-26 01:29:15.000000000 +0100 -@@ -86,10 +86,10 @@ - #include "IMB_anim5.h" - - #ifdef WITH_FFMPEG --#include <ffmpeg/avformat.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/rational.h> --#include <ffmpeg/swscale.h> -+#include <libavformat/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavutil/rational.h> -+#include <libswscale/swscale.h> - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 ---- source/blender/imbuf/intern/util.c.old 2008-03-26 01:52:13.000000000 +0100 -+++ source/blender/imbuf/intern/util.c 2008-03-26 01:52:48.000000000 +0100 -@@ -60,8 +60,8 @@ - #endif - - #ifdef WITH_FFMPEG --#include <ffmpeg/avcodec.h> --#include <ffmpeg/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavformat/avformat.h> - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 ---- source/blender/src/hddaudio.c.old 2008-03-26 02:04:26.000000000 +0100 -+++ source/blender/src/hddaudio.c 2008-03-26 02:04:50.000000000 +0100 -@@ -36,9 +36,9 @@ - #endif - - #ifdef WITH_FFMPEG --#include <ffmpeg/avformat.h> --#include <ffmpeg/avcodec.h> --#include <ffmpeg/rational.h> -+#include <libavformat/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavutil/rational.h> - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 - #else ---- source/blender/src/buttons_scene.c.old 2008-03-26 02:19:19.000000000 +0100 -+++ source/blender/src/buttons_scene.c 2008-03-26 02:19:45.000000000 +0100 -@@ -103,8 +103,8 @@ - - #ifdef WITH_FFMPEG - --#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */ --#include <ffmpeg/avformat.h> -+#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */ -+#include <libavformat/avformat.h> - - static int ffmpeg_preset_sel = 0; - diff --git a/media-gfx/blender/files/blender-2.45-missing_includes.patch b/media-gfx/blender/files/blender-2.45-missing_includes.patch deleted file mode 100644 index 53cf78fedf7c..000000000000 --- a/media-gfx/blender/files/blender-2.45-missing_includes.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur blender-2.45.orig/intern/ghost/intern/GHOST_WindowX11.cpp blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp ---- blender-2.45.orig/intern/ghost/intern/GHOST_WindowX11.cpp 2008-04-12 11:52:10.000000000 +0200 -+++ blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp 2008-04-12 11:54:46.000000000 +0200 -@@ -38,6 +38,8 @@ - #include <X11/cursorfont.h> - #include <X11/Xatom.h> - -+#include <cstdio> -+ - #if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) - #include <strings.h> - #endif -diff -Naur blender-2.45.orig/intern/string/STR_String.h blender-2.45/intern/string/STR_String.h ---- blender-2.45.orig/intern/string/STR_String.h 2008-04-12 11:52:10.000000000 +0200 -+++ blender-2.45/intern/string/STR_String.h 2008-04-12 11:52:50.000000000 +0200 -@@ -47,6 +47,9 @@ - - #include <vector> - #include <limits.h> -+#include <cstring> -+#include <cstdlib> -+ - using namespace std; - - -diff -Naur blender-2.45.orig/source/blender/yafray/intern/export_File.cpp blender-2.45/source/blender/yafray/intern/export_File.cpp ---- blender-2.45.orig/source/blender/yafray/intern/export_File.cpp 2008-04-12 11:52:12.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/export_File.cpp 2008-04-12 12:06:53.000000000 +0200 -@@ -1,6 +1,7 @@ - #include "export_File.h" - --#include <math.h> -+#include <cmath> -+#include <cstring> - - using namespace std; - -diff -Naur blender-2.45.orig/source/blender/yafray/intern/export_Plugin.cpp blender-2.45/source/blender/yafray/intern/export_Plugin.cpp ---- blender-2.45.orig/source/blender/yafray/intern/export_Plugin.cpp 2008-04-12 11:52:12.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-04-12 12:02:12.000000000 +0200 -@@ -1,6 +1,7 @@ - #include "export_Plugin.h" - --#include <math.h> -+#include <cmath> -+#include <cstring> - using namespace std; - - -diff -Naur blender-2.45.orig/source/blender/yafray/intern/yafray_Render.cpp blender-2.45/source/blender/yafray/intern/yafray_Render.cpp ---- blender-2.45.orig/source/blender/yafray/intern/yafray_Render.cpp 2008-04-12 11:52:12.000000000 +0200 -+++ blender-2.45/source/blender/yafray/intern/yafray_Render.cpp 2008-04-12 12:04:47.000000000 +0200 -@@ -6,7 +6,8 @@ - - #include "yafray_Render.h" - --#include <math.h> -+#include <cmath> -+#include <cstring> - - using namespace std; - |