Attachment 189869 Details for Bug 224604 – maintainer update devel/godot

[patch] maintainer update devel/godot

godot.patch (text/plain), 21.53 KB, created by Shane on 2018-01-17 21:42:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2018-01-17 21:42:43 UTC

Size: 21.53 KB

patch

obsolete

>diff -Nru devel/godot.orig/distinfo devel/godot/distinfo
>--- devel/godot.orig/distinfo	2018-01-18 07:57:15.753898000 +1030
>+++ devel/godot/distinfo	2018-01-06 16:21:55.820112000 +1030
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1485416056
>-SHA256 (godotengine-godot-2.1.2-stable_GH0.tar.gz) = 29b3131449f8ca908be800c4c07020efaa9f90a29b6bc1be8a18a331dc34b49a
>-SIZE (godotengine-godot-2.1.2-stable_GH0.tar.gz) = 14399692
>-SHA256 (godotengine-godot-demo-projects-dfa1274_GH0.tar.gz) = 42420f7f473b1391a13f226473d1cc850605f24d2865220e4c5acde05f1c340c
>-SIZE (godotengine-godot-demo-projects-dfa1274_GH0.tar.gz) = 18423807
>+TIMESTAMP = 1514402523
>+SHA256 (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 07cf3b01367d5ea53805f144bc60711bd79efb53f1f88d57d6a706e6944de8d7
>+SIZE (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 14811915
>+SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75
>+SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045
>diff -Nru devel/godot.orig/files/hold-patch-SConstruct devel/godot/files/hold-patch-SConstruct
>--- devel/godot.orig/files/hold-patch-SConstruct	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/hold-patch-SConstruct	2018-01-12 15:22:15.583850000 +1030
>@@ -0,0 +1,36 @@
>+--- SConstruct.orig	2016-11-15 18:44:21 UTC
>++++ SConstruct
>+@@ -65,7 +65,7 @@ elif (os.name == "nt"):
>+     if (os.getenv("VSINSTALLDIR") == None or platform_arg == "android"):
>+         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'))
>+@@ -247,15 +247,16 @@ if selected_platform in platform_list:
>+     if env["extra_suffix"] != '':
>+         env.extra_suffix += '.' + env["extra_suffix"]
>+ 
>+-    CCFLAGS = env.get('CCFLAGS', '')
>+-    env['CCFLAGS'] = ''
>+-
>+-    env.Append(CCFLAGS=string.split(str(CCFLAGS)))
>+-
>+-    CFLAGS = env.get('CFLAGS', '')
>+-    env['CFLAGS'] = ''
>+-
>++    env['CC'] = os.environ['CC']
>++    env['CXX'] = os.environ['CXX']
>++    
>++    CFLAGS = os.environ['CFLAGS']
>++    env['CFLAGS'] = []
>+     env.Append(CFLAGS=string.split(str(CFLAGS)))
>++    
>++    CCFLAGS = os.environ['CXXFLAGS']
>++    env['CCFLAGS'] = []
>++    env.Append(CCFLAGS=string.split(str(CCFLAGS)))
>+ 
>+     LINKFLAGS = env.get('LINKFLAGS', '')
>+     env['LINKFLAGS'] = ''
>diff -Nru devel/godot.orig/files/patch-core_image.cpp devel/godot/files/patch-core_image.cpp
>--- devel/godot.orig/files/patch-core_image.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-core_image.cpp	2018-01-12 15:22:15.605870000 +1030
>@@ -0,0 +1,35 @@
>+--- core/image.cpp.orig	2018-01-10 18:34:14 UTC
>++++ core/image.cpp
>+@@ -1518,8 +1518,8 @@ Error Image::_decompress_bc() {
>+ 					col_b |= src[2];
>+ 
>+ 					uint8_t table[4][4] = {
>+-						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
>+-						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
>++						{ static_cast<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
>++						{ static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_b)&0x1f) << 3), 255 },
>+ 						{ 0, 0, 0, 255 },
>+ 						{ 0, 0, 0, 255 }
>+ 					};
>+@@ -1611,8 +1611,8 @@ Error Image::_decompress_bc() {
>+ 					col_b |= src[8 + 2];
>+ 
>+ 					uint8_t table[4][4] = {
>+-						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
>+-						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
>++						{ static_cast<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
>++						{ static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_b)&0x1f) << 3), 255 },
>+ 						{ 0, 0, 0, 255 },
>+ 						{ 0, 0, 0, 255 }
>+ 					};
>+@@ -1722,8 +1722,8 @@ Error Image::_decompress_bc() {
>+ 					col_b |= src[8 + 2];
>+ 
>+ 					uint8_t table[4][4] = {
>+-						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
>+-						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
>++						{ static_cast<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
>++						{ static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_b)&0x1f) << 3), 255 },
>+ 						{ 0, 0, 0, 255 },
>+ 						{ 0, 0, 0, 255 }
>+ 					};
>diff -Nru devel/godot.orig/files/patch-core_ustring.cpp devel/godot/files/patch-core_ustring.cpp
>--- devel/godot.orig/files/patch-core_ustring.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-core_ustring.cpp	2018-01-12 15:22:15.614121000 +1030
>@@ -0,0 +1,11 @@
>+--- core/ustring.cpp.orig	2018-01-10 18:53:28 UTC
>++++ core/ustring.cpp
>+@@ -3199,7 +3199,7 @@ String String::http_unescape() const {
>+ 			if ((ord1 >= '0' && ord1 <= '9') || (ord1 >= 'A' && ord1 <= 'Z')) {
>+ 				CharType ord2 = ord_at(i + 2);
>+ 				if ((ord2 >= '0' && ord2 <= '9') || (ord2 >= 'A' && ord2 <= 'Z')) {
>+-					char bytes[2] = { ord1, ord2 };
>++					char bytes[2] = { static_cast<char>(ord1), static_cast<char>(ord2) };
>+ 					res += (char)strtol(bytes, NULL, 16);
>+ 					i += 2;
>+ 				}
>diff -Nru devel/godot.orig/files/patch-drivers_gles2_rasterizer__gles2.cpp devel/godot/files/patch-drivers_gles2_rasterizer__gles2.cpp
>--- devel/godot.orig/files/patch-drivers_gles2_rasterizer__gles2.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-drivers_gles2_rasterizer__gles2.cpp	2018-01-12 15:22:15.635008000 +1030
>@@ -0,0 +1,30 @@
>+--- drivers/gles2/rasterizer_gles2.cpp.orig	2018-01-10 11:36:45 UTC
>++++ drivers/gles2/rasterizer_gles2.cpp
>+@@ -2135,9 +2135,9 @@ Error RasterizerGLES2::_surface_set_arra
>+ 					for (int i = 0; i < p_surface->array_len; i++) {
>+ 
>+ 						GLbyte vector[4] = {
>+-							CLAMP(src[i].x * 127, -128, 127),
>+-							CLAMP(src[i].y * 127, -128, 127),
>+-							CLAMP(src[i].z * 127, -128, 127),
>++							static_cast<GLbyte>CLAMP(src[i].x * 127, -128, 127),
>++							static_cast<GLbyte>CLAMP(src[i].y * 127, -128, 127),
>++							static_cast<GLbyte>CLAMP(src[i].z * 127, -128, 127),
>+ 							0,
>+ 						};
>+ 
>+@@ -2169,10 +2169,10 @@ Error RasterizerGLES2::_surface_set_arra
>+ 					for (int i = 0; i < p_surface->array_len; i++) {
>+ 
>+ 						GLbyte xyzw[4] = {
>+-							CLAMP(src[i * 4 + 0] * 127, -128, 127),
>+-							CLAMP(src[i * 4 + 1] * 127, -128, 127),
>+-							CLAMP(src[i * 4 + 2] * 127, -128, 127),
>+-							CLAMP(src[i * 4 + 3] * 127, -128, 127)
>++							static_cast<GLbyte>CLAMP(src[i * 4 + 0] * 127, -128, 127),
>++							static_cast<GLbyte>CLAMP(src[i * 4 + 1] * 127, -128, 127),
>++							static_cast<GLbyte>CLAMP(src[i * 4 + 2] * 127, -128, 127),
>++							static_cast<GLbyte>CLAMP(src[i * 4 + 3] * 127, -128, 127)
>+ 						};
>+ 
>+ 						copymem(&p_mem[a.ofs + i * stride], xyzw, a.size);
>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-01-18 07:57:15.695020000 +1030
>+++ devel/godot/files/patch-drivers_unix_os__unix.cpp	2018-01-12 15:22:15.635329000 +1030
>@@ -1,40 +1,44 @@
>---- drivers/unix/os_unix.cpp.orig	2016-08-09 07:52:15 UTC
>+--- drivers/unix/os_unix.cpp.orig	2017-08-28 01:55:12 UTC
> +++ drivers/unix/os_unix.cpp
>-@@ -50,6 +50,7 @@
>+@@ -51,6 +51,7 @@
>  
>- #ifdef __FreeBSD__
>+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
>  #include <sys/param.h>
> +#include <sys/sysctl.h>
>  #endif
>- #include <stdarg.h>
>- #include <sys/time.h>
>-@@ -371,17 +372,7 @@ Error OS_Unix::execute(const String& p_p
>- 			args.push_back((char*)cs[i].get_data());// shitty C cast
>+ #include "globals.h"
>+ #include <assert.h>
>+@@ -375,17 +376,7 @@ Error OS_Unix::execute(const String &p_p
>+ 			args.push_back((char *)cs[i].get_data()); // shitty C cast
>  		args.push_back(0);
>  
> -#ifdef __FreeBSD__
>--		if(p_path.find("/")) {
>+-		if (p_path.find("/")) {
> -			// exec name contains path so use it
>--			execv(p_path.utf8().get_data(),&args[0]);
>--		}else{
>+-			execv(p_path.utf8().get_data(), &args[0]);
>+-		} else {
> -			// use program name and search through PATH to find it
>--			execvp(getprogname(),&args[0]);
>+-			execvp(getprogname(), &args[0]);
> -		}
> -#else
>- 		execv(p_path.utf8().get_data(),&args[0]);
>+ 		execv(p_path.utf8().get_data(), &args[0]);
> -#endif
>  		// still alive? something failed..
>- 		fprintf(stderr,"**ERROR** OS_Unix::execute - Could not create child process while executing: %s\n",p_path.utf8().get_data());
>+ 		fprintf(stderr, "**ERROR** OS_Unix::execute - Could not create child process while executing: %s\n", p_path.utf8().get_data());
>  		abort();
>-@@ -503,11 +494,16 @@ String OS_Unix::get_executable_path() co
>+@@ -499,12 +490,24 @@ String OS_Unix::get_executable_path() co
>+ 		return OS::get_executable_path();
>  	}
>  	return b;
>- #elif defined(__FreeBSD__)
>--	char resolved_path[MAXPATHLEN];
>--
>--	realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
>--
>--	return String(resolved_path);
>+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
>++#elif defined(__OpenBSD__)
>+ 	char resolved_path[MAXPATHLEN];
>+ 
>+ 	realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
>+ 
>+ 	return String(resolved_path);
>++
>++#elif defined(__FreeBSD__)
> +	int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
> +	char buf[MAXPATHLEN];
> +	size_t len = sizeof(buf);
>@@ -47,4 +51,4 @@
> +	return b;
>  #elif defined(__APPLE__)
>  	char temp_path[1];
>- 	uint32_t buff_size=1;
>+ 	uint32_t buff_size = 1;
>diff -Nru devel/godot.orig/files/patch-modules_speex_audio__stream__speex.cpp devel/godot/files/patch-modules_speex_audio__stream__speex.cpp
>--- devel/godot.orig/files/patch-modules_speex_audio__stream__speex.cpp	2018-01-18 07:57:15.728921000 +1030
>+++ devel/godot/files/patch-modules_speex_audio__stream__speex.cpp	2018-01-12 15:22:15.635424000 +1030
>@@ -1,10 +1,11 @@
>---- modules/speex/audio_stream_speex.cpp.orig	2016-11-28 17:58:00 UTC
>+--- modules/speex/audio_stream_speex.cpp.orig	2017-12-28 01:20:49 UTC
> +++ modules/speex/audio_stream_speex.cpp
>-@@ -28,7 +28,6 @@
>- /*************************************************************************/
>+@@ -29,7 +29,7 @@
>  #include "audio_stream_speex.h"
>  
>--#include "os_support.h"
>  #include "os/os.h"
>+-#include "os_support.h"
>++#include "thirdparty/speex/os_support.h"
>  #define READ_CHUNK 1024
>  
>+ static _FORCE_INLINE_ uint16_t le_short(uint16_t s) {
>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-01-18 07:57:15.707693000 +1030
>+++ devel/godot/files/patch-platform_x11_detect.py	2018-01-12 15:22:15.635523000 +1030
>@@ -1,21 +1,9 @@
>---- platform/x11/detect.py.orig	2016-11-15 18:44:21 UTC
>+--- platform/x11/detect.py.orig	2017-08-27 16:25:12 UTC
> +++ platform/x11/detect.py
>-@@ -31,11 +31,6 @@ def can_build():
>-         print("X11 not found.. x11 disabled.")
>-         return False
>- 
>--    ssl_error = os.system("pkg-config openssl --modversion > /dev/null ")
>--    if (ssl_error):
>--        print("OpenSSL not found.. x11 disabled.")
>--        return False
>--
>-     x11_error = os.system("pkg-config xcursor --modversion > /dev/null ")
>-     if (x11_error):
>-         print("xcursor not found.. x11 disabled.")
>-@@ -61,7 +56,9 @@ def get_opts():
>-         ('use_static_cpp', 'link stdc++ statically', 'no'),
>+@@ -56,7 +56,9 @@ def get_opts():
>          ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
>          ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),
>+         ('use_lto', 'Use link time optimization', 'no'),
> -        ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),
> +        ('alsa','Detect & Use alsa audio','no'),
> +        ('oss','Detect & Use OSS audio','no'),
>@@ -23,16 +11,24 @@
>          ('udev', 'Use udev for gamepad connection callbacks', 'no'),
>          ('debug_release', 'Add debug symbols to release version', 'no'),
>      ]
>-@@ -134,7 +131,7 @@ def configure(env):
>-     env.ParseConfig('pkg-config xrandr --cflags --libs')
>+@@ -148,13 +150,14 @@ def configure(env):
>+         # Currently not compatible with OpenSSL 1.1.0+
>+         # https://github.com/godotengine/godot/issues/8624
>+         import subprocess
>+-        openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
>++        openssl_version = '1.0.2' #subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
>+         if (openssl_version >= "1.1.0"):
>+             print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version)
>+             print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n")
>+             sys.exit(255)
>  
>-     if (env['builtin_openssl'] == 'no'):
> -        env.ParseConfig('pkg-config openssl --cflags --libs')
>++        #env.ParseConfig('pkg-config openssl --cflags --libs')
> +        env.ParseConfig('echo -lssl -lcrypto')
>  
>      if (env['builtin_libwebp'] == 'no'):
>          env.ParseConfig('pkg-config libwebp --cflags --libs')
>-@@ -173,12 +170,13 @@ def configure(env):
>+@@ -199,12 +202,13 @@ def configure(env):
>      if (env['builtin_glew'] == 'no'):
>          env.ParseConfig('pkg-config glew --cflags --libs')
>  
>@@ -52,15 +48,15 @@
>  
>      if (platform.system() == "Linux"):
>          env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
>-@@ -193,6 +191,11 @@ def configure(env):
>+@@ -218,6 +222,11 @@ def configure(env):
>+             env.ParseConfig('pkg-config libudev --cflags --libs')
>          else:
>              print("libudev development libraries not found, disabling udev support")
>- 
>++
> +    if (env["oss"]=="yes"):
> +        print("Enabling OSS Audio")
> +        env.Append(CPPFLAGS=["-DOSS_ENABLED"])
> +        env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])
>-+
>+ 
>      if (env["pulseaudio"] == "yes"):
>          if not os.system("pkg-config --exists libpulse-simple"):
>-             print("Enabling PulseAudio")
>diff -Nru devel/godot.orig/files/patch-platform_x11_os__x11.cpp devel/godot/files/patch-platform_x11_os__x11.cpp
>--- devel/godot.orig/files/patch-platform_x11_os__x11.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-platform_x11_os__x11.cpp	2018-01-12 15:22:15.636056000 +1030
>@@ -0,0 +1,11 @@
>+--- platform/x11/os_x11.cpp.orig	2018-01-10 10:08:3 UTC
>++++ platform/x11/os_x11.cpp
>+@@ -1243,7 +1243,7 @@ static Property read_property(Display *p
>+ 
>+ 	} while (bytes_after != 0);
>+ 
>+-	Property p = { ret, actual_format, nitems, actual_type };
>++	Property p = { ret, actual_format, (int)nitems, actual_type };
>+ 
>+ 	return p;
>+ }
>diff -Nru devel/godot.orig/files/patch-servers_audio_audio__mixer__sw.cpp devel/godot/files/patch-servers_audio_audio__mixer__sw.cpp
>--- devel/godot.orig/files/patch-servers_audio_audio__mixer__sw.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-servers_audio_audio__mixer__sw.cpp	2018-01-12 15:22:15.636575000 +1030
>@@ -0,0 +1,24 @@
>+--- servers/audio/audio_mixer_sw.cpp.orig	2018-01-10 15:33:12 UTC
>++++ servers/audio/audio_mixer_sw.cpp
>+@@ -280,7 +280,7 @@ void AudioMixerSW::mix_channel(Channel &
>+ 		//stereo pan
>+ 		float pan = c.pan * 0.5 + 0.5;
>+ 		float panv[2] = {
>+-			(1.0 - pan) * (1 << MIX_VOL_FRAC_BITS),
>++			(1.0f - pan) * (1 << MIX_VOL_FRAC_BITS),
>+ 			(pan) * (1 << MIX_VOL_FRAC_BITS)
>+ 		};
>+ 
>+@@ -297,9 +297,9 @@ void AudioMixerSW::mix_channel(Channel &
>+ 		float pany = c.depth * 0.5 + 0.5;
>+ 		// with this model every speaker plays at 0.25 energy at the center.. i'm not sure if it's correct but it seems to be balanced
>+ 		float panv[4] = {
>+-			(1.0 - pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS),
>+-			(1.0 - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS),
>+-			(pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS),
>++			(1.0f - pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS),
>++			(1.0f - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS),
>++			(pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS),
>+ 			(pany) * (panx) * (1 << MIX_VOL_FRAC_BITS)
>+ 		};
>+ 
>diff -Nru devel/godot.orig/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp devel/godot/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp
>--- devel/godot.orig/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp	2018-01-12 15:22:15.637115000 +1030
>@@ -0,0 +1,20 @@
>+--- servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp.orig	2018-01-10 18:13:07 UTC
>++++ servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp
>+@@ -675,7 +675,7 @@ bool SpatialSound2DServerSW::internal_bu
>+ 				case 2: {
>+ 
>+ 					float p = sd.panning.x * 0.5 + 0.5;
>+-					float panf[2] = { (1.0 - p), p };
>++					float panf[2] = { (1.0f - p), p };
>+ 					panf[0] *= sd.volume;
>+ 					panf[1] *= sd.volume;
>+ 
>+@@ -726,7 +726,7 @@ bool SpatialSound2DServerSW::internal_bu
>+ 
>+ 					float xp = sd.panning.x * 0.5 + 0.5;
>+ 					float yp = sd.panning.y * 0.5 + 0.5;
>+-					float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) };
>++					float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) };
>+ 					panf[0] *= sd.volume;
>+ 					panf[1] *= sd.volume;
>+ 					panf[2] *= sd.volume;
>diff -Nru devel/godot.orig/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp devel/godot/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp
>--- devel/godot.orig/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp	2018-01-12 15:22:15.637371000 +1030
>@@ -0,0 +1,20 @@
>+--- servers/spatial_sound/spatial_sound_server_sw.cpp.orig	2018-01-10 16:17:16 UTC
>++++ servers/spatial_sound/spatial_sound_server_sw.cpp
>+@@ -689,7 +689,7 @@ bool SpatialSoundServerSW::internal_buff
>+ 				case 2: {
>+ 
>+ 					float p = sd.panning.x * 0.5 + 0.5;
>+-					float panf[2] = { (1.0 - p), p };
>++					float panf[2] = { (1.0f - p), p };
>+ 					panf[0] *= sd.volume;
>+ 					panf[1] *= sd.volume;
>+ 
>+@@ -740,7 +740,7 @@ bool SpatialSoundServerSW::internal_buff
>+ 
>+ 					float xp = sd.panning.x * 0.5 + 0.5;
>+ 					float yp = sd.panning.y * 0.5 + 0.5;
>+-					float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) };
>++					float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) };
>+ 					panf[0] *= sd.volume;
>+ 					panf[1] *= sd.volume;
>+ 					panf[2] *= sd.volume;
>diff -Nru devel/godot.orig/files/patch-thirdparty_glew_glew.c devel/godot/files/patch-thirdparty_glew_glew.c
>--- devel/godot.orig/files/patch-thirdparty_glew_glew.c	1970-01-01 09:30:00.000000000 +0930
>+++ devel/godot/files/patch-thirdparty_glew_glew.c	2018-01-12 15:22:15.637482000 +1030
>@@ -0,0 +1,11 @@
>+--- thirdparty/glew/glew.c.orig	2017-12-28 02:06:18 UTC
>++++ thirdparty/glew/glew.c
>+@@ -30,7 +30,7 @@
>+ ** THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+ 
>+-#include <GL/glew.h>
>++#include "thirdparty/glew/GL/glew.h"
>+ 
>+ #if defined(_WIN32)
>+ #  include <GL/wglew.h>
>diff -Nru devel/godot.orig/Makefile devel/godot/Makefile
>--- devel/godot.orig/Makefile	2018-01-18 07:57:15.766539000 +1030
>+++ devel/godot/Makefile	2018-01-18 07:56:25.774414000 +1030
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	godot
>-PORTVERSION=	2.1.2
>-PORTREVISION=	3
>+PORTVERSION=	2.1.4
> DISTVERSIONSUFFIX=	-stable
> CATEGORIES=	devel games
> 
>@@ -13,7 +12,7 @@
> LICENSE=		MIT CC-BY-3.0
> LICENSE_COMB=		multi
> LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.md
>-LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.md
>+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt
> 
> LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		libpng.so:graphics/png \
>@@ -28,21 +27,21 @@
> 
> USES=		compiler:c++11-lib pkgconfig scons ssl
> USE_XORG=	x11 xcursor xinerama xrandr
>-USE_GL=		gl
>+USE_GL=		gl glu
> 
>-MAKE_ARGS+=	platform=x11 builtin_speex=no builtin_libmpcdec=no
>-MAKE_ARGS+=	${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
>+MAKE_ARGS+=		platform=x11 builtin_speex=no builtin_libmpcdec=no
>+MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
> MAKE_ARGS_clang=	use_llvm=yes
>-CXXFLAGS+=	-DGLEW_NO_GLU -DRTAUDIO_ENABLED
>-CXXFLAGS_i386=	${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
>+CXXFLAGS+=		-DGLEW_NO_GLU -DRTAUDIO_ENABLED
>+CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
> CXXFLAGS_i386_gcc=	-march=i586
> CXXFLAGS_aarch64=	-DNO_THREADS
> CXXFLAGS_sparc64=	-DNO_THREADS
> CXXFLAGS_mips=		-DNO_THREADS
> CXXFLAGS_mips64=	-DNO_THREADS
>-LDFLAGS+=	-lspeex -lmpcdec
>+LDFLAGS+=		-lspeex -lmpcdec
> 
>-OPTIONS_DEFINE=	EXAMPLES TOOLS
>+OPTIONS_DEFINE=		EXAMPLES TOOLS
> OPTIONS_DEFAULT=	OSS
> # Moved to devel/godot-tools
> OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
>@@ -53,13 +52,11 @@
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> ALSA_MAKE_ARGS=		alsa=yes
> EXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
>-# Branch HEAD for PORTVERSION
>-EXAMPLES_GH_TAGNAME=	dfa1274:DEMOS
> EXAMPLES_PORTEXAMPLES=	*
> OSS_MAKE_ARGS=		oss=yes
> PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
> PULSEAUDIO_MAKE_ARGS=	pulseaudio=yes
>-TOOLS_DESC=	Include development tools (IDE)
>+TOOLS_DESC=		Include development tools (IDE)
> TOOLS_MAKE_ARGS=	target=release_debug tools=yes
> TOOLS_MAKE_ARGS_OFF=	target=release tools=no
> TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
>@@ -68,7 +65,7 @@
> 			share/pixmaps/${GODOTFILE}.svg
> 
> GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
>-PLIST_FILES=	bin/${GODOTFILE}
>+PLIST_FILES=		bin/${GODOTFILE}
> 
> .ifmake makesum
> # Always include optional distfiles

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

Attachments on bug 224604: 189184 | 189185 | 189186 | 189868 | 189869 | 190679 | 191297