Attachment 157095 Details for Bug 200424 – update godot to v1.1

[patch] update godot to v1.1

godot.patch (text/plain), 12.55 KB, created by Shane on 2015-05-24 07:14:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2015-05-24 07:14:39 UTC

Size: 12.55 KB

patch

obsolete

>diff -Nru godot.orig/Makefile godot/Makefile
>--- godot.orig/Makefile	2015-05-24 16:38:40.403801794 +0930
>+++ godot/Makefile	2015-05-24 16:38:30.242924063 +0930
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	godot
>-PORTVERSION=	1.0
>+PORTVERSION=	1.1
> DISTVERSIONSUFFIX=	-stable
>-PORTREVISION=	1
> CATEGORIES=	devel games
> 
> MAINTAINER=	FreeBSD@Shaneware.biz
>@@ -19,7 +18,7 @@
> GH_ACCOUNT=	okamstudio
> 
> USES=		scons pkgconfig compiler
>-USE_XORG=	x11 xcursor
>+USE_XORG=	x11 xcursor xinerama
> USE_GL=		glu
> USE_OPENSSL=	yes
> 
>@@ -41,7 +40,7 @@
> BITSUF=	.32
> .endif
> 
>-.if ${COMPILER_TYPE} == clang
>+.if ${CHOSEN_COMPILER_TYPE} == clang
> .if ${OSVERSION} < 900000
> BROKEN=	clang fails to link on 8.x
> .endif
>diff -Nru godot.orig/distinfo godot/distinfo
>--- godot.orig/distinfo	2015-05-24 16:38:40.403801794 +0930
>+++ godot/distinfo	2015-05-23 20:21:00.937948546 +0930
>@@ -1,2 +1,2 @@
>-SHA256 (okamstudio-godot-1.0-stable_GH0.tar.gz) = b3017c145a7715b717a513dd289793688b0c12394f4b56b351a126b678f87064
>-SIZE (okamstudio-godot-1.0-stable_GH0.tar.gz) = 25111224
>+SHA256 (okamstudio-godot-1.1-stable_GH0.tar.gz) = 64281f4fa485cac13ff5b0bc00449a62b19198fc072260d3fb01aa5aad2be8a5
>+SIZE (okamstudio-godot-1.1-stable_GH0.tar.gz) = 54744842
>diff -Nru godot.orig/files/extra-patch-core_variant.h godot/files/extra-patch-core_variant.h
>--- godot.orig/files/extra-patch-core_variant.h	1970-01-01 09:30:00.000000000 +0930
>+++ godot/files/extra-patch-core_variant.h	2015-01-27 18:42:28.581827027 +1030
>@@ -0,0 +1,24 @@
>+--- core/variant.h.orig	2014-12-15 18:49:18 UTC
>++++ core/variant.h
>+@@ -167,8 +167,9 @@ public:
>+ 	static String get_type_name(Variant::Type p_type);
>+ 	static bool can_convert(Type p_type_from,Type p_type_to);
>+ 
>++#if defined(_MSC_VER)
>+ #pragma runtime_checks( "", off )
>+-
>++#endif
>+ 	template<class T>
>+ 	static Type get_type_for() {
>+ 		
>+@@ -177,8 +178,9 @@ public:
>+ 		Type r = v.get_type();
>+ 		return r;
>+ 	}
>++#if defined(_MSC_VER)
>+ #pragma runtime_checks( "", restore )
>+-
>++#endif
>+ 	bool is_ref() const;
>+ 	_FORCE_INLINE_ bool is_num() const { return type==INT || type==REAL; };
>+ 	_FORCE_INLINE_ bool is_array() const { return type>=ARRAY; };
>diff -Nru godot.orig/files/extra-patch-drivers_unix_ip__unix.cpp godot/files/extra-patch-drivers_unix_ip__unix.cpp
>--- godot.orig/files/extra-patch-drivers_unix_ip__unix.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ godot/files/extra-patch-drivers_unix_ip__unix.cpp	2015-01-27 18:42:28.639314173 +1030
>@@ -0,0 +1,20 @@
>+--- drivers/unix/ip_unix.cpp.orig	2014-12-15 18:49:18 UTC
>++++ drivers/unix/ip_unix.cpp
>+@@ -50,11 +50,16 @@
>+  #ifdef ANDROID_ENABLED
>+   #include "platform/android/ifaddrs_android.h"
>+  #else
>++ #ifdef __FreeBSD__
>++  #include <sys/types.h>
>++ #endif
>+   #include <ifaddrs.h>
>+  #endif
>+  #include <arpa/inet.h>
>+  #include <sys/socket.h>
>+-
>++ #ifdef __FreeBSD__
>++  #include <netinet/in.h>
>++ #endif
>+ #endif
>+ 
>+ IP_Address IP_Unix::_resolve_hostname(const String& p_hostname) {
>diff -Nru godot.orig/files/extra-patch-drivers_unix_os__unix.cpp godot/files/extra-patch-drivers_unix_os__unix.cpp
>--- godot.orig/files/extra-patch-drivers_unix_os__unix.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ godot/files/extra-patch-drivers_unix_os__unix.cpp	2015-01-27 18:42:28.639314173 +1030
>@@ -0,0 +1,44 @@
>+--- drivers/unix/os_unix.cpp.orig	2014-12-15 18:49:18 UTC
>++++ drivers/unix/os_unix.cpp
>+@@ -44,7 +44,9 @@
>+ #include "stream_peer_tcp_posix.h"
>+ #include "packet_peer_udp_posix.h"
>+ 
>+-
>++#ifdef __FreeBSD__
>++#include <sys/param.h>
>++#endif
>+ #include <stdarg.h>
>+ #include <sys/time.h>
>+ #include <sys/wait.h>
>+@@ -305,7 +307,17 @@ 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("/")) {
>++            // exec name contains path so use it
>++            execv(p_path.utf8().get_data(),&args[0]);
>++        }else{
>++            // use program name and search through PATH to find it
>++		    execvp(getprogname(),&args[0]);
>++		}
>++#else
>+ 		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());
>+ 		abort();
>+@@ -415,6 +427,12 @@ 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);
>+ #else
>+ 	ERR_PRINT("Warning, don't know how to obtain executable path on this OS! Please override this function properly.");
>+ 	return OS::get_executable_path();
>diff -Nru godot.orig/files/old-patch-platform_x11_detect.py godot/files/old-patch-platform_x11_detect.py
>--- godot.orig/files/old-patch-platform_x11_detect.py	1970-01-01 09:30:00.000000000 +0930
>+++ godot/files/old-patch-platform_x11_detect.py	2015-03-05 17:15:44.427342607 +1030
>@@ -0,0 +1,63 @@
>+--- platform/x11/detect.py.orig	2014-12-15 21:49:18.000000000 +0300
>++++ platform/x11/detect.py	2015-03-03 07:01:34.000000000 +0300
>+@@ -29,11 +29,6 @@
>+ 		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.")
>+@@ -72,17 +67,16 @@
>+ 
>+ 	env.Append(CPPPATH=['#platform/x11'])
>+ 	if (env["use_llvm"]=="yes"):
>+-		env["CC"]="clang"
>+-		env["CXX"]="clang++"
>+-		env["LD"]="clang++"
>+-		if (env["use_sanitizer"]=="yes"):
>+-			env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
>+-			env.Append(LINKFLAGS=['-fsanitize=address'])
>+-			env.extra_suffix=".llvms"
>+-		else:
>+-			env.extra_suffix=".llvm"
>+-
>+-
>++		if 'clang++' not in env['CXX']:
>++			env["CC"]="clang"
>++			env["CXX"]="clang++"
>++			env["LD"]="clang++"
>++		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
>++		env.extra_suffix=".llvm"
>++
>++	if (env["use_sanitizer"]=="yes"):
>++		env.Append(CCFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
>++		env.Append(LINKFLAGS='-fsanitize=address')
>+ 
>+ 
>+ 	#if (env["tools"]=="no"):
>+@@ -105,7 +99,7 @@
>+ 
>+ 	env.ParseConfig('pkg-config x11 --cflags --libs')
>+ 	env.ParseConfig('pkg-config xcursor --cflags --libs')
>+-	env.ParseConfig('pkg-config openssl --cflags --libs')
>++	env.ParseConfig('echo -lssl -lcrypto')
>+ 
>+ 
>+ 	env.ParseConfig('pkg-config freetype2 --cflags --libs')
>+@@ -128,11 +122,6 @@
>+ 		env.Append(LINKFLAGS=['-m64','-L/usr/lib/i686-linux-gnu'])
>+ 
>+ 
>+-	if (env["CXX"]=="clang++"):
>+-		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
>+-		env["CC"]="clang"
>+-		env["LD"]="clang++"
>+-
>+ 	import methods
>+ 
>+ 	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
>diff -Nru godot.orig/files/patch-core_variant.h godot/files/patch-core_variant.h
>--- godot.orig/files/patch-core_variant.h	2015-05-24 16:38:40.402802625 +0930
>+++ godot/files/patch-core_variant.h	1970-01-01 09:30:00.000000000 +0930
>@@ -1,24 +0,0 @@
>---- core/variant.h.orig	2014-12-15 18:49:18 UTC
>-+++ core/variant.h
>-@@ -167,8 +167,9 @@ public:
>- 	static String get_type_name(Variant::Type p_type);
>- 	static bool can_convert(Type p_type_from,Type p_type_to);
>- 
>-+#if defined(_MSC_VER)
>- #pragma runtime_checks( "", off )
>--
>-+#endif
>- 	template<class T>
>- 	static Type get_type_for() {
>- 		
>-@@ -177,8 +178,9 @@ public:
>- 		Type r = v.get_type();
>- 		return r;
>- 	}
>-+#if defined(_MSC_VER)
>- #pragma runtime_checks( "", restore )
>--
>-+#endif
>- 	bool is_ref() const;
>- 	_FORCE_INLINE_ bool is_num() const { return type==INT || type==REAL; };
>- 	_FORCE_INLINE_ bool is_array() const { return type>=ARRAY; };
>diff -Nru godot.orig/files/patch-drivers_unix_ip__unix.cpp godot/files/patch-drivers_unix_ip__unix.cpp
>--- godot.orig/files/patch-drivers_unix_ip__unix.cpp	2015-05-24 16:38:40.403801794 +0930
>+++ godot/files/patch-drivers_unix_ip__unix.cpp	1970-01-01 09:30:00.000000000 +0930
>@@ -1,20 +0,0 @@
>---- drivers/unix/ip_unix.cpp.orig	2014-12-15 18:49:18 UTC
>-+++ drivers/unix/ip_unix.cpp
>-@@ -50,11 +50,16 @@
>-  #ifdef ANDROID_ENABLED
>-   #include "platform/android/ifaddrs_android.h"
>-  #else
>-+ #ifdef __FreeBSD__
>-+  #include <sys/types.h>
>-+ #endif
>-   #include <ifaddrs.h>
>-  #endif
>-  #include <arpa/inet.h>
>-  #include <sys/socket.h>
>--
>-+ #ifdef __FreeBSD__
>-+  #include <netinet/in.h>
>-+ #endif
>- #endif
>- 
>- IP_Address IP_Unix::_resolve_hostname(const String& p_hostname) {
>diff -Nru godot.orig/files/patch-drivers_unix_os__unix.cpp godot/files/patch-drivers_unix_os__unix.cpp
>--- godot.orig/files/patch-drivers_unix_os__unix.cpp	2015-05-24 16:38:40.402802625 +0930
>+++ godot/files/patch-drivers_unix_os__unix.cpp	1970-01-01 09:30:00.000000000 +0930
>@@ -1,44 +0,0 @@
>---- drivers/unix/os_unix.cpp.orig	2014-12-15 18:49:18 UTC
>-+++ drivers/unix/os_unix.cpp
>-@@ -44,7 +44,9 @@
>- #include "stream_peer_tcp_posix.h"
>- #include "packet_peer_udp_posix.h"
>- 
>--
>-+#ifdef __FreeBSD__
>-+#include <sys/param.h>
>-+#endif
>- #include <stdarg.h>
>- #include <sys/time.h>
>- #include <sys/wait.h>
>-@@ -305,7 +307,17 @@ 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("/")) {
>-+            // exec name contains path so use it
>-+            execv(p_path.utf8().get_data(),&args[0]);
>-+        }else{
>-+            // use program name and search through PATH to find it
>-+		    execvp(getprogname(),&args[0]);
>-+		}
>-+#else
>- 		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());
>- 		abort();
>-@@ -415,6 +427,12 @@ 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);
>- #else
>- 	ERR_PRINT("Warning, don't know how to obtain executable path on this OS! Please override this function properly.");
>- 	return OS::get_executable_path();
>diff -Nru godot.orig/files/patch-platform_x11_detect.py godot/files/patch-platform_x11_detect.py
>--- godot.orig/files/patch-platform_x11_detect.py	2015-05-24 16:38:40.402802625 +0930
>+++ godot/files/patch-platform_x11_detect.py	2015-05-23 20:21:00.939040966 +0930
>@@ -1,5 +1,5 @@
>---- platform/x11/detect.py.orig	2014-12-15 21:49:18.000000000 +0300
>-+++ platform/x11/detect.py	2015-03-03 07:01:34.000000000 +0300
>+--- ./platform/x11/detect.py.orig	2015-05-22 03:33:21.000000000 +0930
>++++ ./platform/x11/detect.py	2015-05-23 14:57:49.522273728 +0930
> @@ -29,11 +29,6 @@
>  		print("X11 not found.. x11 disabled.")
>  		return False
>@@ -12,52 +12,12 @@
>  	x11_error=os.system("pkg-config xcursor --modversion > /dev/null ")
>  	if (x11_error):
>  		print("xcursor not found.. x11 disabled.")
>-@@ -72,17 +67,16 @@
>- 
>- 	env.Append(CPPPATH=['#platform/x11'])
>- 	if (env["use_llvm"]=="yes"):
>--		env["CC"]="clang"
>--		env["CXX"]="clang++"
>--		env["LD"]="clang++"
>--		if (env["use_sanitizer"]=="yes"):
>--			env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
>--			env.Append(LINKFLAGS=['-fsanitize=address'])
>--			env.extra_suffix=".llvms"
>--		else:
>--			env.extra_suffix=".llvm"
>--
>--
>-+		if 'clang++' not in env['CXX']:
>-+			env["CC"]="clang"
>-+			env["CXX"]="clang++"
>-+			env["LD"]="clang++"
>-+			env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
>-+		env.extra_suffix=".llvm"
>-+
>-+	if (env["use_sanitizer"]=="yes"):
>-+		env.Append(CCFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
>-+		env.Append(LINKFLAGS='-fsanitize=address')
>- 
>- 
>- 	#if (env["tools"]=="no"):
>-@@ -105,7 +99,7 @@
>- 
>+@@ -126,7 +121,7 @@
>  	env.ParseConfig('pkg-config x11 --cflags --libs')
>+ 	env.ParseConfig('pkg-config xinerama --cflags --libs')
>  	env.ParseConfig('pkg-config xcursor --cflags --libs')
> -	env.ParseConfig('pkg-config openssl --cflags --libs')
> +	env.ParseConfig('echo -lssl -lcrypto')
>  
>  
>  	env.ParseConfig('pkg-config freetype2 --cflags --libs')
>-@@ -128,11 +122,6 @@
>- 		env.Append(LINKFLAGS=['-m64','-L/usr/lib/i686-linux-gnu'])
>- 
>- 
>--	if (env["CXX"]=="clang++"):
>--		env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
>--		env["CC"]="clang"
>--		env["LD"]="clang++"
>--
>- 	import methods
>- 
>- 	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )

Actions: View | Diff

Attachments on bug 200424: 157095 | 157109