haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Godot: OpenSSL required (#3444)

Browse Source
This commit is contained in:
miqlas
2018-12-05 13:00:43 +01:00
committed by GitHub
parent 8c279fca00
commit 0fc3bda012
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dev-games/godot/patches/godot-3.0.6.patchset
View File

@@ -1,4 +1,4 @@
From 385069fe93f95a3e35ef34cf7468b685ba85334b Mon Sep 17 00:00:00 2001
From 101796803d9cf94d60c798f02b7c5529ef56fb02 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 926594527d46cd77474849bf9148ec086bdbff6b Mon Sep 17 00:00:00 2001
From 9e5baf04b74b59840a434e4bf0101792bfcd2f4a 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 bf49887be57aa22c72fd1f92410ccec9c8cf0d14 Mon Sep 17 00:00:00 2001
From 841aa77dd05cef2041fbb188d132fcebc6b6053f 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 a3410b39f738340fed6851fc4fce88189873a47f Mon Sep 17 00:00:00 2001
From e027f2ef8492742b9f45c2f5163d1aaa95230c32 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 ccc76197b2c9a654f4d1dd6b5d3e0d0002cf0307 Mon Sep 17 00:00:00 2001
From 1529fef347cd57af2eb86173c8d31cfd73c94f3d 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 ae99d2744449698a866e87d5800ae47cdb25f2c0 Mon Sep 17 00:00:00 2001
From ea28d9c9e9f3e3c2e7174ff66978832373eec8f9 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 f8e33bce0c8944bd331c68689e9ed0ae4791bb9d Mon Sep 17 00:00:00 2001
From cff6fd5837653560bb74fd7a6ef0b9ff8426a1e1 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
@@ -945,3 +945,27 @@ index c5d7d95..210b2e5 100644
--
2.19.1
From bca4e04e7657b00126c5a3bef410fa34679cca1b 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
diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index 210b2e5..466092c 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -132,6 +132,9 @@ def configure(env):
if any(platform.machine() in s for s in list_of_x86):
env["x86_libtheora_opt_gcc"] = True
+ if not env['builtin_openssl']:
+ env.ParseConfig('pkg-config 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']:
--
2.19.1