svn commit: r473166 - in head/devel/godot2: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sat Jun 23 21:18:30 UTC 2018
Author: amdmi3
Date: Sat Jun 23 21:18:26 2018
New Revision: 473166
URL: https://svnweb.freebsd.org/changeset/ports/473166
Log:
- 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/godot2/files/patch-modules_squish_SCsub (contents, props changed)
Modified:
head/devel/godot2/Makefile
head/devel/godot2/files/patch-platform_x11_detect.py
Modified: head/devel/godot2/Makefile
==============================================================================
--- head/devel/godot2/Makefile Sat Jun 23 21:18:20 2018 (r473165)
+++ head/devel/godot2/Makefile Sat Jun 23 21:18:26 2018 (r473166)
@@ -4,7 +4,7 @@
PORTNAME= godot
PORTVERSION= 2.1.4
DISTVERSIONSUFFIX= -stable
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel games
PKGNAMESUFFIX?= 2
@@ -24,12 +24,12 @@ RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \
xdg-open:devel/xdg-utils \
xmessage:x11/xmessage
-USE_GITHUB= yes
-GH_ACCOUNT= godotengine
-
USES= compiler:c++11-lib pkgconfig scons ssl
USE_XORG= x11 xcursor xinerama xrandr
USE_GL= gl glu
+
+USE_GITHUB= yes
+GH_ACCOUNT= godotengine
MAKE_ARGS+= platform=x11 builtin_speex=no builtin_libmpcdec=no
MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
Added: head/devel/godot2/files/patch-modules_squish_SCsub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/godot2/files/patch-modules_squish_SCsub Sat Jun 23 21:18:26 2018 (r473166)
@@ -0,0 +1,11 @@
+--- modules/squish/SCsub.orig 2018-06-13 13:01:57 UTC
++++ modules/squish/SCsub
+@@ -23,7 +23,7 @@ if (env['builtin_squish'] != 'no'):
+ 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/godot2/files/patch-platform_x11_detect.py
==============================================================================
--- head/devel/godot2/files/patch-platform_x11_detect.py Sat Jun 23 21:18:20 2018 (r473165)
+++ head/devel/godot2/files/patch-platform_x11_detect.py Sat Jun 23 21:18:26 2018 (r473166)
@@ -1,5 +1,5 @@
---- ./platform/x11/detect.py.orig 2017-08-27 16:25:12 UTC
-+++ ./platform/x11/detect.py
+--- platform/x11/detect.py.orig 2017-08-28 01:55: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'),
@@ -46,24 +46,32 @@
env.ParseConfig('pkg-config x11 --cflags --libs')
env.ParseConfig('pkg-config xinerama --cflags --libs')
-@@ -148,13 +143,14 @@ def configure(env):
+@@ -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')
-+ openssl_version = '1.0.2' #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)
- env.ParseConfig('pkg-config openssl --cflags --libs')
-+ #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 (env['builtin_libwebp'] == 'no'):
env.ParseConfig('pkg-config libwebp --cflags --libs')
-@@ -199,12 +195,13 @@ def configure(env):
+@@ -199,12 +203,13 @@ def configure(env):
if (env['builtin_glew'] == 'no'):
env.ParseConfig('pkg-config glew --cflags --libs')
@@ -83,7 +91,7 @@
if (platform.system() == "Linux"):
env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
-@@ -219,6 +216,11 @@ def configure(env):
+@@ -219,6 +224,11 @@ def configure(env):
else:
print("libudev development libraries not found, disabling udev support")
More information about the svn-ports-all
mailing list