@@ -268,6 +268,8 @@ def get_depot_tools(source_dir, fetch=False):
268268 'bug_8759_workaround.patch' ,
269269 'disable_mute_of_audio_processing.patch' ,
270270 'crash_on_fatal_error.patch' ,
271+ 'gcc_fpermissive_error.patch' ,
272+ 'enable_gcc_permissive.patch' ,
271273 ],
272274 'raspberry-pi-os_armv7' : [
273275 'add_license_dav1d.patch' ,
@@ -276,6 +278,8 @@ def get_depot_tools(source_dir, fetch=False):
276278 'bug_8759_workaround.patch' ,
277279 'disable_mute_of_audio_processing.patch' ,
278280 'crash_on_fatal_error.patch' ,
281+ 'gcc_fpermissive_error.patch' ,
282+ 'enable_gcc_permissive.patch' ,
279283 ],
280284 'raspberry-pi-os_armv8' : [
281285 'add_license_dav1d.patch' ,
@@ -284,6 +288,8 @@ def get_depot_tools(source_dir, fetch=False):
284288 'bug_8759_workaround.patch' ,
285289 'disable_mute_of_audio_processing.patch' ,
286290 'crash_on_fatal_error.patch' ,
291+ 'gcc_fpermissive_error.patch' ,
292+ 'enable_gcc_permissive.patch' ,
287293 ],
288294 'ubuntu-18.04_armv8' : [
289295 'add_license_dav1d.patch' ,
@@ -292,6 +298,8 @@ def get_depot_tools(source_dir, fetch=False):
292298 'bug_8759_workaround.patch' ,
293299 'disable_mute_of_audio_processing.patch' ,
294300 'crash_on_fatal_error.patch' ,
301+ 'gcc_fpermissive_error.patch' ,
302+ 'enable_gcc_permissive.patch' ,
295303 ],
296304 'ubuntu-20.04_armv8' : [
297305 'add_license_dav1d.patch' ,
@@ -300,6 +308,8 @@ def get_depot_tools(source_dir, fetch=False):
300308 'bug_8759_workaround.patch' ,
301309 'disable_mute_of_audio_processing.patch' ,
302310 'crash_on_fatal_error.patch' ,
311+ 'gcc_fpermissive_error.patch' ,
312+ 'enable_gcc_permissive.patch' ,
303313 ],
304314 'ubuntu-18.04_x86_64' : [
305315 'add_license_dav1d.patch' ,
@@ -308,6 +318,8 @@ def get_depot_tools(source_dir, fetch=False):
308318 'bug_8759_workaround.patch' ,
309319 'disable_mute_of_audio_processing.patch' ,
310320 'crash_on_fatal_error.patch' ,
321+ 'gcc_fpermissive_error.patch' ,
322+ 'enable_gcc_permissive.patch' ,
311323 ],
312324 'ubuntu-20.04_x86_64' : [
313325 'add_license_dav1d.patch' ,
@@ -316,6 +328,8 @@ def get_depot_tools(source_dir, fetch=False):
316328 'bug_8759_workaround.patch' ,
317329 'disable_mute_of_audio_processing.patch' ,
318330 'crash_on_fatal_error.patch' ,
331+ 'gcc_fpermissive_error.patch' ,
332+ 'enable_gcc_permissive.patch' ,
319333 ],
320334 'ubuntu-22.04_x86_64' : [
321335 'add_license_dav1d.patch' ,
@@ -324,6 +338,8 @@ def get_depot_tools(source_dir, fetch=False):
324338 'bug_8759_workaround.patch' ,
325339 'disable_mute_of_audio_processing.patch' ,
326340 'crash_on_fatal_error.patch' ,
341+ 'gcc_fpermissive_error.patch' ,
342+ 'enable_gcc_permissive.patch' ,
327343 ],
328344}
329345
@@ -374,7 +390,7 @@ def get_webrtc(source_dir, patch_dir, version, target,
374390 cmd (['git' , 'branch' ])
375391 cmd (['git' , 'checkout' , '-f' , version ])
376392 cmd (['git' , 'clean' , '-df' ])
377- cmd (['gclient' , 'sync' , '-D' , '--force' , '--reset' , '--with_branch_heads ' , '--jobs=8' ])
393+ cmd (['gclient' , 'sync' , '-D' , '--force' , '--reset' , '--revision' , version , '--no-history ' , '--jobs=8' ])
378394 for patch in PATCHES [target ]:
379395 depth , dirs = PATCH_INFO .get (patch , (1 , ['.' ]))
380396 dir = os .path .join (src_dir , * dirs )
@@ -797,9 +813,14 @@ def build_webrtc(
797813 gn_args += [
798814 'target_os="linux"' ,
799815 'rtc_use_pipewire=false' ,
816+ 'rtc_use_x11=false' ,
800817 "use_custom_libcxx=false" ,
801818 "use_custom_libcxx_for_host=false" ,
802- 'rtc_include_pulse_audio=false' ,
819+ 'is_clang=false' ,
820+ 'clang_use_chrome_plugins=false' ,
821+ 'use_lld=false' ,
822+ 'use_thin_lto=false' ,
823+ 'rtc_include_pulse_audio=true' ,
803824 'rtc_include_internal_audio_device=true' ,
804825 ]
805826 else :
@@ -824,10 +845,8 @@ def build_webrtc(
824845
825846 if target in ['windows_x86_64' , 'windows_x86' , 'windows_arm64' ]:
826847 pass
827- elif target in ('macos_x86_64' , 'macos_arm64' ):
828- ar = '/usr/bin/ar'
829848 else :
830- ar = os . path . join ( webrtc_src_dir , 'third_party/llvm-build/Release+Asserts/ bin/llvm- ar')
849+ ar = '/usr/ bin/ar'
831850
832851 # ar で libwebrtc.a を生成する
833852 # Create libwebrtc.a with ar
@@ -1218,7 +1237,7 @@ def main():
12181237 commit = version_info .webrtc_commit
12191238 if args .commit :
12201239 commit = args .commit
1221-
1240+
12221241 print ("Building for commit: " , commit )
12231242
12241243 # ソース取得
0 commit comments