Attachment #203065 for bug #236731

View | Details | Raw Unified | Return to bug 236731
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	godot
PORTVERSION=	3.1
DISTVERSIONSUFFIX=	-stable
DISTVERSIONSUFFIX= -stable
CATEGORIES=	devel games

MAINTAINER=	FreeBSD@Shaneware.biz

		xdg-open:devel/xdg-utils \
		xmessage:x11/xmessage

# on 10.4 using clang34 fails - so we want to use clang60
# gl already needs clang60 so this shouldn't add any overhead
USES=		compiler:c++14-lang pkgconfig scons ssl
USE_XORG=	x11 xcursor xi xinerama xrandr xrender
USE_GL=		gl glew glu

USE_GITHUB=	yes

CXXFLAGS_mips=		-DNO_THREADS
CXXFLAGS_mips64=	-DNO_THREADS

# option MONO doesn't build (needs 5.12+) so for now leave it out as an option
# for now leave it out as an option
OPTIONS_DEFINE=		EXAMPLES TOOLS
OPTIONS_DEFAULT=	ALSA
# Moved to devel/godot-tools
OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
OPTIONS_GROUP=		AUDIO
OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO

AUDIO_DESC=		Audio support
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
ALSA_MAKE_ARGS=		alsa=True
EXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
# master at 23/3
EXAMPLES_GH_TAGNAME=	17e80079e3fc:DEMOS
EXAMPLES_PORTEXAMPLES=	*
# mono support doesn't build at present
MONO_USES=		mono:nuget
NUGET_DEPENDS=		DotNet.Glob=2.1.1
MONO_MAKE_ARGS=		module_mono_enabled=True mono_glue=True NUGET_PATH=${NUGET_EXE}
MONO_MAKE_ENV=		NUGET_PATH=${NUGET_EXE}
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
PULSEAUDIO_MAKE_ARGS=	pulseaudio=True
TOOLS_DESC=		Include development tools (IDE)
TOOLS_MAKE_ARGS=	target=release_debug tools=True

	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
		${WRKSRC}/platform/x11/os_x11.cpp

pre-build-MONO-on: makenuget
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \
		target=release_debug tools=True mono_glue=False)

Lines 1-5 Link Here

(-)devel/godot/distinfo (-5 / +7 lines)
1	TIMESTAMP = 1536387978	1	TIMESTAMP = 1553320527
2	SHA256 (godotengine-godot-3.0.6-stable_GH0.tar.gz) = 50431e021ee5ec21002cc23435f530f8fde518c6eb7085c9f7f1027abaae2581	2	SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a
3	SIZE (godotengine-godot-3.0.6-stable_GH0.tar.gz) = 18958766	3	SIZE (dotnet.glob.2.1.1.nupkg) = 73782
4	SHA256 (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = b798d0bb56a643fdb175df463990904523495dd5546bc00bbe762e0645b7c94a	4	SHA256 (godotengine-godot-3.1-stable_GH0.tar.gz) = cd66354b2397f28193ba3add8d8cc5c3562775f662887b56f16de82974f041e3
5	SIZE (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = 140126782	5	SIZE (godotengine-godot-3.1-stable_GH0.tar.gz) = 20400493
		6	SHA256 (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = b430cb02302489f66f69ca6e743b47e227148ae8224cae625c5cfa744d940433
		7	SIZE (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = 151343471

Lines 1-11 Link Here

(-)devel/godot/files/patch-drivers_SCsub (-11 lines)
1	--- drivers/SCsub.orig 2016-11-30 21:41:21 UTC
2	+++ drivers/SCsub
3	@@ -18,6 +18,8 @@ SConscript('pulseaudio/SCsub')
4	if (env["platform"] == "windows"):
5	SConscript("rtaudio/SCsub")
6	SConscript("wasapi/SCsub")
7	+if env["platform"] == "x11":
8	+ SConscript("rtaudio/SCsub")
9	if env['xaudio2']:
10	SConscript("xaudio2/SCsub")
11




--- drivers/rtaudio/audio_driver_rtaudio.cpp.orig	2016-08-09 07:52:15 UTC
+++ drivers/rtaudio/audio_driver_rtaudio.cpp
@@ -35,8 +35,14 @@ const char* AudioDriverRtAudio::get_name
 
 #ifdef OSX_ENABLED
 	return "RtAudio-OSX";
-#elif defined(UNIX_ENABLED)
+#elif defined(UNIX_ENABLED) && (defined(ALSA_ENABLED) || defined(PULSEAUDIO_ENABLED) || defined(OSS_ENABLED))
+#if defined(OSS_ENABLED)
+	return "RtAudio-OSS";
+#elif defined(ALSA_ENABLED)
 	return "RtAudio-ALSA";
+#elif defined(PULSEAUDIO_ENABLED)
+	return "RtAudio-PulseAudio";
+#endif
 #elif defined(WINDOWS_ENABLED)
 	return "RtAudio-DirectSound";
 #else




--- modules/enet/SCsub.orig	2019-03-23 10:48:38 UTC
+++ modules/enet/SCsub
@@ -21,7 +21,7 @@ if env['builtin_enet']:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
     env_enet.add_source_files(env.modules_sources, thirdparty_sources)
-    env_enet.Append(CPPPATH=[thirdparty_dir])
+    env_enet.Prepend(CPPPATH=[thirdparty_dir])
     env_enet.Append(CPPFLAGS=["-DGODOT_ENET"])
 
     env_thirdparty = env_enet.Clone()




--- modules/squish/SCsub.orig	2019-03-23 11:07:40 UTC
+++ modules/squish/SCsub
@@ -22,7 +22,7 @@ if env['builtin_squish']:
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
     env_squish.add_source_files(env.modules_sources, thirdparty_sources)
-    env_squish.Append(CPPPATH=[thirdparty_dir])
+    env_squish.Prepend(CPPPATH=[thirdparty_dir])
 
     env_thirdparty = env_squish.Clone()
     env_thirdparty.disable_warnings()

Line 0 Link Here

(-)devel/godot/files/patch-modules_webm_libvpx_SCsub (+11 lines)
	1	--- modules/webm/libvpx/SCsub.orig 2019-03-23 15:10:53 UTC
	2	+++ modules/webm/libvpx/SCsub
	3	@@ -256,7 +256,7 @@ libvpx_sources_arm_neon_gas_apple = [libvpx_dir + file
	4
	5	env_libvpx = env_modules.Clone()
	6	env_libvpx.disable_warnings()
	7	-env_libvpx.Append(CPPPATH=[libvpx_dir])
	8	+env_libvpx.Prepend(CPPPATH=[libvpx_dir])
	9
	10	webm_multithread = env["platform"] != 'javascript'
	11




--- platform/x11/detect.py.orig	2018-03-04 00:52:04 UTC
+++ platform/x11/detect.py
@@ -52,7 +52,9 @@ def get_opts():
         BoolVariable('use_static_cpp', 'Link libgcc and libstdc++ statically for better portability', False),
         BoolVariable('use_sanitizer', 'Use LLVM compiler address sanitizer', False),
         BoolVariable('use_leak_sanitizer', 'Use LLVM compiler memory leaks sanitizer (implies use_sanitizer)', False),
-        BoolVariable('pulseaudio', 'Detect & use pulseaudio', True),
+        BoolVariable('alsa','Detect & Use alsa audio',False),
+        BoolVariable('oss','Detect & Use OSS audio',False),
+        BoolVariable('pulseaudio', 'Detect & Use pulseaudio', False),
         BoolVariable('udev', 'Use udev for gamepad connection callbacks', False),
         EnumVariable('debug_symbols', 'Add debug symbols to release version', 'yes', ('yes', 'no', 'full')),
         BoolVariable('separate_debug_symbols', 'Create a separate file with the debug symbols', False),
@@ -154,7 +156,12 @@ def configure(env):
     # FIXME: Check for existence of the libs before parsing their flags with pkg-config
 
     if not env['builtin_openssl']:
-        env.ParseConfig('pkg-config openssl --cflags --libs')
+        try:
+            # try to find a port installed openssl
+            env.ParseConfig('pkg-config openssl --cflags --libs')
+        except:
+            # if none found use base system openssl
+            env.ParseConfig('echo -lssl -lcrypto')
 
     if not env['builtin_libwebp']:
         env.ParseConfig('pkg-config libwebp --cflags --libs')
@@ -226,12 +233,18 @@ def configure(env):
 
     ## Flags
 
-    if (os.system("pkg-config --exists alsa") == 0): # 0 means found
-        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']:
+        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['oss']:
+        print("Enabling OSS Audio")
+        env.Append(CPPFLAGS=["-DOSS_ENABLED"])
+        env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])
 
     if env['pulseaudio']:
         if (os.system("pkg-config --exists libpulse-simple") == 0): # 0 means found




--- platform/x11/os_x11.cpp.orig	2018-01-03 04:32:19 UTC
+++ platform/x11/os_x11.cpp
@@ -2469,6 +2469,10 @@ OS_X11::OS_X11() {
 	AudioDriverManager::add_driver(&driver_pulseaudio);
 #endif
 
+#ifdef RTAUDIO_ENABLED
+	AudioDriverManager::add_driver(&driver_rtaudio);
+#endif
+
 #ifdef ALSA_ENABLED
 	AudioDriverManager::add_driver(&driver_alsa);
 #endif




--- platform/x11/os_x11.h.orig	2018-01-03 09:26:19 UTC
+++ platform/x11/os_x11.h
@@ -38,6 +38,7 @@
 //#include "servers/visual/visual_server_wrap_mt.h"
 #include "drivers/alsa/audio_driver_alsa.h"
 #include "drivers/pulseaudio/audio_driver_pulseaudio.h"
+#include "drivers/rtaudio/audio_driver_rtaudio.h"
 #include "joypad_linux.h"
 #include "main/input_default.h"
 #include "power_x11.h"
@@ -166,6 +167,10 @@ class OS_X11 : public OS_Unix {
 	AudioDriverPulseAudio driver_pulseaudio;
 #endif
 
+#ifdef RTAUDIO_ENABLED
+	AudioDriverRtAudio driver_rtaudio;
+#endif
+
 	Atom net_wm_icon;
 
 	PowerX11 *power_manager;




--- thirdparty/libvpx/vpx/vpx_codec.h.orig  2019-03-23 14:24:15 UTC
+++ thirdparty/libvpx/vpx/vpx_codec.h
@@ -36,8 +36,8 @@
  * Once initialized, the instance is manged using other functions from
  * the vpx_codec_* family.
  */
-#ifndef VPX_VPX_CODEC_H_
-#define VPX_VPX_CODEC_H_
+#ifndef VPX_VPX_VPX_CODEC_H_
+#define VPX_VPX_VPX_CODEC_H_

 #ifdef __cplusplus
 extern "C" {
@@ -475,5 +475,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif  // VPX_VPX_CODEC_H_
+#endif  // VPX_VPX_VPX_CODEC_H_





--- thirdparty/libvpx/vpx/vpx_decoder.h.orig    2019-03-23 14:46:15 UTC
+++ thirdparty/libvpx/vpx/vpx_decoder.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef VPX_VPX_DECODER_H_
-#define VPX_VPX_DECODER_H_
+#ifndef VPX_VPX_VPX_DECODER_H_
+#define VPX_VPX_VPX_DECODER_H_

 /*!\defgroup decoder Decoder Algorithm Interface
  * \ingroup codec
@@ -374,5 +374,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif  // VPX_VPX_DECODER_H_
+#endif  // VPX_VPX_VPX_DECODER_H_





--- thirdparty/libvpx/vpx/vpx_frame_buffer.h.orig   2019-03-23 14:31:21 UTC
+++ thirdparty/libvpx/vpx/vpx_frame_buffer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */

-#ifndef VPX_VPX_FRAME_BUFFER_H_
-#define VPX_VPX_FRAME_BUFFER_H_
+#ifndef VPX_VPX_VPX_FRAME_BUFFER_H_
+#define VPX_VPX_VPX_FRAME_BUFFER_H_

 /*!\file
  * \brief Describes the decoder external frame buffer interface.
@@ -80,4 +80,4 @@ typedef int (*vpx_release_frame_buffer_cb_fn_t)(
 }  // extern "C"
 #endif

-#endif  // VPX_VPX_FRAME_BUFFER_H_
+#endif  // VPX_VPX_VPX_FRAME_BUFFER_H_




--- thirdparty/libvpx/vpx/vpx_image.h.orig    2019-03-23 14:18:30 UTC
+++ thirdparty/libvpx/vpx/vpx_image.h
@@ -13,8 +13,8 @@
  * \brief Describes the vpx image descriptor and associated operations
  *
  */
-#ifndef VPX_VPX_IMAGE_H_
-#define VPX_VPX_IMAGE_H_
+#ifndef VPX_VPX_VPX_IMAGE_H_
+#define VPX_VPX_VPX_IMAGE_H_

 #ifdef __cplusplus
 extern "C" {
@@ -232,4 +232,4 @@ extern "C" {
 }  // extern "C"
 #endif

-#endif  // VPX_VPX_IMAGE_H_
+#endif  // VPX_VPX_VPX_IMAGE_H_




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




--- 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__

Lines 1-9 Link Here

(-)devel/godot/files/patch-thirdparty_zstd_SCsub (-9 lines)
1	--- thirdparty/zstd/SCsub.orig 2018-06-13 11:53:45 UTC
2	+++ thirdparty/zstd/SCsub
3	@@ -25,5 +25,5 @@ thirdparty_zstd_sources = [
4	]
5	thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
6	env.add_source_files(env.core_sources, thirdparty_zstd_sources)
7	-env.Append(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"])
8	+env.Prepend(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"])
9	env.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")

Return to bug 236731

Lines 2-10 Link Here

(-)devel/godot/Makefile (-18 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= godot	4	PORTNAME= godot
5	PORTVERSION= 3.0.6	5	PORTVERSION= 3.1
6	PORTREVISION= 1	6	DISTVERSIONSUFFIX= -stable
7	DISTVERSIONSUFFIX= -stable
8	CATEGORIES= devel games	7	CATEGORIES= devel games
9		8
10	MAINTAINER= FreeBSD@Shaneware.biz	9	MAINTAINER= FreeBSD@Shaneware.biz
Lines 27-36 Link Here
27	xdg-open:devel/xdg-utils \	26	xdg-open:devel/xdg-utils \
28	xmessage:x11/xmessage	27	xmessage:x11/xmessage
29		28
30	# on 10.4 using clang34 fails - so we want to use clang60
31	# gl already needs clang60 so this shouldn't add any overhead
32	USES= compiler:c++14-lang pkgconfig scons ssl	29	USES= compiler:c++14-lang pkgconfig scons ssl
33	USE_XORG= x11 xcursor xi xinerama xrandr	30	USE_XORG= x11 xcursor xi xinerama xrandr xrender
34	USE_GL= gl glew glu	31	USE_GL= gl glew glu
35		32
36	USE_GITHUB= yes	33	USE_GITHUB= yes
Lines 47-73 Link Here
47	CXXFLAGS_mips= -DNO_THREADS	44	CXXFLAGS_mips= -DNO_THREADS
48	CXXFLAGS_mips64= -DNO_THREADS	45	CXXFLAGS_mips64= -DNO_THREADS
49		46
50	# option MONO can be built but is not stable enough to use yet	47	# option MONO doesn't build (needs 5.12+) so for now leave it out as an option
51	# for now leave it out as an option
52	OPTIONS_DEFINE= EXAMPLES TOOLS	48	OPTIONS_DEFINE= EXAMPLES TOOLS
53	OPTIONS_DEFAULT= OSS	49	OPTIONS_DEFAULT= ALSA
54	# Moved to devel/godot-tools	50	# Moved to devel/godot-tools
55	OPTIONS_EXCLUDE?= EXAMPLES TOOLS	51	OPTIONS_EXCLUDE?= EXAMPLES TOOLS
56	OPTIONS_GROUP= AUDIO	52	OPTIONS_GROUP= AUDIO
57	OPTIONS_GROUP_AUDIO= ALSA OSS PULSEAUDIO	53	OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO
58		54
59	AUDIO_DESC= Audio support	55	AUDIO_DESC= Audio support
60	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	56	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
61	ALSA_MAKE_ARGS= alsa=True	57	ALSA_MAKE_ARGS= alsa=True
62	EXAMPLES_GH_PROJECT= godot-demo-projects:DEMOS	58	EXAMPLES_GH_PROJECT= godot-demo-projects:DEMOS
63	# master at 31/1	59	# master at 23/3
64	EXAMPLES_GH_TAGNAME= d69cc10a0b8a:DEMOS	60	EXAMPLES_GH_TAGNAME= 17e80079e3fc:DEMOS
65	EXAMPLES_PORTEXAMPLES= *	61	EXAMPLES_PORTEXAMPLES= *
66	# while mono support can build it isn't stable enough to be used yet	62	# mono support doesn't build at present
67	MONO_LIB_DEPENDS= libmonosgen-2.0.so:lang/mono	63	MONO_USES= mono:nuget
68	MONO_MAKE_ARGS= module_mono_enabled=True	64	NUGET_DEPENDS= DotNet.Glob=2.1.1
69	OSS_MAKE_ARGS= oss=True	65	MONO_MAKE_ARGS= module_mono_enabled=True mono_glue=True NUGET_PATH=${NUGET_EXE}
70	PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio	66	MONO_MAKE_ENV= NUGET_PATH=${NUGET_EXE}
		67	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
71	PULSEAUDIO_MAKE_ARGS= pulseaudio=True	68	PULSEAUDIO_MAKE_ARGS= pulseaudio=True
72	TOOLS_DESC= Include development tools (IDE)	69	TOOLS_DESC= Include development tools (IDE)
73	TOOLS_MAKE_ARGS= target=release_debug tools=True	70	TOOLS_MAKE_ARGS= target=release_debug tools=True
Lines 91-97 Link Here
91	@${REINPLACE_CMD} -e 's\|/usr/bin\|${PREFIX}/bin\|' \	88	@${REINPLACE_CMD} -e 's\|/usr/bin\|${PREFIX}/bin\|' \
92	${WRKSRC}/platform/x11/os_x11.cpp	89	${WRKSRC}/platform/x11/os_x11.cpp
93		90
94	pre-build-MONO-on:	91	pre-build-MONO-on: makenuget
95	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \	92	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
96	${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \	93	${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \
97	target=release_debug tools=True mono_glue=False)	94	target=release_debug tools=True mono_glue=False)

Lines 1-18 Link Here

(-)devel/godot/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp (-18 lines)
1	--- drivers/rtaudio/audio_driver_rtaudio.cpp.orig 2016-08-09 07:52:15 UTC
2	+++ drivers/rtaudio/audio_driver_rtaudio.cpp
3	@@ -35,8 +35,14 @@ const char* AudioDriverRtAudio::get_name
4
5	#ifdef OSX_ENABLED
6	return "RtAudio-OSX";
7	-#elif defined(UNIX_ENABLED)
8	+#elif defined(UNIX_ENABLED) && (defined(ALSA_ENABLED) \|\| defined(PULSEAUDIO_ENABLED) \|\| defined(OSS_ENABLED))
9	+#if defined(OSS_ENABLED)
10	+ return "RtAudio-OSS";
11	+#elif defined(ALSA_ENABLED)
12	return "RtAudio-ALSA";
13	+#elif defined(PULSEAUDIO_ENABLED)
14	+ return "RtAudio-PulseAudio";
15	+#endif
16	#elif defined(WINDOWS_ENABLED)
17	return "RtAudio-DirectSound";
18	#else

Lines 1-11 Link Here

(-)devel/godot/files/patch-modules_enet_SCsub (-4 / +4 lines)
1	--- modules/enet/SCsub.orig 2018-06-13 11:43:18 UTC	1	--- modules/enet/SCsub.orig 2019-03-23 10:48:38 UTC
2	+++ modules/enet/SCsub	2	+++ modules/enet/SCsub
3	@@ -22,7 +22,7 @@ if env['builtin_enet']:	3	@@ -21,7 +21,7 @@ if env['builtin_enet']:
		4	]
4	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]	5	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
5		6
6	env_enet.add_source_files(env.modules_sources, thirdparty_sources)
7	- env_enet.Append(CPPPATH=[thirdparty_dir])	7	- env_enet.Append(CPPPATH=[thirdparty_dir])
8	+ env_enet.Prepend(CPPPATH=[thirdparty_dir])	8	+ env_enet.Prepend(CPPPATH=[thirdparty_dir])
9	env_enet.Append(CPPFLAGS=["-DGODOT_ENET"])	9	env_enet.Append(CPPFLAGS=["-DGODOT_ENET"])
10		10
11	env_enet.add_source_files(env.modules_sources, "*.cpp")	11	env_thirdparty = env_enet.Clone()

Lines 1-11 Link Here

(-)devel/godot/files/patch-modules_squish_SCsub (-5 / +5 lines)
1	--- modules/squish/SCsub.orig 2018-06-13 12:02:27 UTC	1	--- modules/squish/SCsub.orig 2019-03-23 11:07:40 UTC
2	+++ modules/squish/SCsub	2	+++ modules/squish/SCsub
3	@@ -23,7 +23,7 @@ if env['builtin_squish']:	3	@@ -22,7 +22,7 @@ if env['builtin_squish']:
		4
4	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]	5	thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
5		6
6	env_squish.add_source_files(env.modules_sources, thirdparty_sources)
7	- env_squish.Append(CPPPATH=[thirdparty_dir])	7	- env_squish.Append(CPPPATH=[thirdparty_dir])
8	+ env_squish.Prepend(CPPPATH=[thirdparty_dir])	8	+ env_squish.Prepend(CPPPATH=[thirdparty_dir])
9		9
10	# Godot source files	10	env_thirdparty = env_squish.Clone()
11	env_squish.add_source_files(env.modules_sources, "*.cpp")	11	env_thirdparty.disable_warnings()

Lines 1-52 Link Here

(-)devel/godot/files/patch-platform_x11_detect.py (-52 lines)
1	--- platform/x11/detect.py.orig 2018-03-04 00:52:04 UTC
2	+++ platform/x11/detect.py
3	@@ -52,7 +52,9 @@ def get_opts():
4	BoolVariable('use_static_cpp', 'Link libgcc and libstdc++ statically for better portability', False),
5	BoolVariable('use_sanitizer', 'Use LLVM compiler address sanitizer', False),
6	BoolVariable('use_leak_sanitizer', 'Use LLVM compiler memory leaks sanitizer (implies use_sanitizer)', False),
7	- BoolVariable('pulseaudio', 'Detect & use pulseaudio', True),
8	+ BoolVariable('alsa','Detect & Use alsa audio',False),
9	+ BoolVariable('oss','Detect & Use OSS audio',False),
10	+ BoolVariable('pulseaudio', 'Detect & Use pulseaudio', False),
11	BoolVariable('udev', 'Use udev for gamepad connection callbacks', False),
12	EnumVariable('debug_symbols', 'Add debug symbols to release version', 'yes', ('yes', 'no', 'full')),
13	BoolVariable('separate_debug_symbols', 'Create a separate file with the debug symbols', False),
14	@@ -154,7 +156,12 @@ def configure(env):
15	# FIXME: Check for existence of the libs before parsing their flags with pkg-config
16
17	if not env['builtin_openssl']:
18	- env.ParseConfig('pkg-config openssl --cflags --libs')
19	+ try:
20	+ # try to find a port installed openssl
21	+ env.ParseConfig('pkg-config openssl --cflags --libs')
22	+ except:
23	+ # if none found use base system openssl
24	+ env.ParseConfig('echo -lssl -lcrypto')
25
26	if not env['builtin_libwebp']:
27	env.ParseConfig('pkg-config libwebp --cflags --libs')
28	@@ -226,12 +233,18 @@ def configure(env):
29
30	## Flags
31
32	- if (os.system("pkg-config --exists alsa") == 0): # 0 means found
33	- print("Enabling ALSA")
34	- env.Append(CPPFLAGS=["-DALSA_ENABLED"])
35	- env.ParseConfig('pkg-config alsa --cflags --libs')
36	- else:
37	- print("ALSA libraries not found, disabling driver")
38	+ if env['alsa']:
39	+ if os.system("pkg-config --exists alsa")==0:
40	+ print("Enabling ALSA")
41	+ env.Append(CPPFLAGS=["-DALSA_ENABLED"])
42	+ env.Append(LIBS=['asound'])
43	+ else:
44	+ print("ALSA libraries not found, disabling driver")
45	+
46	+ if env['oss']:
47	+ print("Enabling OSS Audio")
48	+ env.Append(CPPFLAGS=["-DOSS_ENABLED"])
49	+ env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])
50
51	if env['pulseaudio']:
52	if (os.system("pkg-config --exists libpulse-simple") == 0): # 0 means found

Lines 1-13 Link Here

(-)devel/godot/files/patch-platform_x11_os__x11.cpp (-13 lines)
1	--- platform/x11/os_x11.cpp.orig 2018-01-03 04:32:19 UTC
2	+++ platform/x11/os_x11.cpp
3	@@ -2469,6 +2469,10 @@ OS_X11::OS_X11() {
4	AudioDriverManager::add_driver(&driver_pulseaudio);
5	#endif
6
7	+#ifdef RTAUDIO_ENABLED
8	+ AudioDriverManager::add_driver(&driver_rtaudio);
9	+#endif
10	+
11	#ifdef ALSA_ENABLED
12	AudioDriverManager::add_driver(&driver_alsa);
13	#endif

Lines 1-21 Link Here

(-)devel/godot/files/patch-platform_x11_os__x11.h (-21 lines)
1	--- platform/x11/os_x11.h.orig 2018-01-03 09:26:19 UTC
2	+++ platform/x11/os_x11.h
3	@@ -38,6 +38,7 @@
4	//#include "servers/visual/visual_server_wrap_mt.h"
5	#include "drivers/alsa/audio_driver_alsa.h"
6	#include "drivers/pulseaudio/audio_driver_pulseaudio.h"
7	+#include "drivers/rtaudio/audio_driver_rtaudio.h"
8	#include "joypad_linux.h"
9	#include "main/input_default.h"
10	#include "power_x11.h"
11	@@ -166,6 +167,10 @@ class OS_X11 : public OS_Unix {
12	AudioDriverPulseAudio driver_pulseaudio;
13	#endif
14
15	+#ifdef RTAUDIO_ENABLED
16	+ AudioDriverRtAudio driver_rtaudio;
17	+#endif
18	+
19	Atom net_wm_icon;
20
21	PowerX11 *power_manager;

Line 0 Link Here

(-)devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__codec.h (+20 lines)
	1	--- thirdparty/libvpx/vpx/vpx_codec.h.orig 2019-03-23 14:24:15 UTC
	2	+++ thirdparty/libvpx/vpx/vpx_codec.h
	3	@@ -36,8 +36,8 @@
	4	* Once initialized, the instance is manged using other functions from
	5	* the vpx_codec_* family.
	6	*/
	7	-#ifndef VPX_VPX_CODEC_H_
	8	-#define VPX_VPX_CODEC_H_
	9	+#ifndef VPX_VPX_VPX_CODEC_H_
	10	+#define VPX_VPX_VPX_CODEC_H_
	11
	12	#ifdef __cplusplus
	13	extern "C" {
	14	@@ -475,5 +475,5 @@ extern "C" {
	15	#ifdef __cplusplus
	16	}
	17	#endif
	18	-#endif // VPX_VPX_CODEC_H_
	19	+#endif // VPX_VPX_VPX_CODEC_H_
	20

Line 0 Link Here

(-)devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__decoder.h (+20 lines)
	1	--- thirdparty/libvpx/vpx/vpx_decoder.h.orig 2019-03-23 14:46:15 UTC
	2	+++ thirdparty/libvpx/vpx/vpx_decoder.h
	3	@@ -7,8 +7,8 @@
	4	* in the file PATENTS. All contributing project authors may
	5	* be found in the AUTHORS file in the root of the source tree.
	6	*/
	7	-#ifndef VPX_VPX_DECODER_H_
	8	-#define VPX_VPX_DECODER_H_
	9	+#ifndef VPX_VPX_VPX_DECODER_H_
	10	+#define VPX_VPX_VPX_DECODER_H_
	11
	12	/*!\defgroup decoder Decoder Algorithm Interface
	13	* \ingroup codec
	14	@@ -374,5 +374,5 @@ extern "C" {
	15	#ifdef __cplusplus
	16	}
	17	#endif
	18	-#endif // VPX_VPX_DECODER_H_
	19	+#endif // VPX_VPX_VPX_DECODER_H_
	20

Line 0 Link Here

(-)devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__frame__buffer.h (+19 lines)
	1	--- thirdparty/libvpx/vpx/vpx_frame_buffer.h.orig 2019-03-23 14:31:21 UTC
	2	+++ thirdparty/libvpx/vpx/vpx_frame_buffer.h
	3	@@ -8,8 +8,8 @@
	4	* be found in the AUTHORS file in the root of the source tree.
	5	*/
	6
	7	-#ifndef VPX_VPX_FRAME_BUFFER_H_
	8	-#define VPX_VPX_FRAME_BUFFER_H_
	9	+#ifndef VPX_VPX_VPX_FRAME_BUFFER_H_
	10	+#define VPX_VPX_VPX_FRAME_BUFFER_H_
	11
	12	/*!\file
	13	* \brief Describes the decoder external frame buffer interface.
	14	@@ -80,4 +80,4 @@ typedef int (*vpx_release_frame_buffer_cb_fn_t)(
	15	} // extern "C"
	16	#endif
	17
	18	-#endif // VPX_VPX_FRAME_BUFFER_H_
	19	+#endif // VPX_VPX_VPX_FRAME_BUFFER_H_

Line 0 Link Here

(-)devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__image.h (+19 lines)
	1	--- thirdparty/libvpx/vpx/vpx_image.h.orig 2019-03-23 14:18:30 UTC
	2	+++ thirdparty/libvpx/vpx/vpx_image.h
	3	@@ -13,8 +13,8 @@
	4	* \brief Describes the vpx image descriptor and associated operations
	5	*
	6	*/
	7	-#ifndef VPX_VPX_IMAGE_H_
	8	-#define VPX_VPX_IMAGE_H_
	9	+#ifndef VPX_VPX_VPX_IMAGE_H_
	10	+#define VPX_VPX_VPX_IMAGE_H_
	11
	12	#ifdef __cplusplus
	13	extern "C" {
	14	@@ -232,4 +232,4 @@ extern "C" {
	15	} // extern "C"
	16	#endif
	17
	18	-#endif // VPX_VPX_IMAGE_H_
	19	+#endif // VPX_VPX_VPX_IMAGE_H_

Lines 1-89 Link Here

(-)devel/godot/files/patch-thirdparty_rtaudio_RtAudio.cpp (-89 lines)
1	--- thirdparty/rtaudio/RtAudio.cpp.orig 2016-08-09 07:52:15 UTC
2	+++ thirdparty/rtaudio/RtAudio.cpp
3	@@ -8589,6 +8589,12 @@ bool RtApiPulse::probeDeviceOpen( unsign
4	#include <errno.h>
5	#include <math.h>
6
7	+#if defined(__FreeBSD__)
8	+#define SND_DEVICE "/dev/dsp"
9	+#else
10	+#define SND_DEVICE "/dev/mixer"
11	+#endif
12	+
13	static void ossCallbackHandler(void ptr);
14
15	// A structure to hold various information related to the OSS API
16	@@ -8615,9 +8621,11 @@ RtApiOss :: ~RtApiOss()
17
18	unsigned int RtApiOss :: getDeviceCount( void )
19	{
20	- int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
21	+ int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
22	if ( mixerfd == -1 ) {
23	- errorText_ = "RtApiOss::getDeviceCount: error opening '/dev/mixer'.";
24	+ errorText_ = "RtApiOss::getDeviceCount: error opening '";
25	+ errorText_ += SND_DEVICE;
26	+ errorText_ += "'.";
27	error( RtAudioError::WARNING );
28	return 0;
29	}
30	@@ -8639,9 +8647,11 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
31	RtAudio::DeviceInfo info;
32	info.probed = false;
33
34	- int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
35	+ int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
36	if ( mixerfd == -1 ) {
37	- errorText_ = "RtApiOss::getDeviceInfo: error opening '/dev/mixer'.";
38	+ errorText_ = "RtApiOss::getDeviceInfo: error opening '";
39	+ errorText_ += SND_DEVICE;
40	+ errorText_ += "'.";
41	error( RtAudioError::WARNING );
42	return info;
43	}
44	@@ -8697,8 +8707,10 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
45	info.nativeFormats \|= RTAUDIO_SINT8;
46	if ( mask & AFMT_S32_LE \|\| mask & AFMT_S32_BE )
47	info.nativeFormats \|= RTAUDIO_SINT32;
48	+#if defined(AFMT_FLOAT)
49	if ( mask & AFMT_FLOAT )
50	info.nativeFormats \|= RTAUDIO_FLOAT32;
51	+#endif
52	if ( mask & AFMT_S24_LE \|\| mask & AFMT_S24_BE )
53	info.nativeFormats \|= RTAUDIO_SINT24;
54
55	@@ -8757,9 +8769,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
56	RtAudioFormat format, unsigned int *bufferSize,
57	RtAudio::StreamOptions *options )
58	{
59	- int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
60	+ int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
61	if ( mixerfd == -1 ) {
62	- errorText_ = "RtApiOss::probeDeviceOpen: error opening '/dev/mixer'.";
63	+ errorText_ = "RtApiOss::probeDeviceOpen: error opening '";
64	+ errorText_ += SND_DEVICE;
65	+ errorText_ += "'.";
66	return FAILURE;
67	}
68
69	@@ -8787,7 +8801,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
70	}
71
72	oss_audioinfo ainfo;
73	+#if defined(__FreeBSD__)
74	+ ainfo.dev = -1; // specify -1 to get default device
75	+#else
76	ainfo.dev = device;
77	+#endif
78	result = ioctl( mixerfd, SNDCTL_AUDIOINFO, &ainfo );
79	close( mixerfd );
80	if ( result == -1 ) {
81	@@ -9025,7 +9043,7 @@ bool RtApiOss :: probeDeviceOpen( unsign
82	}
83
84	// Verify the sample rate setup worked.
85	- if ( abs( srate - sampleRate ) > 100 ) {
86	+ if ( abs( srate - (int)sampleRate ) > 100 ) {
87	close( fd );
88	errorStream_ << "RtApiOss::probeDeviceOpen: device (" << ainfo.name << ") does not support sample rate (" << sampleRate << ").";
89	errorText_ = errorStream_.str();

Lines 1-16 Link Here

(-)devel/godot/files/patch-thirdparty_rtaudio_RtAudio.h (-16 lines)
1	--- thirdparty/rtaudio/RtAudio.h.orig 2016-08-09 07:52:15 UTC
2	+++ thirdparty/rtaudio/RtAudio.h
3	@@ -5,7 +5,13 @@
4	#if defined(OSX_ENABLED)
5	#define __MACOSX_CORE__
6	#elif defined(UNIX_ENABLED)
7	+#if defined(OSS_ENABLED)
8	+ #define __LINUX_OSS__
9	+#elif defined(ALSA_ENABLED)
10	#define __LINUX_ALSA__
11	+#elif defined(PULSEAUDIO_ENABLED)
12	+ #define __LINUX_PULSE__
13	+#endif
14	#elif defined(WINDOWS_ENABLED)
15	#if defined(WINRT_ENABLED)
16	#define __RTAUDIO_DUMMY__