mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
tg_owt: bump version
This commit is contained in:
@@ -1,23 +1,23 @@
|
||||
From 97b3ce61414ded808893838668ba30b6d84010a8 Mon Sep 17 00:00:00 2001
|
||||
From d019205b25ee4228eabdff960034b35aa35bcb7b Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Wed, 2 Feb 2022 08:32:54 +1000
|
||||
Date: Tue, 15 Mar 2022 00:13:15 +1000
|
||||
Subject: Add Haiku support
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a9246d4..fdd079b 100644
|
||||
index f400cfc..0aeba37 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -186,7 +186,7 @@ endif()
|
||||
@@ -188,7 +188,7 @@ endif()
|
||||
include(cmake/libwebrtcbuild.cmake)
|
||||
target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
|
||||
|
||||
-if (UNIX AND NOT APPLE)
|
||||
+if (UNIX AND NOT APPLE AND NOT HAIKU)
|
||||
link_x11(tg_owt)
|
||||
link_glib(tg_owt)
|
||||
endif()
|
||||
@@ -1527,6 +1527,9 @@ PRIVATE
|
||||
|
||||
@@ -1528,6 +1528,9 @@ PRIVATE
|
||||
modules/video_capture/device_info_impl.cc
|
||||
modules/video_capture/linux/device_info_linux.cc
|
||||
modules/video_capture/linux/video_capture_linux.cc
|
||||
@@ -27,7 +27,7 @@ index a9246d4..fdd079b 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
|
||||
@@ -2100,6 +2103,7 @@ PRIVATE
|
||||
@@ -2101,6 +2104,7 @@ PRIVATE
|
||||
modules/desktop_capture/mouse_cursor.h
|
||||
modules/desktop_capture/mouse_cursor_monitor.h
|
||||
modules/desktop_capture/mouse_cursor_monitor_linux.cc
|
||||
@@ -35,7 +35,7 @@ index a9246d4..fdd079b 100644
|
||||
modules/desktop_capture/mouse_cursor_monitor_mac.mm
|
||||
modules/desktop_capture/mouse_cursor_monitor_win.cc
|
||||
modules/desktop_capture/resolution_tracker.cc
|
||||
@@ -2111,8 +2115,10 @@ PRIVATE
|
||||
@@ -2112,8 +2116,10 @@ PRIVATE
|
||||
modules/desktop_capture/screen_capturer_helper.h
|
||||
modules/desktop_capture/screen_capturer_darwin.mm
|
||||
modules/desktop_capture/screen_capturer_linux.cc
|
||||
@@ -46,7 +46,7 @@ index a9246d4..fdd079b 100644
|
||||
modules/desktop_capture/window_capturer_mac.mm
|
||||
modules/desktop_capture/window_capturer_win.cc
|
||||
modules/desktop_capture/window_finder.cc
|
||||
@@ -2127,6 +2133,10 @@ PRIVATE
|
||||
@@ -2128,6 +2134,10 @@ PRIVATE
|
||||
modules/desktop_capture/screen_capturer_null.cc
|
||||
modules/desktop_capture/window_capturer_null.cc
|
||||
|
||||
@@ -58,12 +58,12 @@ index a9246d4..fdd079b 100644
|
||||
modules/desktop_capture/linux/base_capturer_pipewire.cc
|
||||
modules/desktop_capture/linux/base_capturer_pipewire.h
|
||||
diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake
|
||||
index 949102a..3c6f359 100644
|
||||
index 04f5aa9..f99e975 100644
|
||||
--- a/cmake/libusrsctp.cmake
|
||||
+++ b/cmake/libusrsctp.cmake
|
||||
@@ -25,6 +25,11 @@ elseif (APPLE)
|
||||
HAVE_SA_LEN
|
||||
HAVE_SCONN_LEN
|
||||
@@ -30,6 +30,11 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
|
||||
PRIVATE
|
||||
__Userspace_os_OpenBSD
|
||||
)
|
||||
+elseif (HAIKU)
|
||||
+ target_compile_definitions(libusrsctp
|
||||
@@ -74,7 +74,7 @@ index 949102a..3c6f359 100644
|
||||
target_compile_definitions(libusrsctp
|
||||
PRIVATE
|
||||
diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
|
||||
index 46467d7..a380a29 100644
|
||||
index 7d955ea..608a16a 100644
|
||||
--- a/cmake/libwebrtcbuild.cmake
|
||||
+++ b/cmake/libwebrtcbuild.cmake
|
||||
@@ -53,6 +53,12 @@ if (WIN32)
|
||||
@@ -1555,7 +1555,7 @@ index 5165a3e..146c787 100644
|
||||
visibility = [ "../api/task_queue:default_task_queue_factory" ]
|
||||
sources = [
|
||||
diff --git a/src/rtc_base/byte_order.h b/src/rtc_base/byte_order.h
|
||||
index f1f87e3..7b8bd85 100644
|
||||
index b4e7e9d..0501bcd 100644
|
||||
--- a/src/rtc_base/byte_order.h
|
||||
+++ b/src/rtc_base/byte_order.h
|
||||
@@ -88,7 +88,7 @@
|
||||
@@ -1565,7 +1565,7 @@ index f1f87e3..7b8bd85 100644
|
||||
-#elif defined(WEBRTC_LINUX)
|
||||
+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_HAIKU)
|
||||
#include <endian.h>
|
||||
#elif defined(WEBRTC_FREEBSD)
|
||||
#elif defined(WEBRTC_FREEBSD) || defined(WEBRTC_OPENBSD)
|
||||
#include <sys/endian.h>
|
||||
diff --git a/src/rtc_base/ip_address.cc b/src/rtc_base/ip_address.cc
|
||||
index a5498c6..3e829bf 100644
|
||||
@@ -1657,7 +1657,7 @@ index d89139d..6d1cae3 100644
|
||||
*slevel = IPPROTO_IPV6;
|
||||
*sopt = IPV6_TCLASS;
|
||||
diff --git a/src/rtc_base/platform_thread_types.h b/src/rtc_base/platform_thread_types.h
|
||||
index 6b9101e..0ae52e5 100644
|
||||
index 6046281..0a113ad 100644
|
||||
--- a/src/rtc_base/platform_thread_types.h
|
||||
+++ b/src/rtc_base/platform_thread_types.h
|
||||
@@ -38,6 +38,9 @@ typedef DWORD PlatformThreadRef;
|
||||
@@ -1668,8 +1668,8 @@ index 6b9101e..0ae52e5 100644
|
||||
+typedef pthread_t PlatformThreadId;
|
||||
+typedef pthread_t PlatformThreadRef;
|
||||
#elif defined(WEBRTC_POSIX)
|
||||
typedef pid_t PlatformThreadId;
|
||||
typedef pthread_t PlatformThreadRef;
|
||||
#if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
|
||||
typedef mach_port_t PlatformThreadId;
|
||||
diff --git a/src/rtc_base/system/rtc_export.h b/src/rtc_base/system/rtc_export.h
|
||||
index d1eb60a..9dc761d 100644
|
||||
--- a/src/rtc_base/system/rtc_export.h
|
||||
@@ -1821,6 +1821,21 @@ index ba64aaf..b5d8cf1
|
||||
int
|
||||
timingsafe_bcmp(const void *b1, const void *b2, size_t n)
|
||||
{
|
||||
diff --git a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_environment.c b/src/third_party/usrsctp/usrsctplib/usrsctplib/user_environment.c
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index 1887718..2e3409e
|
||||
--- a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_environment.c
|
||||
+++ b/src/third_party/usrsctp/usrsctplib/usrsctplib/user_environment.c
|
||||
@@ -172,7 +172,7 @@ finish_random(void)
|
||||
{
|
||||
return;
|
||||
}
|
||||
-#elif (defined(__ANDROID__) && (__ANDROID_API__ < 28)) || defined(__EMSCRIPTEN__)
|
||||
+#elif (defined(__ANDROID__) && (__ANDROID_API__ < 28)) || defined(__EMSCRIPTEN__) || defined(__HAIKU__)
|
||||
#include <fcntl.h>
|
||||
|
||||
static int fd = -1;
|
||||
diff --git a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c b/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
@@ -1873,21 +1888,6 @@ index 513a5a9..73fd4e2
|
||||
if (error == ERESTART) {
|
||||
error = EINTR;
|
||||
}
|
||||
diff --git a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_environment.c b/src/third_party/usrsctp/usrsctplib/usrsctplib/user_environment.c
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index 1887718..2e3409e
|
||||
--- a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_environment.c
|
||||
+++ b/src/third_party/usrsctp/usrsctplib/usrsctplib/user_environment.c
|
||||
@@ -172,7 +172,7 @@ finish_random(void)
|
||||
{
|
||||
return;
|
||||
}
|
||||
-#elif (defined(__ANDROID__) && (__ANDROID_API__ < 28)) || defined(__EMSCRIPTEN__)
|
||||
+#elif (defined(__ANDROID__) && (__ANDROID_API__ < 28)) || defined(__EMSCRIPTEN__) || defined(__HAIKU__)
|
||||
#include <fcntl.h>
|
||||
|
||||
static int fd = -1;
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -4,10 +4,10 @@ HOMEPAGE="https://github.com/desktop-app/tg_owt"
|
||||
COPYRIGHT="2013-2022 Telegram"
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="1"
|
||||
srcGitRev="25c8637f5975db830cc5d74477641a8b609e248d"
|
||||
srcGitRev="a264028ec71d9096e0aa629113c49c25db89d260"
|
||||
SOURCE_URI="https://github.com/desktop-app/tg_owt/archive/$srcGitRev.tar.gz"
|
||||
SOURCE_DIR="tg_owt-$srcGitRev"
|
||||
CHECKSUM_SHA256="beb9965fc26df034e29d171ac9f6ed936066330692e935f9e662d57e689c6a04"
|
||||
CHECKSUM_SHA256="b9d2376e7d4da2e5edf3c2ea86474fa821f39269f1ba2901f30ab7a6e38347b2"
|
||||
SOURCE_FILENAME="tg_owt-$srcGitRev.tar.gz"
|
||||
srcGitRev_2="5b3351bd07e83f9f9a4cb6629561331ecdb7c546"
|
||||
SOURCE_URI_2="https://github.com/lemenkov/libyuv/archive/$srcGitRev_2.tar.gz"
|
||||
Reference in New Issue
Block a user