diff --git a/media-gfx/blender/blender-2.79b.recipe b/media-gfx/blender/blender-2.79b.recipe index 08bb78617..93f5c52b6 100644 --- a/media-gfx/blender/blender-2.79b.recipe +++ b/media-gfx/blender/blender-2.79b.recipe @@ -10,7 +10,7 @@ benefit from its unified pipeline and responsive development process." HOMEPAGE="https://www.blender.org/" COPYRIGHT="2002-2017 Blender Foundation" LICENSE="GNU GPL v2" -REVISION="9" +REVISION="10" SOURCE_URI="https://download.blender.org/source/blender-$portVersion.tar.gz" CHECKSUM_SHA256="4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc" PATCHES="blender-$portVersion.patchset" @@ -63,7 +63,7 @@ REQUIRES=" lib:libilmthread_2_2$secondaryArchSuffix lib:libimath_2_2$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix - lib:libLLVM_5.0$secondaryArchSuffix + lib:libLLVM_8$secondaryArchSuffix lib:liblzma$secondaryArchSuffix lib:liblzo2$secondaryArchSuffix lib:libopenal$secondaryArchSuffix @@ -91,7 +91,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - llvm$secondaryArchSuffix + llvm8$secondaryArchSuffix devel:eigen$secondaryArchSuffix devel:libalembic$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix @@ -148,7 +148,7 @@ BUILD_REQUIRES=" lib:libavdevice$secondaryArchSuffix # REQUIRED " BUILD_PREREQUIRES=" - llvm$secondaryArchSuffix + llvm8$secondaryArchSuffix numpy_python3 requests_python3 cmd:cmake @@ -167,8 +167,7 @@ defineDebugInfoPackage blender$secondaryArchSuffix \ BUILD() { - PY_VENDOR_DIR=`finddir B_SYSTEM_LIB_DIRECTORY`/python${PYTHON_VERSION}/vendor-packages - NUMPY_FOLDER=`find $PY_VENDOR_DIR -maxdepth 1 -type d |grep numpy` + NUMPY_FOLDER=`finddir B_SYSTEM_LIB_DIRECTORY`/python${PYTHON_VERSION}/vendor-packages/ PORT_SUBFOLDER=`echo $portVersion | sed 's/.$//'` # OpenCOLLADA workaround @@ -186,8 +185,6 @@ 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=OFF \ - -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ -DWITH_GHOST_SDL=ON \ -Wno-dev" @@ -247,7 +244,10 @@ BUILD() -DWITH_RAYOPTIMIZATION=ON \ -DWITH_SDL=ON \ -DWITH_PLAYER=OFF \ - -DWITH_OPENSUBDIV=ON" + -DWITH_OPENSUBDIV=ON \ + -DWITH_PYTHON_INSTALL=ON \ + -DWITH_PYTHON_INSTALL_NUMPY=ON \ + -DWITH_PYTHON_INSTALL_REQUESTS=ON" # Extra CXX Flags BLENDER_CXX="-std=c++11 $COLLADA_INC_FLAGS"