Index: head/devel/godot2/Makefile =================================================================== --- head/devel/godot2/Makefile (revision 480148) +++ head/devel/godot2/Makefile (revision 480149) @@ -1,102 +1,103 @@ # Created by: Shane Ambler # $FreeBSD$ PORTNAME= godot -PORTVERSION= 2.1.4 +PORTVERSION= 2.1.5 DISTVERSIONSUFFIX= -stable -PORTREVISION= 2 CATEGORIES= devel games PKGNAMESUFFIX?= 2 MAINTAINER= FreeBSD@Shaneware.biz COMMENT?= Game runtime engine LICENSE= MIT CC-BY-3.0 LICENSE_COMB= multi LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LOGO_LICENSE.md LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ 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 USES= compiler:c++11-lib pkgconfig scons ssl -USE_XORG= x11 xcursor xinerama xrandr +USE_XORG= x11 xcursor xi xinerama xrandr USE_GL= gl glu USE_GITHUB= yes GH_ACCOUNT= godotengine MAKE_ARGS+= platform=x11 builtin_speex=no builtin_libmpcdec=no MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}} MAKE_ARGS_clang= use_llvm=yes CXXFLAGS+= -DGLEW_NO_GLU -DRTAUDIO_ENABLED CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_i386_gcc= -march=i586 CXXFLAGS_aarch64= -DNO_THREADS CXXFLAGS_sparc64= -DNO_THREADS CXXFLAGS_mips= -DNO_THREADS CXXFLAGS_mips64= -DNO_THREADS LDFLAGS+= -lspeex -lmpcdec OPTIONS_DEFINE= EXAMPLES TOOLS OPTIONS_DEFAULT= OSS # Moved to devel/godot-tools OPTIONS_EXCLUDE?= EXAMPLES TOOLS 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 +EXAMPLES_GH_TAGNAME= 2.1.4-stable:DEMOS EXAMPLES_PORTEXAMPLES= * OSS_MAKE_ARGS= oss=yes PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_MAKE_ARGS= pulseaudio=yes TOOLS_DESC= Include development tools (IDE) TOOLS_MAKE_ARGS= target=release_debug tools=yes TOOLS_MAKE_ARGS_OFF= target=release tools=no +TOOLS_LDFLAGS= -lexecinfo TOOLS_DESKTOP_ENTRIES= "Godot-v2" "${COMMENT}" "${GODOTFILE}" \ "${GODOTFILE}" "Development;IDE;" "" TOOLS_PLIST_FILES= share/pixmaps/${GODOTFILE}.png \ share/pixmaps/${GODOTFILE}.svg GODOTFILE= ${PORTNAME}${PKGNAMESUFFIX} PLIST_FILES= bin/${GODOTFILE} # rename to prevent conflict with godot v3 EXAMPLESDIR= ${PREFIX}/share/examples/godot2 .ifmake makesum # Always include optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE= .endif post-patch: @${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \ ${WRKSRC}/methods.py @${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \ ${WRKSRC}/platform/x11/os_x11.cpp # The official godot binary name reflects options used to compile # We just want a simple name matching the portname # This gives us bin/godot for runtime and bin/godot-tools for the IDE do-install: cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \ ${STAGEDIR}/${PREFIX}/bin/${GODOTFILE} do-install-EXAMPLES-on: (cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \ ${STAGEDIR}${EXAMPLESDIR}) do-install-TOOLS-on: ${INSTALL_DATA} ${WRKSRC}/icon.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png ${INSTALL_DATA} ${WRKSRC}/icon.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg .include Index: head/devel/godot2/distinfo =================================================================== --- head/devel/godot2/distinfo (revision 480148) +++ head/devel/godot2/distinfo (revision 480149) @@ -1,5 +1,5 @@ -TIMESTAMP = 1514402523 -SHA256 (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 07cf3b01367d5ea53805f144bc60711bd79efb53f1f88d57d6a706e6944de8d7 -SIZE (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 14811915 +TIMESTAMP = 1536385697 +SHA256 (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 74179c08bcc20cc89b4ac2785a31f201d81eb4aa875c80ffcb82d9fb80e8e187 +SIZE (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 15026226 SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75 SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045 Index: head/devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp =================================================================== --- head/devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp (revision 480148) +++ head/devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp (nonexistent) @@ -1,30 +0,0 @@ ---- drivers/gles2/rasterizer_gles2.cpp.orig 2018-01-10 11:36:45 UTC -+++ drivers/gles2/rasterizer_gles2.cpp -@@ -2135,9 +2135,9 @@ Error RasterizerGLES2::_surface_set_arra - for (int i = 0; i < p_surface->array_len; i++) { - - GLbyte vector[4] = { -- CLAMP(src[i].x * 127, -128, 127), -- CLAMP(src[i].y * 127, -128, 127), -- CLAMP(src[i].z * 127, -128, 127), -+ static_castCLAMP(src[i].x * 127, -128, 127), -+ static_castCLAMP(src[i].y * 127, -128, 127), -+ static_castCLAMP(src[i].z * 127, -128, 127), - 0, - }; - -@@ -2169,10 +2169,10 @@ Error RasterizerGLES2::_surface_set_arra - for (int i = 0; i < p_surface->array_len; i++) { - - GLbyte xyzw[4] = { -- CLAMP(src[i * 4 + 0] * 127, -128, 127), -- CLAMP(src[i * 4 + 1] * 127, -128, 127), -- CLAMP(src[i * 4 + 2] * 127, -128, 127), -- CLAMP(src[i * 4 + 3] * 127, -128, 127) -+ static_castCLAMP(src[i * 4 + 0] * 127, -128, 127), -+ static_castCLAMP(src[i * 4 + 1] * 127, -128, 127), -+ static_castCLAMP(src[i * 4 + 2] * 127, -128, 127), -+ static_castCLAMP(src[i * 4 + 3] * 127, -128, 127) - }; - - copymem(&p_mem[a.ofs + i * stride], xyzw, a.size); Property changes on: head/devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp =================================================================== --- head/devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp (revision 480148) +++ head/devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- servers/spatial_sound/spatial_sound_server_sw.cpp.orig 2018-01-10 16:17:16 UTC -+++ servers/spatial_sound/spatial_sound_server_sw.cpp -@@ -689,7 +689,7 @@ bool SpatialSoundServerSW::internal_buff - case 2: { - - float p = sd.panning.x * 0.5 + 0.5; -- float panf[2] = { (1.0 - p), p }; -+ float panf[2] = { (1.0f - p), p }; - panf[0] *= sd.volume; - panf[1] *= sd.volume; - -@@ -740,7 +740,7 @@ bool SpatialSoundServerSW::internal_buff - - float xp = sd.panning.x * 0.5 + 0.5; - float yp = sd.panning.y * 0.5 + 0.5; -- float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) }; -+ float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) }; - panf[0] *= sd.volume; - panf[1] *= sd.volume; - panf[2] *= sd.volume; Property changes on: head/devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/godot2/files/patch-platform_x11_os__x11.cpp =================================================================== --- head/devel/godot2/files/patch-platform_x11_os__x11.cpp (revision 480148) +++ head/devel/godot2/files/patch-platform_x11_os__x11.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- platform/x11/os_x11.cpp.orig 2018-01-10 10:08:3 UTC -+++ platform/x11/os_x11.cpp -@@ -1243,7 +1243,7 @@ static Property read_property(Display *p - - } while (bytes_after != 0); - -- Property p = { ret, actual_format, nitems, actual_type }; -+ Property p = { ret, actual_format, (int)nitems, actual_type }; - - return p; - } Property changes on: head/devel/godot2/files/patch-platform_x11_os__x11.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/godot2/files/patch-core_image.cpp =================================================================== --- head/devel/godot2/files/patch-core_image.cpp (revision 480148) +++ head/devel/godot2/files/patch-core_image.cpp (nonexistent) @@ -1,35 +0,0 @@ ---- core/image.cpp.orig 2018-01-10 18:34:14 UTC -+++ core/image.cpp -@@ -1518,8 +1518,8 @@ Error Image::_decompress_bc() { - col_b |= src[2]; - - uint8_t table[4][4] = { -- { (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 }, -- { (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 }, -+ { static_cast((col_a >> 11) << 3), static_cast(((col_a >> 5) & 0x3f) << 2), static_cast(((col_a)&0x1f) << 3), 255 }, -+ { static_cast((col_b >> 11) << 3), static_cast(((col_b >> 5) & 0x3f) << 2), static_cast(((col_b)&0x1f) << 3), 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 } - }; -@@ -1611,8 +1611,8 @@ Error Image::_decompress_bc() { - col_b |= src[8 + 2]; - - uint8_t table[4][4] = { -- { (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 }, -- { (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 }, -+ { static_cast((col_a >> 11) << 3), static_cast(((col_a >> 5) & 0x3f) << 2), static_cast(((col_a)&0x1f) << 3), 255 }, -+ { static_cast((col_b >> 11) << 3), static_cast(((col_b >> 5) & 0x3f) << 2), static_cast(((col_b)&0x1f) << 3), 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 } - }; -@@ -1722,8 +1722,8 @@ Error Image::_decompress_bc() { - col_b |= src[8 + 2]; - - uint8_t table[4][4] = { -- { (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 }, -- { (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 }, -+ { static_cast((col_a >> 11) << 3), static_cast(((col_a >> 5) & 0x3f) << 2), static_cast(((col_a)&0x1f) << 3), 255 }, -+ { static_cast((col_b >> 11) << 3), static_cast(((col_b >> 5) & 0x3f) << 2), static_cast(((col_b)&0x1f) << 3), 255 }, - { 0, 0, 0, 255 }, - { 0, 0, 0, 255 } - }; Property changes on: head/devel/godot2/files/patch-core_image.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp =================================================================== --- head/devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp (revision 480148) +++ head/devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp.orig 2018-01-10 18:13:07 UTC -+++ servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp -@@ -675,7 +675,7 @@ bool SpatialSound2DServerSW::internal_bu - case 2: { - - float p = sd.panning.x * 0.5 + 0.5; -- float panf[2] = { (1.0 - p), p }; -+ float panf[2] = { (1.0f - p), p }; - panf[0] *= sd.volume; - panf[1] *= sd.volume; - -@@ -726,7 +726,7 @@ bool SpatialSound2DServerSW::internal_bu - - float xp = sd.panning.x * 0.5 + 0.5; - float yp = sd.panning.y * 0.5 + 0.5; -- float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) }; -+ float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) }; - panf[0] *= sd.volume; - panf[1] *= sd.volume; - panf[2] *= sd.volume; Property changes on: head/devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/godot2/files/patch-core_ustring.cpp =================================================================== --- head/devel/godot2/files/patch-core_ustring.cpp (revision 480148) +++ head/devel/godot2/files/patch-core_ustring.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- core/ustring.cpp.orig 2018-01-10 18:53:28 UTC -+++ core/ustring.cpp -@@ -3199,7 +3199,7 @@ String String::http_unescape() const { - if ((ord1 >= '0' && ord1 <= '9') || (ord1 >= 'A' && ord1 <= 'Z')) { - CharType ord2 = ord_at(i + 2); - if ((ord2 >= '0' && ord2 <= '9') || (ord2 >= 'A' && ord2 <= 'Z')) { -- char bytes[2] = { ord1, ord2 }; -+ char bytes[2] = { static_cast(ord1), static_cast(ord2) }; - res += (char)strtol(bytes, NULL, 16); - i += 2; - } Property changes on: head/devel/godot2/files/patch-core_ustring.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp =================================================================== --- head/devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp (revision 480148) +++ head/devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp (nonexistent) @@ -1,24 +0,0 @@ ---- servers/audio/audio_mixer_sw.cpp.orig 2018-01-10 15:33:12 UTC -+++ servers/audio/audio_mixer_sw.cpp -@@ -280,7 +280,7 @@ void AudioMixerSW::mix_channel(Channel & - //stereo pan - float pan = c.pan * 0.5 + 0.5; - float panv[2] = { -- (1.0 - pan) * (1 << MIX_VOL_FRAC_BITS), -+ (1.0f - pan) * (1 << MIX_VOL_FRAC_BITS), - (pan) * (1 << MIX_VOL_FRAC_BITS) - }; - -@@ -297,9 +297,9 @@ void AudioMixerSW::mix_channel(Channel & - float pany = c.depth * 0.5 + 0.5; - // with this model every speaker plays at 0.25 energy at the center.. i'm not sure if it's correct but it seems to be balanced - float panv[4] = { -- (1.0 - pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS), -- (1.0 - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS), -- (pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS), -+ (1.0f - pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS), -+ (1.0f - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS), -+ (pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS), - (pany) * (panx) * (1 << MIX_VOL_FRAC_BITS) - }; - Property changes on: head/devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/godot2/files/patch-SConstruct =================================================================== --- head/devel/godot2/files/patch-SConstruct (revision 480148) +++ head/devel/godot2/files/patch-SConstruct (revision 480149) @@ -1,36 +1,37 @@ --- SConstruct.orig 2016-11-15 18:44:21 UTC +++ SConstruct @@ -65,7 +65,7 @@ elif (os.name == "nt"): if (os.getenv("VSINSTALLDIR") == None or platform_arg == "android"): custom_tools = ['mingw'] -env_base = Environment(tools=custom_tools) +env_base = Environment(tools=custom_tools, ENV = os.environ) if 'TERM' in os.environ: env_base['ENV']['TERM'] = os.environ['TERM'] env_base.AppendENVPath('PATH', os.getenv('PATH')) -@@ -247,15 +247,16 @@ if selected_platform in platform_list: +@@ -272,15 +272,16 @@ if selected_platform in platform_list: if env["extra_suffix"] != '': env.extra_suffix += '.' + env["extra_suffix"] - CCFLAGS = env.get('CCFLAGS', '') - env['CCFLAGS'] = '' - -- env.Append(CCFLAGS=string.split(str(CCFLAGS))) +- env.Append(CCFLAGS=str(CCFLAGS).split()) - - CFLAGS = env.get('CFLAGS', '') - env['CFLAGS'] = '' - +- env.Append(CFLAGS=str(CFLAGS).split()) + env['CC'] = os.environ['CC'] + env['CXX'] = os.environ['CXX'] + + CFLAGS = os.environ['CFLAGS'] + env['CFLAGS'] = [] - env.Append(CFLAGS=string.split(str(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'] = '' Index: head/devel/godot2/files/patch-platform_x11_detect.py =================================================================== --- head/devel/godot2/files/patch-platform_x11_detect.py (revision 480148) +++ head/devel/godot2/files/patch-platform_x11_detect.py (revision 480149) @@ -1,105 +1,94 @@ ---- platform/x11/detect.py.orig 2017-08-28 01:55:12 UTC +--- platform/x11/detect.py.orig 2018-07-29 00:47:52 UTC +++ platform/x11/detect.py @@ -56,7 +56,9 @@ def get_opts(): ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'), ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'), ('use_lto', 'Use link time optimization', 'no'), - ('pulseaudio', 'Detect & Use pulseaudio', 'yes'), + ('alsa','Detect & Use alsa audio','no'), + ('oss','Detect & Use OSS audio','no'), + ('pulseaudio', 'Detect & Use pulseaudio', 'no'), ('udev', 'Use udev for gamepad connection callbacks', 'no'), ('debug_release', 'Add debug symbols to release version', 'no'), - ] -@@ -84,10 +86,6 @@ def configure(env): + ('touch', 'Enable touch events', 'yes'), +@@ -85,10 +87,6 @@ def configure(env): env.Append(CPPPATH=['#platform/x11']) if (env["use_llvm"] == "yes"): - if 'clang++' not in env['CXX']: - env["CC"] = "clang" - env["CXX"] = "clang++" - env["LD"] = "clang++" env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND']) env.extra_suffix = ".llvm" elif (os.system("gcc --version > /dev/null 2>&1") == 0): # GCC -@@ -125,19 +123,16 @@ def configure(env): +@@ -126,19 +124,14 @@ def configure(env): env.Append(LINKFLAGS=['-pipe']) if (env["target"] == "release"): - env.Prepend(CCFLAGS=['-Ofast']) - if (env["debug_release"] == "yes"): - env.Prepend(CCFLAGS=['-g2']) -+ + pass elif (env["target"] == "release_debug"): - +- - env.Prepend(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED']) - if (env["debug_release"] == "yes"): - env.Prepend(CCFLAGS=['-g2']) +- + env.Prepend(CCFLAGS=['-DDEBUG_ENABLED']) - ++ elif (env["target"] == "debug"): - env.Prepend(CCFLAGS=['-g2', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED']) + env.Prepend(CCFLAGS=['-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED']) + env.Append(LINKFLAGS=['-rdynamic']) env.ParseConfig('pkg-config x11 --cflags --libs') - env.ParseConfig('pkg-config xinerama --cflags --libs') -@@ -148,13 +143,22 @@ def configure(env): - # Currently not compatible with OpenSSL 1.1.0+ - # https://github.com/godotengine/godot/issues/8624 - import subprocess -- openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n') -+ try: -+ openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n') -+ except: -+ # approx base openssl version -+ openssl_version = '1.0.2' - if (openssl_version >= "1.1.0"): - print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version) - print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n") - sys.exit(255) +@@ -155,7 +148,12 @@ def configure(env): + env.Append(CPPFLAGS=['-DTOUCH_ENABLED']) + if (env['builtin_openssl'] == 'no'): - 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 (env['builtin_libwebp'] == 'no'): env.ParseConfig('pkg-config libwebp --cflags --libs') -@@ -199,12 +203,13 @@ def configure(env): +@@ -200,12 +198,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"]) -@@ -219,6 +224,11 @@ def configure(env): +@@ -220,6 +219,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")