Attachment 179361 Details for Bug 216227 – devel/godot maintainer update

[patch] devel/godot maintainer update

godot.patch (text/plain), 20.82 KB, created by Shane on 2017-01-27 21:53:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2017-01-27 21:53:34 UTC

Size: 20.82 KB

patch

obsolete

>diff -Nru godot.orig/distinfo godot/distinfo
>--- godot.orig/distinfo	2017-01-28 08:08:12.164206000 +1030
>+++ godot/distinfo	2017-01-26 18:04:16.341419000 +1030
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1470729135
>-SHA256 (godotengine-godot-2.1-stable_GH0.tar.gz) = 0d2a6f5a3689a818cb4859e7655e64a4d603940fae1bdf16a18b980c22b0b6fe
>-SIZE (godotengine-godot-2.1-stable_GH0.tar.gz) = 17917448
>+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
>diff -Nru godot.orig/files/patch-drivers_rtaudio_RtAudio.cpp godot/files/patch-drivers_rtaudio_RtAudio.cpp
>--- godot.orig/files/patch-drivers_rtaudio_RtAudio.cpp	2017-01-28 08:08:12.163852000 +1030
>+++ godot/files/patch-drivers_rtaudio_RtAudio.cpp	1970-01-01 09:30:00.000000000 +0930
>@@ -1,89 +0,0 @@
>---- drivers/rtaudio/RtAudio.cpp.orig	2016-08-09 07:52:15 UTC
>-+++ drivers/rtaudio/RtAudio.cpp
>-@@ -8589,6 +8589,12 @@ bool RtApiPulse::probeDeviceOpen( unsign
>- #include <errno.h>
>- #include <math.h>
>- 
>-+#if defined(__FreeBSD__)
>-+#define SND_DEVICE "/dev/dsp"
>-+#else
>-+#define SND_DEVICE "/dev/mixer"
>-+#endif
>-+
>- static void *ossCallbackHandler(void * ptr);
>- 
>- // A structure to hold various information related to the OSS API
>-@@ -8615,9 +8621,11 @@ RtApiOss :: ~RtApiOss()
>- 
>- unsigned int RtApiOss :: getDeviceCount( void )
>- {
>--  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>-+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>-   if ( mixerfd == -1 ) {
>--    errorText_ = "RtApiOss::getDeviceCount: error opening '/dev/mixer'.";
>-+    errorText_ = "RtApiOss::getDeviceCount: error opening '";
>-+    errorText_ += SND_DEVICE;
>-+    errorText_ += "'.";
>-     error( RtAudioError::WARNING );
>-     return 0;
>-   }
>-@@ -8639,9 +8647,11 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
>-   RtAudio::DeviceInfo info;
>-   info.probed = false;
>- 
>--  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>-+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>-   if ( mixerfd == -1 ) {
>--    errorText_ = "RtApiOss::getDeviceInfo: error opening '/dev/mixer'.";
>-+    errorText_ = "RtApiOss::getDeviceInfo: error opening '";
>-+    errorText_ += SND_DEVICE;
>-+    errorText_ += "'.";
>-     error( RtAudioError::WARNING );
>-     return info;
>-   }
>-@@ -8697,8 +8707,10 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
>-     info.nativeFormats |= RTAUDIO_SINT8;
>-   if ( mask & AFMT_S32_LE || mask & AFMT_S32_BE )
>-     info.nativeFormats |= RTAUDIO_SINT32;
>-+#if defined(AFMT_FLOAT)
>-   if ( mask & AFMT_FLOAT )
>-     info.nativeFormats |= RTAUDIO_FLOAT32;
>-+#endif
>-   if ( mask & AFMT_S24_LE || mask & AFMT_S24_BE )
>-     info.nativeFormats |= RTAUDIO_SINT24;
>- 
>-@@ -8757,9 +8769,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
>-                                   RtAudioFormat format, unsigned int *bufferSize,
>-                                   RtAudio::StreamOptions *options )
>- {
>--  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>-+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>-   if ( mixerfd == -1 ) {
>--    errorText_ = "RtApiOss::probeDeviceOpen: error opening '/dev/mixer'.";
>-+    errorText_ = "RtApiOss::probeDeviceOpen: error opening '";
>-+    errorText_ += SND_DEVICE;
>-+    errorText_ += "'.";
>-     return FAILURE;
>-   }
>- 
>-@@ -8787,7 +8801,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
>-   }
>- 
>-   oss_audioinfo ainfo;
>-+#if defined(__FreeBSD__)
>-+  ainfo.dev = -1; // specify -1 to get default device
>-+#else
>-   ainfo.dev = device;
>-+#endif
>-   result = ioctl( mixerfd, SNDCTL_AUDIOINFO, &ainfo );
>-   close( mixerfd );
>-   if ( result == -1 ) {
>-@@ -9025,7 +9043,7 @@ bool RtApiOss :: probeDeviceOpen( unsign
>-   }
>- 
>-   // Verify the sample rate setup worked.
>--  if ( abs( srate - sampleRate ) > 100 ) {
>-+  if ( abs( srate - (int)sampleRate ) > 100 ) {
>-     close( fd );
>-     errorStream_ << "RtApiOss::probeDeviceOpen: device (" << ainfo.name << ") does not support sample rate (" << sampleRate << ").";
>-     errorText_ = errorStream_.str();
>diff -Nru godot.orig/files/patch-drivers_rtaudio_RtAudio.h godot/files/patch-drivers_rtaudio_RtAudio.h
>--- godot.orig/files/patch-drivers_rtaudio_RtAudio.h	2017-01-28 08:08:12.163972000 +1030
>+++ godot/files/patch-drivers_rtaudio_RtAudio.h	1970-01-01 09:30:00.000000000 +0930
>@@ -1,16 +0,0 @@
>---- drivers/rtaudio/RtAudio.h.orig	2016-08-09 07:52:15 UTC
>-+++ drivers/rtaudio/RtAudio.h
>-@@ -5,7 +5,13 @@
>- #if defined(OSX_ENABLED)
>-     #define __MACOSX_CORE__
>- #elif defined(UNIX_ENABLED)
>-+#if defined(OSS_ENABLED)
>-+    #define __LINUX_OSS__
>-+#elif defined(ALSA_ENABLED)
>-     #define __LINUX_ALSA__
>-+#elif defined(PULSEAUDIO_ENABLED)
>-+    #define __LINUX_PULSE__
>-+#endif
>- #elif defined(WINDOWS_ENABLED)
>-     #if defined(WINRT_ENABLED)
>-         #define __RTAUDIO_DUMMY__
>diff -Nru godot.orig/files/patch-drivers_SCsub godot/files/patch-drivers_SCsub
>--- godot.orig/files/patch-drivers_SCsub	1970-01-01 09:30:00.000000000 +0930
>+++ godot/files/patch-drivers_SCsub	2016-11-30 21:46:11.468498000 +1030
>@@ -0,0 +1,11 @@
>+--- drivers/SCsub.orig	2016-11-30 21:41:21 UTC
>++++ drivers/SCsub
>+@@ -14,7 +14,7 @@ SConscript('windows/SCsub')
>+ # Sounds drivers
>+ SConscript('alsa/SCsub')
>+ SConscript('pulseaudio/SCsub')
>+-if (env["platform"] == "windows"):
>++if (env["platform"] == "windows") or (env["platform"] == "x11"):
>+     SConscript("rtaudio/SCsub")
>+ 
>+ # Graphics drivers
>diff -Nru godot.orig/files/patch-main_main.cpp godot/files/patch-main_main.cpp
>--- godot.orig/files/patch-main_main.cpp	2017-01-28 08:08:12.163494000 +1030
>+++ godot/files/patch-main_main.cpp	1970-01-01 09:30:00.000000000 +0930
>@@ -1,11 +0,0 @@
>---- main/main.cpp.orig	2016-08-09 07:52:15 UTC
>-+++ main/main.cpp
>-@@ -161,7 +161,7 @@ void Main::print_help(const char* p_bina
>- 	}
>- 	OS::get_singleton()->print(")\n");
>- 	OS::get_singleton()->print("\t-ldpi\t : Force low-dpi mode (OSX Only)");
>--
>-+	OS::get_singleton()->print("\n");
>- 	OS::get_singleton()->print("\t-ad DRIVER\t : Audio Driver (");
>- 	for (int i=0;i<OS::get_singleton()->get_audio_driver_count();i++) {
>- 
>diff -Nru godot.orig/files/patch-modules_speex_audio__stream__speex.cpp godot/files/patch-modules_speex_audio__stream__speex.cpp
>--- godot.orig/files/patch-modules_speex_audio__stream__speex.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ godot/files/patch-modules_speex_audio__stream__speex.cpp	2016-11-28 17:59:08.272723000 +1030
>@@ -0,0 +1,10 @@
>+--- modules/speex/audio_stream_speex.cpp.orig	2016-11-28 17:58:00 UTC
>++++ modules/speex/audio_stream_speex.cpp
>+@@ -28,7 +28,6 @@
>+ /*************************************************************************/
>+ #include "audio_stream_speex.h"
>+ 
>+-#include "os_support.h"
>+ #include "os/os.h"
>+ #define READ_CHUNK 1024
>+ 
>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	2017-01-28 08:08:12.163613000 +1030
>+++ godot/files/patch-platform_x11_detect.py	2016-11-28 17:54:51.441690000 +1030
>@@ -1,65 +1,66 @@
>---- platform/x11/detect.py.orig	2016-08-09 07:52:15 UTC
>+--- platform/x11/detect.py.orig	2016-11-15 18:44:21 UTC
> +++ platform/x11/detect.py
>-@@ -30,11 +30,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
>+@@ -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.")
>-@@ -60,7 +55,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'),
>--	('pulseaudio','Detect & Use pulseaudio','yes'),
>-+	('alsa','Detect & Use alsa audio','no'),
>-+	('oss','Detect & Use OSS audio','no'),
>-+	('pulseaudio','Detect & Use pulseaudio','no'),
>- 	('udev','Use udev for gamepad connection callbacks','no'),
>- 	('debug_release', 'Add debug symbols to release version','no'),
>- 	]
>-@@ -141,7 +138,7 @@ def configure(env):
>- 	env.ParseConfig('pkg-config xrandr --cflags --libs')
>- 
>- 	if (env["openssl"]=="yes"):
>--		env.ParseConfig('pkg-config openssl --cflags --libs')
>-+		env.ParseConfig('echo -lssl -lcrypto')
>- 
>- 
>- 	if (env["freetype"]=="yes"):
>-@@ -152,12 +149,13 @@ def configure(env):
>- 
>- 	env.Append(CPPFLAGS=['-DOPENGL_ENABLED'])
>- 
>--	if os.system("pkg-config --exists alsa")==0:
>--		print("Enabling ALSA")
>--		env.Append(CPPFLAGS=["-DALSA_ENABLED"])
>--		env.Append(LIBS=['asound'])
>--	else:
>--		print("ALSA libraries not found, disabling driver")
>-+	if (env["alsa"]=="yes"):
>-+		if os.system("pkg-config --exists alsa")==0:
>-+			print("Enabling ALSA")
>-+			env.Append(CPPFLAGS=["-DALSA_ENABLED"])
>-+			env.Append(LIBS=['asound'])
>-+		else:
>-+			print("ALSA libraries not found, disabling driver")
>- 
>- 	if (platform.system() == "Linux"):
>- 		env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
>-@@ -172,6 +170,10 @@ def configure(env):
>- 		else:
>- 			print("libudev development libraries not found, disabling udev support")
>- 
>-+	if (env["oss"]=="yes"):
>-+		print("Enabling OSS Audio")
>-+		env.Append(CPPFLAGS=["-DOSS_ENABLED"])
>+     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'),
>+-        ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),
>++        ('alsa','Detect & Use alsa audio','no'),
>++        ('oss','Detect & Use OSS audio','no'),
>++        ('pulseaudio', 'Detect & Use pulseaudio', 'no'),
>+         ('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')
>+ 
>+     if (env['builtin_openssl'] == 'no'):
>+-        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):
>+     if (env['builtin_glew'] == 'no'):
>+         env.ParseConfig('pkg-config glew --cflags --libs')
>+ 
>+-    if os.system("pkg-config --exists alsa") == 0:
>+-        print("Enabling ALSA")
>+-        env.Append(CPPFLAGS=["-DALSA_ENABLED"])
>+-        env.ParseConfig('pkg-config alsa --cflags --libs')
>+-    else:
>+-        print("ALSA libraries not found, disabling driver")
>++    if (env["alsa"]=="yes"):
>++        if os.system("pkg-config --exists alsa")==0:
>++            print("Enabling ALSA")
>++            env.Append(CPPFLAGS=["-DALSA_ENABLED"])
>++            env.Append(LIBS=['asound'])
>++        else:
>++            print("ALSA libraries not found, disabling driver")
>+ 
>+     if (platform.system() == "Linux"):
>+         env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
>+@@ -193,6 +191,11 @@ def configure(env):
>+         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")
>+     if (env["pulseaudio"] == "yes"):
>+         if not os.system("pkg-config --exists libpulse-simple"):
>+             print("Enabling PulseAudio")
>diff -Nru godot.orig/files/patch-SConstruct godot/files/patch-SConstruct
>--- godot.orig/files/patch-SConstruct	2017-01-28 08:08:12.163233000 +1030
>+++ godot/files/patch-SConstruct	2016-11-28 16:45:41.833731000 +1030
>@@ -1,35 +1,36 @@
>---- SConstruct.orig	2016-08-09 07:52:15 UTC
>+--- SConstruct.orig	2016-11-15 18:44:21 UTC
> +++ SConstruct
>-@@ -63,7 +63,7 @@ elif (os.name=="nt"):
>- 	if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
>- 		custom_tools=['mingw']
>+@@ -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);
>+-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'))
>- env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
>- env_base.global_defaults=global_defaults
>-@@ -231,15 +231,17 @@ if selected_platform in platform_list:
>- 	if env["extra_suffix"] != '' :
>- 		env.extra_suffix += '.'+env["extra_suffix"]
>+@@ -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['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)))
>- 
>--	CFLAGS = env.get('CFLAGS', '')
>--	env['CFLAGS'] = ''
>+-    CCFLAGS = env.get('CCFLAGS', '')
>+-    env['CCFLAGS'] = ''
>+-
>+-    env.Append(CCFLAGS=string.split(str(CCFLAGS)))
>+-
>+-    CFLAGS = env.get('CFLAGS', '')
>+-    env['CFLAGS'] = ''
> -
>--	env.Append(CFLAGS=string.split(str(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'] = ''
>+     LINKFLAGS = env.get('LINKFLAGS', '')
>+     env['LINKFLAGS'] = ''
>diff -Nru godot.orig/files/patch-thirdparty_rtaudio_RtAudio.cpp godot/files/patch-thirdparty_rtaudio_RtAudio.cpp
>--- godot.orig/files/patch-thirdparty_rtaudio_RtAudio.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ godot/files/patch-thirdparty_rtaudio_RtAudio.cpp	2016-11-28 16:49:58.862626000 +1030
>@@ -0,0 +1,89 @@
>+--- thirdparty/rtaudio/RtAudio.cpp.orig	2016-08-09 07:52:15 UTC
>++++ thirdparty/rtaudio/RtAudio.cpp
>+@@ -8589,6 +8589,12 @@ bool RtApiPulse::probeDeviceOpen( unsign
>+ #include <errno.h>
>+ #include <math.h>
>+ 
>++#if defined(__FreeBSD__)
>++#define SND_DEVICE "/dev/dsp"
>++#else
>++#define SND_DEVICE "/dev/mixer"
>++#endif
>++
>+ static void *ossCallbackHandler(void * ptr);
>+ 
>+ // A structure to hold various information related to the OSS API
>+@@ -8615,9 +8621,11 @@ RtApiOss :: ~RtApiOss()
>+ 
>+ unsigned int RtApiOss :: getDeviceCount( void )
>+ {
>+-  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>++  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>+   if ( mixerfd == -1 ) {
>+-    errorText_ = "RtApiOss::getDeviceCount: error opening '/dev/mixer'.";
>++    errorText_ = "RtApiOss::getDeviceCount: error opening '";
>++    errorText_ += SND_DEVICE;
>++    errorText_ += "'.";
>+     error( RtAudioError::WARNING );
>+     return 0;
>+   }
>+@@ -8639,9 +8647,11 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
>+   RtAudio::DeviceInfo info;
>+   info.probed = false;
>+ 
>+-  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>++  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>+   if ( mixerfd == -1 ) {
>+-    errorText_ = "RtApiOss::getDeviceInfo: error opening '/dev/mixer'.";
>++    errorText_ = "RtApiOss::getDeviceInfo: error opening '";
>++    errorText_ += SND_DEVICE;
>++    errorText_ += "'.";
>+     error( RtAudioError::WARNING );
>+     return info;
>+   }
>+@@ -8697,8 +8707,10 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
>+     info.nativeFormats |= RTAUDIO_SINT8;
>+   if ( mask & AFMT_S32_LE || mask & AFMT_S32_BE )
>+     info.nativeFormats |= RTAUDIO_SINT32;
>++#if defined(AFMT_FLOAT)
>+   if ( mask & AFMT_FLOAT )
>+     info.nativeFormats |= RTAUDIO_FLOAT32;
>++#endif
>+   if ( mask & AFMT_S24_LE || mask & AFMT_S24_BE )
>+     info.nativeFormats |= RTAUDIO_SINT24;
>+ 
>+@@ -8757,9 +8769,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
>+                                   RtAudioFormat format, unsigned int *bufferSize,
>+                                   RtAudio::StreamOptions *options )
>+ {
>+-  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
>++  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
>+   if ( mixerfd == -1 ) {
>+-    errorText_ = "RtApiOss::probeDeviceOpen: error opening '/dev/mixer'.";
>++    errorText_ = "RtApiOss::probeDeviceOpen: error opening '";
>++    errorText_ += SND_DEVICE;
>++    errorText_ += "'.";
>+     return FAILURE;
>+   }
>+ 
>+@@ -8787,7 +8801,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
>+   }
>+ 
>+   oss_audioinfo ainfo;
>++#if defined(__FreeBSD__)
>++  ainfo.dev = -1; // specify -1 to get default device
>++#else
>+   ainfo.dev = device;
>++#endif
>+   result = ioctl( mixerfd, SNDCTL_AUDIOINFO, &ainfo );
>+   close( mixerfd );
>+   if ( result == -1 ) {
>+@@ -9025,7 +9043,7 @@ bool RtApiOss :: probeDeviceOpen( unsign
>+   }
>+ 
>+   // Verify the sample rate setup worked.
>+-  if ( abs( srate - sampleRate ) > 100 ) {
>++  if ( abs( srate - (int)sampleRate ) > 100 ) {
>+     close( fd );
>+     errorStream_ << "RtApiOss::probeDeviceOpen: device (" << ainfo.name << ") does not support sample rate (" << sampleRate << ").";
>+     errorText_ = errorStream_.str();
>diff -Nru godot.orig/files/patch-thirdparty_rtaudio_RtAudio.h godot/files/patch-thirdparty_rtaudio_RtAudio.h
>--- godot.orig/files/patch-thirdparty_rtaudio_RtAudio.h	1970-01-01 09:30:00.000000000 +0930
>+++ godot/files/patch-thirdparty_rtaudio_RtAudio.h	2016-11-28 16:50:27.199093000 +1030
>@@ -0,0 +1,16 @@
>+--- thirdparty/rtaudio/RtAudio.h.orig	2016-08-09 07:52:15 UTC
>++++ thirdparty/rtaudio/RtAudio.h
>+@@ -5,7 +5,13 @@
>+ #if defined(OSX_ENABLED)
>+     #define __MACOSX_CORE__
>+ #elif defined(UNIX_ENABLED)
>++#if defined(OSS_ENABLED)
>++    #define __LINUX_OSS__
>++#elif defined(ALSA_ENABLED)
>+     #define __LINUX_ALSA__
>++#elif defined(PULSEAUDIO_ENABLED)
>++    #define __LINUX_PULSE__
>++#endif
>+ #elif defined(WINDOWS_ENABLED)
>+     #if defined(WINRT_ENABLED)
>+         #define __RTAUDIO_DUMMY__
>diff -Nru godot.orig/Makefile godot/Makefile
>--- godot.orig/Makefile	2017-01-28 08:08:12.164316000 +1030
>+++ godot/Makefile	2017-01-28 07:30:47.689678000 +1030
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	godot
>-PORTVERSION=	2.1
>+PORTVERSION=	2.1.2
> DISTVERSIONSUFFIX=	-stable
> CATEGORIES=	devel games
> 
>@@ -14,7 +14,10 @@
> LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.md
> LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.md
> 
>-LIB_DEPENDS=	libfreetype.so:print/freetype2
>+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
>+		libpng.so:graphics/png \
>+		libmpcdec.so:audio/musepack \
>+		libspeex.so:audio/speex
> RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
> 		xdg-open:devel/xdg-utils \
> 		xmessage:x11/xmessage
>@@ -26,7 +29,7 @@
> USE_XORG=	x11 xcursor xinerama xrandr
> USE_GL=		gl
> 
>-MAKE_ARGS+=	platform=x11
>+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
>@@ -36,6 +39,7 @@
> CXXFLAGS_sparc64=	-DNO_THREADS
> CXXFLAGS_mips=		-DNO_THREADS
> CXXFLAGS_mips64=	-DNO_THREADS
>+LDFLAGS+=	-lspeex -lmpcdec
> 
> OPTIONS_DEFINE=	EXAMPLES TOOLS
> OPTIONS_DEFAULT=	OSS
>@@ -44,10 +48,16 @@
> OPTIONS_GROUP=		AUDIO
> OPTIONS_GROUP_AUDIO=	ALSA OSS PULSEAUDIO
> 
>+AUDIO_DESC=		Audio support
>+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
>@@ -56,13 +66,6 @@
> TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
> 			share/pixmaps/${GODOTFILE}.svg
> 
>-AUDIO_DESC=		Audio support
>-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>-ALSA_MAKE_ARGS=		alsa=yes
>-OSS_MAKE_ARGS=		oss=yes
>-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
>-PULSEAUDIO_MAKE_ARGS=	pulseaudio=yes
>-
> GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
> PLIST_FILES=	bin/${GODOTFILE}
>

Actions: View | Diff

Attachments on bug 216227: 179361