mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Telegram: bump version
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
From a2c0a8aac80555e4fddb9422e328f602096f2351 Mon Sep 17 00:00:00 2001
|
||||
From c7cf52d0deb5c65488d287ba89fe58026011a000 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 28 Dec 2020 10:24:54 +1000
|
||||
Date: Sat, 30 Jan 2021 21:16:28 +1000
|
||||
Subject: Add Haiku support
|
||||
|
||||
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/CMakeLists.txt b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/CMakeLists.txt
|
||||
index d970719..7371aeb 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/CMakeLists.txt
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/CMakeLists.txt
|
||||
@@ -48,7 +48,7 @@ include(cmake/libusrsctp.cmake)
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/CMakeLists.txt b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/CMakeLists.txt
|
||||
index 7a5bb2c..24db2ef 100644
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/CMakeLists.txt
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/CMakeLists.txt
|
||||
@@ -58,7 +58,7 @@ include(cmake/libusrsctp.cmake)
|
||||
include(cmake/libvpx.cmake)
|
||||
include(cmake/libwebrtcbuild.cmake)
|
||||
include(cmake/libyuv.cmake)
|
||||
@@ -17,7 +17,7 @@ index d970719..7371aeb 100644
|
||||
include(cmake/libevent.cmake)
|
||||
endif()
|
||||
if (APPLE)
|
||||
@@ -115,7 +115,7 @@ PRIVATE
|
||||
@@ -127,7 +127,7 @@ PRIVATE
|
||||
${libopenh264_yasm_objects}
|
||||
)
|
||||
|
||||
@@ -26,7 +26,7 @@ index d970719..7371aeb 100644
|
||||
target_link_libraries(tg_owt PRIVATE tg_owt::libevent)
|
||||
endif()
|
||||
if (APPLE)
|
||||
@@ -361,6 +361,8 @@ PRIVATE
|
||||
@@ -410,6 +410,8 @@ PRIVATE
|
||||
rtc_base/task_queue.cc
|
||||
rtc_base/task_queue_gcd.cc
|
||||
rtc_base/task_queue_gcd.h
|
||||
@@ -35,7 +35,7 @@ index d970719..7371aeb 100644
|
||||
rtc_base/task_queue_libevent.cc
|
||||
rtc_base/task_queue_libevent.h
|
||||
rtc_base/task_queue_win.cc
|
||||
@@ -436,6 +438,7 @@ PRIVATE
|
||||
@@ -489,6 +491,7 @@ PRIVATE
|
||||
api/stats_types.cc
|
||||
api/task_queue/default_task_queue_factory.h
|
||||
api/task_queue/default_task_queue_factory_gcd.cc
|
||||
@@ -43,7 +43,7 @@ index d970719..7371aeb 100644
|
||||
api/task_queue/default_task_queue_factory_libevent.cc
|
||||
api/task_queue/default_task_queue_factory_win.cc
|
||||
api/task_queue/task_queue_base.cc
|
||||
@@ -1305,6 +1308,8 @@ PRIVATE
|
||||
@@ -1410,6 +1413,8 @@ PRIVATE
|
||||
modules/video_capture/device_info_impl.cc
|
||||
modules/video_capture/linux/device_info_linux.cc
|
||||
modules/video_capture/linux/video_capture_linux.cc
|
||||
@@ -52,7 +52,7 @@ index d970719..7371aeb 100644
|
||||
modules/video_capture/windows/device_info_ds.cc
|
||||
modules/video_capture/windows/device_info_ds.h
|
||||
modules/video_capture/windows/help_functions_ds.cc
|
||||
@@ -1841,7 +1846,7 @@ else()
|
||||
@@ -2105,7 +2110,7 @@ else()
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -61,7 +61,7 @@ index d970719..7371aeb 100644
|
||||
remove_target_sources(tg_owt ${webrtc_loc}
|
||||
rtc_base/task_queue_libevent.cc
|
||||
rtc_base/task_queue_libevent.h
|
||||
@@ -1857,7 +1862,7 @@ else()
|
||||
@@ -2121,7 +2126,7 @@ else()
|
||||
endif()
|
||||
|
||||
set(platform_export)
|
||||
@@ -70,10 +70,10 @@ index d970719..7371aeb 100644
|
||||
set(platform_export
|
||||
libevent
|
||||
)
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/libusrsctp.cmake b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/libusrsctp.cmake
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/libusrsctp.cmake b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/libusrsctp.cmake
|
||||
index f652679..0c00f10 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/libusrsctp.cmake
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/libusrsctp.cmake
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/libusrsctp.cmake
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/libusrsctp.cmake
|
||||
@@ -25,6 +25,11 @@ elseif (APPLE)
|
||||
PRIVATE
|
||||
-U__APPLE__
|
||||
@@ -86,10 +86,10 @@ index f652679..0c00f10 100644
|
||||
else()
|
||||
target_compile_definitions(libusrsctp
|
||||
PRIVATE
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/libwebrtcbuild.cmake b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/libwebrtcbuild.cmake
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/libwebrtcbuild.cmake b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/libwebrtcbuild.cmake
|
||||
index d79049e..bad89f0 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/libwebrtcbuild.cmake
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/libwebrtcbuild.cmake
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/libwebrtcbuild.cmake
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/libwebrtcbuild.cmake
|
||||
@@ -17,8 +17,8 @@ INTERFACE
|
||||
WEBRTC_USE_H264
|
||||
WEBRTC_LIBRARY_IMPL
|
||||
@@ -114,10 +114,10 @@ index d79049e..bad89f0 100644
|
||||
else()
|
||||
target_compile_definitions(libwebrtcbuild
|
||||
INTERFACE
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/nice_target_sources.cmake b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/nice_target_sources.cmake
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/nice_target_sources.cmake b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/nice_target_sources.cmake
|
||||
index cfc6aeb..699d0e6 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/nice_target_sources.cmake
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/cmake/nice_target_sources.cmake
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/nice_target_sources.cmake
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/cmake/nice_target_sources.cmake
|
||||
@@ -15,6 +15,7 @@ function(nice_target_sources target_name src_loc)
|
||||
set(not_win_sources "")
|
||||
set(not_mac_sources "")
|
||||
@@ -156,11 +156,11 @@ index cfc6aeb..699d0e6 100644
|
||||
else()
|
||||
set_source_files_properties(${not_linux_sources} PROPERTIES HEADER_FILE_ONLY TRUE)
|
||||
set_source_files_properties(${not_linux_sources} PROPERTIES SKIP_AUTOGEN TRUE)
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/api/task_queue/BUILD.gn b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/api/task_queue/BUILD.gn
|
||||
index 4c9f591..e93c715 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/api/task_queue/BUILD.gn
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/api/task_queue/BUILD.gn
|
||||
@@ -76,7 +76,7 @@ rtc_library("default_task_queue_factory") {
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/api/task_queue/BUILD.gn b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/api/task_queue/BUILD.gn
|
||||
index 1072057..745f5b7 100644
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/api/task_queue/BUILD.gn
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/api/task_queue/BUILD.gn
|
||||
@@ -82,7 +82,7 @@ rtc_library("default_task_queue_factory") {
|
||||
sources = [ "default_task_queue_factory.h" ]
|
||||
deps = [ ":task_queue" ]
|
||||
|
||||
@@ -169,11 +169,11 @@ index 4c9f591..e93c715 100644
|
||||
sources += [ "default_task_queue_factory_libevent.cc" ]
|
||||
deps += [ "../../rtc_base:rtc_task_queue_libevent" ]
|
||||
} else if (is_mac || is_ios) {
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/device_info_haiku.cc b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/device_info_haiku.cc
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/device_info_haiku.cc b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/device_info_haiku.cc
|
||||
new file mode 100644
|
||||
index 0000000..6f1c551
|
||||
--- /dev/null
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/device_info_haiku.cc
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/device_info_haiku.cc
|
||||
@@ -0,0 +1,69 @@
|
||||
+#include "modules/video_capture/haiku/device_info_haiku.h"
|
||||
+
|
||||
@@ -244,11 +244,11 @@ index 0000000..6f1c551
|
||||
+
|
||||
+} // namespace videocapturemodule
|
||||
+} // namespace webrtc
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/device_info_haiku.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/device_info_haiku.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/device_info_haiku.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/device_info_haiku.h
|
||||
new file mode 100644
|
||||
index 0000000..96352fa
|
||||
--- /dev/null
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/device_info_haiku.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/device_info_haiku.h
|
||||
@@ -0,0 +1,36 @@
|
||||
+#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_DEVICE_INFO_HAIKU_H_
|
||||
+#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_DEVICE_INFO_HAIKU_H_
|
||||
@@ -286,11 +286,11 @@ index 0000000..96352fa
|
||||
+} // namespace videocapturemodule
|
||||
+} // namespace webrtc
|
||||
+#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_DEVICE_INFO_HAIKU_H_
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/video_capture_haiku.cc b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/video_capture_haiku.cc
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.cc b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.cc
|
||||
new file mode 100644
|
||||
index 0000000..94a79df
|
||||
--- /dev/null
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/video_capture_haiku.cc
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.cc
|
||||
@@ -0,0 +1,29 @@
|
||||
+#include "modules/video_capture/haiku/video_capture_haiku.h"
|
||||
+
|
||||
@@ -321,11 +321,11 @@ index 0000000..94a79df
|
||||
+}
|
||||
+} // namespace videocapturemodule
|
||||
+} // namespace webrtc
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/video_capture_haiku.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/video_capture_haiku.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.h
|
||||
new file mode 100644
|
||||
index 0000000..55a27fc
|
||||
--- /dev/null
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/modules/video_capture/haiku/video_capture_haiku.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.h
|
||||
@@ -0,0 +1,20 @@
|
||||
+#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_VIDEO_CAPTURE_HAIKU_H_
|
||||
+#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_VIDEO_CAPTURE_HAIKU_H_
|
||||
@@ -347,12 +347,12 @@ index 0000000..55a27fc
|
||||
+} // namespace webrtc
|
||||
+
|
||||
+#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_VIDEO_CAPTURE_HAIKU_H_
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/BUILD.gn b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/BUILD.gn
|
||||
index d078482..fe48338 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/BUILD.gn
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/BUILD.gn
|
||||
@@ -450,7 +450,7 @@ rtc_source_set("rtc_operations_chain") {
|
||||
]
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/BUILD.gn b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/BUILD.gn
|
||||
index c4f4d32..d5d82d1 100644
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/BUILD.gn
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/BUILD.gn
|
||||
@@ -489,7 +489,7 @@ rtc_source_set("rtc_operations_chain") {
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
|
||||
}
|
||||
|
||||
-if (rtc_enable_libevent) {
|
||||
@@ -360,10 +360,10 @@ index d078482..fe48338 100644
|
||||
rtc_library("rtc_task_queue_libevent") {
|
||||
visibility = [ "../api/task_queue:default_task_queue_factory" ]
|
||||
sources = [
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/ip_address.cc b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/ip_address.cc
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/ip_address.cc b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/ip_address.cc
|
||||
index 9dd534c..aadf0fd 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/ip_address.cc
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/ip_address.cc
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/ip_address.cc
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/ip_address.cc
|
||||
@@ -11,6 +11,9 @@
|
||||
#if defined(WEBRTC_POSIX)
|
||||
#include <netinet/in.h>
|
||||
@@ -398,11 +398,11 @@ index 9dd534c..aadf0fd 100644
|
||||
|
||||
static bool IPIsHelper(const IPAddress& ip,
|
||||
const in6_addr& tomatch,
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/logging.cc b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/logging.cc
|
||||
index ff7369d..1208f3e 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/logging.cc
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/logging.cc
|
||||
@@ -114,7 +114,11 @@ LogMessage::LogMessage(const char* file,
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/logging.cc b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/logging.cc
|
||||
index 13a5f02..8362c3e 100644
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/logging.cc
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/logging.cc
|
||||
@@ -122,7 +122,11 @@ LogMessage::LogMessage(const char* file,
|
||||
|
||||
if (thread_) {
|
||||
PlatformThreadId id = CurrentThreadId();
|
||||
@@ -414,11 +414,11 @@ index ff7369d..1208f3e 100644
|
||||
}
|
||||
|
||||
if (file != nullptr) {
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/network.cc b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/network.cc
|
||||
index ffa8f94..29b50ab 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/network.cc
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/network.cc
|
||||
@@ -483,7 +483,7 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces,
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/network.cc b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/network.cc
|
||||
index 07c39ae..a2c077a 100644
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/network.cc
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/network.cc
|
||||
@@ -524,7 +524,7 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces,
|
||||
continue;
|
||||
}
|
||||
// Skip ones which are down.
|
||||
@@ -427,11 +427,11 @@ index ffa8f94..29b50ab 100644
|
||||
continue;
|
||||
}
|
||||
// Skip unknown family.
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/physical_socket_server.cc b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/physical_socket_server.cc
|
||||
index 0cbcb81..c0347f1 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/physical_socket_server.cc
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/physical_socket_server.cc
|
||||
@@ -70,7 +70,7 @@ typedef void* SockOptArg;
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/physical_socket_server.cc b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/physical_socket_server.cc
|
||||
index 3cb7c20..ee1b674 100644
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/physical_socket_server.cc
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/physical_socket_server.cc
|
||||
@@ -69,7 +69,7 @@ typedef void* SockOptArg;
|
||||
|
||||
#endif // WEBRTC_POSIX
|
||||
|
||||
@@ -440,7 +440,7 @@ index 0cbcb81..c0347f1 100644
|
||||
|
||||
int64_t GetSocketRecvTimestamp(int socket) {
|
||||
struct timeval tv_ioctl;
|
||||
@@ -319,7 +319,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
|
||||
@@ -332,7 +332,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
|
||||
value <<= 2;
|
||||
#endif
|
||||
}
|
||||
@@ -448,8 +448,8 @@ index 0cbcb81..c0347f1 100644
|
||||
+#if defined(WEBRTC_POSIX) && !defined(WEBRTC_HAIKU)
|
||||
if (sopt == IPV6_TCLASS) {
|
||||
// Set the IPv4 option in all cases to support dual-stack sockets.
|
||||
::setsockopt(s_, IPPROTO_IP, IP_TOS, (SockOptArg)&value, sizeof(value));
|
||||
@@ -554,7 +554,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) {
|
||||
// Don't bother checking the return code, as this is expected to fail if
|
||||
@@ -574,7 +574,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) {
|
||||
#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__)
|
||||
RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
|
||||
return -1;
|
||||
@@ -458,7 +458,7 @@ index 0cbcb81..c0347f1 100644
|
||||
*slevel = IPPROTO_IP;
|
||||
*sopt = IP_MTU_DISCOVER;
|
||||
break;
|
||||
@@ -572,7 +572,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) {
|
||||
@@ -592,7 +592,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) {
|
||||
*sopt = TCP_NODELAY;
|
||||
break;
|
||||
case OPT_DSCP:
|
||||
@@ -467,10 +467,10 @@ index 0cbcb81..c0347f1 100644
|
||||
if (family_ == AF_INET6) {
|
||||
*slevel = IPPROTO_IPV6;
|
||||
*sopt = IPV6_TCLASS;
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/platform_thread_types.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/platform_thread_types.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/platform_thread_types.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/platform_thread_types.h
|
||||
index 6b9101e..0ae52e5 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/platform_thread_types.h
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/platform_thread_types.h
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/platform_thread_types.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/platform_thread_types.h
|
||||
@@ -38,6 +38,9 @@ typedef DWORD PlatformThreadRef;
|
||||
#elif defined(WEBRTC_FUCHSIA)
|
||||
typedef zx_handle_t PlatformThreadId;
|
||||
@@ -481,10 +481,10 @@ index 6b9101e..0ae52e5 100644
|
||||
#elif defined(WEBRTC_POSIX)
|
||||
typedef pid_t PlatformThreadId;
|
||||
typedef pthread_t PlatformThreadRef;
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/system/rtc_export.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/system/rtc_export.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/system/rtc_export.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/system/rtc_export.h
|
||||
index d1eb60a..9dc761d 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/system/rtc_export.h
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/system/rtc_export.h
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/system/rtc_export.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/system/rtc_export.h
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#else // WEBRTC_WIN
|
||||
@@ -494,10 +494,10 @@ index d1eb60a..9dc761d 100644
|
||||
#define RTC_EXPORT __attribute__((visibility("default")))
|
||||
#endif
|
||||
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/system/rtc_export_template.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/system/rtc_export_template.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/system/rtc_export_template.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/system/rtc_export_template.h
|
||||
index 4ac7043..5fe950f 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/system/rtc_export_template.h
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/rtc_base/system/rtc_export_template.h
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/system/rtc_export_template.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/rtc_base/system/rtc_export_template.h
|
||||
@@ -185,7 +185,7 @@
|
||||
|
||||
RTC_EXPORT_TEMPLATE_TEST(DEFAULT, ); // NOLINT
|
||||
@@ -507,10 +507,10 @@ index 4ac7043..5fe950f 100644
|
||||
RTC_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport));
|
||||
|
||||
#undef RTC_EXPORT_TEMPLATE_TEST
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/base/options.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/base/options.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/base/options.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/base/options.h
|
||||
index 230bf1e..6e1b9e5 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/base/options.h
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/base/options.h
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/base/options.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/base/options.h
|
||||
@@ -100,7 +100,7 @@
|
||||
// User code should not inspect this macro. To check in the preprocessor if
|
||||
// absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY.
|
||||
@@ -547,10 +547,10 @@ index 230bf1e..6e1b9e5 100644
|
||||
|
||||
|
||||
// ABSL_OPTION_USE_INLINE_NAMESPACE
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/strings/match.cc b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/strings/match.cc
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/strings/match.cc b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/strings/match.cc
|
||||
index 8127cb0..40a23b6 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/strings/match.cc
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/strings/match.cc
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/strings/match.cc
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/strings/match.cc
|
||||
@@ -19,22 +19,5 @@
|
||||
namespace absl {
|
||||
ABSL_NAMESPACE_BEGIN
|
||||
@@ -574,10 +574,10 @@ index 8127cb0..40a23b6 100644
|
||||
-
|
||||
ABSL_NAMESPACE_END
|
||||
} // namespace absl
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/strings/match.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/strings/match.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/strings/match.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/strings/match.h
|
||||
index 90fca98..53ada13 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/strings/match.h
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/abseil-cpp/absl/strings/match.h
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/strings/match.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/abseil-cpp/absl/strings/match.h
|
||||
@@ -35,7 +35,9 @@
|
||||
|
||||
#include <cstring>
|
||||
@@ -622,10 +622,10 @@ index 90fca98..53ada13 100644
|
||||
|
||||
ABSL_NAMESPACE_END
|
||||
} // namespace absl
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
|
||||
index 8aa67f1..5c2b6e1 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
@@ -655,10 +655,10 @@ index 8aa67f1..5c2b6e1 100644
|
||||
#elif defined(__EMSCRIPTEN__)
|
||||
|
||||
// There is not yet a way to determine CPU count in emscripten JS environment.
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
|
||||
index 9847624..82409dd 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
|
||||
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD: head/sys/netinet/sctp.h 356357 2020-01-04 20:33:12Z tuexen $
|
||||
#ifndef _NETINET_SCTP_H_
|
||||
#define _NETINET_SCTP_H_
|
||||
@@ -668,10 +668,10 @@ index 9847624..82409dd 100644
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
|
||||
index 5afe781..e1d99a7 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
|
||||
@@ -6304,7 +6304,7 @@ sctp_input(i_pak, va_alist)
|
||||
#if defined(__Windows__)
|
||||
NTOHS(ip->ip_len);
|
||||
@@ -690,10 +690,10 @@ index 5afe781..e1d99a7 100644
|
||||
length = ip->ip_len;
|
||||
#else
|
||||
length = ip->ip_len + iphlen;
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h
|
||||
index f09cb8d..c26fad1 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h
|
||||
@@ -277,7 +277,7 @@ typedef char* caddr_t;
|
||||
|
||||
#else /* !defined(Userspace_os_Windows) */
|
||||
@@ -712,10 +712,10 @@ index f09cb8d..c26fad1 100644
|
||||
int
|
||||
timingsafe_bcmp(const void *, const void *, size_t);
|
||||
#endif
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c
|
||||
index 28922b6..dba15fd 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c
|
||||
@@ -94,7 +94,7 @@ sctp_userspace_set_threadname(const char *name)
|
||||
#endif
|
||||
}
|
||||
@@ -743,10 +743,10 @@ index 28922b6..dba15fd 100644
|
||||
int
|
||||
timingsafe_bcmp(const void *b1, const void *b2, size_t n)
|
||||
{
|
||||
diff --git a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c
|
||||
index 146a6d9..63a6240 100644
|
||||
--- a/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c
|
||||
+++ b/tg_owt-756fd0fb5f40ffb4244c675208e84de781f766f3/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c
|
||||
@@ -50,6 +50,9 @@
|
||||
#if defined(__Userspace_os_Linux)
|
||||
#define __FAVOR_BSD /* (on Ubuntu at least) enables UDP header field names like BSD in RFC 768 */
|
||||
@@ -794,5 +794,29 @@ index 146a6d9..63a6240 100644
|
||||
error = EINTR;
|
||||
}
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 489b7fbcdf3eb5f9ea7e80bc3aab944be19c3001 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 30 Jan 2021 22:18:47 +1000
|
||||
Subject: Fix build
|
||||
|
||||
|
||||
diff --git a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.h b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.h
|
||||
index 55a27fc..ac60bb0 100644
|
||||
--- a/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.h
|
||||
+++ b/tg_owt-be23804afce3bb2e80a1d57a7c1318c71b82b7de/src/modules/video_capture/haiku/video_capture_haiku.h
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
#include "modules/video_capture/video_capture_defines.h"
|
||||
#include "modules/video_capture/video_capture_impl.h"
|
||||
-#include "rtc_base/critical_section.h"
|
||||
#include "rtc_base/platform_thread.h"
|
||||
+#include "rtc_base/synchronization/mutex.h"
|
||||
|
||||
namespace webrtc {
|
||||
namespace videocapturemodule {
|
||||
--
|
||||
2.30.0
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
From 0398bc093297a179e2dc991d7332953fd98fd313 Mon Sep 17 00:00:00 2001
|
||||
From afa0d75be24ad6e3b9fb490876b0b7e7699eb246 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 28 Dec 2020 10:24:18 +1000
|
||||
Date: Sun, 31 Jan 2021 12:26:28 +1000
|
||||
Subject: Add Haiku support
|
||||
|
||||
|
||||
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
|
||||
index bff3d38..1d1a2b9 100644
|
||||
index 663453b..87ecdeb 100644
|
||||
--- a/Telegram/CMakeLists.txt
|
||||
+++ b/Telegram/CMakeLists.txt
|
||||
@@ -883,6 +883,18 @@ PRIVATE
|
||||
@@ -906,6 +906,18 @@ PRIVATE
|
||||
platform/win/windows_dlls.h
|
||||
platform/win/windows_event_filter.cpp
|
||||
platform/win/windows_event_filter.h
|
||||
platform/win/wrapper_wrl_implements_h.h
|
||||
+ platform/haiku/file_utilities_haiku.cpp
|
||||
+ platform/haiku/file_utilities_haiku.h
|
||||
+ platform/haiku/launcher_haiku.cpp
|
||||
@@ -27,7 +27,7 @@ index bff3d38..1d1a2b9 100644
|
||||
platform/platform_audio.h
|
||||
platform/platform_file_utilities.h
|
||||
platform/platform_launcher.h
|
||||
@@ -1094,7 +1106,7 @@ PRIVATE
|
||||
@@ -1119,7 +1131,7 @@ PRIVATE
|
||||
stdafx.h
|
||||
)
|
||||
|
||||
@@ -37,19 +37,10 @@ index bff3d38..1d1a2b9 100644
|
||||
window/window_title_qt.cpp
|
||||
window/window_title_qt.h
|
||||
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
|
||||
index c6333ba..4ecc9fb 100644
|
||||
index 67ffc1f..064c189 100644
|
||||
--- a/Telegram/SourceFiles/core/core_settings.h
|
||||
+++ b/Telegram/SourceFiles/core/core_settings.h
|
||||
@@ -518,7 +518,7 @@ private:
|
||||
bool _desktopNotify = true;
|
||||
bool _flashBounceNotify = true;
|
||||
DBINotifyView _notifyView = dbinvShowPreview;
|
||||
- bool _nativeNotifications = false;
|
||||
+ bool _nativeNotifications = true;
|
||||
int _notificationsCount = 3;
|
||||
ScreenCorner _notificationsCorner = ScreenCorner::BottomRight;
|
||||
bool _includeMutedCounter = true;
|
||||
@@ -561,7 +561,7 @@ private:
|
||||
@@ -576,7 +576,7 @@ private:
|
||||
rpl::variable<float64> _dialogsWidthRatio; // per-window
|
||||
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
|
||||
bool _notifyFromAll = true;
|
||||
@@ -59,10 +50,10 @@ index c6333ba..4ecc9fb 100644
|
||||
rpl::variable<bool> _systemDarkModeEnabled = false;
|
||||
rpl::variable<Window::ControlsLayout> _windowControlsLayout;
|
||||
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
|
||||
index c4e94f8..bbd1d5d 100644
|
||||
index 850e153..3bd14db 100644
|
||||
--- a/Telegram/SourceFiles/core/update_checker.cpp
|
||||
+++ b/Telegram/SourceFiles/core/update_checker.cpp
|
||||
@@ -1552,7 +1552,7 @@ bool checkReadyUpdate() {
|
||||
@@ -1553,7 +1553,7 @@ bool checkReadyUpdate() {
|
||||
ClearAll();
|
||||
return false;
|
||||
}
|
||||
@@ -72,10 +63,10 @@ index c4e94f8..bbd1d5d 100644
|
||||
ClearAll();
|
||||
return false;
|
||||
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
|
||||
index 39b2353..d6c0210 100644
|
||||
index bcc4392..6e838e6 100644
|
||||
--- a/Telegram/SourceFiles/data/data_session.cpp
|
||||
+++ b/Telegram/SourceFiles/data/data_session.cpp
|
||||
@@ -236,7 +236,7 @@ Session::Session(not_null<Main::Session*> session)
|
||||
@@ -237,7 +237,7 @@ Session::Session(not_null<Main::Session*> session)
|
||||
_cache->open(_session->local().cacheKey());
|
||||
_bigFileCache->open(_session->local().cacheBigFileKey());
|
||||
|
||||
@@ -84,33 +75,11 @@ index 39b2353..d6c0210 100644
|
||||
const auto wasVersion = _session->local().oldMapVersion();
|
||||
if (wasVersion >= 1007011 && wasVersion < 1007015) {
|
||||
_bigFileCache->clear();
|
||||
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
|
||||
index c80e59c..ae6a4a5 100644
|
||||
--- a/Telegram/SourceFiles/mainwindow.cpp
|
||||
+++ b/Telegram/SourceFiles/mainwindow.cpp
|
||||
@@ -639,7 +639,7 @@ void MainWindow::updateTrayMenu(bool force) {
|
||||
minimizeAction->setEnabled(isVisible());
|
||||
} else {
|
||||
updateIsActive();
|
||||
- auto active = Platform::IsWayland() ? isVisible() : isActive();
|
||||
+ auto active = (Platform::IsWayland() || Platform::IsHaiku()) ? isVisible() : isActive();
|
||||
auto toggleAction = actions.at(0);
|
||||
disconnect(toggleAction, SIGNAL(triggered(bool)), this, SLOT(minimizeToTray()));
|
||||
disconnect(toggleAction, SIGNAL(triggered(bool)), this, SLOT(showFromTray()));
|
||||
@@ -775,7 +775,7 @@ void MainWindow::handleTrayIconActication(
|
||||
psShowTrayMenu();
|
||||
});
|
||||
} else if (!skipTrayClick()) {
|
||||
- if (Platform::IsWayland() ? isVisible() : isActive()) {
|
||||
+ if ((Platform::IsWayland() || Platform::IsHaiku()) ? isVisible() : isActive()) {
|
||||
minimizeToTray();
|
||||
} else {
|
||||
showFromTray(reason);
|
||||
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
|
||||
index 1f25222..82f21af 100644
|
||||
index 75fff52..b4b0431 100644
|
||||
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
|
||||
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
|
||||
@@ -366,7 +366,7 @@ OverlayWidget::OverlayWidget()
|
||||
@@ -367,7 +367,7 @@ OverlayWidget::OverlayWidget()
|
||||
|
||||
hide();
|
||||
createWinId();
|
||||
@@ -233,7 +202,7 @@ index 0000000..429f17a
|
||||
+} // namespace Platform
|
||||
diff --git a/Telegram/SourceFiles/platform/haiku/launcher_haiku.cpp b/Telegram/SourceFiles/platform/haiku/launcher_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..537a2df
|
||||
index 0000000..9796438
|
||||
--- /dev/null
|
||||
+++ b/Telegram/SourceFiles/platform/haiku/launcher_haiku.cpp
|
||||
@@ -0,0 +1,32 @@
|
||||
@@ -243,7 +212,7 @@ index 0000000..537a2df
|
||||
+For license and copyright information please follow this link:
|
||||
+https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||
+
|
||||
+Copyright (c) 2018-2019 Gerasim Troeglazov, 3dEyes@gmail.com
|
||||
+Copyright (c) 2018-2021 Gerasim Troeglazov, 3dEyes@gmail.com
|
||||
+*/
|
||||
+
|
||||
+#include "platform/haiku/launcher_haiku.h"
|
||||
@@ -261,7 +230,7 @@ index 0000000..537a2df
|
||||
+namespace Platform {
|
||||
+
|
||||
+Launcher::Launcher(int argc, char *argv[])
|
||||
+: Core::Launcher(argc, argv, DeviceModelPretty(), SystemVersionPretty()) {
|
||||
+: Core::Launcher(argc, argv) {
|
||||
+}
|
||||
+
|
||||
+bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||
@@ -302,10 +271,10 @@ index 0000000..45d4cf8
|
||||
+} // namespace Platform
|
||||
diff --git a/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp b/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..4f7a1a3
|
||||
index 0000000..e30d9ba
|
||||
--- /dev/null
|
||||
+++ b/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp
|
||||
@@ -0,0 +1,91 @@
|
||||
@@ -0,0 +1,95 @@
|
||||
+/*
|
||||
+This file is part of Telegram Desktop for Haiku,
|
||||
+
|
||||
@@ -346,6 +315,10 @@ index 0000000..4f7a1a3
|
||||
+void MainWindow::psShowTrayMenu() {
|
||||
+}
|
||||
+
|
||||
+bool MainWindow::isActiveForTrayMenu() {
|
||||
+ return isVisible();
|
||||
+}
|
||||
+
|
||||
+void MainWindow::psTrayMenuUpdated() {
|
||||
+ if (trayIcon && trayIconMenu
|
||||
+ && trayIcon->contextMenu() != trayIconMenu) {
|
||||
@@ -399,10 +372,10 @@ index 0000000..4f7a1a3
|
||||
+} // namespace Platform
|
||||
diff --git a/Telegram/SourceFiles/platform/haiku/main_window_haiku.h b/Telegram/SourceFiles/platform/haiku/main_window_haiku.h
|
||||
new file mode 100644
|
||||
index 0000000..7450e60
|
||||
index 0000000..cd3e888
|
||||
--- /dev/null
|
||||
+++ b/Telegram/SourceFiles/platform/haiku/main_window_haiku.h
|
||||
@@ -0,0 +1,52 @@
|
||||
@@ -0,0 +1,54 @@
|
||||
+/*
|
||||
+This file is part of Telegram Desktop for Haiku,
|
||||
+
|
||||
@@ -429,6 +402,8 @@ index 0000000..7450e60
|
||||
+ explicit MainWindow(not_null<Window::Controller*> controller);
|
||||
+
|
||||
+ virtual QImage iconWithCounter(int size, int count, style::color bg, style::color fg, bool smallIcon) = 0;
|
||||
+
|
||||
+ bool isActiveForTrayMenu() override;
|
||||
+
|
||||
+ ~MainWindow();
|
||||
+
|
||||
@@ -546,17 +521,17 @@ index 0000000..b6f3490
|
||||
+resource app_signature "application/x-vnd.tg-notify-gate";
|
||||
diff --git a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..ef09960
|
||||
index 0000000..e77c32e
|
||||
--- /dev/null
|
||||
+++ b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp
|
||||
@@ -0,0 +1,201 @@
|
||||
@@ -0,0 +1,202 @@
|
||||
+/*
|
||||
+This file is part of Telegram Desktop for Haiku,
|
||||
+
|
||||
+For license and copyright information please follow this link:
|
||||
+https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||
+
|
||||
+Copyright (c) 2018-2019 Gerasim Troeglazov, 3dEyes@gmail.com
|
||||
+Copyright (c) 2018-2021 Gerasim Troeglazov, 3dEyes@gmail.com
|
||||
+*/
|
||||
+
|
||||
+#ifdef __x86_64__
|
||||
@@ -610,11 +585,13 @@ index 0000000..ef09960
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+std::unique_ptr<Window::Notifications::Manager> Create(
|
||||
+ Window::Notifications::System *system) {
|
||||
+ if (Core::App().settings().nativeNotifications() && Supported())
|
||||
+ return std::make_unique<Manager>(system);
|
||||
+ return nullptr;
|
||||
+void Create(Window::Notifications::System *system) {
|
||||
+ if (Core::App().settings().nativeNotifications() && Supported()) {
|
||||
+ auto result = std::make_unique<Manager>(system);
|
||||
+ system->setManager(std::move(result));
|
||||
+ return;
|
||||
+ }
|
||||
+ system->setManager(nullptr);
|
||||
+}
|
||||
+
|
||||
+void Finish() {
|
||||
@@ -648,8 +625,8 @@ index 0000000..ef09960
|
||||
+}
|
||||
+
|
||||
+Manager::Private::Private(not_null<Manager*> manager, Type type)
|
||||
+: _manager(manager)
|
||||
+, _cachedUserpics(type) {
|
||||
+: _cachedUserpics(type)
|
||||
+, _manager(manager) {
|
||||
+ portReaderThread = new QThread;
|
||||
+ portReader = new NotifyReader();
|
||||
+ portReader->moveToThread(portReaderThread);
|
||||
@@ -713,8 +690,7 @@ index 0000000..ef09960
|
||||
+ });
|
||||
+}
|
||||
+
|
||||
+Manager::Manager(not_null<Window::Notifications::System*> system)
|
||||
+: NativeManager(system)
|
||||
+Manager::Manager(Window::Notifications::System *system) : NativeManager(system)
|
||||
+, _private(std::make_unique<Private>(this, Private::Type::Rounded)) {
|
||||
+}
|
||||
+
|
||||
@@ -753,10 +729,10 @@ index 0000000..ef09960
|
||||
+} // namespace Platform
|
||||
diff --git a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h
|
||||
new file mode 100644
|
||||
index 0000000..34b6aaf
|
||||
index 0000000..52adcb0
|
||||
--- /dev/null
|
||||
+++ b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h
|
||||
@@ -0,0 +1,116 @@
|
||||
@@ -0,0 +1,123 @@
|
||||
+/*
|
||||
+This file is part of Telegram Desktop for Haiku,
|
||||
+
|
||||
@@ -802,6 +778,14 @@ index 0000000..34b6aaf
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+inline bool Enforced() {
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+inline bool ByDefault() {
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+void Finish();
|
||||
+
|
||||
+class NotifyReader:public QObject {
|
||||
@@ -818,11 +802,9 @@ index 0000000..34b6aaf
|
||||
+};
|
||||
+
|
||||
+
|
||||
+class Manager
|
||||
+ : public Window::Notifications::NativeManager
|
||||
+ , public base::has_weak_ptr {
|
||||
+class Manager : public Window::Notifications::NativeManager, public base::has_weak_ptr {
|
||||
+public:
|
||||
+ Manager(not_null<Window::Notifications::System*> system);
|
||||
+ Manager(Window::Notifications::System *system);
|
||||
+ ~Manager();
|
||||
+
|
||||
+protected:
|
||||
@@ -867,6 +849,7 @@ index 0000000..34b6aaf
|
||||
+private:
|
||||
+ Window::Notifications::CachedUserpics _cachedUserpics;
|
||||
+ base::weak_ptr<Manager> _manager;
|
||||
+
|
||||
+ QThread *portReaderThread;
|
||||
+ NotifyReader *portReader;
|
||||
+};
|
||||
@@ -875,26 +858,31 @@ index 0000000..34b6aaf
|
||||
+} // namespace Platform
|
||||
diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..a1df976
|
||||
index 0000000..6383199
|
||||
--- /dev/null
|
||||
+++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp
|
||||
@@ -0,0 +1,259 @@
|
||||
@@ -0,0 +1,264 @@
|
||||
+/*
|
||||
+This file is part of Telegram Desktop for Haiku,
|
||||
+
|
||||
+For license and copyright information please follow this link:
|
||||
+https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||
+
|
||||
+Copyright (c) 2018-2019 Gerasim Troeglazov, 3dEyes@gmail.com
|
||||
+Copyright (c) 2018-2021 Gerasim Troeglazov, 3dEyes@gmail.com
|
||||
+*/
|
||||
+
|
||||
+#include "platform/haiku/specific_haiku.h"
|
||||
+
|
||||
+#include "base/platform/base_platform_info.h"
|
||||
+#include "base/qt_adapters.h"
|
||||
+#include "platform/haiku/file_utilities_haiku.h"
|
||||
+#include "lang/lang_keys.h"
|
||||
+#include "mainwidget.h"
|
||||
+#include "mainwindow.h"
|
||||
+#include "storage/localstorage.h"
|
||||
+#include "platform/haiku/file_utilities_haiku.h"
|
||||
+#include "window/window_controller.h"
|
||||
+#include "core/update_checker.h"
|
||||
+#include "core/application.h"
|
||||
+
|
||||
+#include <QtWidgets/QApplication>
|
||||
+#include <QtWidgets/QDesktopWidget>
|
||||
@@ -1140,22 +1128,23 @@ index 0000000..a1df976
|
||||
+}
|
||||
diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.h b/Telegram/SourceFiles/platform/haiku/specific_haiku.h
|
||||
new file mode 100644
|
||||
index 0000000..b10ef6b
|
||||
index 0000000..ceda709
|
||||
--- /dev/null
|
||||
+++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.h
|
||||
@@ -0,0 +1,132 @@
|
||||
@@ -0,0 +1,133 @@
|
||||
+/*
|
||||
+This file is part of Telegram Desktop for Haiku,
|
||||
+
|
||||
+For license and copyright information please follow this link:
|
||||
+https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||
+
|
||||
+Copyright (c) 2018-2019 Gerasim Troeglazov, 3dEyes@gmail.com
|
||||
+Copyright (c) 2018-2021 Gerasim Troeglazov, 3dEyes@gmail.com
|
||||
+*/
|
||||
+
|
||||
+#pragma once
|
||||
+
|
||||
+#include <signal.h>
|
||||
+#include "platform/platform_specific.h"
|
||||
+
|
||||
+namespace Data {
|
||||
+class LocationPoint;
|
||||
@@ -1402,10 +1391,10 @@ index 4bdb939..88bfaf6 100644
|
||||
#include "platform/linux/main_window_linux.h"
|
||||
#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX
|
||||
diff --git a/Telegram/SourceFiles/platform/platform_notifications_manager.h b/Telegram/SourceFiles/platform/platform_notifications_manager.h
|
||||
index 4afeadf..7e4398a 100644
|
||||
index eb3efbd..783d442 100644
|
||||
--- a/Telegram/SourceFiles/platform/platform_notifications_manager.h
|
||||
+++ b/Telegram/SourceFiles/platform/platform_notifications_manager.h
|
||||
@@ -27,6 +27,8 @@ namespace Notifications {
|
||||
@@ -28,6 +28,8 @@ void Create(Window::Notifications::System *system);
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#include "platform/mac/notifications_manager_mac.h"
|
||||
@@ -1440,24 +1429,11 @@ index cd6b3a6..e08f0bd 100644
|
||||
#elif defined Q_OS_WIN // Q_OS_MAC
|
||||
#include "platform/win/window_title_win.h"
|
||||
#elif defined Q_OS_UNIX // Q_OS_MAC || Q_OS_WIN
|
||||
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
|
||||
index 19ce0db..7597438 100644
|
||||
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
|
||||
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
|
||||
@@ -680,7 +680,7 @@ void SetupNotificationsContent(
|
||||
return QString();
|
||||
} else if (Platform::IsWindows()) {
|
||||
return tr::lng_settings_use_windows(tr::now);
|
||||
- } else if (Platform::IsLinux() && !Platform::IsWayland()) {
|
||||
+ } else if ((Platform::IsLinux() || Platform::IsHaiku()) && !Platform::IsWayland()) {
|
||||
return tr::lng_settings_use_native_notifications(tr::now);
|
||||
}
|
||||
return QString();
|
||||
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
|
||||
index f9733b6..e717f58 100644
|
||||
index 9bbbdad..c672d21 100644
|
||||
--- a/Telegram/SourceFiles/window/main_window.cpp
|
||||
+++ b/Telegram/SourceFiles/window/main_window.cpp
|
||||
@@ -116,7 +116,7 @@ QIcon CreateOfficialIcon(Main::Session *session) {
|
||||
@@ -118,7 +118,7 @@ QIcon CreateOfficialIcon(Main::Session *session) {
|
||||
|
||||
QIcon CreateIcon(Main::Session *session) {
|
||||
auto result = CreateOfficialIcon(session);
|
||||
@@ -2345,10 +2321,10 @@ index 0bc42eb..c87cde9 100644
|
||||
typedef pid_t PlatformThreadId;
|
||||
typedef pthread_t PlatformThreadRef;
|
||||
diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake
|
||||
index 6e837df..7e3964b 100644
|
||||
index cde4f61..f353179 100644
|
||||
--- a/Telegram/cmake/lib_tgcalls.cmake
|
||||
+++ b/Telegram/cmake/lib_tgcalls.cmake
|
||||
@@ -132,6 +132,11 @@ if (WIN32)
|
||||
@@ -134,6 +134,11 @@ if (WIN32)
|
||||
PRIVATE
|
||||
WEBRTC_WIN
|
||||
)
|
||||
@@ -2409,13 +2385,13 @@ index 684f927..96811ce 100644
|
||||
target_compile_definitions(lib_tgvoip_bundled
|
||||
PUBLIC
|
||||
diff --git a/Telegram/lib_base/CMakeLists.txt b/Telegram/lib_base/CMakeLists.txt
|
||||
index 0c3df48..bab01fe 100644
|
||||
index 6330f68..79b4d51 100644
|
||||
--- a/Telegram/lib_base/CMakeLists.txt
|
||||
+++ b/Telegram/lib_base/CMakeLists.txt
|
||||
@@ -66,6 +66,20 @@ PRIVATE
|
||||
base/platform/win/base_windows_h.h
|
||||
@@ -69,6 +69,20 @@ PRIVATE
|
||||
base/platform/win/base_windows_safe_library.cpp
|
||||
base/platform/win/base_windows_safe_library.h
|
||||
base/platform/win/wrl/wrl_implements_h.h
|
||||
+ base/platform/haiku/base_file_utilities_haiku.cpp
|
||||
+ base/platform/haiku/base_file_utilities_haiku.h
|
||||
+ base/platform/haiku/base_global_shortcuts_haiku.cpp
|
||||
@@ -2434,10 +2410,10 @@ index 0c3df48..bab01fe 100644
|
||||
base/platform/base_platform_info.h
|
||||
base/platform/base_platform_last_input.h
|
||||
diff --git a/Telegram/lib_base/base/crash_report_writer.cpp b/Telegram/lib_base/base/crash_report_writer.cpp
|
||||
index dff7624..c20bb20 100644
|
||||
index 0552958..202b6ae 100644
|
||||
--- a/Telegram/lib_base/base/crash_report_writer.cpp
|
||||
+++ b/Telegram/lib_base/base/crash_report_writer.cpp
|
||||
@@ -107,6 +107,8 @@ const char *PlatformString() {
|
||||
@@ -111,6 +111,8 @@ const char *PlatformString() {
|
||||
return "Linux32Bit";
|
||||
} else if (Platform::IsLinux64Bit()) {
|
||||
return "Linux64bit";
|
||||
@@ -2446,7 +2422,7 @@ index dff7624..c20bb20 100644
|
||||
}
|
||||
Unexpected("Platform in CrashReports::PlatformString.");
|
||||
}
|
||||
@@ -243,7 +245,7 @@ void SignalHandler(int signum) {
|
||||
@@ -247,7 +249,7 @@ void SignalHandler(int signum) {
|
||||
ReportingThreadId = nullptr;
|
||||
}
|
||||
|
||||
@@ -2469,10 +2445,10 @@ index 1b63b2a..00a9900 100644
|
||||
#include "base/platform/linux/base_file_utilities_linux.h"
|
||||
#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX
|
||||
diff --git a/Telegram/lib_base/base/platform/base_platform_info.h b/Telegram/lib_base/base/platform/base_platform_info.h
|
||||
index da604d0..9339f94 100644
|
||||
index f5b319f..3051caf 100644
|
||||
--- a/Telegram/lib_base/base/platform/base_platform_info.h
|
||||
+++ b/Telegram/lib_base/base/platform/base_platform_info.h
|
||||
@@ -58,6 +58,8 @@ enum class OutdateReason {
|
||||
@@ -60,6 +60,8 @@ enum class OutdateReason {
|
||||
[[nodiscard]] QString GetLibcName();
|
||||
[[nodiscard]] QString GetLibcVersion();
|
||||
|
||||
@@ -2481,7 +2457,7 @@ index da604d0..9339f94 100644
|
||||
void Start(QJsonObject settings);
|
||||
void Finish();
|
||||
|
||||
@@ -65,6 +67,8 @@ void Finish();
|
||||
@@ -67,6 +69,8 @@ void Finish();
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#include "base/platform/mac/base_info_mac.h"
|
||||
@@ -2752,10 +2728,10 @@ index 0000000..20dcf3e
|
||||
+} // namespace Platform
|
||||
diff --git a/Telegram/lib_base/base/platform/haiku/base_info_haiku.h b/Telegram/lib_base/base/platform/haiku/base_info_haiku.h
|
||||
new file mode 100644
|
||||
index 0000000..dc77ab1
|
||||
index 0000000..9e49e7c
|
||||
--- /dev/null
|
||||
+++ b/Telegram/lib_base/base/platform/haiku/base_info_haiku.h
|
||||
@@ -0,0 +1,43 @@
|
||||
@@ -0,0 +1,45 @@
|
||||
+/*
|
||||
+This file is part of Telegram Desktop for Haiku,
|
||||
+
|
||||
@@ -2777,6 +2753,8 @@ index 0000000..dc77ab1
|
||||
+inline constexpr bool IsLinux32Bit() { return false; }
|
||||
+inline constexpr bool IsLinux64Bit() { return false; }
|
||||
+inline constexpr bool IsWindows() { return false; }
|
||||
+inline constexpr bool IsWindows32Bit() { return false; }
|
||||
+inline constexpr bool IsWindows64Bit() { return false; }
|
||||
+inline constexpr bool IsWindowsStoreBuild() { return false; }
|
||||
+inline bool IsWindowsXPOrGreater() { return false; }
|
||||
+inline bool IsWindowsVistaOrGreater() { return false; }
|
||||
@@ -3035,10 +3013,10 @@ index 0000000..f682740
|
||||
+
|
||||
+#endif // CRL_USE_LINUX_TIME
|
||||
diff --git a/Telegram/lib_ui/CMakeLists.txt b/Telegram/lib_ui/CMakeLists.txt
|
||||
index 9860dbe..519ca00 100644
|
||||
index 770ba1a..cb50b55 100644
|
||||
--- a/Telegram/lib_ui/CMakeLists.txt
|
||||
+++ b/Telegram/lib_ui/CMakeLists.txt
|
||||
@@ -93,6 +93,10 @@ PRIVATE
|
||||
@@ -95,6 +95,10 @@ PRIVATE
|
||||
ui/platform/win/ui_window_win.h
|
||||
ui/platform/win/ui_utility_win.cpp
|
||||
ui/platform/win/ui_utility_win.h
|
||||
@@ -3207,24 +3185,43 @@ index 570d169..8644d20 100644
|
||||
if (bold) {
|
||||
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
|
||||
result.setWeight(QFont::DemiBold);
|
||||
diff --git a/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.cpp b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.cpp
|
||||
index 8dfa916..01ece83 100644
|
||||
--- a/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.cpp
|
||||
+++ b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.cpp
|
||||
@@ -5,7 +5,12 @@
|
||||
diff --git a/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp b/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp
|
||||
index 410deb3..4ed5195 100644
|
||||
--- a/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp
|
||||
+++ b/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp
|
||||
@@ -4,6 +4,14 @@
|
||||
// For license and copyright information please follow this link:
|
||||
// https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||
//
|
||||
#include "webrtc/webrtc_audio_input_tester.h"
|
||||
-
|
||||
+
|
||||
+// Don't include SupportDefs.h
|
||||
+#ifdef __HAIKU__
|
||||
+#define _SUPPORT_DEFS_H
|
||||
+typedef int32 status_t;
|
||||
+typedef uint32 type_code;
|
||||
+#endif
|
||||
+
|
||||
#include "webrtc/details/webrtc_openal_adm.h"
|
||||
|
||||
#include "base/timer.h"
|
||||
diff --git a/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.cpp b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.cpp
|
||||
index 092b667..a681b03 100644
|
||||
--- a/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.cpp
|
||||
+++ b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.cpp
|
||||
@@ -6,6 +6,13 @@
|
||||
//
|
||||
#include "webrtc/webrtc_audio_input_tester.h"
|
||||
|
||||
+// Don't include SupportDefs.h
|
||||
+#ifdef __HAIKU__
|
||||
+#define _SUPPORT_DEFS_H
|
||||
+typedef int32 status_t;
|
||||
+typedef uint32 type_code;
|
||||
+#endif
|
||||
+
|
||||
#include "webrtc/webrtc_create_adm.h"
|
||||
#include "media/engine/webrtc_media_engine.h"
|
||||
#include "api/task_queue/default_task_queue_factory.h"
|
||||
#include "crl/crl_object_on_thread.h"
|
||||
diff --git a/cmake/external/webrtc/CMakeLists.txt b/cmake/external/webrtc/CMakeLists.txt
|
||||
index 477fc6f..2d93d07 100644
|
||||
--- a/cmake/external/webrtc/CMakeLists.txt
|
||||
@@ -3384,5 +3381,5 @@ index c30a1ca..74bcb5e 100644
|
||||
if (CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
set(build_linux32 1)
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
SUMMARY="Telegram Desktop Messenger"
|
||||
DESCRIPTION="Unofficial build of the original Telegram client for Haiku."
|
||||
HOMEPAGE="https://www.telegram.org/"
|
||||
COPYRIGHT="2013-2020 Telegram"
|
||||
COPYRIGHT="2013-2021 Telegram"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
|
||||
CHECKSUM_SHA256="1f350a13b05a3c02727e457f21c2fd640e8163cc9a0442e8fa7c99bc2112e4b4"
|
||||
CHECKSUM_SHA256="9c89cb31f8ba8a26821fe3c2769b04162e8d7629d327f9cd25a892e88878417e"
|
||||
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
|
||||
SOURCE_DIR="tdesktop-$portVersion-full"
|
||||
srcGitRev_2="756fd0fb5f40ffb4244c675208e84de781f766f3"
|
||||
srcGitRev_2="be23804afce3bb2e80a1d57a7c1318c71b82b7de"
|
||||
SOURCE_URI_2="https://github.com/desktop-app/tg_owt/archive/$srcGitRev_2.tar.gz"
|
||||
CHECKSUM_SHA256_2="bdf262295da94c2732b962a8f35e4b8db88ecdc21b634337f8774dca790bd06b"
|
||||
CHECKSUM_SHA256_2="b0bcf4f982fe955d41d30c2d2ccab65a9f7fc587dc334c03219aba0c4dd3d13e"
|
||||
SOURCE_FILENAME_2="tg_owt-$srcGitRev_2.tar.gz"
|
||||
srcGitRev_3="3a38edea2cd114d53914cab017cab2e43a600031"
|
||||
srcGitRev_3="ebb5ffc1d462c70dfb2283a5c7afcb75288c7692"
|
||||
SOURCE_URI_3="https://github.com/webmproject/libvpx/archive/$srcGitRev_3.tar.gz"
|
||||
CHECKSUM_SHA256_3="a29148c2d97c18641548aaac7694e1eceeabd8ecdcc15fe845889cfcf69a2efd"
|
||||
CHECKSUM_SHA256_3="a7adf6a905fe7e51caf45ef16c2c4b80fff253db08d49633a045310e0fd3793c"
|
||||
SOURCE_FILENAME_3="libvpx-$srcGitRev_3.tar.gz"
|
||||
srcGitRev_4="19d71f6b351fe992ae34b114eebd872c383a6bdb"
|
||||
SOURCE_URI_4="https://github.com/lemenkov/libyuv/archive/$srcGitRev_4.tar.gz"
|
||||
@@ -166,7 +166,7 @@ BUILD()
|
||||
-DTDESKTOP_API_HASH=$TELEGRAM_API_HASH
|
||||
|
||||
# multi-job takes too much memory
|
||||
make
|
||||
make $jobArgs
|
||||
|
||||
#build notify gate tool
|
||||
gcc -o tg-notify-gate $sourceDir/Telegram/SourceFiles/platform/haiku/notifications_haiku_gate.cpp -lbe
|
||||
Reference in New Issue
Block a user