Attachment #194215 for bug #228764

Line 0 Link Here

(-)devel/godot/files/patch-modules_enet_SCsub (+11 lines)
	1	--- modules/enet/SCsub.orig 2018-06-13 11:43:18 UTC
	2	+++ modules/enet/SCsub
	3	@@ -22,7 +22,7 @@ if env['builtin_enet']:
	4	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
	5
	6	env_enet.add_source_files(env.modules_sources, thirdparty_sources)
	7	- env_enet.Append(CPPPATH=[thirdparty_dir])
	8	+ env_enet.Prepend(CPPPATH=[thirdparty_dir])
	9	env_enet.Append(CPPFLAGS=["-DGODOT_ENET"])
	10
	11	env_enet.add_source_files(env.modules_sources, "*.cpp")

Line 0 Link Here

(-)devel/godot/files/patch-modules_squish_SCsub (+11 lines)
	1	--- modules/squish/SCsub.orig 2018-06-13 12:02:27 UTC
	2	+++ modules/squish/SCsub
	3	@@ -23,7 +23,7 @@ if env['builtin_squish']:
	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	2018-03-04 00:52:04 UTC
+++ platform/x11/detect.py
@@ -52,7 +52,9 @@ def get_opts():
         BoolVariable('use_static_cpp', 'Link libgcc and libstdc++ statically for better portability', False),
         BoolVariable('use_sanitizer', 'Use LLVM compiler address sanitizer', False),
         BoolVariable('use_leak_sanitizer', 'Use LLVM compiler memory leaks sanitizer (implies use_sanitizer)', False),
-        BoolVariable('pulseaudio', 'Detect & use pulseaudio', True),

         BoolVariable('udev', 'Use udev for gamepad connection callbacks', False),
         EnumVariable('debug_symbols', 'Add debug symbols to release version', 'yes', ('yes', 'no', 'full')),
         BoolVariable('separate_debug_symbols', 'Create a separate file with the debug symbols', False),
@@ -154,7 +156,12 @@ def configure(env):
     # FIXME: Check for existence of the libs before parsing their flags with pkg-config
 
     if not env['builtin_openssl']:
-        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 not env['builtin_libwebp']:
         env.ParseConfig('pkg-config libwebp --cflags --libs')
@@ -226,12 +233,18 @@ def configure(env):
 
     ## Flags
 

Line 0 Link Here

(-)devel/godot/files/patch-thirdparty_zstd_SCsub (+9 lines)
	1	--- thirdparty/zstd/SCsub.orig 2018-06-13 11:53:45 UTC
	2	+++ thirdparty/zstd/SCsub
	3	@@ -25,5 +25,5 @@ thirdparty_zstd_sources = [
	4	]
	5	thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
	6	env.add_source_files(env.core_sources, thirdparty_zstd_sources)
	7	-env.Append(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"])
	8	+env.Prepend(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"])
	9	env.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")




PORTNAME=	godot
PORTVERSION=	3.0.2
DISTVERSIONSUFFIX= -stable
PORTREVISION=	1
CATEGORIES=	devel games

MAINTAINER=	FreeBSD@Shaneware.biz

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

USE_GITHUB=	yes
GH_ACCOUNT=	godotengine

# on 10.4 using clang34 fails - so we want to use clang60
# gl already needs clang60 so this shouldn't add any overhead
USES=		compiler:c++14-lang pkgconfig scons ssl
USE_XORG=	x11 xcursor xi xinerama xrandr
USE_GL=		gl glew glu

USE_GITHUB=	yes
GH_ACCOUNT=	godotengine

MAKE_ARGS+=		platform=x11 builtin_libpng=False builtin_openssl=False verbose=True
MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
MAKE_ARGS_clang=	use_llvm=True

Return to bug 228764

Lines 1-7 Link Here

(-)devel/godot/files/patch-platform_x11_detect.py (-5 / +10 lines)
1	--- platform/x11/detect.py.orig 2017-12-28 05:14:45 UTC	1	--- platform/x11/detect.py.orig 2018-03-04 00:52:04 UTC
2	+++ platform/x11/detect.py	2	+++ platform/x11/detect.py
3	@@ -52,7 +52,9 @@ def get_opts():	3	@@ -52,7 +52,9 @@ def get_opts():
4	BoolVariable('use_static_cpp', 'Link stdc++ statically', False),	4	BoolVariable('use_static_cpp', 'Link libgcc and libstdc++ statically for better portability', False),
5	BoolVariable('use_sanitizer', 'Use LLVM compiler address sanitizer', False),	5	BoolVariable('use_sanitizer', 'Use LLVM compiler address sanitizer', False),
6	BoolVariable('use_leak_sanitizer', 'Use LLVM compiler memory leaks sanitizer (implies use_sanitizer)', False),	6	BoolVariable('use_leak_sanitizer', 'Use LLVM compiler memory leaks sanitizer (implies use_sanitizer)', False),
7	- BoolVariable('pulseaudio', 'Detect & use pulseaudio', True),	7	- BoolVariable('pulseaudio', 'Detect & use pulseaudio', True),
Lines 11-26 Link Here
11	BoolVariable('udev', 'Use udev for gamepad connection callbacks', False),	11	BoolVariable('udev', 'Use udev for gamepad connection callbacks', False),
12	EnumVariable('debug_symbols', 'Add debug symbols to release version', 'yes', ('yes', 'no', 'full')),	12	EnumVariable('debug_symbols', 'Add debug symbols to release version', 'yes', ('yes', 'no', 'full')),
13	BoolVariable('separate_debug_symbols', 'Create a separate file with the debug symbols', False),	13	BoolVariable('separate_debug_symbols', 'Create a separate file with the debug symbols', False),
14	@@ -154,7 +156,7 @@ def configure(env):	14	@@ -154,7 +156,12 @@ def configure(env):
15	# FIXME: Check for existence of the libs before parsing their flags with pkg-config	15	# FIXME: Check for existence of the libs before parsing their flags with pkg-config
16		16
17	if not env['builtin_openssl']:	17	if not env['builtin_openssl']:
18	- env.ParseConfig('pkg-config openssl --cflags --libs')	18	- env.ParseConfig('pkg-config openssl --cflags --libs')
19	+ env.ParseConfig('echo -lssl -lcrypto')	19	+ try:
		20	+ # try to find a port installed openssl
		21	+ env.ParseConfig('pkg-config openssl --cflags --libs')
		22	+ except:
		23	+ # if none found use base system openssl
		24	+ env.ParseConfig('echo -lssl -lcrypto')
20		25
21	if not env['builtin_libwebp']:	26	if not env['builtin_libwebp']:
22	env.ParseConfig('pkg-config libwebp --cflags --libs')	27	env.ParseConfig('pkg-config libwebp --cflags --libs')
23	@@ -226,12 +228,18 @@ def configure(env):	28	@@ -226,12 +233,18 @@ def configure(env):
24		29
25	## Flags	30	## Flags
26		31

Lines 4-9 Link Here

(-)devel/godot/Makefile (-3 / +4 lines)
4	PORTNAME= godot	4	PORTNAME= godot
5	PORTVERSION= 3.0.2	5	PORTVERSION= 3.0.2
6	DISTVERSIONSUFFIX= -stable	6	DISTVERSIONSUFFIX= -stable
		7	PORTREVISION= 1
7	CATEGORIES= devel games	8	CATEGORIES= devel games
8		9
9	MAINTAINER= FreeBSD@Shaneware.biz	10	MAINTAINER= FreeBSD@Shaneware.biz
Lines 21-35 Link Here
21	xdg-open:devel/xdg-utils \	22	xdg-open:devel/xdg-utils \
22	xmessage:x11/xmessage	23	xmessage:x11/xmessage
23		24
24	USE_GITHUB= yes
25	GH_ACCOUNT= godotengine
26
27	# on 10.4 using clang34 fails - so we want to use clang60	25	# on 10.4 using clang34 fails - so we want to use clang60
28	# gl already needs clang60 so this shouldn't add any overhead	26	# gl already needs clang60 so this shouldn't add any overhead
29	USES= compiler:c++14-lang pkgconfig scons ssl	27	USES= compiler:c++14-lang pkgconfig scons ssl
30	USE_XORG= x11 xcursor xi xinerama xrandr	28	USE_XORG= x11 xcursor xi xinerama xrandr
31	USE_GL= gl glew glu	29	USE_GL= gl glew glu
32		30
		31	USE_GITHUB= yes
		32	GH_ACCOUNT= godotengine
		33
33	MAKE_ARGS+= platform=x11 builtin_libpng=False builtin_openssl=False verbose=True	34	MAKE_ARGS+= platform=x11 builtin_libpng=False builtin_openssl=False verbose=True
34	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}	35	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
35	MAKE_ARGS_clang= use_llvm=True	36	MAKE_ARGS_clang= use_llvm=True