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

[patch] maintainer update for devel/godot

godot.patch (text/plain), 7.60 KB, created by Shane on 2018-06-17 04:56:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2018-06-17 04:56:11 UTC

Size: 7.60 KB

patch

obsolete

>diff -Nru devel/godot.orig/distinfo devel/godot/distinfo
>--- devel/godot.orig/distinfo	2018-06-17 14:16:16.365312000 +0930
>+++ devel/godot/distinfo	2018-06-17 12:31:58.156917000 +0930
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1520319042
>-SHA256 (godotengine-godot-3.0.2-stable_GH0.tar.gz) = 15bc91dcbc92fe49624118678fcab119ff332dc295b25f4921700a4ee498b651
>-SIZE (godotengine-godot-3.0.2-stable_GH0.tar.gz) = 18812660
>+TIMESTAMP = 1529204518
>+SHA256 (godotengine-godot-3.0.3-stable_GH0.tar.gz) = db6bf2a2cee8e058254fc0b43c38c68a5226b18315b852e266cb3b95e23618c1
>+SIZE (godotengine-godot-3.0.3-stable_GH0.tar.gz) = 18929162
> SHA256 (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = b798d0bb56a643fdb175df463990904523495dd5546bc00bbe762e0645b7c94a
> SIZE (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = 140126782
>diff -Nru devel/godot.orig/files/patch-drivers_unix_os__unix.cpp devel/godot/files/patch-drivers_unix_os__unix.cpp
>--- devel/godot.orig/files/patch-drivers_unix_os__unix.cpp	2018-06-17 14:16:16.290343000 +0930
>+++ devel/godot/files/patch-drivers_unix_os__unix.cpp	1970-01-01 09:30:00.000000000 +0930
>@@ -1,11 +0,0 @@
>---- drivers/unix/os_unix.cpp.orig	2018-02-01 19:27:25 UTC
>-+++ drivers/unix/os_unix.cpp
>-@@ -235,7 +235,7 @@ OS::TimeZoneInfo OS_Unix::get_time_zone_
>- 
>- void OS_Unix::delay_usec(uint32_t p_usec) const {
>- 
>--	struct timespec rem = { p_usec / 1000000, (p_usec % 1000000) * 1000 };
>-+	struct timespec rem = { time_t(p_usec) / 1000000, (long(p_usec) % 1000000) * 1000 };
>- 	while (nanosleep(&rem, &rem) == EINTR) {
>- 	}
>- }
>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-14 02:24:26.062912000 +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-14 02:24:26.062968000 +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-17 14:16:16.311673000 +0930
>+++ devel/godot/files/patch-platform_x11_detect.py	2018-06-14 02:24:26.063061000 +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-scene_gui_rich__text__label.cpp devel/godot/files/patch-scene_gui_rich__text__label.cpp
>--- devel/godot.orig/files/patch-scene_gui_rich__text__label.cpp	2018-06-17 14:16:16.338028000 +0930
>+++ devel/godot/files/patch-scene_gui_rich__text__label.cpp	1970-01-01 09:30:00.000000000 +0930
>@@ -1,14 +0,0 @@
>---- scene/gui/rich_text_label.cpp.orig	2018-01-10 13:20:47 UTC
>-+++ scene/gui/rich_text_label.cpp
>-@@ -806,9 +806,9 @@ void RichTextLabel::_gui_input(Ref<Input
>- 							// Erase previous selection.
>- 							if (selection.active) {
>- 								selection.from = NULL;
>--								selection.from_char = NULL;
>-+								selection.from_char = 0;
>- 								selection.to = NULL;
>--								selection.to_char = NULL;
>-+								selection.to_char = 0;
>- 								selection.active = false;
>- 
>- 								update();
>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-14 02:24:26.063114000 +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-17 14:16:16.383796000 +0930
>+++ devel/godot/Makefile	2018-06-17 14:15:43.074916000 +0930
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	godot
>-PORTVERSION=	3.0.2
>+PORTVERSION=	3.0.3
> DISTVERSIONSUFFIX= -stable
> CATEGORIES=	devel games
> 
>@@ -21,16 +21,16 @@
> 		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
> 
>-MAKE_ARGS+=		platform=x11 builtin_libpng=False builtin_openssl=False verbose=True
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	godotengine
>+
>+MAKE_ARGS+=		platform=x11 builtin_libpng=False builtin_openssl=False
> MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
> MAKE_ARGS_clang=	use_llvm=True
> CXXFLAGS+=		-DRTAUDIO_ENABLED

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

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