Attachment 189868 Details for Bug 224604 – new ports devel/godot2 and devel/godot2-tools

new ports devel/godot2 and devel/godot2-tools

godot2.shar.txt (text/plain), 27.53 KB, created by Shane on 2018-01-17 21:40:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2018-01-17 21:40:25 UTC

Size: 27.53 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	devel/godot2
>#	devel/godot2/files
>#	devel/godot2/files/hold-patch-SConstruct
>#	devel/godot2/files/patch-drivers_unix_os__unix.cpp
>#	devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp
>#	devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp
>#	devel/godot2/files/patch-core_image.cpp
>#	devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp
>#	devel/godot2/files/patch-thirdparty_glew_glew.c
>#	devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h
>#	devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp
>#	devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp
>#	devel/godot2/files/patch-drivers_SCsub
>#	devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp
>#	devel/godot2/files/patch-core_ustring.cpp
>#	devel/godot2/files/patch-platform_x11_detect.py
>#	devel/godot2/files/patch-platform_x11_os__x11.cpp
>#	devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp
>#	devel/godot2/distinfo
>#	devel/godot2/pkg-descr
>#	devel/godot2/Makefile
>#	devel/godot2-tools
>#	devel/godot2-tools/pkg-message
>#	devel/godot2-tools/Makefile
>#
>echo c - devel/godot2
>mkdir -p devel/godot2 > /dev/null 2>&1
>echo c - devel/godot2/files
>mkdir -p devel/godot2/files > /dev/null 2>&1
>echo x - devel/godot2/files/hold-patch-SConstruct
>sed 's/^X//' >devel/godot2/files/hold-patch-SConstruct << 'f5330c6c095ce8e8bc70a79a597a98f8'
>X--- SConstruct.orig	2016-11-15 18:44:21 UTC
>X+++ SConstruct
>X@@ -65,7 +65,7 @@ elif (os.name == "nt"):
>X     if (os.getenv("VSINSTALLDIR") == None or platform_arg == "android"):
>X         custom_tools = ['mingw']
>X 
>X-env_base = Environment(tools=custom_tools)
>X+env_base = Environment(tools=custom_tools, ENV = os.environ)
>X if 'TERM' in os.environ:
>X     env_base['ENV']['TERM'] = os.environ['TERM']
>X env_base.AppendENVPath('PATH', os.getenv('PATH'))
>X@@ -247,15 +247,16 @@ if selected_platform in platform_list:
>X     if env["extra_suffix"] != '':
>X         env.extra_suffix += '.' + env["extra_suffix"]
>X 
>X-    CCFLAGS = env.get('CCFLAGS', '')
>X-    env['CCFLAGS'] = ''
>X-
>X-    env.Append(CCFLAGS=string.split(str(CCFLAGS)))
>X-
>X-    CFLAGS = env.get('CFLAGS', '')
>X-    env['CFLAGS'] = ''
>X-
>X+    env['CC'] = os.environ['CC']
>X+    env['CXX'] = os.environ['CXX']
>X+    
>X+    CFLAGS = os.environ['CFLAGS']
>X+    env['CFLAGS'] = []
>X     env.Append(CFLAGS=string.split(str(CFLAGS)))
>X+    
>X+    CCFLAGS = os.environ['CXXFLAGS']
>X+    env['CCFLAGS'] = []
>X+    env.Append(CCFLAGS=string.split(str(CCFLAGS)))
>X 
>X     LINKFLAGS = env.get('LINKFLAGS', '')
>X     env['LINKFLAGS'] = ''
>f5330c6c095ce8e8bc70a79a597a98f8
>echo x - devel/godot2/files/patch-drivers_unix_os__unix.cpp
>sed 's/^X//' >devel/godot2/files/patch-drivers_unix_os__unix.cpp << '4dac047274a83435bb89b4856b33aef4'
>X--- drivers/unix/os_unix.cpp.orig	2017-08-28 01:55:12 UTC
>X+++ drivers/unix/os_unix.cpp
>X@@ -51,6 +51,7 @@
>X 
>X #if defined(__FreeBSD__) || defined(__OpenBSD__)
>X #include <sys/param.h>
>X+#include <sys/sysctl.h>
>X #endif
>X #include "globals.h"
>X #include <assert.h>
>X@@ -375,17 +376,7 @@ Error OS_Unix::execute(const String &p_p
>X 			args.push_back((char *)cs[i].get_data()); // shitty C cast
>X 		args.push_back(0);
>X 
>X-#ifdef __FreeBSD__
>X-		if (p_path.find("/")) {
>X-			// exec name contains path so use it
>X-			execv(p_path.utf8().get_data(), &args[0]);
>X-		} else {
>X-			// use program name and search through PATH to find it
>X-			execvp(getprogname(), &args[0]);
>X-		}
>X-#else
>X 		execv(p_path.utf8().get_data(), &args[0]);
>X-#endif
>X 		// still alive? something failed..
>X 		fprintf(stderr, "**ERROR** OS_Unix::execute - Could not create child process while executing: %s\n", p_path.utf8().get_data());
>X 		abort();
>X@@ -499,12 +490,24 @@ String OS_Unix::get_executable_path() co
>X 		return OS::get_executable_path();
>X 	}
>X 	return b;
>X-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
>X+#elif defined(__OpenBSD__)
>X 	char resolved_path[MAXPATHLEN];
>X 
>X 	realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
>X 
>X 	return String(resolved_path);
>X+
>X+#elif defined(__FreeBSD__)
>X+	int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
>X+	char buf[MAXPATHLEN];
>X+	size_t len = sizeof(buf);
>X+	if (sysctl(mib, 4, buf, &len, NULL, 0) != 0) {
>X+		WARN_PRINT("Couldn't get executable path from sysctl");
>X+		return OS::get_executable_path();
>X+	}
>X+	String b;
>X+	b.parse_utf8(buf);
>X+	return b;
>X #elif defined(__APPLE__)
>X 	char temp_path[1];
>X 	uint32_t buff_size = 1;
>4dac047274a83435bb89b4856b33aef4
>echo x - devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp
>sed 's/^X//' >devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp << 'fcdf5d8960c802d32f896aa78a11a5bb'
>X--- servers/audio/audio_mixer_sw.cpp.orig	2018-01-10 15:33:12 UTC
>X+++ servers/audio/audio_mixer_sw.cpp
>X@@ -280,7 +280,7 @@ void AudioMixerSW::mix_channel(Channel &
>X 		//stereo pan
>X 		float pan = c.pan * 0.5 + 0.5;
>X 		float panv[2] = {
>X-			(1.0 - pan) * (1 << MIX_VOL_FRAC_BITS),
>X+			(1.0f - pan) * (1 << MIX_VOL_FRAC_BITS),
>X 			(pan) * (1 << MIX_VOL_FRAC_BITS)
>X 		};
>X 
>X@@ -297,9 +297,9 @@ void AudioMixerSW::mix_channel(Channel &
>X 		float pany = c.depth * 0.5 + 0.5;
>X 		// 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
>X 		float panv[4] = {
>X-			(1.0 - pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS),
>X-			(1.0 - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS),
>X-			(pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS),
>X+			(1.0f - pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS),
>X+			(1.0f - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS),
>X+			(pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS),
>X 			(pany) * (panx) * (1 << MIX_VOL_FRAC_BITS)
>X 		};
>X 
>fcdf5d8960c802d32f896aa78a11a5bb
>echo x - devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp
>sed 's/^X//' >devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp << '752c1284eb5015210c8949a0d0de50ba'
>X--- drivers/rtaudio/audio_driver_rtaudio.cpp.orig	2016-08-09 07:52:15 UTC
>X+++ drivers/rtaudio/audio_driver_rtaudio.cpp
>X@@ -35,8 +35,14 @@ const char* AudioDriverRtAudio::get_name
>X 
>X #ifdef OSX_ENABLED
>X 	return "RtAudio-OSX";
>X-#elif defined(UNIX_ENABLED)
>X+#elif defined(UNIX_ENABLED) && (defined(ALSA_ENABLED) || defined(PULSEAUDIO_ENABLED) || defined(OSS_ENABLED))
>X+#if defined(OSS_ENABLED)
>X+	return "RtAudio-OSS";
>X+#elif defined(ALSA_ENABLED)
>X 	return "RtAudio-ALSA";
>X+#elif defined(PULSEAUDIO_ENABLED)
>X+	return "RtAudio-PulseAudio";
>X+#endif
>X #elif defined(WINDOWS_ENABLED)
>X 	return "RtAudio-DirectSound";
>X #else
>752c1284eb5015210c8949a0d0de50ba
>echo x - devel/godot2/files/patch-core_image.cpp
>sed 's/^X//' >devel/godot2/files/patch-core_image.cpp << '1de6fa728a8ef015b68620424e1d5bf1'
>X--- core/image.cpp.orig	2018-01-10 18:34:14 UTC
>X+++ core/image.cpp
>X@@ -1518,8 +1518,8 @@ Error Image::_decompress_bc() {
>X 					col_b |= src[2];
>X 
>X 					uint8_t table[4][4] = {
>X-						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
>X-						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
>X+						{ 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 },
>X+						{ 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 },
>X 						{ 0, 0, 0, 255 },
>X 						{ 0, 0, 0, 255 }
>X 					};
>X@@ -1611,8 +1611,8 @@ Error Image::_decompress_bc() {
>X 					col_b |= src[8 + 2];
>X 
>X 					uint8_t table[4][4] = {
>X-						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
>X-						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
>X+						{ 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 },
>X+						{ 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 },
>X 						{ 0, 0, 0, 255 },
>X 						{ 0, 0, 0, 255 }
>X 					};
>X@@ -1722,8 +1722,8 @@ Error Image::_decompress_bc() {
>X 					col_b |= src[8 + 2];
>X 
>X 					uint8_t table[4][4] = {
>X-						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
>X-						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
>X+						{ 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 },
>X+						{ 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 },
>X 						{ 0, 0, 0, 255 },
>X 						{ 0, 0, 0, 255 }
>X 					};
>1de6fa728a8ef015b68620424e1d5bf1
>echo x - devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp
>sed 's/^X//' >devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp << '8eb0d12b08e3cce0b28093ec0af7b1a6'
>X--- servers/spatial_sound/spatial_sound_server_sw.cpp.orig	2018-01-10 16:17:16 UTC
>X+++ servers/spatial_sound/spatial_sound_server_sw.cpp
>X@@ -689,7 +689,7 @@ bool SpatialSoundServerSW::internal_buff
>X 				case 2: {
>X 
>X 					float p = sd.panning.x * 0.5 + 0.5;
>X-					float panf[2] = { (1.0 - p), p };
>X+					float panf[2] = { (1.0f - p), p };
>X 					panf[0] *= sd.volume;
>X 					panf[1] *= sd.volume;
>X 
>X@@ -740,7 +740,7 @@ bool SpatialSoundServerSW::internal_buff
>X 
>X 					float xp = sd.panning.x * 0.5 + 0.5;
>X 					float yp = sd.panning.y * 0.5 + 0.5;
>X-					float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) };
>X+					float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) };
>X 					panf[0] *= sd.volume;
>X 					panf[1] *= sd.volume;
>X 					panf[2] *= sd.volume;
>8eb0d12b08e3cce0b28093ec0af7b1a6
>echo x - devel/godot2/files/patch-thirdparty_glew_glew.c
>sed 's/^X//' >devel/godot2/files/patch-thirdparty_glew_glew.c << '704c8ff942a4a2382ea5608dc328be73'
>X--- thirdparty/glew/glew.c.orig	2017-12-28 02:06:18 UTC
>X+++ thirdparty/glew/glew.c
>X@@ -30,7 +30,7 @@
>X ** THE POSSIBILITY OF SUCH DAMAGE.
>X */
>X 
>X-#include <GL/glew.h>
>X+#include "thirdparty/glew/GL/glew.h"
>X 
>X #if defined(_WIN32)
>X #  include <GL/wglew.h>
>704c8ff942a4a2382ea5608dc328be73
>echo x - devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h
>sed 's/^X//' >devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h << '3a5b3d5c1bb9078e134d81629968a370'
>X--- thirdparty/rtaudio/RtAudio.h.orig	2016-08-09 07:52:15 UTC
>X+++ thirdparty/rtaudio/RtAudio.h
>X@@ -5,7 +5,13 @@
>X #if defined(OSX_ENABLED)
>X     #define __MACOSX_CORE__
>X #elif defined(UNIX_ENABLED)
>X+#if defined(OSS_ENABLED)
>X+    #define __LINUX_OSS__
>X+#elif defined(ALSA_ENABLED)
>X     #define __LINUX_ALSA__
>X+#elif defined(PULSEAUDIO_ENABLED)
>X+    #define __LINUX_PULSE__
>X+#endif
>X #elif defined(WINDOWS_ENABLED)
>X     #if defined(WINRT_ENABLED)
>X         #define __RTAUDIO_DUMMY__
>3a5b3d5c1bb9078e134d81629968a370
>echo x - devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp
>sed 's/^X//' >devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp << '0d26ec448b491eff555e68795fc296a7'
>X--- thirdparty/rtaudio/RtAudio.cpp.orig	2016-08-09 07:52:15 UTC
>X+++ thirdparty/rtaudio/RtAudio.cpp
>X@@ -8589,6 +8589,12 @@ bool RtApiPulse::probeDeviceOpen( unsign
>X #include <errno.h>
>X #include <math.h>
>X 
>X+#if defined(__FreeBSD__)
>X+#define SND_DEVICE "/dev/dsp"
>X+#else
>X+#define SND_DEVICE "/dev/mixer"
>X+#endif
>X+
>X static void *ossCallbackHandler(void * ptr);
>X 
>X // A structure to hold various information related to the OSS API
>X@@ -8615,9 +8621,11 @@ RtApiOss :: ~RtApiOss()
>X 
>X unsigned int RtApiOss :: getDeviceCount( void )
>X {
>X-  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>X+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>X   if ( mixerfd == -1 ) {
>X-    errorText_ = "RtApiOss::getDeviceCount: error opening '/dev/mixer'.";
>X+    errorText_ = "RtApiOss::getDeviceCount: error opening '";
>X+    errorText_ += SND_DEVICE;
>X+    errorText_ += "'.";
>X     error( RtAudioError::WARNING );
>X     return 0;
>X   }
>X@@ -8639,9 +8647,11 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
>X   RtAudio::DeviceInfo info;
>X   info.probed = false;
>X 
>X-  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>X+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>X   if ( mixerfd == -1 ) {
>X-    errorText_ = "RtApiOss::getDeviceInfo: error opening '/dev/mixer'.";
>X+    errorText_ = "RtApiOss::getDeviceInfo: error opening '";
>X+    errorText_ += SND_DEVICE;
>X+    errorText_ += "'.";
>X     error( RtAudioError::WARNING );
>X     return info;
>X   }
>X@@ -8697,8 +8707,10 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
>X     info.nativeFormats |= RTAUDIO_SINT8;
>X   if ( mask & AFMT_S32_LE || mask & AFMT_S32_BE )
>X     info.nativeFormats |= RTAUDIO_SINT32;
>X+#if defined(AFMT_FLOAT)
>X   if ( mask & AFMT_FLOAT )
>X     info.nativeFormats |= RTAUDIO_FLOAT32;
>X+#endif
>X   if ( mask & AFMT_S24_LE || mask & AFMT_S24_BE )
>X     info.nativeFormats |= RTAUDIO_SINT24;
>X 
>X@@ -8757,9 +8769,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
>X                                   RtAudioFormat format, unsigned int *bufferSize,
>X                                   RtAudio::StreamOptions *options )
>X {
>X-  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>X+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>X   if ( mixerfd == -1 ) {
>X-    errorText_ = "RtApiOss::probeDeviceOpen: error opening '/dev/mixer'.";
>X+    errorText_ = "RtApiOss::probeDeviceOpen: error opening '";
>X+    errorText_ += SND_DEVICE;
>X+    errorText_ += "'.";
>X     return FAILURE;
>X   }
>X 
>X@@ -8787,7 +8801,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
>X   }
>X 
>X   oss_audioinfo ainfo;
>X+#if defined(__FreeBSD__)
>X+  ainfo.dev = -1; // specify -1 to get default device
>X+#else
>X   ainfo.dev = device;
>X+#endif
>X   result = ioctl( mixerfd, SNDCTL_AUDIOINFO, &ainfo );
>X   close( mixerfd );
>X   if ( result == -1 ) {
>X@@ -9025,7 +9043,7 @@ bool RtApiOss :: probeDeviceOpen( unsign
>X   }
>X 
>X   // Verify the sample rate setup worked.
>X-  if ( abs( srate - sampleRate ) > 100 ) {
>X+  if ( abs( srate - (int)sampleRate ) > 100 ) {
>X     close( fd );
>X     errorStream_ << "RtApiOss::probeDeviceOpen: device (" << ainfo.name << ") does not support sample rate (" << sampleRate << ").";
>X     errorText_ = errorStream_.str();
>0d26ec448b491eff555e68795fc296a7
>echo x - devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp
>sed 's/^X//' >devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp << '06e5394b1db851ae67c4288f21add066'
>X--- drivers/gles2/rasterizer_gles2.cpp.orig	2018-01-10 11:36:45 UTC
>X+++ drivers/gles2/rasterizer_gles2.cpp
>X@@ -2135,9 +2135,9 @@ Error RasterizerGLES2::_surface_set_arra
>X 					for (int i = 0; i < p_surface->array_len; i++) {
>X 
>X 						GLbyte vector[4] = {
>X-							CLAMP(src[i].x * 127, -128, 127),
>X-							CLAMP(src[i].y * 127, -128, 127),
>X-							CLAMP(src[i].z * 127, -128, 127),
>X+							static_cast<GLbyte>CLAMP(src[i].x * 127, -128, 127),
>X+							static_cast<GLbyte>CLAMP(src[i].y * 127, -128, 127),
>X+							static_cast<GLbyte>CLAMP(src[i].z * 127, -128, 127),
>X 							0,
>X 						};
>X 
>X@@ -2169,10 +2169,10 @@ Error RasterizerGLES2::_surface_set_arra
>X 					for (int i = 0; i < p_surface->array_len; i++) {
>X 
>X 						GLbyte xyzw[4] = {
>X-							CLAMP(src[i * 4 + 0] * 127, -128, 127),
>X-							CLAMP(src[i * 4 + 1] * 127, -128, 127),
>X-							CLAMP(src[i * 4 + 2] * 127, -128, 127),
>X-							CLAMP(src[i * 4 + 3] * 127, -128, 127)
>X+							static_cast<GLbyte>CLAMP(src[i * 4 + 0] * 127, -128, 127),
>X+							static_cast<GLbyte>CLAMP(src[i * 4 + 1] * 127, -128, 127),
>X+							static_cast<GLbyte>CLAMP(src[i * 4 + 2] * 127, -128, 127),
>X+							static_cast<GLbyte>CLAMP(src[i * 4 + 3] * 127, -128, 127)
>X 						};
>X 
>X 						copymem(&p_mem[a.ofs + i * stride], xyzw, a.size);
>06e5394b1db851ae67c4288f21add066
>echo x - devel/godot2/files/patch-drivers_SCsub
>sed 's/^X//' >devel/godot2/files/patch-drivers_SCsub << '55397fa90e8b1d119fe6e23483e0110a'
>X--- drivers/SCsub.orig	2016-11-30 21:41:21 UTC
>X+++ drivers/SCsub
>X@@ -14,7 +14,7 @@ SConscript('windows/SCsub')
>X # Sounds drivers
>X SConscript('alsa/SCsub')
>X SConscript('pulseaudio/SCsub')
>X-if (env["platform"] == "windows"):
>X+if (env["platform"] == "windows") or (env["platform"] == "x11"):
>X     SConscript("rtaudio/SCsub")
>X 
>X # Graphics drivers
>55397fa90e8b1d119fe6e23483e0110a
>echo x - devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp
>sed 's/^X//' >devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp << 'c9d0e5e8a238da1994f30edc7588a309'
>X--- servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp.orig	2018-01-10 18:13:07 UTC
>X+++ servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp
>X@@ -675,7 +675,7 @@ bool SpatialSound2DServerSW::internal_bu
>X 				case 2: {
>X 
>X 					float p = sd.panning.x * 0.5 + 0.5;
>X-					float panf[2] = { (1.0 - p), p };
>X+					float panf[2] = { (1.0f - p), p };
>X 					panf[0] *= sd.volume;
>X 					panf[1] *= sd.volume;
>X 
>X@@ -726,7 +726,7 @@ bool SpatialSound2DServerSW::internal_bu
>X 
>X 					float xp = sd.panning.x * 0.5 + 0.5;
>X 					float yp = sd.panning.y * 0.5 + 0.5;
>X-					float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) };
>X+					float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) };
>X 					panf[0] *= sd.volume;
>X 					panf[1] *= sd.volume;
>X 					panf[2] *= sd.volume;
>c9d0e5e8a238da1994f30edc7588a309
>echo x - devel/godot2/files/patch-core_ustring.cpp
>sed 's/^X//' >devel/godot2/files/patch-core_ustring.cpp << 'ae950947858d1fe4b5a392024232b5e1'
>X--- core/ustring.cpp.orig	2018-01-10 18:53:28 UTC
>X+++ core/ustring.cpp
>X@@ -3199,7 +3199,7 @@ String String::http_unescape() const {
>X 			if ((ord1 >= '0' && ord1 <= '9') || (ord1 >= 'A' && ord1 <= 'Z')) {
>X 				CharType ord2 = ord_at(i + 2);
>X 				if ((ord2 >= '0' && ord2 <= '9') || (ord2 >= 'A' && ord2 <= 'Z')) {
>X-					char bytes[2] = { ord1, ord2 };
>X+					char bytes[2] = { static_cast<char>(ord1), static_cast<char>(ord2) };
>X 					res += (char)strtol(bytes, NULL, 16);
>X 					i += 2;
>X 				}
>ae950947858d1fe4b5a392024232b5e1
>echo x - devel/godot2/files/patch-platform_x11_detect.py
>sed 's/^X//' >devel/godot2/files/patch-platform_x11_detect.py << '0db2b69f94a15cd309285db85b605446'
>X--- platform/x11/detect.py.orig	2017-08-27 16:25:12 UTC
>X+++ platform/x11/detect.py
>X@@ -56,7 +56,9 @@ def get_opts():
>X         ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
>X         ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),
>X         ('use_lto', 'Use link time optimization', 'no'),
>X-        ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),
>X+        ('alsa','Detect & Use alsa audio','no'),
>X+        ('oss','Detect & Use OSS audio','no'),
>X+        ('pulseaudio', 'Detect & Use pulseaudio', 'no'),
>X         ('udev', 'Use udev for gamepad connection callbacks', 'no'),
>X         ('debug_release', 'Add debug symbols to release version', 'no'),
>X     ]
>X@@ -148,13 +150,14 @@ def configure(env):
>X         # Currently not compatible with OpenSSL 1.1.0+
>X         # https://github.com/godotengine/godot/issues/8624
>X         import subprocess
>X-        openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
>X+        openssl_version = '1.0.2' #subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
>X         if (openssl_version >= "1.1.0"):
>X             print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version)
>X             print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n")
>X             sys.exit(255)
>X 
>X-        env.ParseConfig('pkg-config openssl --cflags --libs')
>X+        #env.ParseConfig('pkg-config openssl --cflags --libs')
>X+        env.ParseConfig('echo -lssl -lcrypto')
>X 
>X     if (env['builtin_libwebp'] == 'no'):
>X         env.ParseConfig('pkg-config libwebp --cflags --libs')
>X@@ -199,12 +202,13 @@ def configure(env):
>X     if (env['builtin_glew'] == 'no'):
>X         env.ParseConfig('pkg-config glew --cflags --libs')
>X 
>X-    if os.system("pkg-config --exists alsa") == 0:
>X-        print("Enabling ALSA")
>X-        env.Append(CPPFLAGS=["-DALSA_ENABLED"])
>X-        env.ParseConfig('pkg-config alsa --cflags --libs')
>X-    else:
>X-        print("ALSA libraries not found, disabling driver")
>X+    if (env["alsa"]=="yes"):
>X+        if os.system("pkg-config --exists alsa")==0:
>X+            print("Enabling ALSA")
>X+            env.Append(CPPFLAGS=["-DALSA_ENABLED"])
>X+            env.Append(LIBS=['asound'])
>X+        else:
>X+            print("ALSA libraries not found, disabling driver")
>X 
>X     if (platform.system() == "Linux"):
>X         env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
>X@@ -218,6 +222,11 @@ def configure(env):
>X             env.ParseConfig('pkg-config libudev --cflags --libs')
>X         else:
>X             print("libudev development libraries not found, disabling udev support")
>X+
>X+    if (env["oss"]=="yes"):
>X+        print("Enabling OSS Audio")
>X+        env.Append(CPPFLAGS=["-DOSS_ENABLED"])
>X+        env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])
>X 
>X     if (env["pulseaudio"] == "yes"):
>X         if not os.system("pkg-config --exists libpulse-simple"):
>0db2b69f94a15cd309285db85b605446
>echo x - devel/godot2/files/patch-platform_x11_os__x11.cpp
>sed 's/^X//' >devel/godot2/files/patch-platform_x11_os__x11.cpp << 'ff5912c6138bbe6e0bc78b51aae0062d'
>X--- platform/x11/os_x11.cpp.orig	2018-01-10 10:08:3 UTC
>X+++ platform/x11/os_x11.cpp
>X@@ -1243,7 +1243,7 @@ static Property read_property(Display *p
>X 
>X 	} while (bytes_after != 0);
>X 
>X-	Property p = { ret, actual_format, nitems, actual_type };
>X+	Property p = { ret, actual_format, (int)nitems, actual_type };
>X 
>X 	return p;
>X }
>ff5912c6138bbe6e0bc78b51aae0062d
>echo x - devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp
>sed 's/^X//' >devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp << '683b6c5c7cc98294ae8e4d80cea4e893'
>X--- modules/speex/audio_stream_speex.cpp.orig	2017-12-28 01:20:49 UTC
>X+++ modules/speex/audio_stream_speex.cpp
>X@@ -29,7 +29,7 @@
>X #include "audio_stream_speex.h"
>X 
>X #include "os/os.h"
>X-#include "os_support.h"
>X+#include "thirdparty/speex/os_support.h"
>X #define READ_CHUNK 1024
>X 
>X static _FORCE_INLINE_ uint16_t le_short(uint16_t s) {
>683b6c5c7cc98294ae8e4d80cea4e893
>echo x - devel/godot2/distinfo
>sed 's/^X//' >devel/godot2/distinfo << '93c2abfaa02b9b57fde554430cfa4949'
>XTIMESTAMP = 1514402523
>XSHA256 (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 07cf3b01367d5ea53805f144bc60711bd79efb53f1f88d57d6a706e6944de8d7
>XSIZE (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 14811915
>XSHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75
>XSIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045
>93c2abfaa02b9b57fde554430cfa4949
>echo x - devel/godot2/pkg-descr
>sed 's/^X//' >devel/godot2/pkg-descr << '3464b2dc79617191151cbaf998ffb7ed'
>XGodot is a multi-platform 2D and 3D game engine. It also provides a
>Xfeature rich development environment.
>X
>XEasily deploy your game on IOS, android, OSX, Linux, Steam, Windows or PS3.
>X
>XThis port installs the older v2 to support projects that
>Xhaven't been updated for v3.0
>X
>XWWW: http://www.godotengine.org/
>3464b2dc79617191151cbaf998ffb7ed
>echo x - devel/godot2/Makefile
>sed 's/^X//' >devel/godot2/Makefile << '1188cf25af39228a6f41ebab3764db5a'
>X# Created by: Shane Ambler <FreeBSD@Shaneware.biz>
>X# $FreeBSD$
>X
>XPORTNAME=	godot
>XPORTVERSION=	2.1.4
>XDISTVERSIONSUFFIX=	-stable
>XPORTREVISION=	0
>XCATEGORIES=	devel games
>XPKGNAMESUFFIX?=	2
>X
>XMAINTAINER=	FreeBSD@Shaneware.biz
>XCOMMENT?=	Game runtime engine
>X
>XLICENSE=		MIT CC-BY-3.0
>XLICENSE_COMB=		multi
>XLICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.md
>XLICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt
>X
>XLIB_DEPENDS=	libfreetype.so:print/freetype2 \
>X		libpng.so:graphics/png \
>X		libmpcdec.so:audio/musepack \
>X		libspeex.so:audio/speex
>XRUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
>X		xdg-open:devel/xdg-utils \
>X		xmessage:x11/xmessage
>X
>XUSE_GITHUB=	yes
>XGH_ACCOUNT=	godotengine
>X
>XUSES=		compiler:c++11-lib pkgconfig scons ssl
>XUSE_XORG=	x11 xcursor xinerama xrandr
>XUSE_GL=		gl glu
>X
>XMAKE_ARGS+=		platform=x11 builtin_speex=no builtin_libmpcdec=no
>XMAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
>XMAKE_ARGS_clang=	use_llvm=yes
>XCXXFLAGS+=		-DGLEW_NO_GLU -DRTAUDIO_ENABLED
>XCXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
>XCXXFLAGS_i386_gcc=	-march=i586
>XCXXFLAGS_aarch64=	-DNO_THREADS
>XCXXFLAGS_sparc64=	-DNO_THREADS
>XCXXFLAGS_mips=		-DNO_THREADS
>XCXXFLAGS_mips64=	-DNO_THREADS
>XLDFLAGS+=		-lspeex -lmpcdec
>X
>XOPTIONS_DEFINE=		EXAMPLES TOOLS
>XOPTIONS_DEFAULT=	OSS
>X# Moved to devel/godot-tools
>XOPTIONS_EXCLUDE?=	EXAMPLES TOOLS
>XOPTIONS_GROUP=		AUDIO
>XOPTIONS_GROUP_AUDIO=	ALSA OSS PULSEAUDIO
>X
>XAUDIO_DESC=		Audio support
>XALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>XALSA_MAKE_ARGS=		alsa=yes
>XEXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
>XEXAMPLES_PORTEXAMPLES=	*
>XOSS_MAKE_ARGS=		oss=yes
>XPULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
>XPULSEAUDIO_MAKE_ARGS=	pulseaudio=yes
>XTOOLS_DESC=		Include development tools (IDE)
>XTOOLS_MAKE_ARGS=	target=release_debug tools=yes
>XTOOLS_MAKE_ARGS_OFF=	target=release tools=no
>XTOOLS_DESKTOP_ENTRIES=	"Godot-v2" "${COMMENT}" "${GODOTFILE}" \
>X			"${GODOTFILE}" "Development;IDE;" ""
>XTOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
>X			share/pixmaps/${GODOTFILE}.svg
>X
>XGODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
>XPLIST_FILES=		bin/${GODOTFILE}
>X# rename to prevent conflict with godot v3
>XEXAMPLESDIR=		${PREFIX}/share/examples/godot2
>X
>X.ifmake makesum
>X# Always include optional distfiles
>X.MAKEFLAGS:	WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=
>X.endif
>X
>Xpost-patch:
>X	@${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \
>X		${WRKSRC}/methods.py
>X	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
>X		${WRKSRC}/platform/x11/os_x11.cpp
>X
>X# The official godot binary name reflects options used to compile
>X# We just want a simple name matching the portname
>X# This gives us bin/godot for runtime and bin/godot-tools for the IDE
>Xdo-install:
>X	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
>X		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
>X
>Xdo-install-EXAMPLES-on:
>X	(cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \
>X		${STAGEDIR}${EXAMPLESDIR})
>X
>Xdo-install-TOOLS-on:
>X	${INSTALL_DATA} ${WRKSRC}/icon.png \
>X		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png
>X	${INSTALL_DATA} ${WRKSRC}/icon.svg \
>X		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
>X
>X.include <bsd.port.mk>
>1188cf25af39228a6f41ebab3764db5a
>echo c - devel/godot2-tools
>mkdir -p devel/godot2-tools > /dev/null 2>&1
>echo x - devel/godot2-tools/pkg-message
>sed 's/^X//' >devel/godot2-tools/pkg-message << '7b3b2e03011c7d6672ac919787ab9b69'
>X============================================================
>XThis is the old v2 of godot and is only for compatability
>Xto be able to work on older projects.
>X
>XIf you are planning any development in godot
>Xplease install the newer v3 version in devel/godot-tools
>X============================================================
>7b3b2e03011c7d6672ac919787ab9b69
>echo x - devel/godot2-tools/Makefile
>sed 's/^X//' >devel/godot2-tools/Makefile << '2809df84a09bcb37d5ebf80072de52f0'
>X# Created by: Shane Ambler <FreeBSD@Shaneware.biz>
>X# $FreeBSD$
>X
>XPKGNAMESUFFIX=	2-tools
>X
>XCOMMENT=	Game integrated development environment
>X
>XOPTIONS_EXCLUDE=	#
>XOPTIONS_SLAVE=	TOOLS
>X
>XMASTERDIR=	${.CURDIR}/../godot2
>X
>X.include "${MASTERDIR}/Makefile"
>2809df84a09bcb37d5ebf80072de52f0
>exit
>

Flags:

FreeBSD: maintainer-approval+

Actions: View

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