From 18d0b1d8a0dc25986cc5fc2e14e92fb56ab39e78 Mon Sep 17 00:00:00 2001
From: X547 <45505339+X547@users.noreply.github.com>
Date: Sun, 22 Dec 2019 04:00:00 +0900
Subject: [PATCH] Blender: fix regression by using python 3.6, small fixes
 (#4465)

* fix regression by using python 3.6, small fixes

* remove git
---
 media-gfx/blender/blender-2.79b.recipe | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-gfx/blender/blender-2.79b.recipe b/media-gfx/blender/blender-2.79b.recipe
index 214a7015d..957c0576a 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="14"
+REVISION="15"
 SOURCE_URI="https://download.blender.org/source/blender-$portVersion.tar.gz"
 CHECKSUM_SHA256="4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc"
 PATCHES="
@@ -24,7 +24,7 @@ ADDITIONAL_FILES="
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
-PYTHON_VERSION="3.7"
+PYTHON_VERSION="3.6"
 
 PROVIDES="
 	blender$secondaryArchSuffix = $portVersion
@@ -150,8 +150,8 @@ BUILD_REQUIRES="
 	lib:libavdevice$secondaryArchSuffix # REQUIRED
 	"
 BUILD_PREREQUIRES="
-	numpy_python3
-	requests_python3
+	numpy_python36
+	requests_python36
 	cmd:cmake
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
@@ -167,7 +167,6 @@ defineDebugInfoPackage blender$secondaryArchSuffix \
 
 BUILD()
 {
-	NUMPY_FOLDER=`finddir B_SYSTEM_LIB_DIRECTORY`/python${PYTHON_VERSION}/vendor-packages/
 	PORT_SUBFOLDER=`echo $portVersion | sed 's/.$//'`
 
 	# OpenCOLLADA workaround
@@ -184,7 +183,11 @@ BUILD()
 		-DPYTHON_INCLUDE_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY`/python${PYTHON_VERSION}m/ \
 		-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 \
+		-DPYTHON_NUMPY_PATH=`finddir B_SYSTEM_LIB_DIRECTORY`/python${PYTHON_VERSION}/vendor-packages \
+		-DPYTHON_REQUESTS_PATH=`finddir B_SYSTEM_LIB_DIRECTORY`/python${PYTHON_VERSION}/vendor-packages \
+		-DOPENJPEG_INCLUDE_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY` \
+		-DOPENJPEG_LIBRARY=`finddir B_SYSTEM_LIB_DIRECTORY` \
+		-DZLIB_LIBRARY_RELEASE=`finddir B_SYSTEM_LIB_DIRECTORY`/libz.so.1 \
 		-DWITH_GHOST_SDL=ON \
 		-Wno-dev"