svn commit: r464714 - in head: devel devel/godot2 devel/godot2-tools devel/godot2/files games/minilens games/tanks-of-freedom
Dmitry Marakasov
amdmi3 at FreeBSD.org
Fri Mar 16 17:28:00 UTC 2018
Author: amdmi3
Date: Fri Mar 16 17:27:57 2018
New Revision: 464714
URL: https://svnweb.freebsd.org/changeset/ports/464714
Log:
- Rename godot, godot-tools to godot2, godot2-tools in preparation for godot 3
- Fix godot consumers to use godot2
PR: 224604
Submitted by: FreeBSD at ShaneWare.Biz (maintainer)
Added:
head/devel/godot2/
- copied from r460384, head/devel/godot/
head/devel/godot2-tools/
- copied from r424623, head/devel/godot-tools/
head/devel/godot2-tools/pkg-message (contents, props changed)
head/devel/godot2/files/patch-core_image.cpp (contents, props changed)
head/devel/godot2/files/patch-core_ustring.cpp (contents, props changed)
head/devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp (contents, props changed)
head/devel/godot2/files/patch-platform_x11_os__x11.cpp (contents, props changed)
head/devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp (contents, props changed)
head/devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp (contents, props changed)
head/devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp (contents, props changed)
head/devel/godot2/files/patch-thirdparty_glew_glew.c (contents, props changed)
Modified:
head/devel/Makefile
head/devel/godot2-tools/Makefile
head/devel/godot2/Makefile
head/devel/godot2/distinfo
head/devel/godot2/files/patch-drivers_unix_os__unix.cpp
head/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp
head/devel/godot2/files/patch-platform_x11_detect.py
head/devel/godot2/pkg-descr
head/games/minilens/Makefile
head/games/tanks-of-freedom/Makefile
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Fri Mar 16 17:06:24 2018 (r464713)
+++ head/devel/Makefile Fri Mar 16 17:27:57 2018 (r464714)
@@ -833,6 +833,8 @@
SUBDIR += godep
SUBDIR += godot
SUBDIR += godot-tools
+ SUBDIR += godot2
+ SUBDIR += godot2-tools
SUBDIR += goffice
SUBDIR += goffice010
SUBDIR += gogland-eap
Modified: head/devel/godot2-tools/Makefile
==============================================================================
--- head/devel/godot-tools/Makefile Tue Oct 25 13:20:28 2016 (r424623)
+++ head/devel/godot2-tools/Makefile Fri Mar 16 17:27:57 2018 (r464714)
@@ -1,13 +1,13 @@
# Created by: Shane Ambler <FreeBSD at Shaneware.biz>
# $FreeBSD$
-PKGNAMESUFFIX= -tools
+PKGNAMESUFFIX= 2-tools
COMMENT= Game integrated development environment
OPTIONS_EXCLUDE= #
OPTIONS_SLAVE= TOOLS
-MASTERDIR= ${.CURDIR}/../godot
+MASTERDIR= ${.CURDIR}/../godot2
.include "${MASTERDIR}/Makefile"
Added: head/devel/godot2-tools/pkg-message
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2-tools/pkg-message Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,7 @@
+============================================================
+This is the old v2 of godot and is only for compatability
+to be able to work on older projects.
+
+If you are planning any development in godot
+please install the newer v3 version in devel/godot-tools
+============================================================
Modified: head/devel/godot2/Makefile
==============================================================================
--- head/devel/godot/Makefile Tue Jan 30 12:35:05 2018 (r460384)
+++ head/devel/godot2/Makefile Fri Mar 16 17:27:57 2018 (r464714)
@@ -2,10 +2,11 @@
# $FreeBSD$
PORTNAME= godot
-PORTVERSION= 2.1.2
-PORTREVISION= 3
+PORTVERSION= 2.1.4
DISTVERSIONSUFFIX= -stable
+PORTREVISION= 0
CATEGORIES= devel games
+PKGNAMESUFFIX?= 2
MAINTAINER= FreeBSD at Shaneware.biz
COMMENT?= Game runtime engine
@@ -13,7 +14,7 @@ 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.md
+LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libpng.so:graphics/png \
@@ -28,21 +29,21 @@ GH_ACCOUNT= godotengine
USES= compiler:c++11-lib pkgconfig scons ssl
USE_XORG= x11 xcursor xinerama xrandr
-USE_GL= gl
+USE_GL= gl glu
-MAKE_ARGS+= platform=x11 builtin_speex=no builtin_libmpcdec=no
-MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
+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+= -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
+LDFLAGS+= -lspeex -lmpcdec
-OPTIONS_DEFINE= EXAMPLES TOOLS
+OPTIONS_DEFINE= EXAMPLES TOOLS
OPTIONS_DEFAULT= OSS
# Moved to devel/godot-tools
OPTIONS_EXCLUDE?= EXAMPLES TOOLS
@@ -53,22 +54,22 @@ AUDIO_DESC= Audio support
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_MAKE_ARGS= alsa=yes
EXAMPLES_GH_PROJECT= godot-demo-projects:DEMOS
-# Branch HEAD for PORTVERSION
-EXAMPLES_GH_TAGNAME= dfa1274: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_DESC= Include development tools (IDE)
TOOLS_MAKE_ARGS= target=release_debug tools=yes
TOOLS_MAKE_ARGS_OFF= target=release tools=no
-TOOLS_DESKTOP_ENTRIES= "Godot" "${COMMENT}" "${GODOTFILE}" \
+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}
+PLIST_FILES= bin/${GODOTFILE}
+# rename to prevent conflict with godot v3
+EXAMPLESDIR= ${PREFIX}/share/examples/godot2
.ifmake makesum
# Always include optional distfiles
Modified: head/devel/godot2/distinfo
==============================================================================
--- head/devel/godot/distinfo Tue Jan 30 12:35:05 2018 (r460384)
+++ head/devel/godot2/distinfo Fri Mar 16 17:27:57 2018 (r464714)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1485416056
-SHA256 (godotengine-godot-2.1.2-stable_GH0.tar.gz) = 29b3131449f8ca908be800c4c07020efaa9f90a29b6bc1be8a18a331dc34b49a
-SIZE (godotengine-godot-2.1.2-stable_GH0.tar.gz) = 14399692
-SHA256 (godotengine-godot-demo-projects-dfa1274_GH0.tar.gz) = 42420f7f473b1391a13f226473d1cc850605f24d2865220e4c5acde05f1c340c
-SIZE (godotengine-godot-demo-projects-dfa1274_GH0.tar.gz) = 18423807
+TIMESTAMP = 1514402523
+SHA256 (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 07cf3b01367d5ea53805f144bc60711bd79efb53f1f88d57d6a706e6944de8d7
+SIZE (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 14811915
+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
Added: head/devel/godot2/files/patch-core_image.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-core_image.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,35 @@
+--- 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<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
++ { static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((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<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
++ { static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((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<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
++ { static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_b)&0x1f) << 3), 255 },
+ { 0, 0, 0, 255 },
+ { 0, 0, 0, 255 }
+ };
Added: head/devel/godot2/files/patch-core_ustring.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-core_ustring.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,11 @@
+--- 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<char>(ord1), static_cast<char>(ord2) };
+ res += (char)strtol(bytes, NULL, 16);
+ i += 2;
+ }
Added: head/devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,30 @@
+--- 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_cast<GLbyte>CLAMP(src[i].x * 127, -128, 127),
++ static_cast<GLbyte>CLAMP(src[i].y * 127, -128, 127),
++ static_cast<GLbyte>CLAMP(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_cast<GLbyte>CLAMP(src[i * 4 + 0] * 127, -128, 127),
++ static_cast<GLbyte>CLAMP(src[i * 4 + 1] * 127, -128, 127),
++ static_cast<GLbyte>CLAMP(src[i * 4 + 2] * 127, -128, 127),
++ static_cast<GLbyte>CLAMP(src[i * 4 + 3] * 127, -128, 127)
+ };
+
+ copymem(&p_mem[a.ofs + i * stride], xyzw, a.size);
Modified: head/devel/godot2/files/patch-drivers_unix_os__unix.cpp
==============================================================================
--- head/devel/godot/files/patch-drivers_unix_os__unix.cpp Tue Jan 30 12:35:05 2018 (r460384)
+++ head/devel/godot2/files/patch-drivers_unix_os__unix.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -1,40 +1,44 @@
---- drivers/unix/os_unix.cpp.orig 2016-08-09 07:52:15 UTC
+--- drivers/unix/os_unix.cpp.orig 2017-08-28 01:55:12 UTC
+++ drivers/unix/os_unix.cpp
-@@ -50,6 +50,7 @@
+@@ -51,6 +51,7 @@
- #ifdef __FreeBSD__
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <sys/param.h>
+#include <sys/sysctl.h>
#endif
- #include <stdarg.h>
- #include <sys/time.h>
-@@ -371,17 +372,7 @@ Error OS_Unix::execute(const String& p_p
- args.push_back((char*)cs[i].get_data());// shitty C cast
+ #include "globals.h"
+ #include <assert.h>
+@@ -375,17 +376,7 @@ Error OS_Unix::execute(const String &p_p
+ args.push_back((char *)cs[i].get_data()); // shitty C cast
args.push_back(0);
-#ifdef __FreeBSD__
-- if(p_path.find("/")) {
+- if (p_path.find("/")) {
- // exec name contains path so use it
-- execv(p_path.utf8().get_data(),&args[0]);
-- }else{
+- execv(p_path.utf8().get_data(), &args[0]);
+- } else {
- // use program name and search through PATH to find it
-- execvp(getprogname(),&args[0]);
+- execvp(getprogname(), &args[0]);
- }
-#else
- execv(p_path.utf8().get_data(),&args[0]);
+ execv(p_path.utf8().get_data(), &args[0]);
-#endif
// still alive? something failed..
- fprintf(stderr,"**ERROR** OS_Unix::execute - Could not create child process while executing: %s\n",p_path.utf8().get_data());
+ fprintf(stderr, "**ERROR** OS_Unix::execute - Could not create child process while executing: %s\n", p_path.utf8().get_data());
abort();
-@@ -503,11 +494,16 @@ String OS_Unix::get_executable_path() co
+@@ -499,12 +490,24 @@ String OS_Unix::get_executable_path() co
+ return OS::get_executable_path();
}
return b;
- #elif defined(__FreeBSD__)
-- char resolved_path[MAXPATHLEN];
--
-- realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
--
-- return String(resolved_path);
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__OpenBSD__)
+ char resolved_path[MAXPATHLEN];
+
+ realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
+
+ return String(resolved_path);
++
++#elif defined(__FreeBSD__)
+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ char buf[MAXPATHLEN];
+ size_t len = sizeof(buf);
@@ -47,4 +51,4 @@
+ return b;
#elif defined(__APPLE__)
char temp_path[1];
- uint32_t buff_size=1;
+ uint32_t buff_size = 1;
Modified: head/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp
==============================================================================
--- head/devel/godot/files/patch-modules_speex_audio__stream__speex.cpp Tue Jan 30 12:35:05 2018 (r460384)
+++ head/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -1,10 +1,11 @@
---- modules/speex/audio_stream_speex.cpp.orig 2016-11-28 17:58:00 UTC
+--- modules/speex/audio_stream_speex.cpp.orig 2017-12-28 01:20:49 UTC
+++ modules/speex/audio_stream_speex.cpp
-@@ -28,7 +28,6 @@
- /*************************************************************************/
+@@ -29,7 +29,7 @@
#include "audio_stream_speex.h"
--#include "os_support.h"
#include "os/os.h"
+-#include "os_support.h"
++#include "thirdparty/speex/os_support.h"
#define READ_CHUNK 1024
+ static _FORCE_INLINE_ uint16_t le_short(uint16_t s) {
Modified: head/devel/godot2/files/patch-platform_x11_detect.py
==============================================================================
--- head/devel/godot/files/patch-platform_x11_detect.py Tue Jan 30 12:35:05 2018 (r460384)
+++ head/devel/godot2/files/patch-platform_x11_detect.py Fri Mar 16 17:27:57 2018 (r464714)
@@ -1,21 +1,9 @@
---- platform/x11/detect.py.orig 2016-11-15 18:44:21 UTC
-+++ platform/x11/detect.py
-@@ -31,11 +31,6 @@ def can_build():
- print("X11 not found.. x11 disabled.")
- return False
-
-- ssl_error = os.system("pkg-config openssl --modversion > /dev/null ")
-- if (ssl_error):
-- print("OpenSSL not found.. x11 disabled.")
-- return False
--
- x11_error = os.system("pkg-config xcursor --modversion > /dev/null ")
- if (x11_error):
- print("xcursor not found.. x11 disabled.")
-@@ -61,7 +56,9 @@ def get_opts():
- ('use_static_cpp', 'link stdc++ statically', 'no'),
+--- ./platform/x11/detect.py.orig 2017-08-27 16:25:12 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'),
@@ -23,16 +11,59 @@
('udev', 'Use udev for gamepad connection callbacks', 'no'),
('debug_release', 'Add debug symbols to release version', 'no'),
]
-@@ -134,7 +131,7 @@ def configure(env):
- env.ParseConfig('pkg-config xrandr --cflags --libs')
+@@ -84,10 +86,6 @@ def configure(env):
- if (env['builtin_openssl'] == 'no'):
+ 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):
+ 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.ParseConfig('pkg-config x11 --cflags --libs')
+ env.ParseConfig('pkg-config xinerama --cflags --libs')
+@@ -148,13 +143,14 @@ 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')
++ openssl_version = '1.0.2' #subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
+ 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)
+
- env.ParseConfig('pkg-config openssl --cflags --libs')
++ #env.ParseConfig('pkg-config openssl --cflags --libs')
+ env.ParseConfig('echo -lssl -lcrypto')
if (env['builtin_libwebp'] == 'no'):
env.ParseConfig('pkg-config libwebp --cflags --libs')
-@@ -173,12 +170,13 @@ def configure(env):
+@@ -199,12 +195,13 @@ def configure(env):
if (env['builtin_glew'] == 'no'):
env.ParseConfig('pkg-config glew --cflags --libs')
@@ -52,7 +83,7 @@
if (platform.system() == "Linux"):
env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
-@@ -193,6 +191,11 @@ def configure(env):
+@@ -219,6 +216,11 @@ def configure(env):
else:
print("libudev development libraries not found, disabling udev support")
Added: head/devel/godot2/files/patch-platform_x11_os__x11.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-platform_x11_os__x11.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,11 @@
+--- 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;
+ }
Added: head/devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,24 @@
+--- 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)
+ };
+
Added: head/devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,20 @@
+--- 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;
Added: head/devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,20 @@
+--- 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;
Added: head/devel/godot2/files/patch-thirdparty_glew_glew.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-thirdparty_glew_glew.c Fri Mar 16 17:27:57 2018 (r464714)
@@ -0,0 +1,11 @@
+--- thirdparty/glew/glew.c.orig 2017-12-28 02:06:18 UTC
++++ thirdparty/glew/glew.c
+@@ -30,7 +30,7 @@
+ ** THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#include <GL/glew.h>
++#include "thirdparty/glew/GL/glew.h"
+
+ #if defined(_WIN32)
+ # include <GL/wglew.h>
Modified: head/devel/godot2/pkg-descr
==============================================================================
--- head/devel/godot/pkg-descr Tue Jan 30 12:35:05 2018 (r460384)
+++ head/devel/godot2/pkg-descr Fri Mar 16 17:27:57 2018 (r464714)
@@ -1,6 +1,9 @@
-Godot is a multi-platform 2D and 3D game engine. It also provides a feature rich
-development environment.
+Godot is a multi-platform 2D and 3D game engine. It also provides a
+feature rich development environment.
Easily deploy your game on IOS, android, OSX, Linux, Steam, Windows or PS3.
+
+This port installs the older v2 to support projects that
+haven't been updated for v3.0
WWW: http://www.godotengine.org/
Modified: head/games/minilens/Makefile
==============================================================================
--- head/games/minilens/Makefile Fri Mar 16 17:06:24 2018 (r464713)
+++ head/games/minilens/Makefile Fri Mar 16 17:27:57 2018 (r464714)
@@ -4,6 +4,7 @@
PORTNAME= minilens
PORTVERSION= 1.2
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= amdmi3 at FreeBSD.org
@@ -13,7 +14,7 @@ LICENSE= GPLv3+ CC-BY-SA-4.0
LICENSE_COMB= multi
LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= godot:devel/godot
+RUN_DEPENDS= godot2:devel/godot2
USE_GITHUB= yes
GH_ACCOUNT= KOBUGE-Games
@@ -35,7 +36,7 @@ OPTIONS_DEFINE= DOCS
do-build:
@${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/${PORTNAME}
- @${ECHO_CMD} "exec \"${LOCALBASE}/bin/godot\" -path \"${DATADIR}\"" >> ${WRKDIR}/${PORTNAME}
+ @${ECHO_CMD} "exec \"${LOCALBASE}/bin/godot2\" -path \"${DATADIR}\"" >> ${WRKDIR}/${PORTNAME}
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
Modified: head/games/tanks-of-freedom/Makefile
==============================================================================
--- head/games/tanks-of-freedom/Makefile Fri Mar 16 17:06:24 2018 (r464713)
+++ head/games/tanks-of-freedom/Makefile Fri Mar 16 17:27:57 2018 (r464714)
@@ -4,6 +4,7 @@
PORTNAME= tanks-of-freedom
PORTVERSION= 0.6.3
DISTVERSIONSUFFIX=-beta
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= amdmi3 at FreeBSD.org
@@ -12,7 +13,7 @@ COMMENT= Indie Turn Based Strategy in Isometric Pixel
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= godot:devel/godot
+RUN_DEPENDS= godot2:devel/godot2
USE_GITHUB= yes
GH_ACCOUNT= w84death
@@ -20,6 +21,10 @@ GH_PROJECT= Tanks-of-Freedom
NO_ARCH= yes
+PLIST_FILES= bin/${PORTNAME}
+PORTDOCS= *
+PORTDATA= *
+
DESKTOP_ENTRIES="Tanks of Freedom" \
"" \
"${DATADIR}/assets/icons/icon32.png" \
@@ -27,15 +32,11 @@ DESKTOP_ENTRIES="Tanks of Freedom" \
"Game;StrategyGame;" \
""
-PLIST_FILES= bin/${PORTNAME}
-PORTDOCS= *
-PORTDATA= *
-
OPTIONS_DEFINE= DOCS
do-build:
@${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/${PORTNAME}
- @${ECHO_CMD} "exec \"${LOCALBASE}/bin/godot\" -path \"${DATADIR}\"" >> ${WRKDIR}/${PORTNAME}
+ @${ECHO_CMD} "exec \"${LOCALBASE}/bin/godot2\" -path \"${DATADIR}\"" >> ${WRKDIR}/${PORTNAME}
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
More information about the svn-ports-head
mailing list