From nobody Wed Jan 11 17:57:18 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nsb3y2KzWz2qkLT; Wed, 11 Jan 2023 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nsb3y1qFhz4lDr; Wed, 11 Jan 2023 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673459838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eg+JyUckbif/Z9e3dovF5CxBvpwLUTKJ6QPcxCZYTSE=; b=gSaTDAj4d2sCwh39sd6QdEbDsprqkvC0LYmAc/5114Q1AclL/18q8L0g81QjcqEbdjIg7W kL1HD5MfqFFUajVTU8m9+M/XEtSRbK/7gyqXIJwkLHPKX9DMVnGSOojhimEmCmNXYx5W1o en1ts1gk7AzL6cuEMG9V9XBcuc1RLn/7Cp7pe0sj8wRmqafyvF3pwPy6P4aiDmAyS84XUc t64aimSoLSCV0+Xe5DCDEbZB4DyjdNMF4KRdl8B9Tm1PPot9S8WWDANhJCSFswj7cYmi4K GIDgWVSUejhdcJORoQUQ2THLzLBHLZ8JM6D7cFJ1xuv4/YAw2ybLkHpX4AIRDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673459838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eg+JyUckbif/Z9e3dovF5CxBvpwLUTKJ6QPcxCZYTSE=; b=tLkXk3Kovqoge6ShP8w19THC0Ri1FzJJ083TUv2sLdZBJUhBb086/TxA3MGfP+2Sfsjhyg WkRR5seavFy/AEm5pKaWZ2Vth4K1wveRmSmxM7pRfRYiSUZIb8qzjLpjB7xCIzRICp/d9/ VwxRpNNrRuKMzS9+3i4X/MKNQkxq21iaFvZKMFZWzwuwHnvcwp7pM/PdQnuxLlSAd0GxZp BRlZZoX8GglfnZJgKp502Jfxru3YpXY3W9eli2hZwECZG6jPPSEzvJaYmbJ1da39PanLnG 0HvtKB/DCHyRBZ4LbYfGi0G4/JVSZE499mEgW/cLXRpzCGo1vztaRhABBXgDCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673459838; a=rsa-sha256; cv=none; b=Vg8zcKoZOyXnht1Zl0lSAklNP9sqQLD0mrkRoWSpdit0Kazt5ZoMotMNB5Oic57rPignuU arKQkpcMQc+0ki1Xj7sNR9aFqEiEADb8srBFiCzBzhNQqy5wlTaW8+VV+iFCk6lYcJ2GND fYQk0+R2cZ7hYeZ7oZnEzns5lKoa7dO+TzVaAIWKc64fP0bByazMzB0Au7JWxXQrQN3OE8 HtBVJaMl4cuWDXpF9u7E3Et7IRabcFxukb5hDXpkYUWQTEMcAIIPAZ0aw41ZDIVShMzDp6 dL043se2JAqgtPg/qeIlunJI66xK+5SjSyOXVL4MWTOm46cYtAlAg4XGfvX17Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nsb3y0sLQzxXr; Wed, 11 Jan 2023 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30BHvIC8019612; Wed, 11 Jan 2023 17:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BHvICO019611; Wed, 11 Jan 2023 17:57:18 GMT (envelope-from git) Date: Wed, 11 Jan 2023 17:57:18 GMT Message-Id: <202301111757.30BHvICO019611@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 19aebafb74e5 - main - net-im/tg_owt: fix build when devel/abseil installed List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19aebafb74e586d7ac6eb13248050efb998ec6cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=19aebafb74e586d7ac6eb13248050efb998ec6cc commit 19aebafb74e586d7ac6eb13248050efb998ec6cc Author: Sergey A. Osokin AuthorDate: 2023-01-11 17:28:56 +0000 Commit: Sergey A. Osokin 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; }