From 364dbe4e4e64ffa6713d06742c20f8fa02bae64f Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Sat, 4 Aug 2018 22:11:47 +0200
Subject: [PATCH] Blender ffmpeg fix, windowed mode, cleanup, unstrip (#2887)

---
 media-gfx/blender/additional-files/Blender.sh |  2 +
 media-gfx/blender/blender-2.79b.recipe        | 47 ++++++++++++-------
 2 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100755 media-gfx/blender/additional-files/Blender.sh

diff --git a/media-gfx/blender/additional-files/Blender.sh b/media-gfx/blender/additional-files/Blender.sh
new file mode 100755
index 000000000..6b384d41a
--- /dev/null
+++ b/media-gfx/blender/additional-files/Blender.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+`finddir B_APPS_DIRECTORY`/Blender/Blender -p 10 10 800 600
diff --git a/media-gfx/blender/blender-2.79b.recipe b/media-gfx/blender/blender-2.79b.recipe
index a98a84d1e..c6844ddac 100644
--- a/media-gfx/blender/blender-2.79b.recipe
+++ b/media-gfx/blender/blender-2.79b.recipe
@@ -10,11 +10,14 @@ benefit from its unified pipeline and responsive development process."
 HOMEPAGE="https://www.blender.org/"
 COPYRIGHT="2002-2017 Blender Foundation"
 LICENSE="GNU GPL v2"
-REVISION="6"
+REVISION="7"
 SOURCE_URI="https://download.blender.org/source/blender-$portVersion.tar.gz"
 CHECKSUM_SHA256="4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc"
 PATCHES="blender-$portVersion.patchset"
-ADDITIONAL_FILES="blender.rdef.in"
+ADDITIONAL_FILES="
+	blender.rdef.in
+	Blender.sh
+"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
@@ -23,15 +26,14 @@ PYTHON_VERSION="3.6"
 
 PROVIDES="
 	blender$secondaryArchSuffix = $portVersion
-	cmd:blender
-#	cmd:blenderplayer
-#	cmd:blender_thumbnailer.py
+	app:blender
+	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
@@ -84,6 +86,7 @@ REQUIRES="
 	lib:libyaml_cpp$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	python3_numpy
+	requests_python3
 	"
 
 BUILD_REQUIRES="
@@ -91,8 +94,9 @@ BUILD_REQUIRES="
 	llvm$secondaryArchSuffix
 	devel:eigen$secondaryArchSuffix
 	devel:libalembic$secondaryArchSuffix
-#	devel:libavcodec$secondaryArchSuffix
-#	devel:libavdevice$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix
+	devel:libavdevice$secondaryArchSuffix
+	lib:libavdevice$secondaryArchSuffix # REQUIRED
 	devel:libboost_atomic$secondaryArchSuffix
 	devel:libboost_chrono$secondaryArchSuffix
 	devel:libboost_date_time$secondaryArchSuffix
@@ -155,13 +159,11 @@ BUILD_PREREQUIRES="
 	cmd:strip
 	llvm$secondaryArchSuffix
 	python3_numpy
-	#python3_requests #maybe later
+	requests_python3
 	"
 
-
 defineDebugInfoPackage blender$secondaryArchSuffix \
 	$appsDir/Blender/Blender
-#	$binDir/cycles
 
 BUILD()
 {
@@ -191,7 +193,6 @@ BUILD()
 
 	# Release settings breaks build on Haiku
 	BLENDER_BUGOUS="-DWITH_CYCLES_LOGGING=OFF \
-		-DWITH_CODEC_FFMPEG=OFF \
 		-DWITH_GAMEENGINE_DECKLINK=OFF \
 		-DWITH_GTESTS=OFF \
 		-DWITH_SYSTEM_EIGEN3=ON \
@@ -207,6 +208,7 @@ 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 \
@@ -248,8 +250,7 @@ BUILD()
 		-DWITH_OPENSUBDIV=ON"
 
 	# Extra CXX Flags
-	BLENDER_CXX="-L`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir \
-		-std=c++11 $COLLADA_INC_FLAGS"
+	BLENDER_CXX="-std=c++11 $COLLADA_INC_FLAGS"
 
 	mkdir -p build_haiku
 	cd build_haiku
@@ -270,7 +271,6 @@ INSTALL()
 	make install $jobArgs
 
 	mv $appsDir/Blender/blender $appsDir/Blender/Blender
-	strip $appsDir/Blender/Blender
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2 | sed 's/[a-z]*//g'`"
@@ -284,6 +284,15 @@ INSTALL()
 	addResourcesToBinaries blender.rdef \
 		$appsDir/Blender/Blender
 
+	# Startscript for windowed mode (WORKAROUND)
+	cp $portDir/additional-files/Blender.sh $appsDir/Blender/
+	chmod +x $appsDir/Blender/Blender.sh
+
+	# Installing extra-attribs
+	rc blender.rdef
+	resattr -o $appsDir/Blender/Blender.sh \
+		blender.rsrc
+
 	cd $appsDir/Blender
 	mkdir -p $docDir/blender
 
@@ -295,7 +304,11 @@ INSTALL()
 
 	rm -rf blender.desktop
 
-	addAppDeskbarSymlink $appsDir/Blender/Blender Blender
+	addAppDeskbarSymlink $appsDir/Blender/Blender.sh Blender
+
+	mkdir -p $binDir
+	ln -s $appsDir/Blender/blender_thumbnailer.py \
+		$binDir/blender_thumbnailer.py
 }
 
 TEST()