FreeBSD Bugzilla – Attachment 194216 Details for
Bug 228764
devel/godot: fails to build on multiple bundled vs. system library conflicts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
maintainer update devel/godot2
godot2.patch (text/plain), 4.29 KB, created by
Shane
on 2018-06-13 08:26:13 UTC
(
hide
)
Description:
maintainer update devel/godot2
Filename:
MIME Type:
Creator:
Shane
Created:
2018-06-13 08:26:13 UTC
Size:
4.29 KB
patch
obsolete
>diff -Nru devel/godot2.orig/files/patch-modules_squish_SCsub devel/godot2/files/patch-modules_squish_SCsub >--- devel/godot2.orig/files/patch-modules_squish_SCsub 1970-01-01 09:30:00.000000000 +0930 >+++ devel/godot2/files/patch-modules_squish_SCsub 2018-06-13 13:03:13.177173000 +0930 >@@ -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") >diff -Nru devel/godot2.orig/files/patch-platform_x11_detect.py devel/godot2/files/patch-platform_x11_detect.py >--- devel/godot2.orig/files/patch-platform_x11_detect.py 2018-06-13 17:33:03.171654000 +0930 >+++ devel/godot2/files/patch-platform_x11_detect.py 2018-06-13 15:34:34.186539000 +0930 >@@ -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") > >diff -Nru devel/godot2.orig/Makefile devel/godot2/Makefile >--- devel/godot2.orig/Makefile 2018-06-13 17:33:03.168169000 +0930 >+++ devel/godot2/Makefile 2018-06-13 17:32:38.790443000 +0930 >@@ -4,7 +4,7 @@ > PORTNAME= godot > PORTVERSION= 2.1.4 > DISTVERSIONSUFFIX= -stable >-PORTREVISION= 0 >+PORTREVISION= 1 > CATEGORIES= devel games > PKGNAMESUFFIX?= 2 > >@@ -24,13 +24,13 @@ > 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}} > MAKE_ARGS_clang= use_llvm=yes
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
FreeBSD
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 228764
:
194215
| 194216 |
194317
|
194474