Attachment 211441 Details for Bug 243953 – maintainer update for devel/godot

[patch] maintainer update for devel/godot

godot.patch (text/plain), 8.93 KB, created by Shane on 2020-02-07 10:25:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2020-02-07 10:25:31 UTC

Size: 8.93 KB

patch

obsolete

>diff -Nru devel/godot.orig/Makefile devel/godot/Makefile
>--- devel/godot.orig/Makefile	2020-02-07 20:15:50.688858000 +1030
>+++ devel/godot/Makefile	2020-02-07 20:15:43.323736000 +1030
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	godot
>-DISTVERSION=	3.1.2
>+DISTVERSION=	3.2
> DISTVERSIONSUFFIX=	-stable
> CATEGORIES=	devel games
> 
>@@ -32,7 +32,6 @@
> 			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
> 
>@@ -47,15 +46,16 @@
> AUDIO_DESC=		Audio support
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> ALSA_MAKE_ARGS=		alsa=True
>-EXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
>-# master at 13/12
>-EXAMPLES_GH_TAGNAME=	c34a2b423bcb:DEMOS
>+# master at 31/1
>+EXAMPLES_GH_TUPLE=	godotengine:godot-demo-projects:a5b8cd11d992:DEMOS
> EXAMPLES_PORTEXAMPLES=	*
> # mono support doesn't build at present
>-MONO_USES=		mono:nuget
>+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)
>@@ -79,7 +79,7 @@
> .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
>+MAKE_ARGS+=	builtin_libvpx=False
> .endif
> 
> post-patch:
>@@ -91,7 +91,7 @@
> 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 mono_glue=False)
>+		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)
>diff -Nru devel/godot.orig/distinfo devel/godot/distinfo
>--- devel/godot.orig/distinfo	2020-02-07 20:15:50.688798000 +1030
>+++ devel/godot/distinfo	2020-02-06 20:13:47.059004000 +1030
>@@ -1,5 +1,9 @@
>-TIMESTAMP = 1576224754
>-SHA256 (godotengine-godot-3.1.2-stable_GH0.tar.gz) = be2ed8d3f0dc6dd0a19e1fe562b2cc4de7d562d5f67ac6bf3dd67b4a1c69b218
>-SIZE (godotengine-godot-3.1.2-stable_GH0.tar.gz) = 20494543
>-SHA256 (godotengine-godot-demo-projects-c34a2b423bcb_GH0.tar.gz) = ee90199bafbb386b47d529ff5688b6c425c069d51523dfe2d6d1ae03e55a6ff3
>-SIZE (godotengine-godot-demo-projects-c34a2b423bcb_GH0.tar.gz) = 150108502
>+TIMESTAMP = 1580957729
>+SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a
>+SIZE (dotnet.glob.2.1.1.nupkg) = 73782
>+SHA256 (godotengine-godot-3.2-stable_GH0.tar.gz) = 39c6768875b07ffb9df6e4fdd77d943dba2c8c0b4dcd83eafeae9426fc77f57d
>+SIZE (godotengine-godot-3.2-stable_GH0.tar.gz) = 22031196
>+SHA256 (godotengine-godot-demo-projects-a5b8cd11d992_GH0.tar.gz) = 17644c74ddb2bd597589ae61a9b55d2e856d0950a0467fc8e624c8ecc2db5b74
>+SIZE (godotengine-godot-demo-projects-a5b8cd11d992_GH0.tar.gz) = 150744236
>+SHA256 (mono-nuget-binary-ebedbf8_GH0.tar.gz) = a0362e65a381c99f222ce141012f5a0663b4a4ae22f27f638198f7414464bf1a
>+SIZE (mono-nuget-binary-ebedbf8_GH0.tar.gz) = 2778322
>diff -Nru devel/godot.orig/files/patch-SConstruct devel/godot/files/patch-SConstruct
>--- devel/godot.orig/files/patch-SConstruct	2020-02-07 20:15:50.688143000 +1030
>+++ devel/godot/files/patch-SConstruct	1970-01-01 09:30:00.000000000 +0930
>@@ -1,37 +0,0 @@
>---- 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())
>diff -Nru devel/godot.orig/files/patch-core_SCsub devel/godot/files/patch-core_SCsub
>--- devel/godot.orig/files/patch-core_SCsub	2020-02-07 20:15:50.688270000 +1030
>+++ devel/godot/files/patch-core_SCsub	1970-01-01 09:30:00.000000000 +0930
>@@ -1,20 +0,0 @@
>---- 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
>diff -Nru devel/godot.orig/files/patch-modules_enet_SCsub devel/godot/files/patch-modules_enet_SCsub
>--- devel/godot.orig/files/patch-modules_enet_SCsub	2020-02-07 20:15:50.688327000 +1030
>+++ devel/godot/files/patch-modules_enet_SCsub	1970-01-01 09:30:00.000000000 +0930
>@@ -1,11 +0,0 @@
>---- modules/enet/SCsub.orig	2019-03-23 10:48:38 UTC
>-+++ modules/enet/SCsub
>-@@ -21,7 +21,7 @@ if env['builtin_enet']:
>-     ]
>-     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
>- 
>--    env_enet.Append(CPPPATH=[thirdparty_dir])
>-+    env_enet.Prepend(CPPPATH=[thirdparty_dir])
>-     env_enet.Append(CPPFLAGS=["-DGODOT_ENET"])
>- 
>-     env_thirdparty = env_enet.Clone()
>diff -Nru devel/godot.orig/files/patch-modules_mono_SCsub devel/godot/files/patch-modules_mono_SCsub
>--- devel/godot.orig/files/patch-modules_mono_SCsub	2020-02-07 20:15:50.688442000 +1030
>+++ devel/godot/files/patch-modules_mono_SCsub	1970-01-01 09:30:00.000000000 +0930
>@@ -1,11 +0,0 @@
>---- modules/mono/SCsub.orig	2018-01-03 10:12:46 UTC
>-+++ modules/mono/SCsub
>-@@ -147,7 +147,7 @@ def mono_build_solution(source, target, 
>-         msbuild_path = msbuild_info[0]
>-         framework_path_override = msbuild_info[1]
>-     else:
>--        msbuild_path = find_msbuild_unix('msbuild')
>-+        msbuild_path = find_msbuild_unix('xbuild')
>-         if msbuild_path is None:
>-             xbuild_fallback = env['xbuild_fallback']
>- 
>diff -Nru devel/godot.orig/files/patch-modules_squish_SCsub devel/godot/files/patch-modules_squish_SCsub
>--- devel/godot.orig/files/patch-modules_squish_SCsub	2020-02-07 20:15:50.688386000 +1030
>+++ devel/godot/files/patch-modules_squish_SCsub	1970-01-01 09:30:00.000000000 +0930
>@@ -1,11 +0,0 @@
>---- modules/squish/SCsub.orig	2019-03-23 11:07:40 UTC
>-+++ modules/squish/SCsub
>-@@ -22,7 +22,7 @@ if env['builtin_squish']:
>- 
>-     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
>- 
>--    env_squish.Append(CPPPATH=[thirdparty_dir])
>-+    env_squish.Prepend(CPPPATH=[thirdparty_dir])
>- 
>-     env_thirdparty = env_squish.Clone()
>-     env_thirdparty.disable_warnings()
>diff -Nru devel/godot.orig/files/patch-modules_webm_libvpx_SCsub devel/godot/files/patch-modules_webm_libvpx_SCsub
>--- devel/godot.orig/files/patch-modules_webm_libvpx_SCsub	2020-02-07 20:15:50.688213000 +1030
>+++ devel/godot/files/patch-modules_webm_libvpx_SCsub	1970-01-01 09:30:00.000000000 +0930
>@@ -1,11 +0,0 @@
>---- modules/webm/libvpx/SCsub.orig  2019-03-23 15:10:53 UTC
>-+++ modules/webm/libvpx/SCsub
>-@@ -256,7 +256,7 @@ libvpx_sources_arm_neon_gas_apple = [libvpx_dir + file
>-
>- env_libvpx = env_modules.Clone()
>- env_libvpx.disable_warnings()
>--env_libvpx.Append(CPPPATH=[libvpx_dir])
>-+env_libvpx.Prepend(CPPPATH=[libvpx_dir])
>-
>- webm_multithread = env["platform"] != 'javascript'
>-

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

Attachments on bug 243953: 211441