Attachment 194215 Details for Bug 228764 – maintainer update devel/godot

[patch] maintainer update devel/godot

godot.patch (text/plain), 5.18 KB, created by Shane on 2018-06-13 08:25:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2018-06-13 08:25:12 UTC

Size: 5.18 KB

patch

obsolete

>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	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-modules_enet_SCsub	2018-06-13 11:51:49.434177000 +0930
>@@ -0,0 +1,11 @@
>+--- modules/enet/SCsub.orig	2018-06-13 11:43:18 UTC
>++++ modules/enet/SCsub
>+@@ -22,7 +22,7 @@ if env['builtin_enet']:
>+     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
>+ 
>+     env_enet.add_source_files(env.modules_sources, thirdparty_sources)
>+-    env_enet.Append(CPPPATH=[thirdparty_dir])
>++    env_enet.Prepend(CPPPATH=[thirdparty_dir])
>+     env_enet.Append(CPPFLAGS=["-DGODOT_ENET"])
>+ 
>+ env_enet.add_source_files(env.modules_sources, "*.cpp")
>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	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-modules_squish_SCsub	2018-06-13 12:03:35.268080000 +0930
>@@ -0,0 +1,11 @@
>+--- modules/squish/SCsub.orig	2018-06-13 12:02:27 UTC
>++++ modules/squish/SCsub
>+@@ -23,7 +23,7 @@ if env['builtin_squish']:
>+     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
>+ 
>+     env_squish.add_source_files(env.modules_sources, thirdparty_sources)
>+-    env_squish.Append(CPPPATH=[thirdparty_dir])
>++    env_squish.Prepend(CPPPATH=[thirdparty_dir])
>+ 
>+ # Godot source files
>+ env_squish.add_source_files(env.modules_sources, "*.cpp")
>diff -Nru devel/godot.orig/files/patch-platform_x11_detect.py devel/godot/files/patch-platform_x11_detect.py
>--- devel/godot.orig/files/patch-platform_x11_detect.py	2018-06-13 17:29:05.897635000 +0930
>+++ devel/godot/files/patch-platform_x11_detect.py	2018-06-13 14:56:42.536607000 +0930
>@@ -1,7 +1,7 @@
>---- platform/x11/detect.py.orig	2017-12-28 05:14:45 UTC
>+--- 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 stdc++ statically', False),
>+         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),
>@@ -11,16 +11,21 @@
>          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,7 @@ def configure(env):
>+@@ -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')
>-+        env.ParseConfig('echo -lssl -lcrypto')
>++        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 +228,18 @@ def configure(env):
>+@@ -226,12 +233,18 @@ def configure(env):
>  
>      ## Flags
>  
>diff -Nru devel/godot.orig/files/patch-thirdparty_zstd_SCsub devel/godot/files/patch-thirdparty_zstd_SCsub
>--- devel/godot.orig/files/patch-thirdparty_zstd_SCsub	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-thirdparty_zstd_SCsub	2018-06-13 11:54:50.878302000 +0930
>@@ -0,0 +1,9 @@
>+--- thirdparty/zstd/SCsub.orig	2018-06-13 11:53:45 UTC
>++++ thirdparty/zstd/SCsub
>+@@ -25,5 +25,5 @@ thirdparty_zstd_sources = [
>+ ]
>+ thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
>+ env.add_source_files(env.core_sources, thirdparty_zstd_sources)
>+-env.Append(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"])
>++env.Prepend(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"])
>+ env.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
>diff -Nru devel/godot.orig/Makefile devel/godot/Makefile
>--- devel/godot.orig/Makefile	2018-06-13 17:29:05.898475000 +0930
>+++ devel/godot/Makefile	2018-06-13 17:25:22.804133000 +0930
>@@ -4,6 +4,7 @@
> PORTNAME=	godot
> PORTVERSION=	3.0.2
> DISTVERSIONSUFFIX= -stable
>+PORTREVISION=	1
> CATEGORIES=	devel games
> 
> MAINTAINER=	FreeBSD@Shaneware.biz
>@@ -21,15 +22,15 @@
> 		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

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

Attachments on bug 228764: 194215 | 194216 | 194317 | 194474