From 190c0cc273624514d2b1aadeafbb1f90bf257b58 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Thu, 6 Dec 2018 21:45:02 +0100
Subject: [PATCH] Godot: use syslibs (#3448)

---
 dev-games/godot/godot-3.0.6.recipe | 40 ++++++++++++++++--------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/dev-games/godot/godot-3.0.6.recipe b/dev-games/godot/godot-3.0.6.recipe
index 669c1aff0..3b6c8952b 100644
--- a/dev-games/godot/godot-3.0.6.recipe
+++ b/dev-games/godot/godot-3.0.6.recipe
@@ -9,14 +9,14 @@ click to a number of platforms, including the major desktop platforms \
 HOMEPAGE="https://godotengine.org/"
 COPYRIGHT="2007-2018 Juan Linietsky, Ariel Manzur"
 LICENSE="MIT"
-REVISION="2"
+REVISION="4"
 SOURCE_URI="https://github.com/godotengine/godot/archive/$portVersion-stable.tar.gz"
 CHECKSUM_SHA256="50431e021ee5ec21002cc23435f530f8fde518c6eb7085c9f7f1027abaae2581"
 SOURCE_DIR="godot-$portVersion-stable"
 PATCHES="godot-3.0.6.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	godot$secondaryArchSuffix = $portVersion
@@ -24,17 +24,18 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
-#	lib:libfreetype$secondaryArchSuffix
+	lib:libenet$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libglew$secondaryArchSuffix
 	lib:libGLU$secondaryArchSuffix
 	lib:libmpcdec$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
-#	lib:libopus$secondaryArchSuffix
-#	lib:libopusfile$secondaryArchSuffix
+	lib:libopus$secondaryArchSuffix
+	lib:libopusfile$secondaryArchSuffix
 	lib:libpcre2_32$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-#	lib:libspeex$secondaryArchSuffix
+	lib:libspeex$secondaryArchSuffix
 	lib:libtheora$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
 	lib:libvpx$secondaryArchSuffix
@@ -45,18 +46,19 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcrypto$secondaryArchSuffix
-#	devel:libfreetype$secondaryArchSuffix
+	devel:libenet$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libglew$secondaryArchSuffix
 	devel:libGLU$secondaryArchSuffix
 	devel:libmpcdec$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
-#	devel:libopus$secondaryArchSuffix
-#	devel:libopusfile$secondaryArchSuffix
+	devel:libopus$secondaryArchSuffix
+	devel:libopusfile$secondaryArchSuffix
 	devel:libpcre2_32$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
-#	devel:libspeex$secondaryArchSuffix
+	devel:libspeex$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libvpx$secondaryArchSuffix
@@ -65,8 +67,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
-	cmd:python
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:python
 	cmd:scons
 	cmd:yasm
 	"
@@ -76,22 +78,24 @@ BUILD()
 	scons $jobArgs \
 		build=release \
 		platform=haiku \
+		builtin_enet=no \
+		builtin_freetype=no \
 		builtin_glew=no \
 		builtin_libmpcdec=no \
 		builtin_libogg=no \
 		builtin_libpng=no \
 		builtin_libtheora=no \
 		builtin_libvorbis=no \
-		builtin_libwebp=no \
-		builtin_zlib=no \
 		builtin_libvpx=no \
+		builtin_libwebp=no \
 		builtin_openssl=no \
+		builtin_opus=no \
 		builtin_pcre2=no \
-		unix_global_settings_path=`finddir B_USER_SETTINGS_DIRECTORY`/Godot
-		#builtin_speex=no
-		#builtin_opus=no
-		#builtin_freetype=no
-		#builtin_squish=no
+		builtin_speex=no \
+		builtin_zlib=no \
+		unix_global_settings_path=$sysconfDir/Godot
+#		builtin_squish=no \
+#		builtin_zstd=no \
 }
 
 INSTALL()