diff options
author | 2014-12-16 15:58:39 +0000 | |
---|---|---|
committer | 2014-12-16 15:58:39 +0000 | |
commit | 74cffde295e99d92591807ac3500c05bd889f762 (patch) | |
tree | 1bfc4367bf089a49da058b1fb1a96e592e4dd994 /media-gfx/blender | |
parent | Fix changelog (diff) | |
download | gentoo-2-74cffde295e99d92591807ac3500c05bd889f762.tar.gz gentoo-2-74cffde295e99d92591807ac3500c05bd889f762.tar.bz2 gentoo-2-74cffde295e99d92591807ac3500c05bd889f762.zip |
rm old
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'media-gfx/blender')
-rw-r--r-- | media-gfx/blender/ChangeLog | 12 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.69-r1.ebuild | 263 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.71-r2.ebuild | 276 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.72-r1.ebuild | 274 | ||||
-rw-r--r-- | media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch | 61 | ||||
-rw-r--r-- | media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch | 105 | ||||
-rw-r--r-- | media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch | 111 | ||||
-rw-r--r-- | media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch | 334 | ||||
-rw-r--r-- | media-gfx/blender/files/07-blender-2.68-sse2.patch | 35 | ||||
-rw-r--r-- | media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch | 62 |
10 files changed, 11 insertions, 1522 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 10abebd71282..c6c88f321cc9 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.276 2014/10/27 20:53:30 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.277 2014/12/16 15:58:39 hasufell Exp $ + + 16 Dec 2014; Julian Ospald <hasufell@gentoo.org> -blender-2.69-r1.ebuild, + -blender-2.71-r2.ebuild, -blender-2.72-r1.ebuild, + -files/07-blender-2.68-sse2.patch, + -files/02-blender-2.68-unbundle-colamd.patch, + -files/05-blender-2.68-unbundle-eigen3.patch, + -files/04-blender-2.68-unbundle-glog.patch, + -files/04-blender-2.71-r2-unbundle-glog.patch, + -files/09-blender-2.72-unbundle-minilzo.patch: + rm old *blender-2.72b (27 Oct 2014) diff --git a/media-gfx/blender/blender-2.69-r1.ebuild b/media-gfx/blender/blender-2.69-r1.ebuild deleted file mode 100644 index 4f5d44349993..000000000000 --- a/media-gfx/blender/blender-2.69-r1.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.69-r1.ebuild,v 1.2 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - media-video/ffmpeg:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.68-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.68-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/libmv/third_party/{ldl,glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - 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 - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.71-r2.ebuild b/media-gfx/blender/blender-2.71-r2.ebuild deleted file mode 100644 index c35a94bc0348..000000000000 --- a/media-gfx/blender/blender-2.71-r2.ebuild +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.71-r2.ebuild,v 1.1 2014/09/27 14:55:43 hasufell Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_4 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz -> ${PF}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/gflags-2.1.1-r1 - >=dev-cpp/glog-0.3.3-r1[gflags] - >=dev-libs/lzo-2.08:2 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( <=media-libs/opencolorio-1.0.9 ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${PN}-v${PV} - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.71-r2-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch \ - "${FILESDIR}"/08-${PN}-2.71-gflags.patch \ - "${FILESDIR}"/09-${PN}-2.72-unbundle-minilzo.patch - - epatch_user - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/lzo \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - cd "${S}"/release/datafiles/locale/po - for i in *.po ; do - mylang=${i%.po} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - 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 - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.72-r1.ebuild b/media-gfx/blender/blender-2.72-r1.ebuild deleted file mode 100644 index 7a6c17179480..000000000000 --- a/media-gfx/blender/blender-2.72-r1.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72-r1.ebuild,v 1.1 2014/09/27 15:03:38 hasufell Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_4 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/gflags-2.1.1-r1 - >=dev-cpp/glog-0.3.3-r1[gflags] - >=dev-libs/lzo-2.08:2 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( <=media-libs/opencolorio-1.0.9 ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.71-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.71-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.72-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch \ - "${FILESDIR}"/08-${PN}-2.71-gflags.patch \ - "${FILESDIR}"/09-${PN}-2.72-unbundle-minilzo.patch - - epatch_user - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/lzo \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - cd "${S}"/release/datafiles/locale/po - for i in *.po ; do - mylang=${i%.po} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - 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 - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch b/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch deleted file mode 100644 index 7103a57cb568..000000000000 --- a/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit f6af85bef74ae6d1df1e811db7274829e50f10a9 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:37:21 2013 +0200 - - unbundle colamd - -diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt -index f6de873..2b40c22 100644 ---- a/extern/CMakeLists.txt -+++ b/extern/CMakeLists.txt -@@ -26,7 +26,6 @@ - # Otherwise we get warnings here that we cant fix in external projects - remove_strict_flags() - --add_subdirectory(colamd) - add_subdirectory(rangetree) - add_subdirectory(wcwidth) - add_subdirectory(libmv) -diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt -index d91319d..bc3baee 100644 ---- a/source/blenderplayer/CMakeLists.txt -+++ b/source/blenderplayer/CMakeLists.txt -@@ -170,8 +170,6 @@ endif() - list(APPEND BLENDER_SORTED_LIBS extern_ceres) - endif() - -- list(APPEND BLENDER_SORTED_LIBS extern_colamd) -- - if(WITH_MOD_BOOLEAN) - list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp) - list(APPEND BLENDER_SORTED_LIBS bf_intern_moto) -@@ -214,7 +212,7 @@ endif() - list(SORT REM_MSG) - message(STATUS "Player Skipping: (${REM_MSG})") - endif() -- target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) -+ target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd) - - unset(SEARCHLIB) - unset(SORTLIB) -diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt -index 8ff4ec4..c84d944 100644 ---- a/source/creator/CMakeLists.txt -+++ b/source/creator/CMakeLists.txt -@@ -919,7 +919,6 @@ endif() - bf_intern_smoke - extern_minilzo - extern_lzma -- extern_colamd - ge_logic_ketsji - extern_recastnavigation - ge_logic -@@ -1033,7 +1032,7 @@ endif() - list(SORT REM_MSG) - message(STATUS "Blender Skipping: (${REM_MSG})") - endif() -- target_link_libraries(blender ${BLENDER_SORTED_LIBS}) -+ target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd) - - unset(SEARCHLIB) - unset(SORTLIB) diff --git a/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch deleted file mode 100644 index 2ac54394db1c..000000000000 --- a/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch +++ /dev/null @@ -1,105 +0,0 @@ -commit 26e853d31931a8bb08695aa98ae53b263236d407 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:40:23 2013 +0200 - - unbundle glog/gflags - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1a7830..a30831c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - - #----------------------------------------------------------------------------- -+# Check for some modules -+if(UNIX) -+ find_package(PkgConfig) -+ pkg_check_modules(_PC_GFLAGS libgflags) -+ pkg_check_modules(_PC_GLOG libglog) -+endif() -+ -+#----------------------------------------------------------------------------- - # Set default config options - - get_blender_version() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 2c9a219..7061e04 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -88,9 +88,6 @@ if(WITH_LIBMV) - third_party/fast/fast_9.c - third_party/fast/fast.c - third_party/fast/nonmax.c -- third_party/gflags/gflags.cc -- third_party/gflags/gflags_completions.cc -- third_party/gflags/gflags_reporting.cc - - libmv/base/id_generator.h - libmv/base/scoped_ptr.h -@@ -141,12 +138,6 @@ if(WITH_LIBMV) - libmv/tracking/trklt_region_tracker.h - - third_party/fast/fast.h -- third_party/gflags/config.h -- third_party/gflags/gflags/gflags_completions.h -- third_party/gflags/gflags/gflags_declare.h -- third_party/gflags/gflags/gflags.h -- third_party/gflags/mutex.h -- third_party/gflags/util.h - third_party/msinttypes/inttypes.h - third_party/msinttypes/stdint.h - ) -@@ -187,42 +178,6 @@ if(WITH_LIBMV) - third_party/msinttypes - ) - endif() -- else() -- list(APPEND SRC -- third_party/glog/src/demangle.cc -- third_party/glog/src/logging.cc -- third_party/glog/src/raw_logging.cc -- third_party/glog/src/signalhandler.cc -- third_party/glog/src/symbolize.cc -- third_party/glog/src/utilities.cc -- third_party/glog/src/vlog_is_on.cc -- -- third_party/glog/src/base/commandlineflags.h -- third_party/glog/src/base/googleinit.h -- third_party/glog/src/base/mutex.h -- third_party/glog/src/config_freebsd.h -- third_party/glog/src/config.h -- third_party/glog/src/config_hurd.h -- third_party/glog/src/config_linux.h -- third_party/glog/src/config_mac.h -- third_party/glog/src/demangle.h -- third_party/glog/src/glog/logging.h -- third_party/glog/src/glog/log_severity.h -- third_party/glog/src/glog/raw_logging.h -- third_party/glog/src/glog/vlog_is_on.h -- third_party/glog/src/stacktrace_generic-inl.h -- third_party/glog/src/stacktrace.h -- third_party/glog/src/stacktrace_libunwind-inl.h -- third_party/glog/src/stacktrace_powerpc-inl.h -- third_party/glog/src/stacktrace_x86_64-inl.h -- third_party/glog/src/stacktrace_x86-inl.h -- third_party/glog/src/symbolize.h -- third_party/glog/src/utilities.h -- ) -- -- list(APPEND INC -- third_party/glog/src -- ) - endif() - - add_definitions( -@@ -234,7 +189,9 @@ else() - ) - endif() - -+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) - blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") -+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) - - if(WITH_LIBMV) - add_subdirectory(third_party) diff --git a/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch deleted file mode 100644 index b64f60ba0b94..000000000000 --- a/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch +++ /dev/null @@ -1,111 +0,0 @@ -commit 26e853d31931a8bb08695aa98ae53b263236d407 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:40:23 2013 +0200 - - unbundle glog/gflags - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1a7830..a30831c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - - #----------------------------------------------------------------------------- -+# Check for some modules -+if(UNIX) -+ find_package(PkgConfig) -+ pkg_check_modules(_PC_GFLAGS libgflags) -+ pkg_check_modules(_PC_GLOG libglog) -+endif() -+ -+#----------------------------------------------------------------------------- - # Set default config options - - get_blender_version() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 2c9a219..7061e04 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -44,8 +44,6 @@ - ) - - list(APPEND INC -- third_party/gflags -- third_party/glog/src - third_party/ceres/include - ../../intern/guardedalloc - ) -@@ -92,10 +90,6 @@ - libmv/tracking/track_region.cc - libmv/tracking/trklt_region_tracker.cc - -- third_party/gflags/gflags.cc -- third_party/gflags/gflags_completions.cc -- third_party/gflags/gflags_reporting.cc -- - libmv-util.h - libmv/base/aligned_malloc.h - libmv/base/id_generator.h -@@ -149,12 +143,6 @@ - libmv/tracking/track_region.h - libmv/tracking/trklt_region_tracker.h - -- third_party/gflags/config.h -- third_party/gflags/gflags/gflags_completions.h -- third_party/gflags/gflags/gflags_declare.h -- third_party/gflags/gflags/gflags.h -- third_party/gflags/mutex.h -- third_party/gflags/util.h - third_party/msinttypes/inttypes.h - third_party/msinttypes/stdint.h - ) -@@ -195,38 +183,6 @@ - third_party/msinttypes - ) - endif() -- else() -- list(APPEND SRC -- third_party/glog/src/demangle.cc -- third_party/glog/src/logging.cc -- third_party/glog/src/raw_logging.cc -- third_party/glog/src/signalhandler.cc -- third_party/glog/src/symbolize.cc -- third_party/glog/src/utilities.cc -- third_party/glog/src/vlog_is_on.cc -- -- third_party/glog/src/base/commandlineflags.h -- third_party/glog/src/base/googleinit.h -- third_party/glog/src/base/mutex.h -- third_party/glog/src/config_freebsd.h -- third_party/glog/src/config.h -- third_party/glog/src/config_hurd.h -- third_party/glog/src/config_linux.h -- third_party/glog/src/config_mac.h -- third_party/glog/src/demangle.h -- third_party/glog/src/glog/logging.h -- third_party/glog/src/glog/log_severity.h -- third_party/glog/src/glog/raw_logging.h -- third_party/glog/src/glog/vlog_is_on.h -- third_party/glog/src/stacktrace_generic-inl.h -- third_party/glog/src/stacktrace.h -- third_party/glog/src/stacktrace_libunwind-inl.h -- third_party/glog/src/stacktrace_powerpc-inl.h -- third_party/glog/src/stacktrace_x86_64-inl.h -- third_party/glog/src/stacktrace_x86-inl.h -- third_party/glog/src/symbolize.h -- third_party/glog/src/utilities.h -- ) - endif() - else() - list(APPEND SRC -@@ -234,7 +190,9 @@ - ) - endif() - -+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) - blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") -+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) - - if(WITH_LIBMV) - add_subdirectory(third_party) diff --git a/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch b/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch deleted file mode 100644 index 0382bbc051ff..000000000000 --- a/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch +++ /dev/null @@ -1,334 +0,0 @@ -commit 03b41be3de15b4810e55ff1988d27d28eb358df0 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:47:43 2013 +0200 - - unbundle Eigen3 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a30831c..78bb3c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -109,6 +109,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - # Check for some modules - if(UNIX) - find_package(PkgConfig) -+ pkg_check_modules(_PC_EIGEN3 eigen3) - pkg_check_modules(_PC_GFLAGS libgflags) - pkg_check_modules(_PC_GLOG libglog) - endif() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 7061e04..b8ab180 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -44,7 +44,7 @@ if(WITH_LIBMV) - ) - - set(INC_SYS -- ../Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ${PNG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} - ) -diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt -index 0645883..d79fe9e 100644 ---- a/extern/libmv/third_party/ceres/CMakeLists.txt -+++ b/extern/libmv/third_party/ceres/CMakeLists.txt -@@ -35,7 +35,7 @@ set(INC - ) - - set(INC_SYS -- ../../../Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt -index da5e10f..a4aae1b 100644 ---- a/intern/dualcon/CMakeLists.txt -+++ b/intern/dualcon/CMakeLists.txt -@@ -22,7 +22,7 @@ set(INC - ) - - set(INC_SYS -- ../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt -index bc3ea0c..f8cbc23 100644 ---- a/intern/itasc/CMakeLists.txt -+++ b/intern/itasc/CMakeLists.txt -@@ -28,7 +28,7 @@ - ) - - set(INC_SYS -- ../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -@@ -119,237 +119,6 @@ - kdl/frameacc.inl - kdl/frames.inl - kdl/framevel.inl -- -- # until we have another user... -- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h -- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h -- ../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h -- ../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h -- ../../extern/Eigen3/Eigen/src/Core/Array.h -- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h -- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h -- ../../extern/Eigen3/Eigen/src/Core/Assign.h -- ../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/Block.h -- ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h -- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h -- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h -- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h -- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h -- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h -- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h -- ../../extern/Eigen3/Eigen/src/Core/Dot.h -- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h -- ../../extern/Eigen3/Eigen/src/Core/Flagged.h -- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h -- ../../extern/Eigen3/Eigen/src/Core/Functors.h -- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h -- ../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h -- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/IO.h -- ../../extern/Eigen3/Eigen/src/Core/Map.h -- ../../extern/Eigen3/Eigen/src/Core/MapBase.h -- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/Matrix.h -- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h -- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h -- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h -- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h -- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h -- ../../extern/Eigen3/Eigen/src/Core/Product.h -- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h -- ../../extern/Eigen3/Eigen/src/Core/Random.h -- ../../extern/Eigen3/Eigen/src/Core/Redux.h -- ../../extern/Eigen3/Eigen/src/Core/Replicate.h -- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h -- ../../extern/Eigen3/Eigen/src/Core/Reverse.h -- ../../extern/Eigen3/Eigen/src/Core/Select.h -- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h -- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h -- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h -- ../../extern/Eigen3/Eigen/src/Core/Stride.h -- ../../extern/Eigen3/Eigen/src/Core/Swap.h -- ../../extern/Eigen3/Eigen/src/Core/Transpose.h -- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h -- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h -- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h -- ../../extern/Eigen3/Eigen/src/Core/Visitor.h -- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h -- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h -- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h -- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h -- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h -- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h -- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h -- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h -- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h -- ../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h -- ../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h -- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h -- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h -- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h -- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h -- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h -- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h -- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h -- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h -- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h -- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h -- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h -- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h -- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h -- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h -- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h -- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h -- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h -- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h -- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h -- ../../extern/Eigen3/Eigen/src/Householder/Householder.h -- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h -- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h -- ../../extern/Eigen3/Eigen/src/LU/Determinant.h -- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h -- ../../extern/Eigen3/Eigen/src/LU/Inverse.h -- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h -- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h -- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h -- ../../extern/Eigen3/Eigen/src/misc/blas.h -- ../../extern/Eigen3/Eigen/src/misc/Image.h -- ../../extern/Eigen3/Eigen/src/misc/Kernel.h -- ../../extern/Eigen3/Eigen/src/misc/Solve.h -- ../../extern/Eigen3/Eigen/src/misc/SparseSolve.h -- ../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h -- ../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h -- ../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h -- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h -- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h -- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h -- ../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h -- ../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h -- ../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h -- ../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h -- ../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h -- ../../extern/Eigen3/Eigen/src/StlSupport/details.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h -- ../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h -- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h -- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h -- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h -- ../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h - ) - - -diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt -index 0a0e0e6..45fe6c9 100644 ---- a/source/blender/ikplugin/CMakeLists.txt -+++ b/source/blender/ikplugin/CMakeLists.txt -@@ -59,7 +59,7 @@ if(WITH_IK_ITASC) - ../../../intern/itasc - ) - list(APPEND INC_SYS -- ../../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - list(APPEND SRC - intern/itasc_plugin.cpp -diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt -index 084a85c..7cdfa01 100644 ---- a/source/gameengine/Converter/CMakeLists.txt -+++ b/source/gameengine/Converter/CMakeLists.txt -@@ -57,7 +57,7 @@ set(INC - set(INC_SYS - ../../../intern/moto/include - ../../../extern/recastnavigation/Detour/Include -- ../../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ${PTHREADS_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIR} - ) diff --git a/media-gfx/blender/files/07-blender-2.68-sse2.patch b/media-gfx/blender/files/07-blender-2.68-sse2.patch deleted file mode 100644 index 18b12db700d0..000000000000 --- a/media-gfx/blender/files/07-blender-2.68-sse2.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:50:19 2013 +0200 - - add option to explicitly control sse2 optimization - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78bb3c6..d5f4576 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -86,6 +86,7 @@ cmake_policy(SET CMP0014 NEW) - #----------------------------------------------------------------------------- - # Load some macros. - include(build_files/cmake/macros.cmake) -+include(CMakeDependentOption) - - - #----------------------------------------------------------------------------- -@@ -255,6 +256,7 @@ option(WITH_FREESTYLE "Enable Freestyle (advanced edges rendering)" ON) - # Misc - option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) - option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) -+cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF) - if(UNIX AND NOT APPLE) - option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) - option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF) -@@ -1833,7 +1835,7 @@ if(WITH_RAYOPTIMIZATION) - set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") - add_definitions(-D__SSE__ -D__MMX__) - endif() -- if(SUPPORT_SSE2_BUILD) -+ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD) - set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") - add_definitions(-D__SSE2__) - if(NOT SUPPORT_SSE_BUILD) # dont double up diff --git a/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch b/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch deleted file mode 100644 index e3ebc31532c7..000000000000 --- a/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Sat Sep 27 13:35:35 UTC 2014 -Subject: unbundle vulnerable minilzo version - ---- source/blender/blenkernel/intern/pointcache.c -+++ source/blender/blenkernel/intern/pointcache.c -@@ -84,11 +84,14 @@ - #endif - - #ifdef WITH_LZO --#include "minilzo.h" --#else -+#include <lzo/lzo1x.h> -+ -+#define LZO_HEAP_ALLOC(var,size) \ -+ lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] -+#endif -+ - /* used for non-lzo cases */ - #define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) --#endif - - #ifdef WITH_LZMA - #include "LzmaLib.h" ---- extern/CMakeLists.txt -+++ extern/CMakeLists.txt -@@ -62,10 +62,6 @@ - add_subdirectory(libredcode) - endif() - --if(WITH_LZO) -- add_subdirectory(lzo) --endif() -- - if(WITH_LZMA) - add_subdirectory(lzma) - endif() ---- source/blender/blenkernel/CMakeLists.txt -+++ source/blender/blenkernel/CMakeLists.txt -@@ -397,9 +397,6 @@ - endif() - - if(WITH_LZO) -- list(APPEND INC_SYS -- ../../../extern/lzo/minilzo -- ) - add_definitions(-DWITH_LZO) - endif() - ---- build_files/cmake/macros.cmake -+++ build_files/cmake/macros.cmake -@@ -304,6 +304,10 @@ - endif() - endif() - -+ if(WITH_LZO) -+ target_link_libraries(${target} liblzo2.so) -+ endif() -+ - if(WITH_SYSTEM_GLEW) - target_link_libraries(${target} ${GLEW_LIBRARY}) - endif() |