Date: Thu, 20 Sep 2018 00:57:43 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480149 - in head/devel/godot2: . files Message-ID: <201809200057.w8K0vhO9023035@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Thu Sep 20 00:57:43 2018 New Revision: 480149 URL: https://svnweb.freebsd.org/changeset/ports/480149 Log: devel/godot2: update to 2.1.5 PR: 231316 Submitted by: Shane <FreeBSD@ShaneWare.Biz> (maintainer) Deleted: head/devel/godot2/files/patch-core_image.cpp head/devel/godot2/files/patch-core_ustring.cpp head/devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp head/devel/godot2/files/patch-platform_x11_os__x11.cpp head/devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp head/devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp head/devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp Modified: head/devel/godot2/Makefile (contents, props changed) head/devel/godot2/distinfo (contents, props changed) head/devel/godot2/files/patch-SConstruct (contents, props changed) head/devel/godot2/files/patch-platform_x11_detect.py (contents, props changed) Modified: head/devel/godot2/Makefile ============================================================================== --- head/devel/godot2/Makefile Thu Sep 20 00:54:30 2018 (r480148) +++ head/devel/godot2/Makefile Thu Sep 20 00:57:43 2018 (r480149) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= godot -PORTVERSION= 2.1.4 +PORTVERSION= 2.1.5 DISTVERSIONSUFFIX= -stable -PORTREVISION= 2 CATEGORIES= devel games PKGNAMESUFFIX?= 2 @@ -25,7 +24,7 @@ RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \ 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 @@ -54,6 +53,7 @@ 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 @@ -61,6 +61,7 @@ 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 \ Modified: head/devel/godot2/distinfo ============================================================================== --- head/devel/godot2/distinfo Thu Sep 20 00:54:30 2018 (r480148) +++ head/devel/godot2/distinfo Thu Sep 20 00:57:43 2018 (r480149) @@ -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 Modified: head/devel/godot2/files/patch-SConstruct ============================================================================== --- head/devel/godot2/files/patch-SConstruct Thu Sep 20 00:54:30 2018 (r480148) +++ head/devel/godot2/files/patch-SConstruct Thu Sep 20 00:57:43 2018 (r480149) @@ -9,24 +9,25 @@ 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'] = [] Modified: head/devel/godot2/files/patch-platform_x11_detect.py ============================================================================== --- head/devel/godot2/files/patch-platform_x11_detect.py Thu Sep 20 00:54:30 2018 (r480148) +++ head/devel/godot2/files/patch-platform_x11_detect.py Thu Sep 20 00:57:43 2018 (r480149) @@ -1,4 +1,4 @@ ---- 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'), @@ -10,8 +10,8 @@ + ('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"): @@ -22,45 +22,34 @@ 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 @@ -71,7 +60,7 @@ 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') @@ -91,7 +80,7 @@ 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")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809200057.w8K0vhO9023035>