haikuports · Jul 22, 2021
Showing with 170 additions and 37 deletions.

+163 −31 media-libs/tg_owt/patches/{tg_owt-0.0.20210422.patchset → tg_owt-0.0.20210627.patchset}

+7 −6 media-libs/tg_owt/{tg_owt-0.0.20210422.recipe → tg_owt-0.0.20210627.recipe}
diff --git a/..._owt/patches/tg_owt-0.0.20210422.patchset → ..._owt/patches/tg_owt-0.0.20210627.patchset b/..._owt/patches/tg_owt-0.0.20210422.patchset → ..._owt/patches/tg_owt-0.0.20210627.patchset
@@ -1,32 +1,40 @@
-From c3e856bc13442b529003fd3b9816931cd44183c8 Mon Sep 17 00:00:00 2001
+From 0920a87753099a5a2f6823eaf168bf82b8586877 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 27 Apr 2021 10:37:28 +1000
+Date: Thu, 22 Jul 2021 19:58:59 +1000
 Subject: Add Haiku support
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f8e3bd..fb4c807 100644
+index f5696ed..5106673 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -62,7 +62,7 @@ include(cmake/libusrsctp.cmake)
+@@ -71,7 +71,7 @@ include(cmake/libsrtp.cmake)
+ include(cmake/libusrsctp.cmake)
  include(cmake/libvpx.cmake)
- include(cmake/libwebrtcbuild.cmake)
  include(cmake/libyuv.cmake)
 -if (NOT WIN32 AND NOT APPLE)
 +if (NOT WIN32 AND NOT APPLE AND NOT HAIKU)
      include(cmake/libevent.cmake)
  endif()
  if (APPLE)
-@@ -131,7 +131,7 @@ PRIVATE
-     ${libopenh264_yasm_objects}
- )
+@@ -160,14 +160,14 @@ if (TG_OWT_BUILD_AUDIO_BACKENDS AND (UNIX AND NOT APPLE))
+     link_dl(tg_owt)
+ endif()
 
 -if (NOT WIN32 AND NOT APPLE)
 +if (NOT WIN32 AND NOT APPLE AND NOT HAIKU)
-     target_link_libraries(tg_owt PRIVATE tg_owt::libevent)
+     link_libevent(tg_owt)
  endif()
- if (APPLE)
-@@ -407,6 +407,8 @@ PRIVATE
+
+ 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()
+@@ -446,6 +446,8 @@ PRIVATE
      rtc_base/task_queue.cc
      rtc_base/task_queue_gcd.cc
      rtc_base/task_queue_gcd.h
@@ -35,15 +43,15 @@ index 7f8e3bd..fb4c807 100644
      rtc_base/task_queue_libevent.cc
      rtc_base/task_queue_libevent.h
      rtc_base/task_queue_win.cc
-@@ -485,6 +487,7 @@ PRIVATE
+@@ -527,6 +529,7 @@ PRIVATE
      api/stats_types.cc
      api/task_queue/default_task_queue_factory.h
      api/task_queue/default_task_queue_factory_gcd.cc
 +    api/task_queue/default_task_queue_factory_stdlib.cc
      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
-@@ -1380,6 +1383,8 @@ PRIVATE
+@@ -1458,6 +1461,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 +60,26 @@ index 7f8e3bd..fb4c807 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
-@@ -2149,7 +2154,7 @@ else()
+@@ -2006,6 +2011,7 @@ PRIVATE
+     modules/desktop_capture/mouse_cursor.h
+     modules/desktop_capture/mouse_cursor_monitor.h
+     modules/desktop_capture/mouse_cursor_monitor_linux.cc
++    modules/desktop_capture/mouse_cursor_monitor_haiku.cc
+     modules/desktop_capture/mouse_cursor_monitor_mac.mm
+     modules/desktop_capture/mouse_cursor_monitor_win.cc
+     modules/desktop_capture/resolution_tracker.cc
+@@ -2017,8 +2023,10 @@ PRIVATE
+     modules/desktop_capture/screen_capturer_helper.h
+     modules/desktop_capture/screen_capturer_darwin.mm
+     modules/desktop_capture/screen_capturer_linux.cc
++    modules/desktop_capture/screen_capturer_haiku.cc
+     modules/desktop_capture/screen_capturer_win.cc
+     modules/desktop_capture/window_capturer_linux.cc
++    modules/desktop_capture/window_capturer_haiku.cc
+     modules/desktop_capture/window_capturer_mac.mm
+     modules/desktop_capture/window_capturer_win.cc
+     modules/desktop_capture/window_finder.cc
+@@ -2307,7 +2315,7 @@ else()
      )
  endif()
 
@@ -61,17 +88,17 @@ index 7f8e3bd..fb4c807 100644
      remove_target_sources(tg_owt ${webrtc_loc}
          rtc_base/task_queue_libevent.cc
          rtc_base/task_queue_libevent.h
-@@ -2165,7 +2170,7 @@ else()
+@@ -2323,7 +2331,7 @@ else()
  endif()
 
  set(platform_export)
--if (NOT WIN32 AND NOT APPLE)
-+if (NOT WIN32 AND NOT APPLE AND NOT HAIKU)
+-if (NOT WIN32 AND NOT APPLE AND NOT LIBEVENT_FOUND)
++if (NOT WIN32 AND NOT APPLE AND NOT HAIKU AND NOT LIBEVENT_FOUND)
      set(platform_export
          libevent
      )
 diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake
-index ad41d12..2cd35f4 100644
+index 1dc5e5e..e88531c 100644
 --- a/cmake/libusrsctp.cmake
 +++ b/cmake/libusrsctp.cmake
 @@ -31,6 +31,11 @@ elseif (APPLE)
@@ -87,10 +114,10 @@ index ad41d12..2cd35f4 100644
      target_compile_definitions(libusrsctp
      PRIVATE
 diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
-index 15f854e..d77f40a 100644
+index 86e2993..7cd70b6 100644
 --- a/cmake/libwebrtcbuild.cmake
 +++ b/cmake/libwebrtcbuild.cmake
-@@ -40,6 +40,12 @@ elseif (APPLE)
+@@ -58,6 +58,12 @@ elseif (APPLE)
          WEBRTC_POSIX
          WEBRTC_MAC
      )
@@ -158,6 +185,111 @@ index 1072057..745f5b7 100644
      sources += [ "default_task_queue_factory_libevent.cc" ]
      deps += [ "../../rtc_base:rtc_task_queue_libevent" ]
    } else if (is_mac || is_ios) {
+diff --git a/src/modules/desktop_capture/mouse_cursor_monitor_haiku.cc b/src/modules/desktop_capture/mouse_cursor_monitor_haiku.cc
+new file mode 100644
+index 0000000..8ea2aa2
+--- /dev/null
++++ b/src/modules/desktop_capture/mouse_cursor_monitor_haiku.cc
+@@ -0,0 +1,39 @@
++/*
++ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
++#include <memory>
++
++#include "modules/desktop_capture/desktop_capture_types.h"
++#include "modules/desktop_capture/mouse_cursor_monitor.h"
++//#include "modules/desktop_capture/haiku/mouse_cursor_monitor.h"
++
++namespace webrtc {
++
++// static
++MouseCursorMonitor* MouseCursorMonitor::CreateForWindow(
++    const DesktopCaptureOptions& options,
++    WindowId window) {
++  return nullptr;
++}
++
++// static
++MouseCursorMonitor* MouseCursorMonitor::CreateForScreen(
++    const DesktopCaptureOptions& options,
++    ScreenId screen) {
++  return nullptr;
++}
++
++// static
++std::unique_ptr<MouseCursorMonitor> MouseCursorMonitor::Create(
++    const DesktopCaptureOptions& options) {
++  return nullptr;
++}
++
++}  // namespace webrtc
+diff --git a/src/modules/desktop_capture/screen_capturer_haiku.cc b/src/modules/desktop_capture/screen_capturer_haiku.cc
+new file mode 100644
+index 0000000..da0428e
+--- /dev/null
++++ b/src/modules/desktop_capture/screen_capturer_haiku.cc
+@@ -0,0 +1,24 @@
++/*
++ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
++#include <memory>
++
++#include "modules/desktop_capture/desktop_capture_options.h"
++#include "modules/desktop_capture/desktop_capturer.h"
++
++namespace webrtc {
++
++// static
++std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
++    const DesktopCaptureOptions& options) {
++  return nullptr;
++}
++
++}  // namespace webrtc
+diff --git a/src/modules/desktop_capture/window_capturer_haiku.cc b/src/modules/desktop_capture/window_capturer_haiku.cc
+new file mode 100644
+index 0000000..1092898
+--- /dev/null
++++ b/src/modules/desktop_capture/window_capturer_haiku.cc
+@@ -0,0 +1,24 @@
++/*
++ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
++ *
++ *  Use of this source code is governed by a BSD-style license
++ *  that can be found in the LICENSE file in the root of the source
++ *  tree. An additional intellectual property rights grant can be found
++ *  in the file PATENTS.  All contributing project authors may
++ *  be found in the AUTHORS file in the root of the source tree.
++ */
++
++#include <memory>
++
++#include "modules/desktop_capture/desktop_capture_options.h"
++#include "modules/desktop_capture/desktop_capturer.h"
++
++namespace webrtc {
++
++// static
++std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
++    const DesktopCaptureOptions& options) {
++  return nullptr;
++}
++
++}  // namespace webrtc
 diff --git a/src/modules/video_capture/haiku/device_info_haiku.cc b/src/modules/video_capture/haiku/device_info_haiku.cc
 new file mode 100644
 index 0000000..6f1c551
@@ -337,7 +469,7 @@ index 0000000..ac60bb0
 +
 +#endif  // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_VIDEO_CAPTURE_HAIKU_H_
 diff --git a/src/rtc_base/BUILD.gn b/src/rtc_base/BUILD.gn
-index c4f4d32..d5d82d1 100644
+index 3cf1a9f..013e361 100644
 --- a/src/rtc_base/BUILD.gn
 +++ b/src/rtc_base/BUILD.gn
 @@ -489,7 +489,7 @@ rtc_source_set("rtc_operations_chain") {
@@ -350,7 +482,7 @@ index c4f4d32..d5d82d1 100644
      visibility = [ "../api/task_queue:default_task_queue_factory" ]
      sources = [
 diff --git a/src/rtc_base/ip_address.cc b/src/rtc_base/ip_address.cc
-index 9dd534c..aadf0fd 100644
+index 9f1df58..a2f8712 100644
 --- a/src/rtc_base/ip_address.cc
 +++ b/src/rtc_base/ip_address.cc
 @@ -11,6 +11,9 @@
@@ -363,7 +495,7 @@ index 9dd534c..aadf0fd 100644
  #ifdef OPENBSD
  #include <netinet/in_systm.h>
  #endif
-@@ -32,6 +35,15 @@
+@@ -33,6 +36,15 @@
  namespace rtc {
 
  // Prefixes used for categorizing IPv6 addresses.
@@ -379,7 +511,7 @@ index 9dd534c..aadf0fd 100644
  static const in6_addr kV4MappedPrefix = {
      {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0}}};
  static const in6_addr k6To4Prefix = {{{0x20, 0x02, 0}}};
-@@ -39,6 +51,7 @@ static const in6_addr kTeredoPrefix = {{{0x20, 0x01, 0x00, 0x00}}};
+@@ -40,6 +52,7 @@ static const in6_addr kTeredoPrefix = {{{0x20, 0x01, 0x00, 0x00}}};
  static const in6_addr kV4CompatibilityPrefix = {{{0}}};
  static const in6_addr k6BonePrefix = {{{0x3f, 0xfe, 0}}};
  static const in6_addr kPrivateNetworkPrefix = {{{0xFD}}};
@@ -404,10 +536,10 @@ index 13a5f02..8362c3e 100644
 
    if (file != nullptr) {
 diff --git a/src/rtc_base/network.cc b/src/rtc_base/network.cc
-index 07c39ae..a2c077a 100644
+index 1b0ba36..6b0d090 100644
 --- a/src/rtc_base/network.cc
 +++ b/src/rtc_base/network.cc
-@@ -524,7 +524,7 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces,
+@@ -525,7 +525,7 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces,
        continue;
      }
      // Skip ones which are down.
@@ -417,10 +549,10 @@ index 07c39ae..a2c077a 100644
      }
      // Skip unknown family.
 diff --git a/src/rtc_base/physical_socket_server.cc b/src/rtc_base/physical_socket_server.cc
-index 3cb7c20..ee1b674 100644
+index 7904548..b54366e 100644
 --- a/src/rtc_base/physical_socket_server.cc
 +++ b/src/rtc_base/physical_socket_server.cc
-@@ -69,7 +69,7 @@ typedef void* SockOptArg;
+@@ -70,7 +70,7 @@ typedef void* SockOptArg;
 
  #endif  // WEBRTC_POSIX
 
@@ -429,7 +561,7 @@ index 3cb7c20..ee1b674 100644
 
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -332,7 +332,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -325,7 +325,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
      value <<= 2;
  #endif
    }
@@ -438,7 +570,7 @@ index 3cb7c20..ee1b674 100644
    if (sopt == IPV6_TCLASS) {
      // Set the IPv4 option in all cases to support dual-stack sockets.
      // 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) {
+@@ -567,7 +567,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;
@@ -447,7 +579,7 @@ index 3cb7c20..ee1b674 100644
        *slevel = IPPROTO_IP;
        *sopt = IP_MTU_DISCOVER;
        break;
-@@ -592,7 +592,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) {
+@@ -585,7 +585,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* slevel, int* sopt) {
        *sopt = TCP_NODELAY;
        break;
      case OPT_DSCP:

diff --git a/media-libs/tg_owt/tg_owt-0.0.20210422.recipe → media-libs/tg_owt/tg_owt-0.0.20210627.recipe b/media-libs/tg_owt/tg_owt-0.0.20210422.recipe → media-libs/tg_owt/tg_owt-0.0.20210627.recipe
@@ -4,18 +4,18 @@ HOMEPAGE="https://github.com/desktop-app/tg_owt"
 COPYRIGHT="2013-2021 Telegram"
 LICENSE="BSD (3-clause)"
 REVISION="1"
-srcGitRev="18cb4cd9bb4c2f5f5f5e760ec808f74c302bc1bf"
+srcGitRev="91d836dc84a16584c6ac52b36c04c0de504d9c34"
 SOURCE_URI="https://github.com/desktop-app/tg_owt/archive/$srcGitRev.tar.gz"
 SOURCE_DIR="tg_owt-$srcGitRev"
-CHECKSUM_SHA256="5babd17686cb015a188c910797a3c604660b6135804a5d3bf87e09749df7cbf8"
+CHECKSUM_SHA256="94f00a591d207f9b2e064475e922ef4fe4383e011816cb45e61be7c5b93732b0"
 SOURCE_FILENAME="tg_owt-$srcGitRev.tar.gz"
-srcGitRev_2="ebb5ffc1d462c70dfb2283a5c7afcb75288c7692"
+srcGitRev_2="bd53f0cc9faefbca2dcb6b21b6849d5e24141c9c"
 SOURCE_URI_2="https://github.com/webmproject/libvpx/archive/$srcGitRev_2.tar.gz"
-CHECKSUM_SHA256_2="a7adf6a905fe7e51caf45ef16c2c4b80fff253db08d49633a045310e0fd3793c"
+CHECKSUM_SHA256_2="6d0bb99a05ee906ff90fd6de9d5663773ad33f3d778992037abf220be04dd974"
 SOURCE_FILENAME_2="libvpx-$srcGitRev_2.tar.gz"
-srcGitRev_3="19d71f6b351fe992ae34b114eebd872c383a6bdb"
+srcGitRev_3="5b3351bd07e83f9f9a4cb6629561331ecdb7c546"
 SOURCE_URI_3="https://github.com/lemenkov/libyuv/archive/$srcGitRev_3.tar.gz"
-CHECKSUM_SHA256_3="64a277a20a85f38ac963a9434ec7faa261bf66d2f9268c24461476c8b3d9b39f"
+CHECKSUM_SHA256_3="242e3c42d2c6ff7770d62d78cfb45642541e92dea6afe2ebe07a9a04db3a98cb"
 SOURCE_FILENAME_3="libyuv-$srcGitRev_3.tar.gz"
 
 PATCHES="tg_owt-$portVersion.patchset"
@@ -83,6 +83,7 @@ BUILD()
 		-DTG_OWT_PACKAGED_BUILD=TRUE \
 		-DTG_OWT_SPECIAL_TARGET=haiku \
 		-DTG_OWT_USE_PROTOBUF=FALSE \
+		-DTG_OWT_USE_PIPEWIRE=FALSE \
 		-DTG_OWT_LIBJPEG_INCLUDE_PATH=/system/$relativeIncludeDir \
 		-DTG_OWT_OPENSSL_INCLUDE_PATH=/system/$relativeIncludeDir \
 		-DTG_OWT_OPUS_INCLUDE_PATH=/system/$relativeIncludeDir/opus \