Index: head/devel/godot/Makefile =================================================================== --- head/devel/godot/Makefile (revision 500932) +++ head/devel/godot/Makefile (revision 500933) @@ -1,116 +1,116 @@ # Created by: Shane Ambler # $FreeBSD$ PORTNAME= godot -PORTVERSION= 3.1 +DISTVERSION= 3.1.1 DISTVERSIONSUFFIX= -stable CATEGORIES= devel games 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 BROKEN_armv6= fails to build: KeyError: 'android_arch' BROKEN_armv7= fails to build: KeyError: 'android_arch' BROKEN_powerpc64= fails to compile: inv_txfm_sse2.h:14:32: emmintrin.h: No such file or directory BUILD_DEPENDS= yasm:devel/yasm LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \ xdg-open:devel/xdg-utils \ xmessage:x11/xmessage USES= compiler:c++14-lang pkgconfig scons ssl USE_XORG= x11 xcursor xi xinerama xrandr xrender USE_GL= gl glew glu USE_GITHUB= yes GH_ACCOUNT= godotengine MAKE_ARGS+= platform=x11 builtin_libpng=False builtin_openssl=False MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}} MAKE_ARGS_clang= use_llvm=True CXXFLAGS+= -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 # option MONO doesn't build (needs 5.12+) so 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 TOOLS_MAKE_ARGS_OFF= target=release tools=False TOOLS_DESKTOP_ENTRIES= "Godot" "${COMMENT}" "${GODOTFILE}" \ "${GODOTFILE}" "Development;IDE;" "" TOOLS_PLIST_FILES= share/pixmaps/${GODOTFILE}.png \ share/pixmaps/${GODOTFILE}.svg GODOTFILE= ${PORTNAME}${PKGNAMESUFFIX} PLIST_FILES= bin/${GODOTFILE} .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 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) @(cd ${WRKSRC} && ${FIND} ${WRKSRC}/bin -name 'godot*' -exec {} \ --generate-mono-glue modules/mono/glue \; && \ ${FIND} ${WRKSRC}/bin -name 'godot*' -delete) # 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: @${RM} ${WRKSRC}/bin/*.debugsymbols 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/godot/distinfo =================================================================== --- head/devel/godot/distinfo (revision 500932) +++ head/devel/godot/distinfo (revision 500933) @@ -1,7 +1,5 @@ -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 +TIMESTAMP = 1556599809 +SHA256 (godotengine-godot-3.1.1-stable_GH0.tar.gz) = 3d952cda12a43d71c53c508bc64ca82cc165a3345976b6d128f869d5bd7a61d2 +SIZE (godotengine-godot-3.1.1-stable_GH0.tar.gz) = 20353131 SHA256 (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = b430cb02302489f66f69ca6e743b47e227148ae8224cae625c5cfa744d940433 SIZE (godotengine-godot-demo-projects-17e80079e3fc_GH0.tar.gz) = 151343471 Index: head/devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h =================================================================== --- head/devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h (revision 500932) +++ head/devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h (nonexistent) @@ -1,40 +0,0 @@ ---- thirdparty/thekla_atlas/nvcore/StdStream.h.orig 2017-12-29 19:15:48 UTC -+++ thirdparty/thekla_atlas/nvcore/StdStream.h -@@ -160,14 +160,14 @@ namespace nv - nvDebugCheck(m_fp != NULL); - #if NV_OS_WIN32 - return (uint)_fwrite_nolock(data, 1, len, m_fp); --#elif NV_OS_LINUX -- return (uint)fwrite_unlocked(data, 1, len, m_fp); --#elif NV_OS_DARWIN -+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD - // @@ No error checking, always returns len. - for (uint i = 0; i < len; i++) { - putc_unlocked(((char *)data)[i], m_fp); - } - return len; -+#elif NV_OS_LINUX -+ return (uint)fwrite_unlocked(data, 1, len, m_fp); - #else - return (uint)fwrite(data, 1, len, m_fp); - #endif -@@ -210,9 +210,7 @@ namespace nv - nvDebugCheck(m_fp != NULL); - #if NV_OS_WIN32 - return (uint)_fread_nolock(data, 1, len, m_fp); --#elif NV_OS_LINUX -- return (uint)fread_unlocked(data, 1, len, m_fp); --#elif NV_OS_DARWIN -+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD - // This is rather lame. Not sure if it's faster than the locked version. - for (uint i = 0; i < len; i++) { - ((char *)data)[i] = getc_unlocked(m_fp); -@@ -221,6 +219,8 @@ namespace nv - } - } - return len; -+#elif NV_OS_LINUX -+ return (uint)fread_unlocked(data, 1, len, m_fp); - #else - return (uint)fread(data, 1, len, m_fp); - #endif Property changes on: head/devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_StdStream.h ___________________________________________________________________ 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/godot/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp =================================================================== --- head/devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp (revision 500932) +++ head/devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_Memory.cpp (nonexistent) @@ -1,22 +0,0 @@ ---- thirdparty/thekla_atlas/nvcore/Memory.cpp.orig 2017-12-29 15:53:28 UTC -+++ thirdparty/thekla_atlas/nvcore/Memory.cpp -@@ -6,10 +6,6 @@ - - #include - --#ifdef NV_OS_LINUX --#include --#endif -- - #define USE_EFENCE 0 - - #if USE_EFENCE -@@ -130,7 +126,7 @@ void * nv::aligned_malloc(size_t size, s - - #if NV_OS_WIN32 || NV_OS_DURANGO - return _aligned_malloc(size, alignment); --#elif NV_OS_DARWIN && !NV_OS_IOS -+#elif (NV_OS_FREEBSD || NV_OS_DARWIN) && !NV_OS_IOS - void * ptr = NULL; - posix_memalign(&ptr, alignment, size); - return ptr; Property changes on: head/devel/godot/files/patch-thirdparty_thekla__atlas_nvcore_Memory.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/godot/files/patch-core_SCsub =================================================================== --- head/devel/godot/files/patch-core_SCsub (nonexistent) +++ head/devel/godot/files/patch-core_SCsub (revision 500933) @@ -0,0 +1,20 @@ +--- core/SCsub.orig 2019-05-02 02:03:58 UTC ++++ core/SCsub +@@ -80,7 +80,7 @@ if env['builtin_zlib']: + ] + thirdparty_zlib_sources = [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources] + +- env_thirdparty.Append(CPPPATH=[thirdparty_zlib_dir]) ++ env_thirdparty.Prepend(CPPPATH=[thirdparty_zlib_dir]) + # Needs to be available in main env too + env.Append(CPPPATH=[thirdparty_zlib_dir]) + +@@ -128,7 +128,7 @@ if env['builtin_zstd']: + ] + thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources] + +- env_thirdparty.Append(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"]) ++ env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"]) + env_thirdparty.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY") + env.Append(CPPPATH=thirdparty_zstd_dir) + # Also needed in main env includes will trigger warnings Property changes on: head/devel/godot/files/patch-core_SCsub ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property