Attachment #211441 for bug #243953

View | Details | Raw Unified | Return to bug 243953
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	godot
DISTVERSION=	3.2
DISTVERSIONSUFFIX=	-stable
CATEGORIES=	devel games


			builtin_openssl=False verbose=True
MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
MAKE_ARGS_clang=	use_llvm=True
CXXFLAGS+=		-DRTAUDIO_ENABLED
CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
CXXFLAGS_i386_gcc=	-march=i586


AUDIO_DESC=		Audio support
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
ALSA_MAKE_ARGS=		alsa=True
# master at 31/1
EXAMPLES_GH_TUPLE=	godotengine:godot-demo-projects:a5b8cd11d992:DEMOS
EXAMPLES_GH_TAGNAME=	c34a2b423bcb:DEMOS
EXAMPLES_PORTEXAMPLES=	*
# mono support doesn't build at present
MONO_BUILD_DEPENDS=	msbuild:devel/msbuild
MONO_LIB_DEPENDS=	libinotify.so:devel/libinotify
MONO_GH_TUPLE=		mono:nuget-binary:ebedbf8:NUGT/nuget-binary
MONO_MAKE_ARGS=		module_mono_enabled=yes mono_glue=True
MONO_USES=		gettext-runtime mono:nuget
NUGET_DEPENDS=		DotNet.Glob=2.1.1
MONO_MAKE_ARGS=		module_mono_enabled=True mono_glue=True NUGET_PATH=${NUGET_EXE}
MONO_MAKE_ENV=		NUGET_PATH=${NUGET_EXE}
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
PULSEAUDIO_MAKE_ARGS=	pulseaudio=True
TOOLS_DESC=		Include development tools (IDE)

.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != armv6 && ${ARCH} != armv7
# use system libvpx on archs that break with built-in
LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
MAKE_ARGS+=	builtin_libvpx=False
.endif

post-patch:

pre-build-MONO-on: makenuget
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \
		target=release_debug tools=True platform=server mono_glue=False)
	@(cd ${WRKSRC} && ${FIND} ${WRKSRC}/bin -name 'godot*' -exec {} \
		--generate-mono-glue modules/mono/glue \; && \
		${FIND} ${WRKSRC}/bin -name 'godot*' -delete)

Lines 1-5 Link Here

(-)devel/godot/distinfo (-5 / +9 lines)
1	TIMESTAMP = 1576224754	1	TIMESTAMP = 1580957729
2	SHA256 (godotengine-godot-3.1.2-stable_GH0.tar.gz) = be2ed8d3f0dc6dd0a19e1fe562b2cc4de7d562d5f67ac6bf3dd67b4a1c69b218	2	SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a
3	SIZE (godotengine-godot-3.1.2-stable_GH0.tar.gz) = 20494543	3	SIZE (dotnet.glob.2.1.1.nupkg) = 73782
4	SHA256 (godotengine-godot-demo-projects-c34a2b423bcb_GH0.tar.gz) = ee90199bafbb386b47d529ff5688b6c425c069d51523dfe2d6d1ae03e55a6ff3	4	SHA256 (godotengine-godot-3.2-stable_GH0.tar.gz) = 39c6768875b07ffb9df6e4fdd77d943dba2c8c0b4dcd83eafeae9426fc77f57d
5	SIZE (godotengine-godot-demo-projects-c34a2b423bcb_GH0.tar.gz) = 150108502	5	SIZE (godotengine-godot-3.2-stable_GH0.tar.gz) = 22031196
		6	SHA256 (godotengine-godot-demo-projects-a5b8cd11d992_GH0.tar.gz) = 17644c74ddb2bd597589ae61a9b55d2e856d0950a0467fc8e624c8ecc2db5b74
		7	SIZE (godotengine-godot-demo-projects-a5b8cd11d992_GH0.tar.gz) = 150744236
		8	SHA256 (mono-nuget-binary-ebedbf8_GH0.tar.gz) = a0362e65a381c99f222ce141012f5a0663b4a4ae22f27f638198f7414464bf1a
		9	SIZE (mono-nuget-binary-ebedbf8_GH0.tar.gz) = 2778322




--- SConstruct.orig	2017-12-28 05:14:45 UTC
+++ SConstruct
@@ -68,7 +68,7 @@ elif (os.name == "nt"):
     if (os.getenv("VCINSTALLDIR") == None or platform_arg == "android" or platform_arg == "javascript"):
         custom_tools = ['mingw']
 
-env_base = Environment(tools=custom_tools)
+env_base = Environment(tools=custom_tools, ENV = os.environ)
 if 'TERM' in os.environ:
     env_base['ENV']['TERM'] = os.environ['TERM']
 env_base.AppendENVPath('PATH', os.getenv('PATH'))
@@ -297,17 +297,20 @@ if selected_platform in platform_list:
     if env["extra_suffix"] != '':
         env.extra_suffix += '.' + env["extra_suffix"]
 
-    CCFLAGS = env.get('CCFLAGS', '')
-    env['CCFLAGS'] = ''
+    env['CC'] = os.environ['CC']
+    env['CXX'] = os.environ['CXX']
+
+    CCFLAGS = os.environ['CXXFLAGS']
+    env['CCFLAGS'] = []
 
     env.Append(CCFLAGS=str(CCFLAGS).split())
 
-    CFLAGS = env.get('CFLAGS', '')
-    env['CFLAGS'] = ''
+    CFLAGS = os.environ['CFLAGS']
+    env['CFLAGS'] = []
 
     env.Append(CFLAGS=str(CFLAGS).split())
 
-    LINKFLAGS = env.get('LINKFLAGS', '')
+    LINKFLAGS = os.environ['LDFLAGS']
     env['LINKFLAGS'] = ''
 
     env.Append(LINKFLAGS=str(LINKFLAGS).split())




--- core/SCsub.orig	2019-05-02 02:03:58 UTC
+++ core/SCsub
@@ -80,7 +80,7 @@ if env['builtin_zlib']:
 	]
 	thirdparty_zlib_sources = [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources]
 
-	env_thirdparty.Append(CPPPATH=[thirdparty_zlib_dir])
+	env_thirdparty.Prepend(CPPPATH=[thirdparty_zlib_dir])
 	# Needs to be available in main env too
 	env.Append(CPPPATH=[thirdparty_zlib_dir])
 
@@ -128,7 +128,7 @@ if env['builtin_zstd']:
     ]
     thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
 
-    env_thirdparty.Append(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
+    env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
     env_thirdparty.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
     env.Append(CPPPATH=thirdparty_zstd_dir)
     # Also needed in main env includes will trigger warnings

Lines 1-11 Link Here

(-)devel/godot/files/patch-modules_enet_SCsub (-11 lines)
1	--- modules/enet/SCsub.orig 2019-03-23 10:48:38 UTC
2	+++ modules/enet/SCsub
3	@@ -21,7 +21,7 @@ if env['builtin_enet']:
4	]
5	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
6
7	- env_enet.Append(CPPPATH=[thirdparty_dir])
8	+ env_enet.Prepend(CPPPATH=[thirdparty_dir])
9	env_enet.Append(CPPFLAGS=["-DGODOT_ENET"])
10
11	env_thirdparty = env_enet.Clone()

Lines 1-11 Link Here

(-)devel/godot/files/patch-modules_mono_SCsub (-11 lines)
1	--- modules/mono/SCsub.orig 2018-01-03 10:12:46 UTC
2	+++ modules/mono/SCsub
3	@@ -147,7 +147,7 @@ def mono_build_solution(source, target,
4	msbuild_path = msbuild_info[0]
5	framework_path_override = msbuild_info[1]
6	else:
7	- msbuild_path = find_msbuild_unix('msbuild')
8	+ msbuild_path = find_msbuild_unix('xbuild')
9	if msbuild_path is None:
10	xbuild_fallback = env['xbuild_fallback']
11

Lines 1-11 Link Here

(-)devel/godot/files/patch-modules_squish_SCsub (-11 lines)
1	--- modules/squish/SCsub.orig 2019-03-23 11:07:40 UTC
2	+++ modules/squish/SCsub
3	@@ -22,7 +22,7 @@ if env['builtin_squish']:
4
5	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
6
7	- env_squish.Append(CPPPATH=[thirdparty_dir])
8	+ env_squish.Prepend(CPPPATH=[thirdparty_dir])
9
10	env_thirdparty = env_squish.Clone()
11	env_thirdparty.disable_warnings()

Lines 1-11 Link Here

(-)devel/godot/files/patch-modules_webm_libvpx_SCsub (-11 lines)
1	--- modules/webm/libvpx/SCsub.orig 2019-03-23 15:10:53 UTC
2	+++ modules/webm/libvpx/SCsub
3	@@ -256,7 +256,7 @@ libvpx_sources_arm_neon_gas_apple = [libvpx_dir + file
4
5	env_libvpx = env_modules.Clone()
6	env_libvpx.disable_warnings()
7	-env_libvpx.Append(CPPPATH=[libvpx_dir])
8	+env_libvpx.Prepend(CPPPATH=[libvpx_dir])
9
10	webm_multithread = env["platform"] != 'javascript'
11

Return to bug 243953

Lines 2-8 Link Here

(-)devel/godot/Makefile (-10 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= godot	4	PORTNAME= godot
5	DISTVERSION= 3.1.2	5	DISTVERSION= 3.2
6	DISTVERSIONSUFFIX= -stable	6	DISTVERSIONSUFFIX= -stable
7	CATEGORIES= devel games	7	CATEGORIES= devel games
8		8
Lines 32-38 Link Here
32	builtin_openssl=False verbose=True	32	builtin_openssl=False verbose=True
33	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}	33	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
34	MAKE_ARGS_clang= use_llvm=True	34	MAKE_ARGS_clang= use_llvm=True
35	CXXFLAGS+= -DRTAUDIO_ENABLED
36	CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}	35	CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
37	CXXFLAGS_i386_gcc= -march=i586	36	CXXFLAGS_i386_gcc= -march=i586
38		37
Lines 47-61 Link Here
47	AUDIO_DESC= Audio support	46	AUDIO_DESC= Audio support
48	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	47	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
49	ALSA_MAKE_ARGS= alsa=True	48	ALSA_MAKE_ARGS= alsa=True
50	EXAMPLES_GH_PROJECT= godot-demo-projects:DEMOS	49	# master at 31/1
51	# master at 13/12	50	EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:a5b8cd11d992:DEMOS
52	EXAMPLES_GH_TAGNAME= c34a2b423bcb:DEMOS
53	EXAMPLES_PORTEXAMPLES= *	51	EXAMPLES_PORTEXAMPLES= *
54	# mono support doesn't build at present	52	# mono support doesn't build at present
55	MONO_USES= mono:nuget	53	MONO_BUILD_DEPENDS= msbuild:devel/msbuild
		54	MONO_LIB_DEPENDS= libinotify.so:devel/libinotify
		55	MONO_GH_TUPLE= mono:nuget-binary:ebedbf8:NUGT/nuget-binary
		56	MONO_MAKE_ARGS= module_mono_enabled=yes mono_glue=True
		57	MONO_USES= gettext-runtime mono:nuget
56	NUGET_DEPENDS= DotNet.Glob=2.1.1	58	NUGET_DEPENDS= DotNet.Glob=2.1.1
57	MONO_MAKE_ARGS= module_mono_enabled=True mono_glue=True NUGET_PATH=${NUGET_EXE}
58	MONO_MAKE_ENV= NUGET_PATH=${NUGET_EXE}
59	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	59	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
60	PULSEAUDIO_MAKE_ARGS= pulseaudio=True	60	PULSEAUDIO_MAKE_ARGS= pulseaudio=True
61	TOOLS_DESC= Include development tools (IDE)	61	TOOLS_DESC= Include development tools (IDE)
Lines 79-85 Link Here
79	.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != armv6 && ${ARCH} != armv7	79	.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != armv6 && ${ARCH} != armv7
80	# use system libvpx on archs that break with built-in	80	# use system libvpx on archs that break with built-in
81	LIB_DEPENDS+= libvpx.so:multimedia/libvpx	81	LIB_DEPENDS+= libvpx.so:multimedia/libvpx
82	MAKE_ARGS+= builtin_libvpx=False	82	MAKE_ARGS+= builtin_libvpx=False
83	.endif	83	.endif
84		84
85	post-patch:	85	post-patch:
Lines 91-97 Link Here
91	pre-build-MONO-on: makenuget	91	pre-build-MONO-on: makenuget
92	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \	92	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
93	${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \	93	${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \
94	target=release_debug tools=True mono_glue=False)	94	target=release_debug tools=True platform=server mono_glue=False)
95	@(cd ${WRKSRC} && ${FIND} ${WRKSRC}/bin -name 'godot*' -exec {} \	95	@(cd ${WRKSRC} && ${FIND} ${WRKSRC}/bin -name 'godot*' -exec {} \
96	--generate-mono-glue modules/mono/glue \; && \	96	--generate-mono-glue modules/mono/glue \; && \
97	${FIND} ${WRKSRC}/bin -name 'godot*' -delete)	97	${FIND} ${WRKSRC}/bin -name 'godot*' -delete)

Lines 1-37 Link Here

(-)devel/godot/files/patch-SConstruct (-37 lines)
1	--- SConstruct.orig 2017-12-28 05:14:45 UTC
2	+++ SConstruct
3	@@ -68,7 +68,7 @@ elif (os.name == "nt"):
4	if (os.getenv("VCINSTALLDIR") == None or platform_arg == "android" or platform_arg == "javascript"):
5	custom_tools = ['mingw']
6
7	-env_base = Environment(tools=custom_tools)
8	+env_base = Environment(tools=custom_tools, ENV = os.environ)
9	if 'TERM' in os.environ:
10	env_base['ENV']['TERM'] = os.environ['TERM']
11	env_base.AppendENVPath('PATH', os.getenv('PATH'))
12	@@ -297,17 +297,20 @@ if selected_platform in platform_list:
13	if env["extra_suffix"] != '':
14	env.extra_suffix += '.' + env["extra_suffix"]
15
16	- CCFLAGS = env.get('CCFLAGS', '')
17	- env['CCFLAGS'] = ''
18	+ env['CC'] = os.environ['CC']
19	+ env['CXX'] = os.environ['CXX']
20	+
21	+ CCFLAGS = os.environ['CXXFLAGS']
22	+ env['CCFLAGS'] = []
23
24	env.Append(CCFLAGS=str(CCFLAGS).split())
25
26	- CFLAGS = env.get('CFLAGS', '')
27	- env['CFLAGS'] = ''
28	+ CFLAGS = os.environ['CFLAGS']
29	+ env['CFLAGS'] = []
30
31	env.Append(CFLAGS=str(CFLAGS).split())
32
33	- LINKFLAGS = env.get('LINKFLAGS', '')
34	+ LINKFLAGS = os.environ['LDFLAGS']
35	env['LINKFLAGS'] = ''
36
37	env.Append(LINKFLAGS=str(LINKFLAGS).split())

Lines 1-20 Link Here

(-)devel/godot/files/patch-core_SCsub (-20 lines)
1	--- core/SCsub.orig 2019-05-02 02:03:58 UTC
2	+++ core/SCsub
3	@@ -80,7 +80,7 @@ if env['builtin_zlib']:
4	]
5	thirdparty_zlib_sources = [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources]
6
7	- env_thirdparty.Append(CPPPATH=[thirdparty_zlib_dir])
8	+ env_thirdparty.Prepend(CPPPATH=[thirdparty_zlib_dir])
9	# Needs to be available in main env too
10	env.Append(CPPPATH=[thirdparty_zlib_dir])
11
12	@@ -128,7 +128,7 @@ if env['builtin_zstd']:
13	]
14	thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
15
16	- env_thirdparty.Append(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
17	+ env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
18	env_thirdparty.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
19	env.Append(CPPPATH=thirdparty_zstd_dir)
20	# Also needed in main env includes will trigger warnings