svn commit: r473165 - in head/devel/godot: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sat Jun 23 21:18:22 UTC 2018
Author: amdmi3
Date: Sat Jun 23 21:18:20 2018
New Revision: 473165
URL: https://svnweb.freebsd.org/changeset/ports/473165
Log:
- Update to 3.0.3
- Fix conflicts for some system libraries due to incorrect include path order
- Pet portlint
- Fix openssl detection
PR: 228764
Submitted by: FreeBSD at ShaneWare.Biz (maintainer)
Added:
head/devel/godot/files/patch-modules_enet_SCsub (contents, props changed)
head/devel/godot/files/patch-modules_squish_SCsub (contents, props changed)
head/devel/godot/files/patch-thirdparty_zstd_SCsub (contents, props changed)
Deleted:
head/devel/godot/files/patch-drivers_unix_os__unix.cpp
head/devel/godot/files/patch-scene_gui_rich__text__label.cpp
Modified:
head/devel/godot/Makefile
head/devel/godot/distinfo
head/devel/godot/files/patch-platform_x11_detect.py
Modified: head/devel/godot/Makefile
==============================================================================
--- head/devel/godot/Makefile Sat Jun 23 21:16:12 2018 (r473164)
+++ head/devel/godot/Makefile Sat Jun 23 21:18:20 2018 (r473165)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= godot
-PORTVERSION= 3.0.2
+PORTVERSION= 3.0.3
DISTVERSIONSUFFIX= -stable
CATEGORIES= devel games
@@ -25,14 +25,14 @@ RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \
xdg-open:devel/xdg-utils \
xmessage:x11/xmessage
-USE_GITHUB= yes
-GH_ACCOUNT= godotengine
-
# 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_GL= gl glew glu
+
+USE_GITHUB= yes
+GH_ACCOUNT= godotengine
MAKE_ARGS+= platform=x11 builtin_libpng=False builtin_openssl=False verbose=True
MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
Modified: head/devel/godot/distinfo
==============================================================================
--- head/devel/godot/distinfo Sat Jun 23 21:16:12 2018 (r473164)
+++ head/devel/godot/distinfo Sat Jun 23 21:18:20 2018 (r473165)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1520319042
-SHA256 (godotengine-godot-3.0.2-stable_GH0.tar.gz) = 15bc91dcbc92fe49624118678fcab119ff332dc295b25f4921700a4ee498b651
-SIZE (godotengine-godot-3.0.2-stable_GH0.tar.gz) = 18812660
+TIMESTAMP = 1529204518
+SHA256 (godotengine-godot-3.0.3-stable_GH0.tar.gz) = db6bf2a2cee8e058254fc0b43c38c68a5226b18315b852e266cb3b95e23618c1
+SIZE (godotengine-godot-3.0.3-stable_GH0.tar.gz) = 18929162
SHA256 (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = b798d0bb56a643fdb175df463990904523495dd5546bc00bbe762e0645b7c94a
SIZE (godotengine-godot-demo-projects-d69cc10a0b8a_GH0.tar.gz) = 140126782
Added: head/devel/godot/files/patch-modules_enet_SCsub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot/files/patch-modules_enet_SCsub Sat Jun 23 21:18:20 2018 (r473165)
@@ -0,0 +1,11 @@
+--- modules/enet/SCsub.orig 2018-06-13 11:43:18 UTC
++++ modules/enet/SCsub
+@@ -22,7 +22,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")
Added: head/devel/godot/files/patch-modules_squish_SCsub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot/files/patch-modules_squish_SCsub Sat Jun 23 21:18:20 2018 (r473165)
@@ -0,0 +1,11 @@
+--- modules/squish/SCsub.orig 2018-06-13 12:02:27 UTC
++++ modules/squish/SCsub
+@@ -23,7 +23,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")
Modified: head/devel/godot/files/patch-platform_x11_detect.py
==============================================================================
--- head/devel/godot/files/patch-platform_x11_detect.py Sat Jun 23 21:16:12 2018 (r473164)
+++ head/devel/godot/files/patch-platform_x11_detect.py Sat Jun 23 21:18:20 2018 (r473165)
@@ -1,7 +1,7 @@
---- platform/x11/detect.py.orig 2017-12-28 05:14:45 UTC
+--- platform/x11/detect.py.orig 2018-03-04 00:52:04 UTC
+++ platform/x11/detect.py
@@ -52,7 +52,9 @@ def get_opts():
- BoolVariable('use_static_cpp', 'Link stdc++ statically', False),
+ BoolVariable('use_static_cpp', 'Link libgcc and libstdc++ statically for better portability', False),
BoolVariable('use_sanitizer', 'Use LLVM compiler address sanitizer', False),
BoolVariable('use_leak_sanitizer', 'Use LLVM compiler memory leaks sanitizer (implies use_sanitizer)', False),
- BoolVariable('pulseaudio', 'Detect & use pulseaudio', True),
@@ -11,16 +11,21 @@
BoolVariable('udev', 'Use udev for gamepad connection callbacks', False),
EnumVariable('debug_symbols', 'Add debug symbols to release version', 'yes', ('yes', 'no', 'full')),
BoolVariable('separate_debug_symbols', 'Create a separate file with the debug symbols', False),
-@@ -154,7 +156,7 @@ def configure(env):
+@@ -154,7 +156,12 @@ def configure(env):
# FIXME: Check for existence of the libs before parsing their flags with pkg-config
if not env['builtin_openssl']:
- env.ParseConfig('pkg-config openssl --cflags --libs')
-+ env.ParseConfig('echo -lssl -lcrypto')
++ 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 not env['builtin_libwebp']:
env.ParseConfig('pkg-config libwebp --cflags --libs')
-@@ -226,12 +228,18 @@ def configure(env):
+@@ -226,12 +233,18 @@ def configure(env):
## Flags
Added: head/devel/godot/files/patch-thirdparty_zstd_SCsub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot/files/patch-thirdparty_zstd_SCsub Sat Jun 23 21:18:20 2018 (r473165)
@@ -0,0 +1,9 @@
+--- thirdparty/zstd/SCsub.orig 2018-06-13 11:53:45 UTC
++++ thirdparty/zstd/SCsub
+@@ -25,5 +25,5 @@ thirdparty_zstd_sources = [
+ ]
+ thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
+ env.add_source_files(env.core_sources, thirdparty_zstd_sources)
+-env.Append(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"])
++env.Prepend(CPPPATH=["#thirdparty/zstd", "#thirdparty/zstd/common"])
+ env.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
More information about the svn-ports-all
mailing list