Merge pull request #75 from Faless/bump/beta8

Bump godot-cpp to beta8, libdatachannel to v0.18.0
godotengine · Dec 10, 2022 · 61a6d25 · 61a6d25
2 parents 35bdd5e + dfaad6f
commit 61a6d25
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 18 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -177,7 +177,9 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: ${{ github.job }}-${{ matrix.platform }}-${{ matrix.arch }}
-          path: bin/*
+          path: |
+            bin/
+            !bin/thirdparty/
 
   package:
     name: 📦 Package
@@ -195,13 +197,13 @@ jobs:
       - name: Bundle licenses.
         run: |
           cp LICENSE artifacts/LICENSE.webrtc-native
-          cp deps/libdatachannel/LICENSE artifacts/LICENSE.libdatachannel
-          cp deps/openssl/LICENSE.txt artifacts/LICENSE.openssl
-          cp deps/libdatachannel/deps/libjuice/LICENSE artifacts/LICENSE.libjuice
-          cp deps/libdatachannel/deps/usrsctp/LICENSE.md artifacts/LICENSE.usrsctp
-          cp deps/libdatachannel/deps/libsrtp/LICENSE artifacts/LICENSE.libsrtp
-          cp deps/libdatachannel/deps/json/LICENSE.MIT artifacts/LICENSE.json
-          cp deps/libdatachannel/deps/plog/LICENSE artifacts/LICENSE.plog
+          cp thirdparty/libdatachannel/LICENSE artifacts/LICENSE.libdatachannel
+          cp thirdparty/openssl/LICENSE.txt artifacts/LICENSE.openssl
+          cp thirdparty/libdatachannel/deps/libjuice/LICENSE artifacts/LICENSE.libjuice
+          cp thirdparty/libdatachannel/deps/usrsctp/LICENSE.md artifacts/LICENSE.usrsctp
+          cp thirdparty/libdatachannel/deps/libsrtp/LICENSE artifacts/LICENSE.libsrtp
+          cp thirdparty/libdatachannel/deps/json/LICENSE.MIT artifacts/LICENSE.json
+          cp thirdparty/libdatachannel/deps/plog/LICENSE artifacts/LICENSE.plog
 
       - name: Package artifacts for release
         env:

diff --git a/.gitmodules b/.gitmodules
@@ -5,8 +5,8 @@
 	path = godot-cpp
 	url = https://github.com/godotengine/godot-cpp.git
 [submodule "libdatachannel"]
-	path = deps/libdatachannel
+	path = thirdparty/libdatachannel
 	url = https://github.com/paullouisageneau/libdatachannel.git
 [submodule "openssl"]
-	path = deps/openssl
+	path = thirdparty/openssl
 	url = https://github.com/openssl/openssl.git
diff --git a/README.md b/README.md
@@ -45,6 +45,4 @@ You simply need to copy that folder to the root folder of your project. Note tha
 
 ### License
 
-The `webrtc-native` plugin is licensed under the MIT license (see [LICENSE](https://github.com/godotengine/webrtc-native/blob/master/LICENSE)), while `libdatachannel` and one of its dependencies (`libjuice`) are licensed under LGPLv2.1 or later, see [libdatachannel LICENSE](https://github.com/paullouisageneau/libdatachannel/blob/master/LICENSE) and [libjuice LICENSE](https://github.com/paullouisageneau/libjuice/blob/master/LICENSE).
-
-Make sure you understand and comply with the LGPLv2.1 license when redistributing this plugin.
+The `webrtc-native` plugin is licensed under the MIT license (see [LICENSE](https://github.com/godotengine/webrtc-native/blob/master/LICENSE)), while `libdatachannel` and its dependencies are licensed under other permissive open source licences. Please see [`thirdparty/README.md`](thirdparty/README.md) for more informations.
diff --git a/SConstruct b/SConstruct
@@ -101,7 +101,6 @@ else:
     result_path = os.path.join("bin", "extension", "webrtc")
 
 # Dependencies
-deps_source_dir = "deps"
 env.Append(BUILDERS={
     "BuildOpenSSL": env.Builder(action=builders.ssl_action, emitter=builders.ssl_emitter),
     "BuildLibDataChannel": env.Builder(action=builders.rtc_action, emitter=builders.rtc_emitter),
@@ -126,6 +125,7 @@ env.Prepend(LIBS=[builders.get_rtc_libs(env)])
 
 # Our includes and sources
 env.Append(CPPPATH=["src/"])
+env.Append(CPPDEFINES=["RTC_STATIC"])
 sources = []
 sources.append(
     [

diff --git a/deps/build/.gitignore → bin/thirdparty/.gitignore b/deps/build/.gitignore → bin/thirdparty/.gitignore
diff --git a/builders.py b/builders.py
@@ -8,11 +8,11 @@ def get_android_api(env):
 
 
 def get_deps_dir(env):
-    return env.Dir("#deps").abspath
+    return env.Dir("#thirdparty").abspath
 
 
 def get_deps_build_dir(env):
-    return get_deps_dir(env) + "/build/build{}.{}.dir".format(env["suffix"], "RelWithDebInfo" if env["debug_symbols"] else "Release")
+    return env.Dir("#bin/thirdparty").abspath + "/{}.{}.dir".format(env["suffix"][1:], "RelWithDebInfo" if env["debug_symbols"] else "Release")
 
 
 def get_rtc_source_dir(env):

diff --git a/deps/libdatachannel b/deps/libdatachannel
diff --git a/godot-cpp b/godot-cpp
diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -0,0 +1,82 @@
+# Third party libraries
+
+Please keep categories (`##` level) listed alphabetically and matching their
+respective folder names. Use two empty lines to separate categories for
+readability.
+
+
+## json
+
+- Upstream: https://github.com/nlohmann/json
+- Version: 3.10.5 (4f8fba14066156b73f1189a2b8bd568bde5284c5, 2022)
+- License: MIT
+
+Module location:
+
+- thirdparty/libdatachannel/deps/json
+
+
+## libdatachannel
+
+- Upstream: https://github.com/paullouisageneau/libdatachannel
+- Version: 0.18.0 (084445012d6c63c9f2cc250d88df553aed2eb189, 2022)
+- License: MPL 2.0
+
+Module location:
+
+- thirdparty/libdatachannel
+
+
+# libjuice
+
+- Upstream: https://github.com/paullouisageneau/libjuice
+- Version: 1.1.0 (0dabc046cd23da6908749e4c6add834ec29a7c49, 2022)
+- License: MPL 2.0
+
+Module location:
+
+- thirdparty/libdatachannel/deps/libjuice
+
+
+## libsrtp
+
+- Upstream: https://github.com/cisco/libsrtp
+- Version: 2.4.2 (90d05bf8980d16e4ac3f16c19b77e296c4bc207b, 2021)
+- License: BSD-3-Clause
+
+Module location:
+
+- thirdparty/libdatachannel/deps/libsrtp
+
+
+## openssl
+
+- Upstream: git://git.openssl.org/openssl.git
+- Version: 3.0.7 (19cc035b6c6f2283573d29c7ea7f7d675cf750ce, 2022)
+- License: Apache 2.0
+
+Module location:
+
+- thirdparty/openssl
+
+
+## plog
+
+- Upstream: https://github.com/SergiusTheBest/plog
+- Version: git (d8461e9d473e59fbcc1f79eee021550dcf81e618, 2021)
+- License: MPL 2.0
+
+Module location:
+
+- thirdparty/libdatachannel/deps/plog
+
+
+## usrsctp
+
+- Upstream: https://github.com/sctplab/usrsctp
+- Version: git (7c31bd35c79ba67084ce029511193a19ceb97447, 2021)
+- License: BSD-3-Clause
+
+Module location:
+
+- thirdparty/libdatachannel/deps/usrsctp
diff --git a/thirdparty/libdatachannel b/thirdparty/libdatachannel
diff --git a/deps/openssl → thirdparty/openssl b/deps/openssl → thirdparty/openssl
+6 −0		.github/CODEOWNERS
+21 −23		CMakeLists.txt
+1 −1		README.md
+6 −6		binding_generator.py
+4,020 −6,147		godot-headers/extension_api.json
+108 −105		godot-headers/godot/gdnative_interface.h
+4 −4		include/godot_cpp/classes/ref.hpp
+211 −210		include/godot_cpp/classes/wrapped.hpp
+56 −56		include/godot_cpp/core/binder_common.hpp
+5 −5		include/godot_cpp/core/builtin_ptrcall.hpp
+7 −7		include/godot_cpp/core/class_db.hpp
+6 −6		include/godot_cpp/core/engine_ptrcall.hpp
+19 −19		include/godot_cpp/core/method_bind.hpp
+31 −31		include/godot_cpp/core/method_ptrcall.hpp
+1 −1		include/godot_cpp/core/type_info.hpp
+3 −3		include/godot_cpp/godot.hpp
+3 −3		include/godot_cpp/variant/variant.hpp
+2 −6		src/classes/wrapped.cpp
+5 −5		src/core/class_db.cpp
+2 −2		src/core/method_bind.cpp
+1 −1		src/godot.cpp
+3 −3		src/variant/variant.cpp
+1 −1		test/src/register_types.cpp