From nobody Mon May 27 14:02:09 2024 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 4Vny4x3N9zz5L9mv; Mon, 27 May 2024 14:02:09 +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 4Vny4x2pVhz459s; Mon, 27 May 2024 14:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716818529; 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=WACE6EeFyXQMFFCw3PgFOkEuRuy+MrQEn7b50YWS67A=; b=sv9V15z0SY0se72g0gwtNkezJ5mMjvvKHv0bMjlsUxWvdF8mMYmfgHt0wteA3m+6hIr9uv 8w0fyTJHjYV4W/WcOKE8XffdYTxNVGwEN2RCy/kpzjsv6Lyg01Ncww6M8CMSrprDWrOU+d SOfVSo/Tuv7nRoVjyhUD/MpykspWTsXgC1QtKGtDWkqCXdogUm4UqPHV80+7iw3QVCMazm KcfNyutwn7962rx4gBcjihv0VcBD2R8M+JGrFEz0NC8uuSkQXc5odyKbQakKcsLeTlj5dQ dm448o8u7MFIHvi8UHOaAjLnmB0m/c6lHlXtFE6NX2Nvz2HeWL7oDWC89fZrPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716818529; a=rsa-sha256; cv=none; b=ibNHCResarLOU092fcX/7NQD574FF2HC79UKj1kMOxaMTMI+REm/yqgVAcSFVaOHUiUNyt jYksqBlZAQTEWBcraPMyWrtvXVqXy6sUugFQHiMULU6azJUxjs4IK2QRFuT664/v1fzQTi 2akfJVWerFDKKzVp9i6FGch/f//sQmNgTYOf6bP2q5zuCzVmbzmpmNN7huvI+VsmsoYtwW 0eBIfw4v0u77J3QMpd/+F2gr8CUwX1I2liScIFZ4nTlF+Mp88nFlDGUVGO+oebJcW5u3S8 ewDkxUzr66JEQV3mO4ce5OBu/IExPDLxUzAw7BNjDmy1cgjlZs8Ps67sSsDxvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716818529; 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=WACE6EeFyXQMFFCw3PgFOkEuRuy+MrQEn7b50YWS67A=; b=dX8Tk/XRM9pXr0qLCl2995XFhsfCXfwCczahpvnO4sIxfv5PsU+xG9uyr183MYZqoqtgze 8Qtq6i+vMoeRxYI1I5wnx51G49JQ67B9V6t3nUAEjxDfWzN6e4bX8fZ8JSyvddKb2e3B0x j+w7i2NFWLLwWb3XuMxGEIKxnk6ffbBqLICBVfzLZlqvi8pS8imm9r1qe5qwUEInI+ImQT hv/OJXnpTsG9A3dCXd8ECwj0F4BHIWgejO5tkPm5tBhufPbvrCx9f4josPr8pA7sLnw956 YFekvI/CT9iwrjYobwuQkQzcRaPoUAXpz16PByWjhOZ0q5Bjb+vYc2yuPphQSA== 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 4Vny4x2MC5znSs; Mon, 27 May 2024 14:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RE29xe056346; Mon, 27 May 2024 14:02:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RE29s8056343; Mon, 27 May 2024 14:02:09 GMT (envelope-from git) Date: Mon, 27 May 2024 14:02:09 GMT Message-Id: <202405271402.44RE29s8056343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: 5f042b2ae6c5 - main - www/*chromium: unbreak ffmpeg configure stage on arm64 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f042b2ae6c5ed5bead4d7687bbc4afa339807d0 Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f042b2ae6c5ed5bead4d7687bbc4afa339807d0 commit 5f042b2ae6c5ed5bead4d7687bbc4afa339807d0 Author: Robert Nagy AuthorDate: 2024-05-27 14:01:48 +0000 Commit: Robert Nagy CommitDate: 2024-05-27 14:01:48 +0000 www/*chromium: unbreak ffmpeg configure stage on arm64 --- www/chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py | 9 +++++---- .../files/patch-media_ffmpeg_scripts_build__ffmpeg.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/www/chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py b/www/chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py index a82145d40b3c..7a1005537338 100644 --- a/www/chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py +++ b/www/chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py @@ -1,4 +1,4 @@ ---- media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-05-21 18:07:39 UTC +--- media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-05-27 14:01:28 UTC +++ media/ffmpeg/scripts/build_ffmpeg.py @@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' @@ -62,16 +62,17 @@ if target_arch == 'x64': if target_os == 'android': configure_flags['Common'].extend([ -@@ -829,8 +830,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -828,9 +829,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + configure_flags['Common'].extend([ '--target-os=linux', - '--sysroot=' + +- '--sysroot=' + - os.path.join(CHROMIUM_ROOT_DIR, - 'build/linux/debian_bullseye_arm64-sysroot'), # See crbug.com/1467681. These could be removed eventually '--disable-dotprod', '--disable-i8mm', -@@ -1034,7 +1033,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -1034,7 +1032,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + configure_args) diff --git a/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py b/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py index ed41d729d13b..7a1005537338 100644 --- a/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py +++ b/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py @@ -1,4 +1,4 @@ ---- media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-05-23 20:04:36 UTC +--- media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-05-27 14:01:28 UTC +++ media/ffmpeg/scripts/build_ffmpeg.py @@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' @@ -62,16 +62,17 @@ if target_arch == 'x64': if target_os == 'android': configure_flags['Common'].extend([ -@@ -829,8 +830,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -828,9 +829,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + configure_flags['Common'].extend([ '--target-os=linux', - '--sysroot=' + +- '--sysroot=' + - os.path.join(CHROMIUM_ROOT_DIR, - 'build/linux/debian_bullseye_arm64-sysroot'), # See crbug.com/1467681. These could be removed eventually '--disable-dotprod', '--disable-i8mm', -@@ -1034,7 +1033,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -1034,7 +1032,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + configure_args)