Attachment #189869 for bug #224604

Lines 1-5 Link Here

(-)devel/godot/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1485416056	1	TIMESTAMP = 1514402523
2	SHA256 (godotengine-godot-2.1.2-stable_GH0.tar.gz) = 29b3131449f8ca908be800c4c07020efaa9f90a29b6bc1be8a18a331dc34b49a	2	SHA256 (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 07cf3b01367d5ea53805f144bc60711bd79efb53f1f88d57d6a706e6944de8d7
3	SIZE (godotengine-godot-2.1.2-stable_GH0.tar.gz) = 14399692	3	SIZE (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 14811915
4	SHA256 (godotengine-godot-demo-projects-dfa1274_GH0.tar.gz) = 42420f7f473b1391a13f226473d1cc850605f24d2865220e4c5acde05f1c340c	4	SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75
5	SIZE (godotengine-godot-demo-projects-dfa1274_GH0.tar.gz) = 18423807	5	SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045




--- 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'] = ''

Line 0 Link Here

(-)devel/godot/files/patch-core_image.cpp (+35 lines)
	1	--- core/image.cpp.orig 2018-01-10 18:34:14 UTC
	2	+++ core/image.cpp
	3	@@ -1518,8 +1518,8 @@ Error Image::_decompress_bc() {
	4	col_b \|= src[2];
	5
	6	uint8_t table[4][4] = {
	7	- { (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
	8	- { (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
	9	+ { 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 },
	10	+ { 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 },
	11	{ 0, 0, 0, 255 },
	12	{ 0, 0, 0, 255 }
	13	};
	14	@@ -1611,8 +1611,8 @@ Error Image::_decompress_bc() {
	15	col_b \|= src[8 + 2];
	16
	17	uint8_t table[4][4] = {
	18	- { (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
	19	- { (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
	20	+ { 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 },
	21	+ { 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 },
	22	{ 0, 0, 0, 255 },
	23	{ 0, 0, 0, 255 }
	24	};
	25	@@ -1722,8 +1722,8 @@ Error Image::_decompress_bc() {
	26	col_b \|= src[8 + 2];
	27
	28	uint8_t table[4][4] = {
	29	- { (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
	30	- { (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
	31	+ { 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 },
	32	+ { 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 },
	33	{ 0, 0, 0, 255 },
	34	{ 0, 0, 0, 255 }
	35	};

Line 0 Link Here

(-)devel/godot/files/patch-core_ustring.cpp (+11 lines)
	1	--- core/ustring.cpp.orig 2018-01-10 18:53:28 UTC
	2	+++ core/ustring.cpp
	3	@@ -3199,7 +3199,7 @@ String String::http_unescape() const {
	4	if ((ord1 >= '0' && ord1 <= '9') \|\| (ord1 >= 'A' && ord1 <= 'Z')) {
	5	CharType ord2 = ord_at(i + 2);
	6	if ((ord2 >= '0' && ord2 <= '9') \|\| (ord2 >= 'A' && ord2 <= 'Z')) {
	7	- char bytes[2] = { ord1, ord2 };
	8	+ char bytes[2] = { static_cast<char>(ord1), static_cast<char>(ord2) };
	9	res += (char)strtol(bytes, NULL, 16);
	10	i += 2;
	11	}




--- 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);




--- drivers/unix/os_unix.cpp.orig	2017-08-28 01:55:12 UTC
+++ drivers/unix/os_unix.cpp
@@ -51,6 +51,7 @@
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <sys/param.h>
+#include <sys/sysctl.h>
 #endif
 #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("/")) {
-			// 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();
@@ -499,12 +490,24 @@ String OS_Unix::get_executable_path() co
 		return OS::get_executable_path();
 	}
 	return b;
-#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);

+	return b;
 #elif defined(__APPLE__)
 	char temp_path[1];
 	uint32_t buff_size = 1;




--- modules/speex/audio_stream_speex.cpp.orig	2017-12-28 01:20:49 UTC
+++ modules/speex/audio_stream_speex.cpp
@@ -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) {




--- platform/x11/detect.py.orig	2017-08-27 16:25:12 UTC
+++ platform/x11/detect.py
@@ -56,7 +56,9 @@ def get_opts():
         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'),
         ('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'),

         ('udev', 'Use udev for gamepad connection callbacks', 'no'),
         ('debug_release', 'Add debug symbols to release version', 'no'),
     ]
@@ -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')
@@ -199,12 +202,13 @@ def configure(env):
     if (env['builtin_glew'] == 'no'):
         env.ParseConfig('pkg-config glew --cflags --libs')
 

 
     if (platform.system() == "Linux"):
         env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
@@ -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")

Line 0 Link Here

(-)devel/godot/files/patch-platform_x11_os__x11.cpp (+11 lines)
	1	--- platform/x11/os_x11.cpp.orig 2018-01-10 10:08:3 UTC
	2	+++ platform/x11/os_x11.cpp
	3	@@ -1243,7 +1243,7 @@ static Property read_property(Display *p
	4
	5	} while (bytes_after != 0);
	6
	7	- Property p = { ret, actual_format, nitems, actual_type };
	8	+ Property p = { ret, actual_format, (int)nitems, actual_type };
	9
	10	return p;
	11	}




--- 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)
 		};
 

Line 0 Link Here

(-)devel/godot/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp (+20 lines)
	1	--- servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp.orig 2018-01-10 18:13:07 UTC
	2	+++ servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp
	3	@@ -675,7 +675,7 @@ bool SpatialSound2DServerSW::internal_bu
	4	case 2: {
	5
	6	float p = sd.panning.x * 0.5 + 0.5;
	7	- float panf[2] = { (1.0 - p), p };
	8	+ float panf[2] = { (1.0f - p), p };
	9	panf[0] *= sd.volume;
	10	panf[1] *= sd.volume;
	11
	12	@@ -726,7 +726,7 @@ bool SpatialSound2DServerSW::internal_bu
	13
	14	float xp = sd.panning.x * 0.5 + 0.5;
	15	float yp = sd.panning.y * 0.5 + 0.5;
	16	- float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) };
	17	+ float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) };
	18	panf[0] *= sd.volume;
	19	panf[1] *= sd.volume;
	20	panf[2] *= sd.volume;

Line 0 Link Here

(-)devel/godot/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp (+20 lines)
	1	--- servers/spatial_sound/spatial_sound_server_sw.cpp.orig 2018-01-10 16:17:16 UTC
	2	+++ servers/spatial_sound/spatial_sound_server_sw.cpp
	3	@@ -689,7 +689,7 @@ bool SpatialSoundServerSW::internal_buff
	4	case 2: {
	5
	6	float p = sd.panning.x * 0.5 + 0.5;
	7	- float panf[2] = { (1.0 - p), p };
	8	+ float panf[2] = { (1.0f - p), p };
	9	panf[0] *= sd.volume;
	10	panf[1] *= sd.volume;
	11
	12	@@ -740,7 +740,7 @@ bool SpatialSoundServerSW::internal_buff
	13
	14	float xp = sd.panning.x * 0.5 + 0.5;
	15	float yp = sd.panning.y * 0.5 + 0.5;
	16	- float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) };
	17	+ float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) };
	18	panf[0] *= sd.volume;
	19	panf[1] *= sd.volume;
	20	panf[2] *= sd.volume;

Line 0 Link Here

(-)devel/godot/files/patch-thirdparty_glew_glew.c (+11 lines)
	1	--- thirdparty/glew/glew.c.orig 2017-12-28 02:06:18 UTC
	2	+++ thirdparty/glew/glew.c
	3	@@ -30,7 +30,7 @@
	4	** THE POSSIBILITY OF SUCH DAMAGE.
	5	*/
	6
	7	-#include <GL/glew.h>
	8	+#include "thirdparty/glew/GL/glew.h"
	9
	10	#if defined(_WIN32)
	11	# include <GL/wglew.h>




# $FreeBSD$

PORTNAME=	godot
PORTVERSION=	2.1.4
PORTREVISION=	3
DISTVERSIONSUFFIX=	-stable
CATEGORIES=	devel games


LICENSE=		MIT CC-BY-3.0
LICENSE_COMB=		multi
LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.md
LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt

LIB_DEPENDS=	libfreetype.so:print/freetype2 \
		libpng.so:graphics/png \


USES=		compiler:c++11-lib pkgconfig scons ssl
USE_XORG=	x11 xcursor xinerama xrandr
USE_GL=		gl glu

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_i386_gcc=	-march=i586
CXXFLAGS_aarch64=	-DNO_THREADS
CXXFLAGS_sparc64=	-DNO_THREADS
CXXFLAGS_mips=		-DNO_THREADS
CXXFLAGS_mips64=	-DNO_THREADS
LDFLAGS+=		-lspeex -lmpcdec

OPTIONS_DEFINE=		EXAMPLES TOOLS
OPTIONS_DEFAULT=	OSS
# Moved to devel/godot-tools
OPTIONS_EXCLUDE?=	EXAMPLES TOOLS

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_MAKE_ARGS=	target=release_debug tools=yes
TOOLS_MAKE_ARGS_OFF=	target=release tools=no
TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \

			share/pixmaps/${GODOTFILE}.svg

GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
PLIST_FILES=		bin/${GODOTFILE}

.ifmake makesum
# Always include optional distfiles

Return to bug 224604

Line 0 Link Here

(-)devel/godot/files/hold-patch-SConstruct (+36 lines)
	1	--- SConstruct.orig 2016-11-15 18:44:21 UTC
	2	+++ SConstruct
	3	@@ -65,7 +65,7 @@ elif (os.name == "nt"):
	4	if (os.getenv("VSINSTALLDIR") == None or platform_arg == "android"):
	5	custom_tools = ['mingw']
	6
	7	-env_base = Environment(tools=custom_tools)
	8	+env_base = Environment(tools=custom_tools, ENV = os.environ)
	9	if 'TERM' in os.environ:
	10	env_base['ENV']['TERM'] = os.environ['TERM']
	11	env_base.AppendENVPath('PATH', os.getenv('PATH'))
	12	@@ -247,15 +247,16 @@ if selected_platform in platform_list:
	13	if env["extra_suffix"] != '':
	14	env.extra_suffix += '.' + env["extra_suffix"]
	15
	16	- CCFLAGS = env.get('CCFLAGS', '')
	17	- env['CCFLAGS'] = ''
	18	-
	19	- env.Append(CCFLAGS=string.split(str(CCFLAGS)))
	20	-
	21	- CFLAGS = env.get('CFLAGS', '')
	22	- env['CFLAGS'] = ''
	23	-
	24	+ env['CC'] = os.environ['CC']
	25	+ env['CXX'] = os.environ['CXX']
	26	+
	27	+ CFLAGS = os.environ['CFLAGS']
	28	+ env['CFLAGS'] = []
	29	env.Append(CFLAGS=string.split(str(CFLAGS)))
	30	+
	31	+ CCFLAGS = os.environ['CXXFLAGS']
	32	+ env['CCFLAGS'] = []
	33	+ env.Append(CCFLAGS=string.split(str(CCFLAGS)))
	34
	35	LINKFLAGS = env.get('LINKFLAGS', '')
	36	env['LINKFLAGS'] = ''

Line 0 Link Here

(-)devel/godot/files/patch-drivers_gles2_rasterizer__gles2.cpp (+30 lines)
	1	--- drivers/gles2/rasterizer_gles2.cpp.orig 2018-01-10 11:36:45 UTC
	2	+++ drivers/gles2/rasterizer_gles2.cpp
	3	@@ -2135,9 +2135,9 @@ Error RasterizerGLES2::_surface_set_arra
	4	for (int i = 0; i < p_surface->array_len; i++) {
	5
	6	GLbyte vector[4] = {
	7	- CLAMP(src[i].x * 127, -128, 127),
	8	- CLAMP(src[i].y * 127, -128, 127),
	9	- CLAMP(src[i].z * 127, -128, 127),
	10	+ static_cast<GLbyte>CLAMP(src[i].x * 127, -128, 127),
	11	+ static_cast<GLbyte>CLAMP(src[i].y * 127, -128, 127),
	12	+ static_cast<GLbyte>CLAMP(src[i].z * 127, -128, 127),
	13	0,
	14	};
	15
	16	@@ -2169,10 +2169,10 @@ Error RasterizerGLES2::_surface_set_arra
	17	for (int i = 0; i < p_surface->array_len; i++) {
	18
	19	GLbyte xyzw[4] = {
	20	- CLAMP(src[i * 4 + 0] * 127, -128, 127),
	21	- CLAMP(src[i * 4 + 1] * 127, -128, 127),
	22	- CLAMP(src[i * 4 + 2] * 127, -128, 127),
	23	- CLAMP(src[i * 4 + 3] * 127, -128, 127)
	24	+ static_cast<GLbyte>CLAMP(src[i * 4 + 0] * 127, -128, 127),
	25	+ static_cast<GLbyte>CLAMP(src[i * 4 + 1] * 127, -128, 127),
	26	+ static_cast<GLbyte>CLAMP(src[i * 4 + 2] * 127, -128, 127),
	27	+ static_cast<GLbyte>CLAMP(src[i * 4 + 3] * 127, -128, 127)
	28	};
	29
	30	copymem(&p_mem[a.ofs + i * stride], xyzw, a.size);

Lines 1-40 Link Here

(-)devel/godot/files/patch-drivers_unix_os__unix.cpp (-21 / +25 lines)
1	--- drivers/unix/os_unix.cpp.orig 2016-08-09 07:52:15 UTC	1	--- drivers/unix/os_unix.cpp.orig 2017-08-28 01:55:12 UTC
2	+++ drivers/unix/os_unix.cpp	2	+++ drivers/unix/os_unix.cpp
3	@@ -50,6 +50,7 @@	3	@@ -51,6 +51,7 @@
4		4
5	#ifdef __FreeBSD__	5	#if defined(__FreeBSD__) \|\| defined(__OpenBSD__)
6	#include <sys/param.h>	6	#include <sys/param.h>
7	+#include <sys/sysctl.h>	7	+#include <sys/sysctl.h>
8	#endif	8	#endif
9	#include <stdarg.h>	9	#include "globals.h"
10	#include <sys/time.h>	10	#include <assert.h>
11	@@ -371,17 +372,7 @@ Error OS_Unix::execute(const String& p_p	11	@@ -375,17 +376,7 @@ Error OS_Unix::execute(const String &p_p
12	args.push_back((char*)cs[i].get_data());// shitty C cast	12	args.push_back((char *)cs[i].get_data()); // shitty C cast
13	args.push_back(0);	13	args.push_back(0);
14		14
15	-#ifdef __FreeBSD__	15	-#ifdef __FreeBSD__
16	- if(p_path.find("/")) {	16	- if (p_path.find("/")) {
17	- // exec name contains path so use it	17	- // exec name contains path so use it
18	- execv(p_path.utf8().get_data(),&args[0]);	18	- execv(p_path.utf8().get_data(), &args[0]);
19	- }else{	19	- } else {
20	- // use program name and search through PATH to find it	20	- // use program name and search through PATH to find it
21	- execvp(getprogname(),&args[0]);	21	- execvp(getprogname(), &args[0]);
22	- }	22	- }
23	-#else	23	-#else
24	execv(p_path.utf8().get_data(),&args[0]);	24	execv(p_path.utf8().get_data(), &args[0]);
25	-#endif	25	-#endif
26	// still alive? something failed..	26	// still alive? something failed..
27	fprintf(stderr,"ERROR OS_Unix::execute - Could not create child process while executing: %s\n",p_path.utf8().get_data());	27	fprintf(stderr, "ERROR OS_Unix::execute - Could not create child process while executing: %s\n", p_path.utf8().get_data());
28	abort();	28	abort();
29	@@ -503,11 +494,16 @@ String OS_Unix::get_executable_path() co	29	@@ -499,12 +490,24 @@ String OS_Unix::get_executable_path() co
		30	return OS::get_executable_path();
30	}	31	}
31	return b;	32	return b;
32	#elif defined(__FreeBSD__)	33	-#elif defined(__FreeBSD__) \|\| defined(__OpenBSD__)
33	- char resolved_path[MAXPATHLEN];	34	+#elif defined(__OpenBSD__)
34	-	35	char resolved_path[MAXPATHLEN];
35	- realpath(OS::get_executable_path().utf8().get_data(), resolved_path);	36
36	-	37	realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
37	- return String(resolved_path);	38
		39	return String(resolved_path);
		40	+
		41	+#elif defined(__FreeBSD__)
38	+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };	42	+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
39	+ char buf[MAXPATHLEN];	43	+ char buf[MAXPATHLEN];
40	+ size_t len = sizeof(buf);	44	+ size_t len = sizeof(buf);
Lines 47-50 Link Here
47	+ return b;	51	+ return b;
48	#elif defined(__APPLE__)	52	#elif defined(__APPLE__)
49	char temp_path[1];	53	char temp_path[1];
50	uint32_t buff_size=1;	54	uint32_t buff_size = 1;

Lines 1-10 Link Here

(-)devel/godot/files/patch-modules_speex_audio__stream__speex.cpp (-4 / +5 lines)
1	--- modules/speex/audio_stream_speex.cpp.orig 2016-11-28 17:58:00 UTC	1	--- modules/speex/audio_stream_speex.cpp.orig 2017-12-28 01:20:49 UTC
2	+++ modules/speex/audio_stream_speex.cpp	2	+++ modules/speex/audio_stream_speex.cpp
3	@@ -28,7 +28,6 @@	3	@@ -29,7 +29,7 @@
4	/*************************************************************************/
5	#include "audio_stream_speex.h"	4	#include "audio_stream_speex.h"
6		5
7	-#include "os_support.h"
8	#include "os/os.h"	6	#include "os/os.h"
		7	-#include "os_support.h"
		8	+#include "thirdparty/speex/os_support.h"
9	#define READ_CHUNK 1024	9	#define READ_CHUNK 1024
10		10
		11	static _FORCE_INLINE_ uint16_t le_short(uint16_t s) {

Lines 1-21 Link Here

(-)devel/godot/files/patch-platform_x11_detect.py (-23 / +19 lines)
1	--- platform/x11/detect.py.orig 2016-11-15 18:44:21 UTC	1	--- platform/x11/detect.py.orig 2017-08-27 16:25:12 UTC
2	+++ platform/x11/detect.py	2	+++ platform/x11/detect.py
3	@@ -31,11 +31,6 @@ def can_build():	3	@@ -56,7 +56,9 @@ def get_opts():
4	print("X11 not found.. x11 disabled.")
5	return False
6
7	- ssl_error = os.system("pkg-config openssl --modversion > /dev/null ")
8	- if (ssl_error):
9	- print("OpenSSL not found.. x11 disabled.")
10	- return False
11	-
12	x11_error = os.system("pkg-config xcursor --modversion > /dev/null ")
13	if (x11_error):
14	print("xcursor not found.. x11 disabled.")
15	@@ -61,7 +56,9 @@ def get_opts():
16	('use_static_cpp', 'link stdc++ statically', 'no'),
17	('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),	4	('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
18	('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),	5	('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),
		6	('use_lto', 'Use link time optimization', 'no'),
19	- ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),	7	- ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),
20	+ ('alsa','Detect & Use alsa audio','no'),	8	+ ('alsa','Detect & Use alsa audio','no'),
21	+ ('oss','Detect & Use OSS audio','no'),	9	+ ('oss','Detect & Use OSS audio','no'),
Lines 23-38 Link Here
23	('udev', 'Use udev for gamepad connection callbacks', 'no'),	11	('udev', 'Use udev for gamepad connection callbacks', 'no'),
24	('debug_release', 'Add debug symbols to release version', 'no'),	12	('debug_release', 'Add debug symbols to release version', 'no'),
25	]	13	]
26	@@ -134,7 +131,7 @@ def configure(env):	14	@@ -148,13 +150,14 @@ def configure(env):
27	env.ParseConfig('pkg-config xrandr --cflags --libs')	15	# Currently not compatible with OpenSSL 1.1.0+
		16	# https://github.com/godotengine/godot/issues/8624
		17	import subprocess
		18	- openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
		19	+ openssl_version = '1.0.2' #subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
		20	if (openssl_version >= "1.1.0"):
		21	print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version)
		22	print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n")
		23	sys.exit(255)
28		24
29	if (env['builtin_openssl'] == 'no'):
30	- env.ParseConfig('pkg-config openssl --cflags --libs')	25	- env.ParseConfig('pkg-config openssl --cflags --libs')
		26	+ #env.ParseConfig('pkg-config openssl --cflags --libs')
31	+ env.ParseConfig('echo -lssl -lcrypto')	27	+ env.ParseConfig('echo -lssl -lcrypto')
32		28
33	if (env['builtin_libwebp'] == 'no'):	29	if (env['builtin_libwebp'] == 'no'):
34	env.ParseConfig('pkg-config libwebp --cflags --libs')	30	env.ParseConfig('pkg-config libwebp --cflags --libs')
35	@@ -173,12 +170,13 @@ def configure(env):	31	@@ -199,12 +202,13 @@ def configure(env):
36	if (env['builtin_glew'] == 'no'):	32	if (env['builtin_glew'] == 'no'):
37	env.ParseConfig('pkg-config glew --cflags --libs')	33	env.ParseConfig('pkg-config glew --cflags --libs')
38		34
Lines 52-66 Link Here
52		48
53	if (platform.system() == "Linux"):	49	if (platform.system() == "Linux"):
54	env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])	50	env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
55	@@ -193,6 +191,11 @@ def configure(env):	51	@@ -218,6 +222,11 @@ def configure(env):
		52	env.ParseConfig('pkg-config libudev --cflags --libs')
56	else:	53	else:
57	print("libudev development libraries not found, disabling udev support")	54	print("libudev development libraries not found, disabling udev support")
58		55	+
59	+ if (env["oss"]=="yes"):	56	+ if (env["oss"]=="yes"):
60	+ print("Enabling OSS Audio")	57	+ print("Enabling OSS Audio")
61	+ env.Append(CPPFLAGS=["-DOSS_ENABLED"])	58	+ env.Append(CPPFLAGS=["-DOSS_ENABLED"])
62	+ env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])	59	+ env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])
63	+	60
64	if (env["pulseaudio"] == "yes"):	61	if (env["pulseaudio"] == "yes"):
65	if not os.system("pkg-config --exists libpulse-simple"):	62	if not os.system("pkg-config --exists libpulse-simple"):
66	print("Enabling PulseAudio")

Line 0 Link Here

(-)devel/godot/files/patch-servers_audio_audio__mixer__sw.cpp (+24 lines)
	1	--- servers/audio/audio_mixer_sw.cpp.orig 2018-01-10 15:33:12 UTC
	2	+++ servers/audio/audio_mixer_sw.cpp
	3	@@ -280,7 +280,7 @@ void AudioMixerSW::mix_channel(Channel &
	4	//stereo pan
	5	float pan = c.pan * 0.5 + 0.5;
	6	float panv[2] = {
	7	- (1.0 - pan) * (1 << MIX_VOL_FRAC_BITS),
	8	+ (1.0f - pan) * (1 << MIX_VOL_FRAC_BITS),
	9	(pan) * (1 << MIX_VOL_FRAC_BITS)
	10	};
	11
	12	@@ -297,9 +297,9 @@ void AudioMixerSW::mix_channel(Channel &
	13	float pany = c.depth * 0.5 + 0.5;
	14	// 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
	15	float panv[4] = {
	16	- (1.0 - pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS),
	17	- (1.0 - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS),
	18	- (pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS),
	19	+ (1.0f - pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS),
	20	+ (1.0f - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS),
	21	+ (pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS),
	22	(pany) * (panx) * (1 << MIX_VOL_FRAC_BITS)
	23	};
	24

Lines 2-9 Link Here

(-)devel/godot/Makefile (-14 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= godot	4	PORTNAME= godot
5	PORTVERSION= 2.1.2	5	PORTVERSION= 2.1.4
6	PORTREVISION= 3
7	DISTVERSIONSUFFIX= -stable	6	DISTVERSIONSUFFIX= -stable
8	CATEGORIES= devel games	7	CATEGORIES= devel games
9		8
Lines 13-19 Link Here
13	LICENSE= MIT CC-BY-3.0	12	LICENSE= MIT CC-BY-3.0
14	LICENSE_COMB= multi	13	LICENSE_COMB= multi
15	LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LOGO_LICENSE.md	14	LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LOGO_LICENSE.md
16	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.md	15	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt
17		16
18	LIB_DEPENDS= libfreetype.so:print/freetype2 \	17	LIB_DEPENDS= libfreetype.so:print/freetype2 \
19	libpng.so:graphics/png \	18	libpng.so:graphics/png \
Lines 28-48 Link Here
28		27
29	USES= compiler:c++11-lib pkgconfig scons ssl	28	USES= compiler:c++11-lib pkgconfig scons ssl
30	USE_XORG= x11 xcursor xinerama xrandr	29	USE_XORG= x11 xcursor xinerama xrandr
31	USE_GL= gl	30	USE_GL= gl glu
32		31
33	MAKE_ARGS+= platform=x11 builtin_speex=no builtin_libmpcdec=no	32	MAKE_ARGS+= platform=x11 builtin_speex=no builtin_libmpcdec=no
34	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}	33	MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
35	MAKE_ARGS_clang= use_llvm=yes	34	MAKE_ARGS_clang= use_llvm=yes
36	CXXFLAGS+= -DGLEW_NO_GLU -DRTAUDIO_ENABLED	35	CXXFLAGS+= -DGLEW_NO_GLU -DRTAUDIO_ENABLED
37	CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}	36	CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
38	CXXFLAGS_i386_gcc= -march=i586	37	CXXFLAGS_i386_gcc= -march=i586
39	CXXFLAGS_aarch64= -DNO_THREADS	38	CXXFLAGS_aarch64= -DNO_THREADS
40	CXXFLAGS_sparc64= -DNO_THREADS	39	CXXFLAGS_sparc64= -DNO_THREADS
41	CXXFLAGS_mips= -DNO_THREADS	40	CXXFLAGS_mips= -DNO_THREADS
42	CXXFLAGS_mips64= -DNO_THREADS	41	CXXFLAGS_mips64= -DNO_THREADS
43	LDFLAGS+= -lspeex -lmpcdec	42	LDFLAGS+= -lspeex -lmpcdec
44		43
45	OPTIONS_DEFINE= EXAMPLES TOOLS	44	OPTIONS_DEFINE= EXAMPLES TOOLS
46	OPTIONS_DEFAULT= OSS	45	OPTIONS_DEFAULT= OSS
47	# Moved to devel/godot-tools	46	# Moved to devel/godot-tools
48	OPTIONS_EXCLUDE?= EXAMPLES TOOLS	47	OPTIONS_EXCLUDE?= EXAMPLES TOOLS
Lines 53-65 Link Here
53	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	52	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
54	ALSA_MAKE_ARGS= alsa=yes	53	ALSA_MAKE_ARGS= alsa=yes
55	EXAMPLES_GH_PROJECT= godot-demo-projects:DEMOS	54	EXAMPLES_GH_PROJECT= godot-demo-projects:DEMOS
56	# Branch HEAD for PORTVERSION
57	EXAMPLES_GH_TAGNAME= dfa1274:DEMOS
58	EXAMPLES_PORTEXAMPLES= *	55	EXAMPLES_PORTEXAMPLES= *
59	OSS_MAKE_ARGS= oss=yes	56	OSS_MAKE_ARGS= oss=yes
60	PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio	57	PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio
61	PULSEAUDIO_MAKE_ARGS= pulseaudio=yes	58	PULSEAUDIO_MAKE_ARGS= pulseaudio=yes
62	TOOLS_DESC= Include development tools (IDE)	59	TOOLS_DESC= Include development tools (IDE)
63	TOOLS_MAKE_ARGS= target=release_debug tools=yes	60	TOOLS_MAKE_ARGS= target=release_debug tools=yes
64	TOOLS_MAKE_ARGS_OFF= target=release tools=no	61	TOOLS_MAKE_ARGS_OFF= target=release tools=no
65	TOOLS_DESKTOP_ENTRIES= "Godot" "${COMMENT}" "${GODOTFILE}" \	62	TOOLS_DESKTOP_ENTRIES= "Godot" "${COMMENT}" "${GODOTFILE}" \
Lines 68-74 Link Here
68	share/pixmaps/${GODOTFILE}.svg	65	share/pixmaps/${GODOTFILE}.svg
69		66
70	GODOTFILE= ${PORTNAME}${PKGNAMESUFFIX}	67	GODOTFILE= ${PORTNAME}${PKGNAMESUFFIX}
71	PLIST_FILES= bin/${GODOTFILE}	68	PLIST_FILES= bin/${GODOTFILE}
72		69
73	.ifmake makesum	70	.ifmake makesum
74	# Always include optional distfiles	71	# Always include optional distfiles