From nobody Wed Jun 07 05:56:00 2023 X-Original-To: dev-commits-ports-main@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 4Qbc5r5ybNz4bm6Z; Wed, 7 Jun 2023 05:56:00 +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 4Qbc5r5TzJz4Yq5; Wed, 7 Jun 2023 05:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686117360; 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=TJkUgB1BkYbdrtbMKZ+QVa+osg2Y37dk13TSTo7NaLQ=; b=IW7Z65zl79iFOY//IngQxLHs2E1cCpVk/Ryal44t2hJAm443fGTk+iq+lGwiDPISOGre9Q 7aHXnJdDTr3VuRprzeLdAkaiCikUSlUZEhT6aibowhObVwq9cnD9zmG3l4WmB56o1YsF07 gCPwsLoTxc6i/DfIHoeW5DMx0LUR5wMTN/1u2T1Xme+ODBBhN9dFPzWdLrxmmuL1syTvWE 6vUM+P7KbFKH6bdX99ARtpn+v1+YfcCxtXP0w8bMFNz0sOZ2fVH+517ImiGS48Ow6wLE5/ kmFTB9BuDlpLJxMG6HhbgUXC7pQ1ZzhZhwUCkUhYJR1aNSeAqJP4SLYyuX5gDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686117360; 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=TJkUgB1BkYbdrtbMKZ+QVa+osg2Y37dk13TSTo7NaLQ=; b=d9LJWp+g4aAQ59N2vOtgDL2H9a34WypSu67aZiZ+cd+ZwYyfsueFKgPl6exI75Xjpc6lsZ 9UERxZ5OOfIX/HQU4G65ca7MSSMslitMamB4GAJK0Ts/7OfAem/vYRWQutMKcLGOLd2inQ V5blB4C+2COy8TLmUIVd6p3o1g720eikb+hPy86+cSRyYvZktf3SHvgE1ueJXtHmoBTNyd h8EOoCQWZ+B5SsC16xbs4yo6tQSMIj+dJyMn+p82A1dMghdnWvec1PDQMyn3+GeKZDF8dj WRErqEwlnwxpsZry5gOCpMbD4TDAIJXzxIRlYZSUGdf7mbXgYLDtTc7GTUfIvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686117360; a=rsa-sha256; cv=none; b=opYiKU37E5pJuaHeT/pIDrOQsJdNyPCJ84qhTOx5ej4hmCjXv/D/HAR/9XU1YWDSHU4b3h Wqh826N0r2HL55oZdG/Z3eK14Gck0o2ikV7rsZGtX4iZYJvJyJJ6jLv+uzprx+6KWmCTUe DuvmztLDABSNVMS/kpS0g+hJppmeJGnQEIJGOHZnIiWGrdqE2J5pNaH+F2LaEZyOvHQULJ 1iXi6/2HahZVfXcmQ4oSFlGh/JUXyi+CGhYn7pfX8OInfowdm6WK/+Uptcf8oXUHupJ/go 7hIWR3kGMxZ35sWKWka98IfLJzHX3TakEnpl3qZJYhPm6zF5ttFGQMAFyN5RaA== 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 4Qbc5r4YqHz11C0; Wed, 7 Jun 2023 05:56:00 +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 3575u0n0036039; Wed, 7 Jun 2023 05:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3575u0t8036038; Wed, 7 Jun 2023 05:56:00 GMT (envelope-from git) Date: Wed, 7 Jun 2023 05:56:00 GMT Message-Id: <202306070556.3575u0t8036038@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 2135341051ba - main - multimedia/ringrtc: Fix build. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2135341051ba56b5395e1b800dc11865465bd19e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=2135341051ba56b5395e1b800dc11865465bd19e commit 2135341051ba56b5395e1b800dc11865465bd19e Author: Mikael Urankar AuthorDate: 2023-06-07 05:55:21 +0000 Commit: Mikael Urankar CommitDate: 2023-06-07 05:55:57 +0000 multimedia/ringrtc: Fix build. Add missing patches. --- ...src_webrtc_src_build_toolchain_freebsd_BUILD.gn | 69 ++++++++++++++++++++++ .../patch-src_webrtc_src_ringrtc_opus_BUILD.gn | 18 ++++++ .../patch-src_webrtc_src_third__nasm_BUILD.gn | 16 +++++ 3 files changed, 103 insertions(+) diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_build_toolchain_freebsd_BUILD.gn b/multimedia/ringrtc/files/patch-src_webrtc_src_build_toolchain_freebsd_BUILD.gn new file mode 100644 index 000000000000..90410ef74eb3 --- /dev/null +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_build_toolchain_freebsd_BUILD.gn @@ -0,0 +1,69 @@ +--- ../../src/webrtc/src/build/toolchain/freebsd/BUILD.gn.orig 2022-02-07 13:39:41 UTC ++++ ../../src/webrtc/src/build/toolchain/freebsd/BUILD.gn +@@ -0,0 +1,66 @@ ++# Copyright 2013 The Chromium Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++import("//build/config/sysroot.gni") ++import("//build/toolchain/gcc_toolchain.gni") ++ ++clang_toolchain("clang_x86") { ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "freebsd" ++ } ++} ++ ++gcc_toolchain("x86") { ++ cc = "gcc" ++ cxx = "g++" ++ ++ readelf = "readelf" ++ nm = "nm" ++ ar = "ar" ++ ld = cxx ++ ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "freebsd" ++ is_clang = false ++ } ++} ++ ++clang_toolchain("clang_x64") { ++ toolchain_args = { ++ current_cpu = "x64" ++ current_os = "freebsd" ++ } ++} ++ ++gcc_toolchain("x64") { ++ cc = "gcc" ++ cxx = "g++" ++ ++ readelf = "readelf" ++ nm = "nm" ++ ar = "ar" ++ ld = cxx ++ ++ toolchain_args = { ++ current_cpu = "x64" ++ current_os = "freebsd" ++ is_clang = false ++ } ++} ++ ++clang_toolchain("clang_arm") { ++ toolchain_args = { ++ current_cpu = "arm64" ++ current_os = "freebsd" ++ } ++} ++ ++clang_toolchain("clang_arm64") { ++ toolchain_args = { ++ current_cpu = "arm64" ++ current_os = "freebsd" ++ } ++} diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_ringrtc_opus_BUILD.gn b/multimedia/ringrtc/files/patch-src_webrtc_src_ringrtc_opus_BUILD.gn new file mode 100644 index 000000000000..1a4cd1ccb33a --- /dev/null +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_ringrtc_opus_BUILD.gn @@ -0,0 +1,18 @@ +Use VAR_ARRAYS on FreeBSD (same as audio/opus) + +--- ../../src/webrtc/src/ringrtc/opus/BUILD.gn 2021-03-15 17:51:55 UTC ++++ ../../src/webrtc/src/ringrtc/opus/BUILD.gn +@@ -37,10 +37,11 @@ config("opus_private_config") { + "OPUS_EXPORT=", + "ENABLE_HARDENING", + ++ "VAR_ARRAYS", + # Prefer alloca() over variable length arrays which are often inefficient; + # the opus code will automatically handle this correctly per-platform. +- "USE_ALLOCA", +- "HAVE_ALLOCA_H", ++# "USE_ALLOCA", ++# "HAVE_ALLOCA_H", + ] + + include_dirs = [ diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_third__nasm_BUILD.gn b/multimedia/ringrtc/files/patch-src_webrtc_src_third__nasm_BUILD.gn new file mode 100644 index 000000000000..83521ea47d84 --- /dev/null +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_third__nasm_BUILD.gn @@ -0,0 +1,16 @@ +--- ../../src/webrtc/src/third_party/nasm/BUILD.gn.orig 2023-02-01 18:45:20 UTC ++++ ../../src/webrtc/src/third_party/nasm/BUILD.gn +@@ -63,6 +63,13 @@ config("nasm_config") { + + defines = [ "HAVE_CONFIG_H" ] + ++ _string_h_lines = ++ read_file("/usr/include/string.h", "list lines") ++ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) ++ if (_mempcpy != []) { ++ defines += [ "HAVE_MEMPCPY=1" ] ++ } ++ + if (is_clang) { + cflags = [ + # The inline functions in NASM's headers flag this.