haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

tg_owt: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2022-09-17 23:06:15 +10:00
parent e62eed4cd9
commit 01cb5600a1
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
media-libs/tg_owt/patches/tg_owt-0.0.20220811.patchset → media-libs/tg_owt/patches/tg_owt-0.0.20220914.patchset
View File

@@ -1,22 +1,13 @@
From de85b0d6fd402945a8442e6568826fed8dfa0b7c Mon Sep 17 00:00:00 2001
From dd0d5ecafbb683b04ef211dd803451c312458549 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 23 Jun 2022 22:09:18 +1000
Date: Sat, 17 Sep 2022 21:51:10 +1000
Subject: Add Haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 235f0f3..6deeced 100644
index aa0b8a0..1b75490 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,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)
endif()
@@ -1476,6 +1476,9 @@ PRIVATE
modules/video_capture/device_info_impl.cc
modules/video_capture/linux/device_info_linux.cc
@@ -58,10 +49,10 @@ index 235f0f3..6deeced 100644
modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
modules/desktop_capture/linux/wayland/base_capturer_pipewire.h
diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
index 4d037f4..e5f1dd5 100644
index 388b7aa..9db3d48 100644
--- a/cmake/libwebrtcbuild.cmake
+++ b/cmake/libwebrtcbuild.cmake
@@ -54,6 +54,12 @@ if (WIN32)
@@ -61,6 +61,12 @@ if (WIN32)
INTERFACE
WEBRTC_WIN
)
@@ -1676,10 +1667,10 @@ index 4ac7043..5fe950f 100644
#undef RTC_EXPORT_TEMPLATE_TEST
diff --git a/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp b/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
index 8aa67f1..5c2b6e1 100644
index 8aa67f1..11c500f 100644
--- a/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
+++ b/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
@@ -48,7 +48,7 @@
@@ -48,9 +48,12 @@
#include <sys/types.h>
#include <sys/param.h>
#include <unistd.h>
@@ -1687,8 +1678,13 @@ index 8aa67f1..5c2b6e1 100644
+#if !defined(__Fuchsia__) && !defined(__HAIKU__)
#include <sys/sysctl.h>
#endif
+#ifdef __HAIKU__
+#include <OS.h>
+#endif
#ifdef __APPLE__
@@ -244,7 +244,7 @@ WELS_THREAD_ERROR_CODE WelsThreadCreate (WELS_THREAD_HANDLE* thread, LPWELS_
#define HW_NCPU_NAME "hw.logicalcpu"
#else
@@ -244,7 +247,7 @@ WELS_THREAD_ERROR_CODE WelsThreadCreate (WELS_THREAD_HANDLE* thread, LPWELS_
err = pthread_attr_init (&at);
if (err)
return err;
@@ -1697,12 +1693,17 @@ index 8aa67f1..5c2b6e1 100644
err = pthread_attr_setscope (&at, PTHREAD_SCOPE_SYSTEM);
if (err)
return err;
@@ -517,6 +517,10 @@ WELS_THREAD_ERROR_CODE WelsQueryLogicalProcessInfo (WelsLogicalProcessInfo* p
@@ -517,6 +520,15 @@ WELS_THREAD_ERROR_CODE WelsQueryLogicalProcessInfo (WelsLogicalProcessInfo* p
return WELS_THREAD_ERROR_OK;
+#elif defined(__HAIKU__)
+ pInfo->ProcessorCount = 1;
+ system_info sysinfo;
+ if (get_system_info(&sysinfo) == B_OK) {
+ pInfo->ProcessorCount = sysinfo.cpu_count;
+ } else {
+ pInfo->ProcessorCount = 1;
+ }
+ return WELS_THREAD_ERROR_OK;
+
#elif defined(__EMSCRIPTEN__)

8
media-libs/tg_owt/tg_owt-0.0.20220811.recipe → media-libs/tg_owt/tg_owt-0.0.20220914.recipe
View File

@@ -4,10 +4,10 @@ HOMEPAGE="https://github.com/desktop-app/tg_owt"
COPYRIGHT="2013-2022 Telegram"
LICENSE="BSD (3-clause)"
REVISION="1"
srcGitRev="a5fbc9123e056e611e69acf0ceb4252ddd838adb"
srcGitRev="621f3da55331733bf0d1b223786b96b68c03dca1"
SOURCE_URI="https://github.com/desktop-app/tg_owt/archive/$srcGitRev.tar.gz"
SOURCE_DIR="tg_owt-$srcGitRev"
CHECKSUM_SHA256="f87c5e81f4150fecb5e0de7c65829066981322f7ae66825152b8bc18ffd499f4"
CHECKSUM_SHA256="d56b80fb67548633c62511498bfe77e2f4ecb5b6a1c0a780d1911a678c6c6064"
SOURCE_FILENAME="tg_owt-$srcGitRev.tar.gz"
srcGitRev_2="5b3351bd07e83f9f9a4cb6629561331ecdb7c546"
SOURCE_URI_2="https://github.com/lemenkov/libyuv/archive/$srcGitRev_2.tar.gz"
@@ -86,7 +86,9 @@ BUILD()
-DTG_OWT_PACKAGED_BUILD=TRUE \
-DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
-DTG_OWT_USE_PROTOBUF=FALSE \
-DTG_OWT_USE_PIPEWIRE=FALSE
-DTG_OWT_USE_PIPEWIRE=FALSE \
-DTG_OWT_USE_X11=FALSE
make $jobArgs
}