From 8d18f545031d45756e01489726472925f2bc0752 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeak.de>
Date: Wed, 25 Mar 2020 20:38:29 +0100
Subject: [PATCH] Updating revs

---
 TeaSpeak                     |  2 +-
 build-helpers                |  2 +-
 libraries/DataPipes          |  2 +-
 libraries/build_datapipes.sh | 28 +++-------------------------
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/TeaSpeak b/TeaSpeak
index 124844b..c627690 160000
--- a/TeaSpeak
+++ b/TeaSpeak
@@ -1 +1 @@
-Subproject commit 124844b9d43031f8ce4c6a136f105a0b87eff6f1
+Subproject commit c62769001170986d80410f595c8e0a85b0634a51
diff --git a/build-helpers b/build-helpers
index 2420535..8c26435 160000
--- a/build-helpers
+++ b/build-helpers
@@ -1 +1 @@
-Subproject commit 242053508289bf6afbdccbbf830061625c068fb1
+Subproject commit 8c26435ab9c0f15fc607688834e88e2538e91dbe
diff --git a/libraries/DataPipes b/libraries/DataPipes
index d2fa76d..1060d43 160000
--- a/libraries/DataPipes
+++ b/libraries/DataPipes
@@ -1 +1 @@
-Subproject commit d2fa76d48f13bb76863e3137e8e21548d4c42f4a
+Subproject commit 1060d43aabdfff61190c6fe01448241ef37ab2d9
diff --git a/libraries/build_datapipes.sh b/libraries/build_datapipes.sh
index 0dc883f..29546f5 100755
--- a/libraries/build_datapipes.sh
+++ b/libraries/build_datapipes.sh
@@ -16,36 +16,14 @@ requires_rebuild ${library_path}
 
 web_cmake_flags="-DBUILD_WEBRTC=${_datapipes_webrtc}"
 if [[ ${build_os_type} != "win32" && "${_datapipes_webrtc}" == "ON" ]]; then
-    cd ${library_path}
-
-    #echo "Testing for libnice"
-    #dpkg-query -l libnice-dev2 &>/dev/null
-    #if [[ $? -ne 0 ]]; then
-    #    echo "Installing libnice"
-    #    sudo apt-get update
-    #    sudo apt-get install -yes --force-yes libnice-dev
-    #else
-    #    echo "libnice already installed"
-    #fi
-
-    echo "Building dependencies"
-    ./build_usrsctp.sh
-    check_err_exit ${library_path} "Failed to build usrsctp!"
-
-    ./build_srtp.sh
-    check_err_exit ${library_path} "Failed to build srtp!"
-
-    ./build_sdptransform.sh
-    check_err_exit ${library_path} "Failed to build sdptransform!"
-
-    cd ..
 
+	# -DLibevent_DIR="/mnt/d/TeaSpeak/server/libraries/event/out/linux_amd64/lib/cmake/libevent"
     glib20_dir=$(realpath "$(pwd)/glibc/linux_${build_os_arch}/")
     # shellcheck disable=SC2125
     glib20_lib_path=$(realpath "$glib20_dir/lib/"*"/")
 
     # TODO: pcre really required here?
-    web_cmake_flags="$web_cmake_flags -DGLIB_PREBUILD_FLAGS=\"-I$glib20_dir/include -I$glib20_dir/include/glib-2.0/ -I$glib20_lib_path/glib-2.0/include/\""
+    web_cmake_flags="$web_cmake_flags -DGLIB_PREBUILD_INCLUDES=\"$glib20_dir/include;$glib20_dir/include/glib-2.0/;$glib20_lib_path/glib-2.0/include/\""
     web_cmake_flags="$web_cmake_flags -DGLIB_PREBUILD_LIBRARIES=\"$glib20_lib_path/libgio-2.0.so;z;resolv;$glib20_lib_path/libgmodule-2.0.so;$glib20_lib_path/libgobject-2.0.so;$glib20_lib_path/libffi.so;$glib20_lib_path/libglib-2.0.so;pcre\""
     web_cmake_flags="$web_cmake_flags -DLIBNICE_PREBUILD_PATH=\"../libnice/linux_${build_os_arch}\""
     echo "WebRTC flags: $web_cmake_flags"
@@ -56,7 +34,7 @@ _cxx_options=""
 [[ ${build_os_type} != "win32" ]] && _cxx_options="-fPIC -static-libgcc -static-libstdc++"
 [[ ${build_os_type} == "win32" ]] && _cxx_options="-DWIN32"
 
-general_options="-DCMAKE_C_FLAGS=\"-fPIC\" -DCMAKE_CXX_FLAGS=\"$_cxx_options\" -DBUILD_TESTS=OFF -DBUILD_STATIC=1 -DBUILD_SHARED=1 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
+general_options="-DCMAKE_C_FLAGS=\"-fPIC\" -DCMAKE_CXX_FLAGS=\"$_cxx_options\" -DBUILD_EXAMPLES=OFF -DBUILD_STATIC=1 -DBUILD_SHARED=1 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
 #crypto_options="-DCrypto_ROOT_DIR=\"$(pwd)/boringssl/lib/\" -DCRYPTO_TYPE=\"boringssl\""
 crypto_options="-DCRYPTO_TYPE=\"openssl\" -DCrypto_ROOT_DIR=\"$(pwd)/openssl-prebuild/${build_os_type}_${build_os_arch}/\""