]> git.sthu.org Git - shuber-gentoo-overlay.git/commitdiff
remove blender
authorStefan Huber <shuber2@gmx.at>
Sat, 19 Nov 2011 08:57:30 +0000 (09:57 +0100)
committerStefan Huber <shuber2@gmx.at>
Sat, 19 Nov 2011 08:57:30 +0000 (09:57 +0100)
media-gfx/blender/Manifest [deleted file]
media-gfx/blender/README [deleted file]
media-gfx/blender/blender-2.56_beta.ebuild [deleted file]
media-gfx/blender/files/blender-2.5-bmake.patch [deleted file]
media-gfx/blender/files/blender-2.5-desktop.patch [deleted file]
media-gfx/blender/files/blender-2.5-doxygen.patch [deleted file]
media-gfx/blender/files/blender-2.5-eigen.patch [deleted file]
media-gfx/blender/files/blender-2.5-glew.patch [deleted file]

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
deleted file mode 100644 (file)
index f8abace..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX blender-2.5-bmake.patch 438 RMD160 793bc3bf9ddca77f357d440b9ff78aefc16fadba SHA1 73b8f02a08141f7259da38f079a9e8abe4589c21 SHA256 ea7ca2ea55620143212f5844f0eecaebae5432557286c05447b8d6f928c3b6e4
-AUX blender-2.5-desktop.patch 643 RMD160 d1eabbecb79a6d753260b0487d201675a43db22c SHA1 9fe57905eb06979b05364e15577c42d5d8a9f491 SHA256 916307b215f80fef9686aea6d0c934aad55991733a284ac3f50b484563b04695
-AUX blender-2.5-doxygen.patch 1336 RMD160 b96cc6cf90ac677bd03e2cca8989bb3c3a0a63c2 SHA1 f4f4a34df9618b7d8817b666e7a679645e07b071 SHA256 8b5f244adc5f75ce1884555a05cb847593047df75b723ba8dcad97acf8400789
-AUX blender-2.5-eigen.patch 940 RMD160 9acf7cd0fadb1fac515a16535d82569d2adb110b SHA1 8f2ba202d10abb32bda7c220465f7db0d616b8c5 SHA256 a5bb17c7bd2f68dd44d439c0a72302654b204a8d3da9a4a6365a85396c4bc3ea
-AUX blender-2.5-glew.patch 475 RMD160 90d35c27521ac843410445c91d71d336b128a1b5 SHA1 aa5d5963d630d494ca282380c747314ff3a6eb08 SHA256 c6a3a7e9e2f07e5e126357fd0dcf7971830cd5ae12559bcecf238ff21db70f95
-DIST blender-2.56-beta.tar.gz 16621998 RMD160 68561b7078ea1060292d3020707907f7b5982ee2 SHA1 6a0b6b370c4a5d83c526f786f8802ef8b5e98a0e SHA256 e83cbbafb01e81b7edb5c118f5d5abfdc2e079c1569cb7a96bfd90bdb19a9f05
-EBUILD blender-2.56_beta.ebuild 11399 RMD160 0293466a5a4e8961e86f425b3989cdfe3d0ffca5 SHA1 f9c833dac1afaf62a437277d16662b4c0cd774fa SHA256 4cb2601e0d83c56a4adf5a5d35a006fc994cb91b00413e85431cdd3043d922f0
-MISC README 148 RMD160 3113838710a89d506b708174704b7d870330e1d1 SHA1 95692e9a7363fe4fd88f073113856dcb42f81ab1 SHA256 8e0dd41daa8c7fa8814bcbc5862c8adbdda25a24fe63a617da7edd98b2a9d757
diff --git a/media-gfx/blender/README b/media-gfx/blender/README
deleted file mode 100644 (file)
index b373b23..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-The origin of blender-2.56_beta.ebuild is the 2.5 svn ebuild version from
-bugs.gentoo.org [1].
-
-[1]  http://bugs.gentoo.org/show_bug.cgi?id=276338
-
diff --git a/media-gfx/blender/blender-2.56_beta.ebuild b/media-gfx/blender/blender-2.56_beta.ebuild
deleted file mode 100644 (file)
index 3207622..0000000
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b.ebuild,v 1.3 2010/05/31 15:02:53 arfrever Exp $
-
-EAPI=2
-#NEED_PYTHON="3.1"
-PYTHON_DEPEND="3:3.1"
-inherit eutils python versionator flag-o-matic toolchain-funcs
-
-
-IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
-       +dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
-       redcode +zlib iconv"
-
-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
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-MY_P=${P//_/-}
-MY_PV="${PV%_*}"
-SRC_URI="http://download.blender.org/source/${MY_P}.tar.gz"
-
-SLOT="2.5"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64"
-
-RDEPEND="media-libs/jpeg
-       media-libs/libpng
-       x11-libs/libXi
-       x11-libs/libX11
-       media-libs/tiff
-       media-libs/libsamplerate
-       virtual/opengl
-       >=media-libs/freetype-2.0
-       virtual/libintl
-       media-libs/glew
-       dev-cpp/eigen:2
-       >=sci-physics/bullet-2.76
-       iconv? ( virtual/libiconv )
-       zlib? ( sys-libs/zlib )
-       sdl? ( media-libs/libsdl[audio,joystick] )
-       openexr? ( media-libs/openexr )
-       ffmpeg? (
-               >=media-video/ffmpeg-0.5[x264,xvid,mp3,encode,theora]
-               jpeg2k? ( >=media-video/ffmpeg-0.5[x264,xvid,mp3,encode,theora,jpeg2k] )
-       )
-       openal? ( >=media-libs/openal-1.6.372 )
-       fftw? ( sci-libs/fftw:3.0 )
-       jack? ( media-sound/jack-audio-connection-kit )
-       sndfile? ( media-libs/libsndfile )
-       lcms? ( media-libs/lcms )"
-
-DEPEND=">=dev-util/scons-0.98
-       apidoc? (
-               dev-python/sphinx
-               >=app-doc/doxygen-1.5.7[-nodot]
-       )
-       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
-
-S="${WORKDIR}/${MY_P}-source"
-
-blend_with() {
-       local UWORD="$2"
-       [ -z "${UWORD}" ] && UWORD="$1"
-       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
-}
-
-pkg_setup() {
-       enable_openmp=0
-       if use openmp; then
-               if tc-has-openmp; then
-                       enable_openmp=1
-               else
-                       ewarn "You are using gcc built without 'openmp' USE."
-                       ewarn "Switch CXX to an OpenMP capable compiler."
-                       die "Need openmp"
-               fi
-       fi
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-${SLOT}-desktop.patch
-       epatch "${FILESDIR}"/${PN}-${SLOT}-doxygen.patch
-
-       # TODO: write a proper Makefile to replace the borked bmake script
-       epatch "${FILESDIR}"/${PN}-${SLOT}-bmake.patch
-
-       # OpenJPEG
-       einfo "Removing bundled OpenJPEG ..."
-       rm -r extern/libopenjpeg
-
-       # Glew
-       einfo "Removing bundled Glew ..."
-       rm -r extern/glew
-       epatch "${FILESDIR}"/${PN}-${SLOT}-glew.patch
-
-       # Eigen2
-       einfo "Removing bundled Eigen2 ..."
-       rm -r extern/Eigen2
-       epatch "${FILESDIR}"/${PN}-${SLOT}-eigen.patch
-}
-
-src_configure() {
-       # add system openjpeg into Scons build options.
-       cat <<- EOF >> "${S}"/user-config.py
-               BF_OPENJPEG="/usr"
-               BF_OPENJPEG_INC="/usr/include"
-               BF_OPENJPEG_LIB="openjpeg"
-       EOF
-
-       # FIX: littlecms includes path aren't specified
-       if use lcms; then
-               cat <<- EOF >> "${S}"/user-config.py
-                       BF_LCMS_INC="/usr/include/"
-                       BF_LCMS_LIB="lcms"
-                       BF_LCMS_LIBPATH="/usr/lib/"
-               EOF
-       fi
-
-       #add iconv into Scons build options.
-       if use !elibc_glibc && use !elibc_uclibc && use iconv; then
-               cat <<- EOF >> "${S}"/user-config.py
-                       WITH_BF_ICONV=1
-                       BF_ICONV="/usr"
-               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
-
-       # configure Tweak Mode
-       use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
-       # FIX: Game Engine module needs to be active to build the Blender Player
-       if ! use game-engine && use player; then
-               elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
-               echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
-       else
-               blend_with game-engine gameengine
-       fi
-
-       # set CFLAGS used in /etc/make.conf correctly
-       echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
-               | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-       # set CXXFLAGS used in /etc/make.conf correctly
-       local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
-       echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-       echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-       # reset general options passed to the C/C++ compilers (useless hardcoded flags)
-       # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-       # shadows, see bug #276338 for reference
-       echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
-       # set LDFLAGS used in /etc/make.conf correctly
-       local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
-       echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-       echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-       # reset REL_* variables (useless hardcoded flags)
-       cat <<- EOF >> "${S}"/user-config.py
-               REL_CFLAGS=[]
-               REL_CXXFLAGS=[]
-               REL_CCFLAGS=[]
-       EOF
-
-       # reset warning flags (useless for NON blender developers)
-       cat <<- EOF >> "${S}"/user-config.py
-               C_WARN  =[ '-w', '-g0' ]
-               CC_WARN =[ '-w', '-g0' ]
-               CXX_WARN=[ '-w', '-g0' ]
-       EOF
-
-       # detecting -j value from MAKEOPTS
-       local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
-       [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
-       # generic settings which differ from the defaults from linux2-config.py
-       cat <<- EOF >> "${S}"/user-config.py
-               BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
-               BF_INSTALLDIR="../install"
-               WITHOUT_BF_PYTHON_INSTALL=1
-               BF_PYTHON="/usr"
-               BF_BUILDINFO=0
-               BF_QUIET=1
-               BF_NUMJOBS=${NUMJOBS}
-               BF_LINE_OVERWRITE=0
-               WITH_BF_FHS=1
-               WITH_BF_BINRELOC=0
-               WITH_BF_STATICOPENGL=0
-               WITH_BF_OPENMP=${enable_openmp}
-       EOF
-
-       # configure WITH_BF* Scons build options
-       for arg in \
-               'sdl' \
-               'apidoc docs' \
-               'lcms' \
-               'jack' \
-               'sndfile' \
-               'openexr' \
-               'dds' \
-               'fftw fftw3' \
-               'jpeg2k openjpeg' \
-               'openal'\
-               'ffmpeg' \
-               'ffmpeg ogg' \
-               'player' \
-               'collada' \
-               'sse rayoptimization' \
-               'redcode' \
-               'zlib' \
-               'verse' ; do
-               blend_with ${arg}
-       done
-
-       # enable debugging/testing support
-       use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
-       use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-}
-
-src_compile() {
-       scons || die \
-               '!!! Please add "${S}/scons.config" when filing bugs reports \
-               to bugs.gentoo.org'
-
-       einfo "Building plugins ..."
-       cd "${WORKDIR}/install/${MY_PV}/plugins/" \
-               || die "dir ${WORKDIR}/install/plugins/ do not exists"
-       chmod 755 bmake
-
-       # FIX: plugins are built without respecting user's LDFLAGS
-       emake \
-               CFLAGS="${CFLAGS} -fPIC" \
-               LDFLAGS="$(raw-ldflags) -Bshareable" \
-               > /dev/null \
-               || die "plugins compilation failed"
-}
-
-src_install() {
-       # creating binary wrapper
-       cat <<- EOF >> "${WORKDIR}/install/blender-${SLOT}"
-               #!/bin/sh
-
-               # stop this script if the local blender path is a symlink
-               if [ -L \${HOME}/.blender ]; then
-                       echo "Detected a symbolic link for \${HOME}/.blender"
-                       echo "Sorry, to avoid dangerous situations, the Blender binary can"
-                       echo "not be started until you have removed the symbolic link:"
-                       echo "  # rm -i \${HOME}/.blender"
-                       exit 1
-               fi
-
-               export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${SLOT}/scripts"
-        export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${SLOT}/datafiles" 
-                       exec /usr/bin/blender-bin-${SLOT}
-       EOF
-
-       # install binaries
-       exeinto /usr/bin/
-       mv "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${SLOT}"
-       doexe "${WORKDIR}/install/blender-bin-${SLOT}"
-       doexe "${WORKDIR}/install/blender-${SLOT}"
-       if use player; then
-               mv "${WORKDIR}"/install/blenderplayer \
-                       "${WORKDIR}/install/blenderplayer-${SLOT}"
-               doexe "${WORKDIR}"/install/blenderplayer
-       fi
-
-
-       PLUGINDIR="${WORKDIR}/install/${MY_PV}/plugins"
-       # install plugins
-       exeinto /usr/share/${PN}/${SLOT}/textures
-       doexe "${PLUGINDIR}"/texture/*.so
-       exeinto /usr/share/${PN}/${SLOT}/sequences
-       doexe "${PLUGINDIR}"/sequence/*.so
-       insinto /usr/include/${PN}/${SLOT}
-       doins "${PLUGINDIR}"/include/*.h
-       rm -r "${PLUGINDIR}" || 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
-       insinto /usr/share/applications
-       cp release/freedesktop/blender.desktop \
-               release/freedesktop/blender-${SLOT}.desktop
-       doins release/freedesktop/blender-${SLOT}.desktop
-
-       # install docs
-       use doc && dodoc release/text/BlenderQuickStart.pdf
-       if use apidoc; then
-
-               einfo "Generating (BGE) Blender Game Engine API docs ..."
-               docinto "API/BGE_API"
-               dohtml -r "${WORKDIR}"/install/share/${PN}/${SLOT}/doc/*
-               rm -r "${WORKDIR}"/install/share/${PN}/${SLOT}/doc
-
-
-               einfo "Generating Blender C/C++ API docs ..."
-               pushd "${S}"/doc > /dev/null
-                       doxygen -u Doxyfile
-                       doxygen || die "doxygen failed to build API docs."
-                       docinto "API/blender"
-                       dohtml -r html/*
-               popd > /dev/null
-       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/${MY_PV}/*
-       doins release/VERSION
-
-       # 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
-}
-
-pkg_preinst() {
-       if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
-       then
-               rm -r "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
-       fi
-}
-
-pkg_postinst() {
-       echo
-       elog "Blender uses python integration. As such, may have some"
-       elog "inherit risks with running unknown python scripting."
-       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"
-       elog "dragging the main menu down do display all paths."
-       elog
-       elog "Blender has its own internal rendering engine but you"
-       elog "can export to external renderers for image computation"
-       elog "like: YafRay[1], sunflow[2], PovRay[3] and luxrender[4]"
-       elog
-       elog "If you need one of them just emerge it:"
-       elog "  [1] emerge -av media-gfx/yafray"
-       elog "  [2] emerge -av media-gfx/sunflow"
-       elog "  [3] emerge -av media-gfx/povray"
-       elog "  [4] emerge -av media-gfx/luxrender"
-       elog
-       elog "When setting the Blender paths with the User Preferences"
-       elog "dialog box, remember to NOT declare your home's paths as:"
-       elog "~/.blender, but as: /home/user/.blender; in other words,"
-       elog "DO NOT USE the tilde inside the paths, as Blender is not"
-       elog "able to handle it, ignoring your customizations."
-}
-
diff --git a/media-gfx/blender/files/blender-2.5-bmake.patch b/media-gfx/blender/files/blender-2.5-bmake.patch
deleted file mode 100644 (file)
index 9f4c5ab..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- blender/release/plugins/bmake      2010-03-21 17:44:20.500741049 +0100
-+++ blender/release/plugins/bmake      2010-03-21 17:44:33.659740173 +0100
-@@ -57,10 +57,10 @@
-       LDFLAGS="-Bshareable";
- elif ( test $UNAME = "Linux" ) then
-       CC="gcc";
--      CFLAGS="-fPIC -funsigned-char -O2";
-+#     CFLAGS="-fPIC -funsigned-char -O2";
-       LD="ld";
--      LDFLAGS="-Bshareable";
-+#     LDFLAGS="-Bshareable";
- elif ( test $UNAME = "SunOS" ) then
-       CC="cc";
-       CFLAGS="-O";
diff --git a/media-gfx/blender/files/blender-2.5-desktop.patch b/media-gfx/blender/files/blender-2.5-desktop.patch
deleted file mode 100644 (file)
index ac83ad9..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop        2010-09-12 00:05:51.000000000 -0700
-+++ release/freedesktop/blender.desktop        2010-09-12 00:07:32.000000000 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.5
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D Modellierer
-@@ -7,8 +7,8 @@
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
--Exec=blender
--Icon=blender.svg
-+Exec=blender-2.5
-+Icon=blender-2.5.svg
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.5-doxygen.patch b/media-gfx/blender/files/blender-2.5-doxygen.patch
deleted file mode 100644 (file)
index 05ae702..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
---- doc/Doxyfile       2009-08-29 18:14:48.752493755 +0200
-+++ doc/Doxyfile       2009-08-29 18:16:03.509492729 +0200
-@@ -23,7 +23,7 @@
- # This could be handy for archiving the generated documentation or 
- # if some version control system is used.
--PROJECT_NUMBER         = V2.27
-+PROJECT_NUMBER         = 2.50
- # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
- # base path where the generated documentation will be put. 
-@@ -272,19 +272,20 @@
- # The QUIET tag can be used to turn on/off the messages that are generated 
- # by doxygen. Possible values are YES and NO. If left blank NO is used.
--QUIET                  = NO
-+QUIET                  = YES
- # The WARNINGS tag can be used to turn on/off the warning messages that are 
- # generated by doxygen. Possible values are YES and NO. If left blank 
- # NO is used.
--WARNINGS               = YES
-+WARNINGS               = NO
- # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
- # for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
- # automatically be disabled.
--WARN_IF_UNDOCUMENTED   = YES
-+WARN_IF_UNDOCUMENTED   = NO
-+WARN_IF_DOC_ERROR      = NO
- # The WARN_FORMAT tag determines the format of the warning messages that 
- # doxygen can produce. The string should contain the $file, $line, and $text 
diff --git a/media-gfx/blender/files/blender-2.5-eigen.patch b/media-gfx/blender/files/blender-2.5-eigen.patch
deleted file mode 100644 (file)
index 91d8af4..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- intern/itasc/SConscript    2009-09-26 09:14:02.000000000 +0200
-+++ intern/itasc/SConscript    2009-09-26 09:14:54.000000000 +0200
-@@ -5,7 +5,8 @@
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
--incs = '. ../../extern/Eigen2'
-+#incs = '. ../../extern/Eigen2'
-+incs = '. /usr/include/eigen2'
- env.BlenderLib ('bf_ITASC', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
---- source/blender/ikplugin/SConscript
-+++ source/blender/ikplugin/SConscript
-@@ -4,6 +4,6 @@
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2'
- env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] )
diff --git a/media-gfx/blender/files/blender-2.5-glew.patch b/media-gfx/blender/files/blender-2.5-glew.patch
deleted file mode 100644 (file)
index db982c7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- extern/SConscript
-+++ extern/SConscript
-@@ -2,8 +2,6 @@
- Import('env')
--SConscript(['glew/SConscript'])
--
- if env['WITH_BF_BULLET']:
-     SConscript(['bullet2/src/SConscript'])
---- source/blender/editors/include/BIF_gl.h
-+++ source/blender/editors/include/BIF_gl.h
-@@ -31,7 +31,7 @@
- #ifndef BIF_GL_H
- #define BIF_GL_H
--#include "../../../../extern/glew/include/GL/glew.h"
-+#include <GL/glew.h>
-       /*
-        * these should be phased out. cpack should be replaced in