Preliminary x86 support (#3447)

dev-games/godot/godot-3.0.6.recipe

@@ -9,7 +9,7 @@ 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="1"
+REVISION="2"
 SOURCE_URI="https://github.com/godotengine/godot/archive/$portVersion-stable.tar.gz"
 CHECKSUM_SHA256="50431e021ee5ec21002cc23435f530f8fde518c6eb7085c9f7f1027abaae2581"
 SOURCE_DIR="godot-$portVersion-stable"

dev-games/godot/patches/godot-3.0.6.patchset

@@ -1,4 +1,4 @@
-From 101796803d9cf94d60c798f02b7c5529ef56fb02 Mon Sep 17 00:00:00 2001
+From 22fa1be90b4b3601e841079e5469b63fd1debd8b Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 9 Jul 2018 15:36:13 +0200
 Subject: Fix various things for Godot 3
@@ -757,7 +757,7 @@ index 3038297..16dc694 100644
 2.19.1
 
 
-From 9e5baf04b74b59840a434e4bf0101792bfcd2f4a Mon Sep 17 00:00:00 2001
+From 0c979385909db4218199ed39ee9d21e4aa13f142 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 10 Jul 2018 15:26:41 +0200
 Subject: Update patches for Godot 3.0.6
@@ -812,7 +812,7 @@ index bbd72df..72c8ee2 100644
 2.19.1
 
 
-From 841aa77dd05cef2041fbb188d132fcebc6b6053f Mon Sep 17 00:00:00 2001
+From 0403b96697d19cf1e42c970cf39379b7529514fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Tue, 20 Nov 2018 20:32:05 +0100
 Subject: Godot: platform detection patch for AMD64 arch.
@@ -841,7 +841,7 @@ index 82a7678..8546319 100644
 2.19.1
 
 
-From e027f2ef8492742b9f45c2f5163d1aaa95230c32 Mon Sep 17 00:00:00 2001
+From a8208b396179460c667e0d9855483c8b01b32be9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Tue, 20 Nov 2018 20:39:43 +0100
 Subject: Header location fix for upnpc
@@ -868,7 +868,7 @@ index 8546319..43dcbf3 100644
 2.19.1
 
 
-From 1529fef347cd57af2eb86173c8d31cfd73c94f3d Mon Sep 17 00:00:00 2001
+From 2d323c5fe1bcec60e47a46dff00d26678cf6aa8e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 28 Nov 2018 21:28:36 +0100
 Subject: No websockets anymore
@@ -892,7 +892,7 @@ index 43dcbf3..97dbc33 100644
 2.19.1
 
 
-From ea28d9c9e9f3e3c2e7174ff66978832373eec8f9 Mon Sep 17 00:00:00 2001
+From 9522327086f3253ea29def0536f8041b70478147 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 28 Nov 2018 21:29:54 +0100
 Subject: No mbedtls either
@@ -917,7 +917,7 @@ index 97dbc33..c5d7d95 100644
 2.19.1
 
 
-From cff6fd5837653560bb74fd7a6ef0b9ff8426a1e1 Mon Sep 17 00:00:00 2001
+From bbf3f9573103bb6d15eef1ac66216cb08e557893 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 28 Nov 2018 21:30:46 +0100
 Subject: No miniupnpc either
@@ -946,7 +946,7 @@ index c5d7d95..210b2e5 100644
 2.19.1
 
 
-From bca4e04e7657b00126c5a3bef410fa34679cca1b Mon Sep 17 00:00:00 2001
+From 4711a904703e3ef2c56d454739b02a5878308046 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 5 Dec 2018 12:53:32 +0100
 Subject: OpenSSL required
@@ -969,3 +969,114 @@ index 210b2e5..466092c 100644
 -- 
 2.19.1
 
+
+From 1df73d87cc38bc8363a9666b6d0fd6ddd5eb4829 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Thu, 6 Dec 2018 19:16:26 +0100
+Subject: x86 pkg-config support
+
+
+diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
+index 466092c..2eacd7e 100644
+--- a/platform/haiku/detect.py
++++ b/platform/haiku/detect.py
+@@ -64,14 +64,16 @@ def configure(env):
+     if (is64):
+         env["CC"] = "gcc"
+         env["CXX"] = "g++"
++        pkgconf = "pkg-config"
+     else:
+         env["CC"] = "gcc-x86"
+         env["CXX"] = "g++-x86"
++        pkgconf = "pkg-config_x86"
+ 
+     ## Dependencies
+ 
+     if not env['builtin_libwebp']:
+-        env.ParseConfig('pkg-config libwebp --cflags --libs')
++        env.ParseConfig('pkgconf libwebp --cflags --libs')
+ 
+     # freetype depends on libpng and zlib, so bundling one of them while keeping others
+     # as shared libraries leads to weird issues
+@@ -81,29 +83,29 @@ def configure(env):
+         env['builtin_zlib'] = True
+ 
+     if not env['builtin_freetype']:
+-        env.ParseConfig('pkg-config freetype2 --cflags --libs')
++        env.ParseConfig('pkgconf freetype2 --cflags --libs')
+ 
+     if not env['builtin_libpng']:
+-        env.ParseConfig('pkg-config libpng --cflags --libs')
++        env.ParseConfig('pkgconf libpng --cflags --libs')
+ 
+     if not env['builtin_bullet']:
+         # We need at least version 2.88
+         import subprocess
+-        bullet_version = subprocess.check_output(['pkg-config', 'bullet', '--modversion']).strip()
++        bullet_version = subprocess.check_output(['pkgconf', 'bullet', '--modversion']).strip()
+         if bullet_version < "2.88":
+             # Abort as system bullet was requested but too old
+             print("Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(bullet_version, "2.88"))
+             sys.exit(255)
+-        env.ParseConfig('pkg-config bullet --cflags --libs')
++        env.ParseConfig('pkgconf bullet --cflags --libs')
+ 
+     if not env['builtin_enet']:
+-        env.ParseConfig('pkg-config libenet --cflags --libs')
++        env.ParseConfig('pkgconf libenet --cflags --libs')
+ 
+     if not env['builtin_squish'] and env['tools']:
+-        env.ParseConfig('pkg-config libsquish --cflags --libs')
++        env.ParseConfig('pkgconf libsquish --cflags --libs')
+ 
+     if not env['builtin_zstd']:
+-        env.ParseConfig('pkg-config libzstd --cflags --libs')
++        env.ParseConfig('pkgconf libzstd --cflags --libs')
+ 
+     # Sound and video libraries
+     # Keep the order as it triggers chained dependencies (ogg needed by others, etc.)
+@@ -111,21 +113,21 @@ def configure(env):
+     if not env['builtin_libtheora']:
+         env['builtin_libogg'] = False  # Needed to link against system libtheora
+         env['builtin_libvorbis'] = False  # Needed to link against system libtheora
+-        env.ParseConfig('pkg-config theora theoradec --cflags --libs')
++        env.ParseConfig('pkgconf theora theoradec --cflags --libs')
+ 
+     if not env['builtin_libvpx']:
+-        env.ParseConfig('pkg-config vpx --cflags --libs')
++        env.ParseConfig('pkgconf vpx --cflags --libs')
+ 
+     if not env['builtin_libvorbis']:
+         env['builtin_libogg'] = False  # Needed to link against system libvorbis
+-        env.ParseConfig('pkg-config vorbis vorbisfile --cflags --libs')
++        env.ParseConfig('pkgconf vorbis vorbisfile --cflags --libs')
+ 
+     if not env['builtin_opus']:
+         env['builtin_libogg'] = False  # Needed to link against system opus
+-        env.ParseConfig('pkg-config opus opusfile --cflags --libs')
++        env.ParseConfig('pkgconf opus opusfile --cflags --libs')
+ 
+     if not env['builtin_libogg']:
+-        env.ParseConfig('pkg-config ogg --cflags --libs')
++        env.ParseConfig('pkgconf ogg --cflags --libs')
+ 
+     if env['builtin_libtheora']:
+         list_of_x86 = ['x86_64', 'x86', 'i386', 'i586']
+@@ -133,12 +135,12 @@ def configure(env):
+             env["x86_libtheora_opt_gcc"] = True
+ 
+     if not env['builtin_openssl']:
+-        env.ParseConfig('pkg-config openssl --cflags --libs')
++        env.ParseConfig('pkgconf openssl --cflags --libs')
+ 
+     # On Linux wchar_t should be 32-bits
+     # 16-bit library shouldn't be required due to compiler optimisations
+     if not env['builtin_pcre2']:
+-        env.ParseConfig('pkg-config libpcre2-32 --cflags --libs')
++        env.ParseConfig('pkgconf libpcre2-32 --cflags --libs')
+ 
+ 
+     ## Flags
+-- 
+2.19.1
+