diff options
Diffstat (limited to 'www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py')
| -rw-r--r-- | www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py index edaeb1787951..87731313ef77 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2023-06-05 19:39:05 UTC +--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2023-09-17 07:59:53 UTC +++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -@@ -29,7 +29,7 @@ NDK_ROOT_DIR = os.path.abspath( +@@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build')) @@ -9,7 +9,7 @@ BRANDINGS = [ 'Chrome', -@@ -42,6 +42,8 @@ ARCH_MAP = { +@@ -45,6 +45,8 @@ ARCH_MAP = { 'linux': [ 'ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64' ], @@ -18,7 +18,7 @@ 'mac': ['x64', 'arm64'], 'win': ['ia32', 'x64', 'arm64'], } -@@ -51,6 +53,8 @@ USAGE_END = """ +@@ -54,6 +56,8 @@ USAGE_END = """ Valid combinations are android [%(android)s] linux [%(linux)s] mac [%(mac)s] @@ -27,7 +27,7 @@ win [%(win)s] If no target architecture is specified all will be built. -@@ -123,6 +127,10 @@ def PrintAndCheckCall(argv, *args, **kwargs): +@@ -126,6 +130,10 @@ def PrintAndCheckCall(argv, *args, **kwargs): def DetermineHostOsAndArch(): if platform.system() == 'Linux': host_os = 'linux' @@ -38,7 +38,7 @@ elif platform.system() == 'Darwin': host_os = 'mac' elif platform.system() == 'Windows' or 'CYGWIN_NT' in platform.system(): -@@ -132,7 +140,7 @@ def DetermineHostOsAndArch(): +@@ -135,7 +143,7 @@ def DetermineHostOsAndArch(): if re.match(r'i.86', platform.machine()): host_arch = 'ia32' @@ -47,7 +47,7 @@ host_arch = 'x64' elif platform.machine() == 'aarch64': host_arch = 'arm64' -@@ -149,7 +157,7 @@ def DetermineHostOsAndArch(): +@@ -152,7 +160,7 @@ def DetermineHostOsAndArch(): def GetDsoName(target_os, dso_name, dso_version): @@ -56,7 +56,7 @@ return 'lib%s.so.%s' % (dso_name, dso_version) elif target_os == 'mac': return 'lib%s.%s.dylib' % (dso_name, dso_version) -@@ -492,7 +500,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ +@@ -495,7 +503,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation # #warning which will be converted to an error via -Werror. # There is also no prctl.h @@ -65,7 +65,7 @@ pre_make_rewrites += [ (r'(#define HAVE_SYSCTL [01])', r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), -@@ -613,7 +621,7 @@ def main(argv): +@@ -622,7 +630,7 @@ def main(argv): configure_args = args[2:] @@ -74,7 +74,7 @@ parser.print_help() return 1 -@@ -735,7 +743,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -744,7 +752,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--enable-parser=vp3,vp8', ]) @@ -83,7 +83,7 @@ if target_arch == 'x64': if target_os == 'android': configure_flags['Common'].extend([ -@@ -745,7 +753,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -754,7 +762,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, configure_flags['Common'].extend([ '--enable-lto', '--arch=x86_64', @@ -92,7 +92,7 @@ ]) if host_arch != 'x64': -@@ -836,7 +844,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -845,7 +853,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--extra-cflags=-mfpu=vfpv3-d16', ]) elif target_arch == 'arm64': @@ -101,7 +101,7 @@ if host_arch != 'arm64': configure_flags['Common'].extend([ '--enable-cross-compile', -@@ -898,7 +906,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -910,7 +918,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--disable-mips64r2', '--enable-msa', ]) @@ -110,7 +110,7 @@ configure_flags['Common'].extend([ '--enable-cross-compile', '--target-os=linux', -@@ -1049,7 +1057,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -1061,7 +1069,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + configure_args) |