Attachment #194216 for bug #228764

Line 0 Link Here

(-)devel/godot2/files/patch-modules_squish_SCsub (+11 lines)
	1	--- modules/squish/SCsub.orig 2018-06-13 13:01:57 UTC
	2	+++ modules/squish/SCsub
	3	@@ -23,7 +23,7 @@ if (env['builtin_squish'] != 'no'):
	4	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
	5
	6	env_squish.add_source_files(env.modules_sources, thirdparty_sources)
	7	- env_squish.Append(CPPPATH=[thirdparty_dir])
	8	+ env_squish.Prepend(CPPPATH=[thirdparty_dir])
	9
	10	# Godot source files
	11	env_squish.add_source_files(env.modules_sources, "*.cpp")




--- platform/x11/detect.py.orig	2017-08-28 01:55:12 UTC
+++ platform/x11/detect.py
@@ -56,7 +56,9 @@ def get_opts():
         ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
         ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),

 
     env.ParseConfig('pkg-config x11 --cflags --libs')
     env.ParseConfig('pkg-config xinerama --cflags --libs')
@@ -148,13 +143,22 @@ def configure(env):
         # Currently not compatible with OpenSSL 1.1.0+
         # https://github.com/godotengine/godot/issues/8624
         import subprocess
-        openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
+        try:
+            openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
+        except:
+            # approx base openssl version
+            openssl_version = '1.0.2'
         if (openssl_version >= "1.1.0"):
             print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version)
             print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n")
             sys.exit(255)
 
-        env.ParseConfig('pkg-config openssl --cflags --libs')
+        try:
+            # try to find a port installed openssl
+            env.ParseConfig('pkg-config openssl --cflags --libs')
+        except:
+            # if none found use base system openssl
+            env.ParseConfig('echo -lssl -lcrypto')
 
     if (env['builtin_libwebp'] == 'no'):
         env.ParseConfig('pkg-config libwebp --cflags --libs')
@@ -199,12 +203,13 @@ def configure(env):
     if (env['builtin_glew'] == 'no'):
         env.ParseConfig('pkg-config glew --cflags --libs')
 

 
     if (platform.system() == "Linux"):
         env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
@@ -219,6 +224,11 @@ def configure(env):
         else:
             print("libudev development libraries not found, disabling udev support")
 




PORTNAME=	godot
PORTVERSION=	2.1.4
DISTVERSIONSUFFIX=	-stable
PORTREVISION=	1
CATEGORIES=	devel games
PKGNAMESUFFIX?=	2


		xdg-open:devel/xdg-utils \
		xmessage:x11/xmessage

USE_GITHUB=	yes
GH_ACCOUNT=	godotengine

USES=		compiler:c++11-lib pkgconfig scons ssl
USE_XORG=	x11 xcursor xinerama xrandr
USE_GL=		gl glu

USE_GITHUB=	yes
GH_ACCOUNT=	godotengine

MAKE_ARGS+=		platform=x11 builtin_speex=no builtin_libmpcdec=no
MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
MAKE_ARGS_clang=	use_llvm=yes

Return to bug 228764

Lines 1-5 Link Here

(-)devel/godot2/files/patch-platform_x11_detect.py (-8 / +16 lines)
1	--- ./platform/x11/detect.py.orig 2017-08-27 16:25:12 UTC	1	--- platform/x11/detect.py.orig 2017-08-28 01:55:12 UTC
2	+++ ./platform/x11/detect.py	2	+++ platform/x11/detect.py
3	@@ -56,7 +56,9 @@ def get_opts():	3	@@ -56,7 +56,9 @@ def get_opts():
4	('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),	4	('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
5	('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),	5	('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),
Lines 46-69 Link Here
46		46
47	env.ParseConfig('pkg-config x11 --cflags --libs')	47	env.ParseConfig('pkg-config x11 --cflags --libs')
48	env.ParseConfig('pkg-config xinerama --cflags --libs')	48	env.ParseConfig('pkg-config xinerama --cflags --libs')
49	@@ -148,13 +143,14 @@ def configure(env):	49	@@ -148,13 +143,22 @@ def configure(env):
50	# Currently not compatible with OpenSSL 1.1.0+	50	# Currently not compatible with OpenSSL 1.1.0+
51	# https://github.com/godotengine/godot/issues/8624	51	# https://github.com/godotengine/godot/issues/8624
52	import subprocess	52	import subprocess
53	- openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')	53	- openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
54	+ openssl_version = '1.0.2' #subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')	54	+ try:
		55	+ openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
		56	+ except:
		57	+ # approx base openssl version
		58	+ openssl_version = '1.0.2'
55	if (openssl_version >= "1.1.0"):	59	if (openssl_version >= "1.1.0"):
56	print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version)	60	print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version)
57	print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n")	61	print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n")
58	sys.exit(255)	62	sys.exit(255)
59		63
60	- env.ParseConfig('pkg-config openssl --cflags --libs')	64	- env.ParseConfig('pkg-config openssl --cflags --libs')
61	+ #env.ParseConfig('pkg-config openssl --cflags --libs')	65	+ try:
62	+ env.ParseConfig('echo -lssl -lcrypto')	66	+ # try to find a port installed openssl
		67	+ env.ParseConfig('pkg-config openssl --cflags --libs')
		68	+ except:
		69	+ # if none found use base system openssl
		70	+ env.ParseConfig('echo -lssl -lcrypto')
63		71
64	if (env['builtin_libwebp'] == 'no'):	72	if (env['builtin_libwebp'] == 'no'):
65	env.ParseConfig('pkg-config libwebp --cflags --libs')	73	env.ParseConfig('pkg-config libwebp --cflags --libs')
66	@@ -199,12 +195,13 @@ def configure(env):	74	@@ -199,12 +203,13 @@ def configure(env):
67	if (env['builtin_glew'] == 'no'):	75	if (env['builtin_glew'] == 'no'):
68	env.ParseConfig('pkg-config glew --cflags --libs')	76	env.ParseConfig('pkg-config glew --cflags --libs')
69		77
Lines 83-89 Link Here
83		91
84	if (platform.system() == "Linux"):	92	if (platform.system() == "Linux"):
85	env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])	93	env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
86	@@ -219,6 +216,11 @@ def configure(env):	94	@@ -219,6 +224,11 @@ def configure(env):
87	else:	95	else:
88	print("libudev development libraries not found, disabling udev support")	96	print("libudev development libraries not found, disabling udev support")
89		97

Lines 4-10 Link Here

(-)devel/godot2/Makefile (-4 / +4 lines)
4	PORTNAME= godot	4	PORTNAME= godot
5	PORTVERSION= 2.1.4	5	PORTVERSION= 2.1.4
6	DISTVERSIONSUFFIX= -stable	6	DISTVERSIONSUFFIX= -stable
7	PORTREVISION= 0	7	PORTREVISION= 1
8	CATEGORIES= devel games	8	CATEGORIES= devel games
9	PKGNAMESUFFIX?= 2	9	PKGNAMESUFFIX?= 2
10		10
Lines 24-36 Link Here
24	xdg-open:devel/xdg-utils \	24	xdg-open:devel/xdg-utils \
25	xmessage:x11/xmessage	25	xmessage:x11/xmessage
26		26
27	USE_GITHUB= yes
28	GH_ACCOUNT= godotengine
29
30	USES= compiler:c++11-lib pkgconfig scons ssl	27	USES= compiler:c++11-lib pkgconfig scons ssl
31	USE_XORG= x11 xcursor xinerama xrandr	28	USE_XORG= x11 xcursor xinerama xrandr
32	USE_GL= gl glu	29	USE_GL= gl glu
33		30
		31	USE_GITHUB= yes
		32	GH_ACCOUNT= godotengine
		33
34	MAKE_ARGS+= platform=x11 builtin_speex=no builtin_libmpcdec=no	34	MAKE_ARGS+= platform=x11 builtin_speex=no builtin_libmpcdec=no
35	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}	35	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
36	MAKE_ARGS_clang= use_llvm=yes	36	MAKE_ARGS_clang= use_llvm=yes