diff --git a/media-gfx/blender/blender-2.79.recipe b/media-gfx/blender/blender-2.79b.recipe similarity index 86% rename from media-gfx/blender/blender-2.79.recipe rename to media-gfx/blender/blender-2.79b.recipe index c8fe0711b..991ea428e 100644 --- a/media-gfx/blender/blender-2.79.recipe +++ b/media-gfx/blender/blender-2.79b.recipe @@ -10,9 +10,9 @@ benefit from its unified pipeline and responsive development process." HOMEPAGE="http://www.blender.org/" COPYRIGHT="2002-2017 Blender Foundation" LICENSE="GNU GPL v2" -REVISION="8" +REVISION="1" SOURCE_URI="http://download.blender.org/source/blender-$portVersion.tar.gz" -CHECKSUM_SHA256="a9de03e769a2a4a0bf92186556896c4f4d32fd9ac4480915ae92d7f95b25c899" +CHECKSUM_SHA256="4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc" PATCHES="blender-$portVersion.patchset" ADDITIONAL_FILES="blender.rdef.in" @@ -24,14 +24,14 @@ PYTHON_VERSION="3.6" PROVIDES=" blender$secondaryArchSuffix = $portVersion cmd:blender - cmd:blenderplayer - cmd:blender_thumbnailer.py +# cmd:blenderplayer +# cmd:blender_thumbnailer.py " REQUIRES=" haiku$secondaryArchSuffix lib:libalembic$secondaryArchSuffix - lib:libavcodec$secondaryArchSuffix - lib:libavdevice$secondaryArchSuffix +# lib:libavcodec$secondaryArchSuffix +# lib:libavdevice$secondaryArchSuffix lib:libboost_atomic$secondaryArchSuffix lib:libboost_chrono$secondaryArchSuffix lib:libboost_date_time$secondaryArchSuffix @@ -40,7 +40,7 @@ REQUIRES=" lib:libboost_regex$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:libboost_thread$secondaryArchSuffix -# lib:libexecinfo$secondaryArchSuffix + lib:libexecinfo$secondaryArchSuffix lib:libfftw3$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix @@ -67,10 +67,10 @@ REQUIRES=" lib:libopencolorio$secondaryArchSuffix lib:libopenimageio$secondaryArchSuffix # lib:libopenjp2$secondaryArchSuffix -# lib:libopenvdb$secondaryArchSuffix + lib:libopenvdb$secondaryArchSuffix lib:libosdCPU$secondaryArchSuffix lib:libosdGPU$secondaryArchSuffix -# lib:liboslcomp$secondaryArchSuffix + lib:liboslcomp$secondaryArchSuffix lib:libpcre$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libpugixml$secondaryArchSuffix @@ -91,8 +91,8 @@ BUILD_REQUIRES=" llvm$secondaryArchSuffix devel:eigen$secondaryArchSuffix devel:libalembic$secondaryArchSuffix - devel:libavcodec$secondaryArchSuffix - devel:libavdevice$secondaryArchSuffix +# devel:libavcodec$secondaryArchSuffix +# devel:libavdevice$secondaryArchSuffix devel:libboost_atomic$secondaryArchSuffix devel:libboost_chrono$secondaryArchSuffix devel:libboost_date_time$secondaryArchSuffix @@ -101,7 +101,7 @@ BUILD_REQUIRES=" devel:libboost_regex$secondaryArchSuffix devel:libboost_system$secondaryArchSuffix devel:libboost_thread$secondaryArchSuffix -# devel:libexecinfo$secondaryArchSuffix + devel:libexecinfo$secondaryArchSuffix devel:libfftw3$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix # devel:libgflags$secondaryArchSuffix @@ -126,10 +126,10 @@ BUILD_REQUIRES=" devel:libopencolorio$secondaryArchSuffix devel:libopenimageio$secondaryArchSuffix # devel:libopenjp2$secondaryArchSuffix -# devel:libopenvdb$secondaryArchSuffix + devel:libopenvdb$secondaryArchSuffix devel:libosdCPU$secondaryArchSuffix devel:libosdGPU$secondaryArchSuffix -# devel:liboslcomp$secondaryArchSuffix + devel:liboslcomp$secondaryArchSuffix devel:libpcre$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libpugixml$secondaryArchSuffix @@ -158,9 +158,9 @@ BUILD_PREREQUIRES=" #python3_requests #maybe later " -# Debuginfo strips the Icon, so lets disable it for now. -#defineDebugInfoPackage blender$secondaryArchSuffix \ -# $appsDir/Blender/Blender \ + +defineDebugInfoPackage blender$secondaryArchSuffix \ + $appsDir/Blender/Blender # $binDir/cycles BUILD() @@ -184,27 +184,25 @@ BUILD() -DPYTHON_LIBRARY=`finddir B_SYSTEM_LIB_DIRECTORY`/libpython${PYTHON_VERSION}m.so.1.0 \ -DPYTHON_EXECUTABLE=/bin/python${PYTHON_VERSION} \ -DPYTHON_NUMPY_PATH=$NUMPY_FOLDER \ - -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF \ - -DWITH_PYTHON_INSTALL_REQUESTS:BOOL=OFF \ - -DWITH_GHOST_SDL:BOOL=ON \ + -DWITH_PYTHON_INSTALL_NUMPY=OFF \ + -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ + -DWITH_GHOST_SDL=ON \ -Wno-dev" # Release settings breaks build on Haiku - BLENDER_BUGOUS="-DWITH_SYSTEM_OPENJPEG:BOOL=OFF \ - -DWITH_SYSTEM_GLOG:BOOL=OFF \ - -DWITH_SYSTEM_GFLAGS:BOOL=OFF \ - -DWITH_GTESTS:BOOL=OFF \ - -DWITH_CYCLES_OSL=OFF \ - -DWITH_OPENVDB=OFF \ - -DWITH_OPENVDB_BLOSC=OFF \ - -DWITH_BOOST:BOOL=ON \ - -DWITH_GAMEENGINE_DECKLINK:BOOL=OFF \ - -DWITH_OPENIMAGEIO:BOOL=ON \ - -DWITH_SYSTEM_EIGEN3:BOOL=ON \ - -DWITH_SYSTEM_LZO:BOOL=ON \ - -DWITH_LLVM:BOOL=ON \ - -DWITH_CYCLES_NATIVE_ONLY:BOOL=ON \ - -DWITH_CYCLES_OPENSUBDIV:BOOL=ON" + BLENDER_BUGOUS="-DWITH_BOOST=ON \ + -DWITH_CYCLES_NATIVE_ONLY=ON \ + -DWITH_CYCLES_LOGGING=OFF \ + -DWITH_CODEC_FFMPEG=OFF \ + -DWITH_GAMEENGINE_DECKLINK=OFF \ + -DWITH_GTESTS=OFF \ + -DWITH_LLVM=ON \ + -DWITH_OPENIMAGEIO=ON \ + -DWITH_SYSTEM_EIGEN3=ON \ + -DWITH_SYSTEM_GFLAGS=OFF \ + -DWITH_SYSTEM_GLOG=OFF \ + -DWITH_SYSTEM_OPENJPEG=OFF \ + -DWITH_SYSTEM_LZO=ON" # Missing deps on Haiku BLENDER_MISSING="-DWITH_JACK=OFF \ @@ -216,10 +214,10 @@ BUILD() -DWITH_BUILDINFO=ON \ -DWITH_BULLET=ON \ -DWITH_CODEC_AVI=ON \ - -DWITH_CODEC_FFMPEG=ON \ -DWITH_CODEC_SNDFILE=ON \ -DWITH_CYCLES=ON \ -DWITH_CYCLES_OPENSUBDIV=ON \ + -DWITH_CYCLES_OSL=ON \ -DWITH_FFTW3=ON \ -DWITH_LIBMV=ON \ -DWITH_LIBMV_SCHUR_SPECIALIZATIONS=ON \ @@ -248,10 +246,12 @@ BUILD() -DWITH_OPENCOLLADA=ON \ -DWITH_OPENCOLORIO=ON \ -DWITH_OPENMP=ON \ + -DWITH_OPENVDB=ON \ + -DWITH_OPENVDB_BLOSC=ON \ -DWITH_PYTHON_INSTALL=ON \ -DWITH_RAYOPTIMIZATION=ON \ -DWITH_SDL=ON \ - -DWITH_PLAYER=ON \ + -DWITH_PLAYER=OFF \ -DWITH_OPENSUBDIV=ON" # Extra CXX Flags diff --git a/media-gfx/blender/patches/blender-2.79.patchset b/media-gfx/blender/patches/blender-2.79b.patchset similarity index 100% rename from media-gfx/blender/patches/blender-2.79.patchset rename to media-gfx/blender/patches/blender-2.79b.patchset