View | Details | Raw Unified | Return to bug 224604 | Differences between
and this patch

Collapse All | Expand All

(-)devel/godot/distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1485416056
1
TIMESTAMP = 1520319042
2
SHA256 (godotengine-godot-2.1.2-stable_GH0.tar.gz) = 29b3131449f8ca908be800c4c07020efaa9f90a29b6bc1be8a18a331dc34b49a
2
SHA256 (godotengine-godot-3.0.2-stable_GH0.tar.gz) = 15bc91dcbc92fe49624118678fcab119ff332dc295b25f4921700a4ee498b651
3
SIZE (godotengine-godot-2.1.2-stable_GH0.tar.gz) = 14399692
3
SIZE (godotengine-godot-3.0.2-stable_GH0.tar.gz) = 18812660
4
SHA256 (godotengine-godot-demo-projects-dfa1274_GH0.tar.gz) = 42420f7f473b1391a13f226473d1cc850605f24d2865220e4c5acde05f1c340c
4
SHA256 (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = b798d0bb56a643fdb175df463990904523495dd5546bc00bbe762e0645b7c94a
5
SIZE (godotengine-godot-demo-projects-dfa1274_GH0.tar.gz) = 18423807
5
SIZE (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = 140126782
(-)devel/godot/files/patch-drivers_SCsub (-7 / +7 lines)
Lines 1-11 Link Here
1
--- drivers/SCsub.orig	2016-11-30 21:41:21 UTC
1
--- drivers/SCsub.orig	2016-11-30 21:41:21 UTC
2
+++ drivers/SCsub
2
+++ drivers/SCsub
3
@@ -14,7 +14,7 @@ SConscript('windows/SCsub')
3
@@ -18,6 +18,8 @@ SConscript('pulseaudio/SCsub')
4
 # Sounds drivers
4
 if (env["platform"] == "windows"):
5
 SConscript('alsa/SCsub')
6
 SConscript('pulseaudio/SCsub')
7
-if (env["platform"] == "windows"):
8
+if (env["platform"] == "windows") or (env["platform"] == "x11"):
9
     SConscript("rtaudio/SCsub")
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")
10
 
11
 
11
 # Graphics drivers
(-)devel/godot/files/patch-drivers_unix_os__unix.cpp (-46 / +7 lines)
Lines 1-50 Link Here
1
--- drivers/unix/os_unix.cpp.orig	2016-08-09 07:52:15 UTC
1
--- drivers/unix/os_unix.cpp.orig	2018-02-01 19:27:25 UTC
2
+++ drivers/unix/os_unix.cpp
2
+++ drivers/unix/os_unix.cpp
3
@@ -50,6 +50,7 @@
3
@@ -235,7 +235,7 @@ OS::TimeZoneInfo OS_Unix::get_time_zone_
4
 
4
 
5
 #ifdef __FreeBSD__
5
 void OS_Unix::delay_usec(uint32_t p_usec) const {
6
 #include <sys/param.h>
7
+#include <sys/sysctl.h>
8
 #endif
9
 #include <stdarg.h>
10
 #include <sys/time.h>
11
@@ -371,17 +372,7 @@ Error OS_Unix::execute(const String& p_p
12
 			args.push_back((char*)cs[i].get_data());// shitty C cast
13
 		args.push_back(0);
14
 
6
 
15
-#ifdef __FreeBSD__
7
-	struct timespec rem = { p_usec / 1000000, (p_usec % 1000000) * 1000 };
16
-		if(p_path.find("/")) {
8
+	struct timespec rem = { time_t(p_usec) / 1000000, (long(p_usec) % 1000000) * 1000 };
17
-			// exec name contains path so use it
9
 	while (nanosleep(&rem, &rem) == EINTR) {
18
-			execv(p_path.utf8().get_data(),&args[0]);
19
-		}else{
20
-			// use program name and search through PATH to find it
21
-			execvp(getprogname(),&args[0]);
22
-		}
23
-#else
24
 		execv(p_path.utf8().get_data(),&args[0]);
25
-#endif
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());
28
 		abort();
29
@@ -503,11 +494,16 @@ String OS_Unix::get_executable_path() co
30
 	}
10
 	}
31
 	return b;
11
 }
32
 #elif defined(__FreeBSD__)
33
-	char resolved_path[MAXPATHLEN];
34
-
35
-	realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
36
-
37
-	return String(resolved_path);
38
+	int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
39
+	char buf[MAXPATHLEN];
40
+	size_t len = sizeof(buf);
41
+	if (sysctl(mib, 4, buf, &len, NULL, 0) != 0) {
42
+		WARN_PRINT("Couldn't get executable path from sysctl");
43
+		return OS::get_executable_path();
44
+	}
45
+	String b;
46
+	b.parse_utf8(buf);
47
+	return b;
48
 #elif defined(__APPLE__)
49
 	char temp_path[1];
50
 	uint32_t buff_size=1;
(-)devel/godot/files/patch-modules_mono_SCsub (+11 lines)
Line 0 Link Here
1
--- modules/mono/SCsub.orig	2018-01-03 10:12:46 UTC
2
+++ modules/mono/SCsub
3
@@ -147,7 +147,7 @@ def mono_build_solution(source, target, 
4
         msbuild_path = msbuild_info[0]
5
         framework_path_override = msbuild_info[1]
6
     else:
7
-        msbuild_path = find_msbuild_unix('msbuild')
8
+        msbuild_path = find_msbuild_unix('xbuild')
9
         if msbuild_path is None:
10
             xbuild_fallback = env['xbuild_fallback']
11
 
(-)devel/godot/files/patch-modules_speex_audio__stream__speex.cpp (-10 lines)
Lines 1-10 Link Here
1
--- modules/speex/audio_stream_speex.cpp.orig	2016-11-28 17:58:00 UTC
2
+++ modules/speex/audio_stream_speex.cpp
3
@@ -28,7 +28,6 @@
4
 /*************************************************************************/
5
 #include "audio_stream_speex.h"
6
 
7
-#include "os_support.h"
8
 #include "os/os.h"
9
 #define READ_CHUNK 1024
10
 
(-)devel/godot/files/patch-platform_x11_detect.py (-45 / +26 lines)
Lines 1-66 Link Here
1
--- platform/x11/detect.py.orig	2016-11-15 18:44:21 UTC
1
--- platform/x11/detect.py.orig	2017-12-28 05:14:45 UTC
2
+++ platform/x11/detect.py
2
+++ platform/x11/detect.py
3
@@ -31,11 +31,6 @@ def can_build():
3
@@ -52,7 +52,9 @@ def get_opts():
4
         print("X11 not found.. x11 disabled.")
4
         BoolVariable('use_static_cpp', 'Link stdc++ statically', False),
5
         return 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,7 @@ def configure(env):
15
     # FIXME: Check for existence of the libs before parsing their flags with pkg-config
6
 
16
 
7
-    ssl_error = os.system("pkg-config openssl --modversion > /dev/null ")
17
     if not env['builtin_openssl']:
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'),
18
         ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),
19
-        ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),
20
+        ('alsa','Detect & Use alsa audio','no'),
21
+        ('oss','Detect & Use OSS audio','no'),
22
+        ('pulseaudio', 'Detect & Use pulseaudio', 'no'),
23
         ('udev', 'Use udev for gamepad connection callbacks', 'no'),
24
         ('debug_release', 'Add debug symbols to release version', 'no'),
25
     ]
26
@@ -134,7 +131,7 @@ def configure(env):
27
     env.ParseConfig('pkg-config xrandr --cflags --libs')
28
 
29
     if (env['builtin_openssl'] == 'no'):
30
-        env.ParseConfig('pkg-config openssl --cflags --libs')
18
-        env.ParseConfig('pkg-config openssl --cflags --libs')
31
+        env.ParseConfig('echo -lssl -lcrypto')
19
+        env.ParseConfig('echo -lssl -lcrypto')
32
 
20
 
33
     if (env['builtin_libwebp'] == 'no'):
21
     if not env['builtin_libwebp']:
34
         env.ParseConfig('pkg-config libwebp --cflags --libs')
22
         env.ParseConfig('pkg-config libwebp --cflags --libs')
35
@@ -173,12 +170,13 @@ def configure(env):
23
@@ -226,12 +228,18 @@ def configure(env):
36
     if (env['builtin_glew'] == 'no'):
24
 
37
         env.ParseConfig('pkg-config glew --cflags --libs')
25
     ## Flags
38
 
26
 
39
-    if os.system("pkg-config --exists alsa") == 0:
27
-    if (os.system("pkg-config --exists alsa") == 0): # 0 means found
40
-        print("Enabling ALSA")
28
-        print("Enabling ALSA")
41
-        env.Append(CPPFLAGS=["-DALSA_ENABLED"])
29
-        env.Append(CPPFLAGS=["-DALSA_ENABLED"])
42
-        env.ParseConfig('pkg-config alsa --cflags --libs')
30
-        env.ParseConfig('pkg-config alsa --cflags --libs')
43
-    else:
31
-    else:
44
-        print("ALSA libraries not found, disabling driver")
32
-        print("ALSA libraries not found, disabling driver")
45
+    if (env["alsa"]=="yes"):
33
+    if env['alsa']:
46
+        if os.system("pkg-config --exists alsa")==0:
34
+        if os.system("pkg-config --exists alsa")==0:
47
+            print("Enabling ALSA")
35
+            print("Enabling ALSA")
48
+            env.Append(CPPFLAGS=["-DALSA_ENABLED"])
36
+            env.Append(CPPFLAGS=["-DALSA_ENABLED"])
49
+            env.Append(LIBS=['asound'])
37
+            env.Append(LIBS=['asound'])
50
+        else:
38
+        else:
51
+            print("ALSA libraries not found, disabling driver")
39
+            print("ALSA libraries not found, disabling driver")
52
 
40
+
53
     if (platform.system() == "Linux"):
41
+    if env['oss']:
54
         env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
55
@@ -193,6 +191,11 @@ def configure(env):
56
         else:
57
             print("libudev development libraries not found, disabling udev support")
58
 
59
+    if (env["oss"]=="yes"):
60
+        print("Enabling OSS Audio")
42
+        print("Enabling OSS Audio")
61
+        env.Append(CPPFLAGS=["-DOSS_ENABLED"])
43
+        env.Append(CPPFLAGS=["-DOSS_ENABLED"])
62
+        env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])
44
+        env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])
63
+
45
 
64
     if (env["pulseaudio"] == "yes"):
46
     if env['pulseaudio']:
65
         if not os.system("pkg-config --exists libpulse-simple"):
47
         if (os.system("pkg-config --exists libpulse-simple") == 0): # 0 means found
66
             print("Enabling PulseAudio")
(-)devel/godot/files/patch-platform_x11_os__x11.cpp (+13 lines)
Line 0 Link Here
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
(-)devel/godot/files/patch-platform_x11_os__x11.h (+21 lines)
Line 0 Link Here
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;
(-)devel/godot/files/patch-scene_gui_rich__text__label.cpp (+14 lines)
Line 0 Link Here
1
--- scene/gui/rich_text_label.cpp.orig	2018-01-10 13:20:47 UTC
2
+++ scene/gui/rich_text_label.cpp
3
@@ -806,9 +806,9 @@ void RichTextLabel::_gui_input(Ref<Input
4
 							// Erase previous selection.
5
 							if (selection.active) {
6
 								selection.from = NULL;
7
-								selection.from_char = NULL;
8
+								selection.from_char = 0;
9
 								selection.to = NULL;
10
-								selection.to_char = NULL;
11
+								selection.to_char = 0;
12
 								selection.active = false;
13
 
14
 								update();
(-)devel/godot/files/patch-SConstruct (-17 / +18 lines)
Lines 1-7 Link Here
1
--- SConstruct.orig	2016-11-15 18:44:21 UTC
1
--- SConstruct.orig	2017-12-28 05:14:45 UTC
2
+++ SConstruct
2
+++ SConstruct
3
@@ -65,7 +65,7 @@ elif (os.name == "nt"):
3
@@ -68,7 +68,7 @@ elif (os.name == "nt"):
4
     if (os.getenv("VSINSTALLDIR") == None or platform_arg == "android"):
4
     if (os.getenv("VCINSTALLDIR") == None or platform_arg == "android" or platform_arg == "javascript"):
5
         custom_tools = ['mingw']
5
         custom_tools = ['mingw']
6
 
6
 
7
-env_base = Environment(tools=custom_tools)
7
-env_base = Environment(tools=custom_tools)
Lines 9-36 Link Here
9
 if 'TERM' in os.environ:
9
 if 'TERM' in os.environ:
10
     env_base['ENV']['TERM'] = os.environ['TERM']
10
     env_base['ENV']['TERM'] = os.environ['TERM']
11
 env_base.AppendENVPath('PATH', os.getenv('PATH'))
11
 env_base.AppendENVPath('PATH', os.getenv('PATH'))
12
@@ -247,15 +247,16 @@ if selected_platform in platform_list:
12
@@ -297,17 +297,20 @@ if selected_platform in platform_list:
13
     if env["extra_suffix"] != '':
13
     if env["extra_suffix"] != '':
14
         env.extra_suffix += '.' + env["extra_suffix"]
14
         env.extra_suffix += '.' + env["extra_suffix"]
15
 
15
 
16
-    CCFLAGS = env.get('CCFLAGS', '')
16
-    CCFLAGS = env.get('CCFLAGS', '')
17
-    env['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']
18
+    env['CC'] = os.environ['CC']
25
+    env['CXX'] = os.environ['CXX']
19
+    env['CXX'] = os.environ['CXX']
26
+    
20
+
27
+    CFLAGS = os.environ['CFLAGS']
28
+    env['CFLAGS'] = []
29
     env.Append(CFLAGS=string.split(str(CFLAGS)))
30
+    
31
+    CCFLAGS = os.environ['CXXFLAGS']
21
+    CCFLAGS = os.environ['CXXFLAGS']
32
+    env['CCFLAGS'] = []
22
+    env['CCFLAGS'] = []
33
+    env.Append(CCFLAGS=string.split(str(CCFLAGS)))
34
 
23
 
35
     LINKFLAGS = env.get('LINKFLAGS', '')
24
     env.Append(CCFLAGS=str(CCFLAGS).split())
25
 
26
-    CFLAGS = env.get('CFLAGS', '')
27
-    env['CFLAGS'] = ''
28
+    CFLAGS = os.environ['CFLAGS']
29
+    env['CFLAGS'] = []
30
 
31
     env.Append(CFLAGS=str(CFLAGS).split())
32
 
33
-    LINKFLAGS = env.get('LINKFLAGS', '')
34
+    LINKFLAGS = os.environ['LDFLAGS']
36
     env['LINKFLAGS'] = ''
35
     env['LINKFLAGS'] = ''
36
 
37
     env.Append(LINKFLAGS=str(LINKFLAGS).split())
(-)devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp (+22 lines)
Line 0 Link Here
1
--- thirdparty/thekla_atlas/nvcore/Memory.cpp.orig	2017-12-29 15:53:28 UTC
2
+++ thirdparty/thekla_atlas/nvcore/Memory.cpp
3
@@ -6,10 +6,6 @@
4
 
5
 #include <stdlib.h>
6
 
7
-#ifdef NV_OS_LINUX
8
-#include <malloc.h>
9
-#endif
10
-
11
 #define USE_EFENCE 0
12
 
13
 #if USE_EFENCE
14
@@ -130,7 +126,7 @@ void * nv::aligned_malloc(size_t size, s
15
 
16
 #if NV_OS_WIN32 || NV_OS_DURANGO
17
     return _aligned_malloc(size, alignment);
18
-#elif NV_OS_DARWIN && !NV_OS_IOS
19
+#elif (NV_OS_FREEBSD || NV_OS_DARWIN) && !NV_OS_IOS
20
     void * ptr = NULL;
21
     posix_memalign(&ptr, alignment, size);
22
     return ptr;
(-)devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h (+40 lines)
Line 0 Link Here
1
--- thirdparty/thekla_atlas/nvcore/StdStream.h.orig	2017-12-29 19:15:48 UTC
2
+++ thirdparty/thekla_atlas/nvcore/StdStream.h
3
@@ -160,14 +160,14 @@ namespace nv
4
             nvDebugCheck(m_fp != NULL);
5
 #if NV_OS_WIN32
6
             return (uint)_fwrite_nolock(data, 1, len, m_fp);
7
-#elif NV_OS_LINUX
8
-            return (uint)fwrite_unlocked(data, 1, len, m_fp);
9
-#elif NV_OS_DARWIN
10
+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
11
             // @@ No error checking, always returns len.
12
             for (uint i = 0; i < len; i++) {
13
                 putc_unlocked(((char *)data)[i], m_fp);
14
             }
15
             return len;
16
+#elif NV_OS_LINUX
17
+            return (uint)fwrite_unlocked(data, 1, len, m_fp);
18
 #else
19
             return (uint)fwrite(data, 1, len, m_fp);
20
 #endif
21
@@ -210,9 +210,7 @@ namespace nv
22
             nvDebugCheck(m_fp != NULL);
23
 #if NV_OS_WIN32
24
             return (uint)_fread_nolock(data, 1, len, m_fp);
25
-#elif NV_OS_LINUX
26
-            return (uint)fread_unlocked(data, 1, len, m_fp);
27
-#elif NV_OS_DARWIN
28
+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
29
             // This is rather lame. Not sure if it's faster than the locked version.
30
             for (uint i = 0; i < len; i++) {
31
                 ((char *)data)[i] = getc_unlocked(m_fp);
32
@@ -221,6 +219,8 @@ namespace nv
33
                 }
34
             }
35
             return len;
36
+#elif NV_OS_LINUX
37
+            return (uint)fread_unlocked(data, 1, len, m_fp);
38
 #else
39
             return (uint)fread(data, 1, len, m_fp);
40
 #endif
(-)devel/godot/Makefile (-30 / +40 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	godot
4
PORTNAME=	godot
5
PORTVERSION=	2.1.2
5
PORTVERSION=	3.0.2
6
PORTREVISION=	3
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 13-27 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
18
BROKEN_SSL=	openssl-devel
19
BROKEN_SSL_REASON_openssl-devel=	member access into incomplete type 'BIO' (aka 'bio_st')
20
16
17
BUILD_DEPENDS=	yasm:devel/yasm
21
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
18
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
22
		libpng.so:graphics/png \
19
		libpng.so:graphics/png
23
		libmpcdec.so:audio/musepack \
24
		libspeex.so:audio/speex
25
RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
20
RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
26
		xdg-open:devel/xdg-utils \
21
		xdg-open:devel/xdg-utils \
27
		xmessage:x11/xmessage
22
		xmessage:x11/xmessage
Lines 29-51 Link Here
29
USE_GITHUB=	yes
24
USE_GITHUB=	yes
30
GH_ACCOUNT=	godotengine
25
GH_ACCOUNT=	godotengine
31
26
32
USES=		compiler:c++11-lib pkgconfig scons ssl
27
# on 10.4 using clang34 fails - so we want to use clang50
33
USE_XORG=	x11 xcursor xinerama xrandr
28
# gl already needs clang50 so this shouldn't add any overhead
34
USE_GL=		gl
29
USES=		compiler:c++14-lang pkgconfig scons ssl
35
30
USE_XORG=	x11 xcursor xi xinerama xrandr
36
MAKE_ARGS+=	platform=x11 builtin_speex=no builtin_libmpcdec=no
31
USE_GL=		gl glew glu
37
MAKE_ARGS+=	${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
32
38
MAKE_ARGS_clang=	use_llvm=yes
33
MAKE_ARGS+=		platform=x11 builtin_libpng=False builtin_openssl=False
39
CXXFLAGS+=	-DGLEW_NO_GLU -DRTAUDIO_ENABLED
34
MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
40
CXXFLAGS_i386=	${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
35
MAKE_ARGS_clang=	use_llvm=True
36
CXXFLAGS+=		-DRTAUDIO_ENABLED
37
CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
41
CXXFLAGS_i386_gcc=	-march=i586
38
CXXFLAGS_i386_gcc=	-march=i586
42
CXXFLAGS_aarch64=	-DNO_THREADS
39
CXXFLAGS_aarch64=	-DNO_THREADS
43
CXXFLAGS_sparc64=	-DNO_THREADS
40
CXXFLAGS_sparc64=	-DNO_THREADS
44
CXXFLAGS_mips=		-DNO_THREADS
41
CXXFLAGS_mips=		-DNO_THREADS
45
CXXFLAGS_mips64=	-DNO_THREADS
42
CXXFLAGS_mips64=	-DNO_THREADS
46
LDFLAGS+=	-lspeex -lmpcdec
47
43
48
OPTIONS_DEFINE=	EXAMPLES TOOLS
44
# option MONO can be built but is not stable enough to use yet
45
# for now leave it out as an option
46
OPTIONS_DEFINE=		EXAMPLES TOOLS
49
OPTIONS_DEFAULT=	OSS
47
OPTIONS_DEFAULT=	OSS
50
# Moved to devel/godot-tools
48
# Moved to devel/godot-tools
51
OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
49
OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
Lines 54-77 Link Here
54
52
55
AUDIO_DESC=		Audio support
53
AUDIO_DESC=		Audio support
56
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
54
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
57
ALSA_MAKE_ARGS=		alsa=yes
55
ALSA_MAKE_ARGS=		alsa=True
58
EXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
56
EXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
59
# Branch HEAD for PORTVERSION
57
# master at 31/1
60
EXAMPLES_GH_TAGNAME=	dfa1274:DEMOS
58
EXAMPLES_GH_TAGNAME=	d69cc10a0b8a:DEMOS
61
EXAMPLES_PORTEXAMPLES=	*
59
EXAMPLES_PORTEXAMPLES=	*
62
OSS_MAKE_ARGS=		oss=yes
60
# while mono support can build it isn't stable enough to be used yet
61
MONO_LIB_DEPENDS=	libmonosgen-2.0.so:lang/mono
62
MONO_MAKE_ARGS=		module_mono_enabled=True
63
OSS_MAKE_ARGS=		oss=True
63
PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
64
PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
64
PULSEAUDIO_MAKE_ARGS=	pulseaudio=yes
65
PULSEAUDIO_MAKE_ARGS=	pulseaudio=True
65
TOOLS_DESC=	Include development tools (IDE)
66
TOOLS_DESC=		Include development tools (IDE)
66
TOOLS_MAKE_ARGS=	target=release_debug tools=yes
67
TOOLS_MAKE_ARGS=	target=release_debug tools=True
67
TOOLS_MAKE_ARGS_OFF=	target=release tools=no
68
TOOLS_MAKE_ARGS_OFF=	target=release tools=False
68
TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
69
TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
69
			"${GODOTFILE}" "Development;IDE;" ""
70
			"${GODOTFILE}" "Development;IDE;" ""
70
TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
71
TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
71
			share/pixmaps/${GODOTFILE}.svg
72
			share/pixmaps/${GODOTFILE}.svg
72
73
73
GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
74
GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
74
PLIST_FILES=	bin/${GODOTFILE}
75
PLIST_FILES=		bin/${GODOTFILE}
75
76
76
.ifmake makesum
77
.ifmake makesum
77
# Always include optional distfiles
78
# Always include optional distfiles
Lines 84-93 Link Here
84
	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
85
	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
85
		${WRKSRC}/platform/x11/os_x11.cpp
86
		${WRKSRC}/platform/x11/os_x11.cpp
86
87
88
pre-build-MONO-on:
89
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
90
		${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \
91
		target=release_debug tools=True mono_glue=False)
92
	@(cd ${WRKSRC} && ${FIND} ${WRKSRC}/bin -name 'godot*' -exec {} \
93
		--generate-mono-glue modules/mono/glue \; && \
94
		${FIND} ${WRKSRC}/bin -name 'godot*' -delete)
95
87
# The official godot binary name reflects options used to compile
96
# The official godot binary name reflects options used to compile
88
# We just want a simple name matching the portname
97
# We just want a simple name matching the portname
89
# This gives us bin/godot for runtime and bin/godot-tools for the IDE
98
# This gives us bin/godot for runtime and bin/godot-tools for the IDE
90
do-install:
99
do-install:
100
	@${RM} ${WRKSRC}/bin/*.debugsymbols
91
	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
101
	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
92
		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
102
		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
93
103

Return to bug 224604