diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-05-27 14:01:48 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-05-27 14:01:48 +0000 |
| commit | 5f042b2ae6c5ed5bead4d7687bbc4afa339807d0 (patch) | |
| tree | aec454ff1d9ef3f52d75eb4bc051df4aa48acc50 | |
| parent | 5ff6c634aa34e56cae9f076ac402005586133fd2 (diff) | |
| download | ports-5f042b2ae6c5ed5bead4d7687bbc4afa339807d0.tar.gz ports-5f042b2ae6c5ed5bead4d7687bbc4afa339807d0.zip | |
www/*chromium: unbreak ffmpeg configure stage on arm64
| -rw-r--r-- | www/chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py | 9 | ||||
| -rw-r--r-- | www/ungoogled-chromium/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) |