git: 19aebafb74e5 - main - net-im/tg_owt: fix build when devel/abseil installed
Date: Wed, 11 Jan 2023 17:57:18 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=19aebafb74e586d7ac6eb13248050efb998ec6cc
commit 19aebafb74e586d7ac6eb13248050efb998ec6cc
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-01-11 17:28:56 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2023-01-11 17:57:12 +0000
net-im/tg_owt: fix build when devel/abseil installed
Resurrect the patch that helps resolve a build issue when
devel/abseil installed in the system.
While I'm here regen another patch.
Fixes: 3637dcfb119c87bcb09b87072fb4f3d23aae37a7
---
net-im/tg_owt/files/patch-cmake_external.cmake | 12 ++++++++++++
net-im/tg_owt/files/patch-src_common__audio_wav__header.cc | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/net-im/tg_owt/files/patch-cmake_external.cmake b/net-im/tg_owt/files/patch-cmake_external.cmake
new file mode 100644
index 000000000000..cfd164d0aa03
--- /dev/null
+++ b/net-im/tg_owt/files/patch-cmake_external.cmake
@@ -0,0 +1,12 @@
+--- cmake/external.cmake.orig 2023-01-11 16:35:01 UTC
++++ cmake/external.cmake
+@@ -120,6 +120,9 @@ function(link_libabsl target_name)
+ absl::type_traits
+ absl::variant
+ )
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(ABSL REQUIRED QUIET absl_flags)
++ target_include_directories(${target_name} PRIVATE ${ABSL_INCLUDE_DIRS})
+ endif()
+ endif()
+ if (NOT absl_FOUND)
diff --git a/net-im/tg_owt/files/patch-src_common__audio_wav__header.cc b/net-im/tg_owt/files/patch-src_common__audio_wav__header.cc
index 5f8f73eff0db..94e5736ebc48 100644
--- a/net-im/tg_owt/files/patch-src_common__audio_wav__header.cc
+++ b/net-im/tg_owt/files/patch-src_common__audio_wav__header.cc
@@ -1,4 +1,4 @@
---- src/common_audio/wav_header.cc.orig 2022-02-09 19:21:53 UTC
+--- src/common_audio/wav_header.cc.orig 2023-01-05 05:48:49 UTC
+++ src/common_audio/wav_header.cc
@@ -26,10 +26,6 @@
namespace webrtc {
@@ -11,7 +11,7 @@
#pragma pack(2)
struct ChunkHeader {
uint32_t ID;
-@@ -119,9 +115,22 @@ uint32_t PackFourCC(char a, char b, char c, char d) {
+@@ -113,9 +109,22 @@ uint32_t PackFourCC(char a, char b, char c, char d) {
return packed_value;
}