Date: Thu, 18 Apr 2019 19:45:12 +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: r499312 - in head/devel/godot: . files Message-ID: <201904181945.x3IJjC5Z041318@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Thu Apr 18 19:45:12 2019 New Revision: 499312 URL: https://svnweb.freebsd.org/changeset/ports/499312 Log: devel/godot: update to 3.1 PR: 236731 Submitted by: Shane <FreeBSD@ShaneWare.Biz> (maintainer) Added: head/devel/godot/files/patch-modules_webm_libvpx_SCsub (contents, props changed) head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__codec.h (contents, props changed) head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__decoder.h (contents, props changed) head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__frame__buffer.h (contents, props changed) head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__image.h (contents, props changed) Deleted: head/devel/godot/files/patch-drivers_SCsub head/devel/godot/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp head/devel/godot/files/patch-platform_x11_detect.py head/devel/godot/files/patch-platform_x11_os__x11.cpp head/devel/godot/files/patch-platform_x11_os__x11.h head/devel/godot/files/patch-thirdparty_rtaudio_RtAudio.cpp head/devel/godot/files/patch-thirdparty_rtaudio_RtAudio.h head/devel/godot/files/patch-thirdparty_zstd_SCsub Modified: head/devel/godot/Makefile (contents, props changed) head/devel/godot/distinfo (contents, props changed) head/devel/godot/files/patch-modules_enet_SCsub (contents, props changed) head/devel/godot/files/patch-modules_squish_SCsub (contents, props changed) Modified: head/devel/godot/Makefile ============================================================================== --- head/devel/godot/Makefile Thu Apr 18 19:42:39 2019 (r499311) +++ head/devel/godot/Makefile Thu Apr 18 19:45:12 2019 (r499312) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= godot -PORTVERSION= 3.0.6 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -stable +PORTVERSION= 3.1 +DISTVERSIONSUFFIX= -stable CATEGORIES= devel games MAINTAINER= FreeBSD@Shaneware.biz @@ -27,10 +26,8 @@ RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \ 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 +USE_XORG= x11 xcursor xi xinerama xrandr xrender USE_GL= gl glew glu USE_GITHUB= yes @@ -47,27 +44,27 @@ CXXFLAGS_sparc64= -DNO_THREADS CXXFLAGS_mips= -DNO_THREADS CXXFLAGS_mips64= -DNO_THREADS -# option MONO can be built but is not stable enough to use yet -# for now leave it out as an option +# option MONO doesn't build (needs 5.12+) so for now leave it out as an option OPTIONS_DEFINE= EXAMPLES TOOLS -OPTIONS_DEFAULT= OSS +OPTIONS_DEFAULT= ALSA # Moved to devel/godot-tools OPTIONS_EXCLUDE?= EXAMPLES TOOLS OPTIONS_GROUP= AUDIO -OPTIONS_GROUP_AUDIO= ALSA OSS PULSEAUDIO +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 31/1 -EXAMPLES_GH_TAGNAME= d69cc10a0b8a:DEMOS +# master at 23/3 +EXAMPLES_GH_TAGNAME= 17e80079e3fc:DEMOS EXAMPLES_PORTEXAMPLES= * -# while mono support can build it isn't stable enough to be used yet -MONO_LIB_DEPENDS= libmonosgen-2.0.so:lang/mono -MONO_MAKE_ARGS= module_mono_enabled=True -OSS_MAKE_ARGS= oss=True -PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio +# 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 @@ -91,7 +88,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \ ${WRKSRC}/platform/x11/os_x11.cpp -pre-build-MONO-on: +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) Modified: head/devel/godot/distinfo ============================================================================== --- head/devel/godot/distinfo Thu Apr 18 19:42:39 2019 (r499311) +++ head/devel/godot/distinfo Thu Apr 18 19:45:12 2019 (r499312) @@ -1,5 +1,7 @@ -TIMESTAMP = 1536387978 -SHA256 (godotengine-godot-3.0.6-stable_GH0.tar.gz) = 50431e021ee5ec21002cc23435f530f8fde518c6eb7085c9f7f1027abaae2581 -SIZE (godotengine-godot-3.0.6-stable_GH0.tar.gz) = 18958766 -SHA256 (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = b798d0bb56a643fdb175df463990904523495dd5546bc00bbe762e0645b7c94a -SIZE (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = 140126782 +TIMESTAMP = 1553320527 +SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a +SIZE (dotnet.glob.2.1.1.nupkg) = 73782 +SHA256 (godotengine-godot-3.1-stable_GH0.tar.gz) = cd66354b2397f28193ba3add8d8cc5c3562775f662887b56f16de82974f041e3 +SIZE (godotengine-godot-3.1-stable_GH0.tar.gz) = 20400493 +SHA256 (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = b430cb02302489f66f69ca6e743b47e227148ae8224cae625c5cfa744d940433 +SIZE (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = 151343471 Modified: head/devel/godot/files/patch-modules_enet_SCsub ============================================================================== --- head/devel/godot/files/patch-modules_enet_SCsub Thu Apr 18 19:42:39 2019 (r499311) +++ head/devel/godot/files/patch-modules_enet_SCsub Thu Apr 18 19:45:12 2019 (r499312) @@ -1,11 +1,11 @@ ---- modules/enet/SCsub.orig 2018-06-13 11:43:18 UTC +--- modules/enet/SCsub.orig 2019-03-23 10:48:38 UTC +++ modules/enet/SCsub -@@ -22,7 +22,7 @@ if env['builtin_enet']: +@@ -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_enet.add_source_files(env.modules_sources, "*.cpp") + env_thirdparty = env_enet.Clone() Modified: head/devel/godot/files/patch-modules_squish_SCsub ============================================================================== --- head/devel/godot/files/patch-modules_squish_SCsub Thu Apr 18 19:42:39 2019 (r499311) +++ head/devel/godot/files/patch-modules_squish_SCsub Thu Apr 18 19:45:12 2019 (r499312) @@ -1,11 +1,11 @@ ---- modules/squish/SCsub.orig 2018-06-13 12:02:27 UTC +--- modules/squish/SCsub.orig 2019-03-23 11:07:40 UTC +++ modules/squish/SCsub -@@ -23,7 +23,7 @@ if env['builtin_squish']: +@@ -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]) - # Godot source files - env_squish.add_source_files(env.modules_sources, "*.cpp") + env_thirdparty = env_squish.Clone() + env_thirdparty.disable_warnings() Added: head/devel/godot/files/patch-modules_webm_libvpx_SCsub ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/godot/files/patch-modules_webm_libvpx_SCsub Thu Apr 18 19:45:12 2019 (r499312) @@ -0,0 +1,11 @@ +--- modules/webm/libvpx/SCsub.orig 2019-03-23 15:10:53 UTC ++++ modules/webm/libvpx/SCsub +@@ -256,7 +256,7 @@ libvpx_sources_arm_neon_gas_apple = [libvpx_dir + file + + env_libvpx = env_modules.Clone() + env_libvpx.disable_warnings() +-env_libvpx.Append(CPPPATH=[libvpx_dir]) ++env_libvpx.Prepend(CPPPATH=[libvpx_dir]) + + webm_multithread = env["platform"] != 'javascript' + Added: head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__codec.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__codec.h Thu Apr 18 19:45:12 2019 (r499312) @@ -0,0 +1,20 @@ +--- 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_ + Added: head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__decoder.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__decoder.h Thu Apr 18 19:45:12 2019 (r499312) @@ -0,0 +1,20 @@ +--- 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_ + Added: head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__frame__buffer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__frame__buffer.h Thu Apr 18 19:45:12 2019 (r499312) @@ -0,0 +1,19 @@ +--- 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_ Added: head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__image.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__image.h Thu Apr 18 19:45:12 2019 (r499312) @@ -0,0 +1,19 @@ +--- 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_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904181945.x3IJjC5Z041318>