From a8a7c1a7b538df4b75c25f347bb58f1e4ba75083 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 18 Apr 2024 08:36:50 +0900 Subject: [PATCH 01/20] =?UTF-8?q?chore:=20125.6422.0.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 0280dc3f..fa0437b7 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.9 -WEBRTC_VERSION=m124.6367@{\#2} -WEBRTC_SEMANTIC_VERSION=124.6367.2.0 -WEBRTC_COMMIT=93e9ac6285bceef08e4c44c221ec57e8f7995b2f +WEBRTC_VERSION=m125.6422@{\#0} +WEBRTC_SEMANTIC_VERSION=125.6422.0.0 +WEBRTC_COMMIT=b831eb816ef847d09d446ef4168e36b13af163f8 PACKAGE_NAMES= \ linux-arm \ From 224d92cd6a6ccfae1b84f7258602c3cfe6f57a69 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Wed, 1 May 2024 15:59:38 +0900 Subject: [PATCH 02/20] =?UTF-8?q?chore:=20125.6422.2.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index fa0437b7..f5be83f9 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.9 -WEBRTC_VERSION=m125.6422@{\#0} -WEBRTC_SEMANTIC_VERSION=125.6422.0.0 -WEBRTC_COMMIT=b831eb816ef847d09d446ef4168e36b13af163f8 +WEBRTC_VERSION=m125.6422@{\#2} +WEBRTC_SEMANTIC_VERSION=125.6422.2.0 +WEBRTC_COMMIT=8505a9838ea91c66c96c173d30cd66f9dbcc7548 PACKAGE_NAMES= \ linux-arm \ From c932e600b3d063813831af41c10e031749aa9850 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 16 May 2024 14:28:13 +0900 Subject: [PATCH 03/20] =?UTF-8?q?chore:=20126.6478.0.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index f5be83f9..e77660d9 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.9 -WEBRTC_VERSION=m125.6422@{\#2} -WEBRTC_SEMANTIC_VERSION=125.6422.2.0 -WEBRTC_COMMIT=8505a9838ea91c66c96c173d30cd66f9dbcc7548 +WEBRTC_VERSION=m126.6478@{\#0} +WEBRTC_SEMANTIC_VERSION=126.6478.0.0 +WEBRTC_COMMIT=16fb7903e546051483720548168cd40cded7a040 PACKAGE_NAMES= \ linux-arm \ From 84b6f2e35590986fd762710080b736836caee57f Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sat, 25 May 2024 08:20:02 +0900 Subject: [PATCH 04/20] =?UTF-8?q?chore:=20126.6478.1.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index e77660d9..b9d3fa71 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.9 -WEBRTC_VERSION=m126.6478@{\#0} -WEBRTC_SEMANTIC_VERSION=126.6478.0.0 -WEBRTC_COMMIT=16fb7903e546051483720548168cd40cded7a040 +WEBRTC_VERSION=m126.6478@{\#1} +WEBRTC_SEMANTIC_VERSION=126.6478.1.0 +WEBRTC_COMMIT=a18e38fed2307edd6382760213fa3ddf199fa181 PACKAGE_NAMES= \ linux-arm \ From 73ae3f5e0e220bb9273bca9a102a52de7ba999de Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Wed, 12 Jun 2024 13:00:53 +0900 Subject: [PATCH 05/20] =?UTF-8?q?build(deps):=20ccache=204.10=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b9d3fa71..986bf057 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -CCACHE_VERSION=4.9 +CCACHE_VERSION=4.10 WEBRTC_VERSION=m126.6478@{\#1} WEBRTC_SEMANTIC_VERSION=126.6478.1.0 WEBRTC_COMMIT=a18e38fed2307edd6382760213fa3ddf199fa181 From f359e6132bd59015229842034a37ed7270f5829f Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Wed, 12 Jun 2024 13:01:16 +0900 Subject: [PATCH 06/20] =?UTF-8?q?chore:=20127.6533.0.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 986bf057..94d09ed3 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.10 -WEBRTC_VERSION=m126.6478@{\#1} -WEBRTC_SEMANTIC_VERSION=126.6478.1.0 -WEBRTC_COMMIT=a18e38fed2307edd6382760213fa3ddf199fa181 +WEBRTC_VERSION=m127.6533@{\#0} +WEBRTC_SEMANTIC_VERSION=127.6533.0.0 +WEBRTC_COMMIT=63c380918687cd4c233e9eb856e98ba4c0589722 PACKAGE_NAMES= \ linux-arm \ From cf0cb3250dd4918c395f5bc80f4be27e154facad Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Tue, 2 Jul 2024 00:31:40 +0900 Subject: [PATCH 07/20] =?UTF-8?q?chore:=20127.6533.1.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 94d09ed3..4f51afc7 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.10 -WEBRTC_VERSION=m127.6533@{\#0} -WEBRTC_SEMANTIC_VERSION=127.6533.0.0 -WEBRTC_COMMIT=63c380918687cd4c233e9eb856e98ba4c0589722 +WEBRTC_VERSION=m127.6533@{\#1} +WEBRTC_SEMANTIC_VERSION=127.6533.1.0 +WEBRTC_COMMIT=e0b28a6a81a989c1f5c89e30fcd247870047390d PACKAGE_NAMES= \ linux-arm \ From 8a9130cdc3b25bc1fd9c21c333c0cbbc6502cd61 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Wed, 24 Jul 2024 08:53:37 +0900 Subject: [PATCH 08/20] =?UTF-8?q?chore:=20128.6613.0.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 4f51afc7..08343d34 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.10 -WEBRTC_VERSION=m127.6533@{\#1} -WEBRTC_SEMANTIC_VERSION=127.6533.1.0 -WEBRTC_COMMIT=e0b28a6a81a989c1f5c89e30fcd247870047390d +WEBRTC_VERSION=m128.6613@{\#0} +WEBRTC_SEMANTIC_VERSION=128.6613.0.0 +WEBRTC_COMMIT=1ac162ee20a214bf97f6594a7effcbbc21f1effb PACKAGE_NAMES= \ linux-arm \ From 45100dd4da4fc51e9f54215acb84c2d404e58cb1 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Wed, 24 Jul 2024 08:54:03 +0900 Subject: [PATCH 09/20] =?UTF-8?q?build(deps):=20ccache=204.10.2=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 08343d34..a67b3153 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -CCACHE_VERSION=4.10 +CCACHE_VERSION=4.10.2 WEBRTC_VERSION=m128.6613@{\#0} WEBRTC_SEMANTIC_VERSION=128.6613.0.0 WEBRTC_COMMIT=1ac162ee20a214bf97f6594a7effcbbc21f1effb From 06894d5670412d9651672dc91c92a264021ff90f Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Fri, 2 Aug 2024 13:34:21 +0900 Subject: [PATCH 10/20] =?UTF-8?q?chore:=20128.6613.1.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index a67b3153..329bef73 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.10.2 -WEBRTC_VERSION=m128.6613@{\#0} -WEBRTC_SEMANTIC_VERSION=128.6613.0.0 -WEBRTC_COMMIT=1ac162ee20a214bf97f6594a7effcbbc21f1effb +WEBRTC_VERSION=m128.6613@{\#1} +WEBRTC_SEMANTIC_VERSION=128.6613.1.0 +WEBRTC_COMMIT=bef5d63112748d963af30b7ac39bf3628b6ce9ef PACKAGE_NAMES= \ linux-arm \ From e2ef1cfb87935e3fb8c471206eabb40b8a26750e Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Mon, 5 Aug 2024 13:35:39 +0900 Subject: [PATCH 11/20] =?UTF-8?q?fix:=20perfetto=E3=82=92=E7=84=A1?= =?UTF-8?q?=E5=8A=B9=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- build.windows.ps1 | 8 ++++---- build/android/Makefile | 11 ++++++----- build/ios/Makefile | 8 +++++--- build/linux-arm/Makefile | 9 +++++---- build/linux-arm64/Makefile | 11 ++++++----- build/linux-x64/Makefile | 11 ++++++----- build/macos-arm64/Makefile | 15 ++++++++------- build/macos-x64/Makefile | 9 +++++---- 8 files changed, 45 insertions(+), 37 deletions(-) diff --git a/build.windows.ps1 b/build.windows.ps1 index 9ee4b717..359de398 100644 --- a/build.windows.ps1 +++ b/build.windows.ps1 @@ -91,19 +91,19 @@ Get-PSDrive Push-Location $WEBRTC_DIR\src # WebRTC Debugビルド x64 - gn gen $BUILD_DIR\debug_x64 --args='is_debug=true treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false is_component_build=false use_rtti=true use_custom_libcxx=false' + gn gen $BUILD_DIR\debug_x64 --args='is_debug=true treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false rtc_use_perfetto=false is_component_build=false use_rtti=true use_custom_libcxx=false' ninja -C "$BUILD_DIR\debug_x64" # WebRTC Releaseビルド x64 - gn gen $BUILD_DIR\release_x64 --args='is_debug=false treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false is_component_build=false use_rtti=true strip_debug_info=true symbol_level=0 use_custom_libcxx=false' + gn gen $BUILD_DIR\release_x64 --args='is_debug=false treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false rtc_use_perfetto=false is_component_build=false use_rtti=true strip_debug_info=true symbol_level=0 use_custom_libcxx=false' ninja -C "$BUILD_DIR\release_x64" # WebRTC Debugビルド x86 - gn gen $BUILD_DIR\debug_x86 --args='target_os=\"win\" target_cpu=\"x86\" is_debug=true treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false is_component_build=false use_rtti=true use_custom_libcxx=false' + gn gen $BUILD_DIR\debug_x86 --args='target_os=\"win\" target_cpu=\"x86\" is_debug=true treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false rtc_use_perfetto=false is_component_build=false use_rtti=true use_custom_libcxx=false' ninja -C "$BUILD_DIR\debug_x86" # WebRTC Releaseビルド x86 - gn gen $BUILD_DIR\release_x86 --args='target_os=\"win\" target_cpu=\"x86\" is_debug=false treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false is_component_build=false use_rtti=true strip_debug_info=true symbol_level=0 use_custom_libcxx=false' + gn gen $BUILD_DIR\release_x86 --args='target_os=\"win\" target_cpu=\"x86\" is_debug=false treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false rtc_use_perfetto=false is_component_build=false use_rtti=true strip_debug_info=true symbol_level=0 use_custom_libcxx=false' ninja -C "$BUILD_DIR\release_x86" Pop-Location diff --git a/build/android/Makefile b/build/android/Makefile index 6df81178..2b976ebc 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -12,14 +12,15 @@ include ../common.mk EXTRA_GN_ARGS := \ is_debug=false \ is_java_debug=false \ - $(RTC_USE_H264) \ - rtc_build_tools=false \ - rtc_build_examples=false \ - rtc_include_tests=false \ is_clang=true \ is_component_build=false \ - rtc_enable_protobuf=false \ + $(RTC_USE_H264) \ + rtc_build_examples=false \ rtc_build_json=true \ + rtc_build_tools=false \ + rtc_enable_protobuf=false \ + rtc_include_tests=false \ + rtc_use_perfetto=false \ use_rtti=true .PHONY: all diff --git a/build/ios/Makefile b/build/ios/Makefile index d5a0c961..9864688f 100644 --- a/build/ios/Makefile +++ b/build/ios/Makefile @@ -10,12 +10,14 @@ TARGET_CPU = include ../common.mk EXTRA_GN_ARGS := \ - use_rtti=true \ + is_debug=false + $(RTC_USE_H264) \ rtc_libvpx_build_vp9=true \ rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_use_h264=false + rtc_build_tools=false \ + rtc_use_perfetto=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/linux-arm/Makefile b/build/linux-arm/Makefile index 1eb5af8b..fcb574e1 100644 --- a/build/linux-arm/Makefile +++ b/build/linux-arm/Makefile @@ -16,13 +16,14 @@ EXTRA_GN_ARGS := \ $(RTC_USE_H264) \ $(RTC_USE_X11) \ rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_use_pipewire=false \ rtc_build_json=true \ - use_rtti=true \ + rtc_build_tools=false \ + rtc_use_perfetto=false \ + rtc_use_pipewire=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/linux-arm64/Makefile b/build/linux-arm64/Makefile index 49e86c1a..d6503cd4 100644 --- a/build/linux-arm64/Makefile +++ b/build/linux-arm64/Makefile @@ -15,14 +15,15 @@ EXTRA_GN_ARGS := \ is_debug=false \ $(RTC_USE_H264) \ $(RTC_USE_X11) \ - rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_use_pipewire=false \ rtc_build_json=true \ - use_rtti=true \ + rtc_build_tools=false \ + rtc_include_tests=false \ + rtc_use_perfetto=false \ + rtc_use_pipewire=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/linux-x64/Makefile b/build/linux-x64/Makefile index bae3ce1b..7784d02c 100644 --- a/build/linux-x64/Makefile +++ b/build/linux-x64/Makefile @@ -15,14 +15,15 @@ EXTRA_GN_ARGS := \ is_debug=false \ $(RTC_USE_H264) \ $(RTC_USE_X11) \ - rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_use_pipewire=false \ rtc_build_json=true \ - use_rtti=true \ + rtc_build_tools=false \ + rtc_include_tests=false \ + rtc_use_perfetto=false \ + rtc_use_pipewire=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/macos-arm64/Makefile b/build/macos-arm64/Makefile index 0d4ffc8d..5f7d9930 100644 --- a/build/macos-arm64/Makefile +++ b/build/macos-arm64/Makefile @@ -15,18 +15,19 @@ EXTRA_GN_ARGS := \ enable_stripping=true \ enable_dsyms=true \ is_debug=false \ + is_component_build=false \ treat_warnings_as_errors=false \ $(RTC_USE_H264) \ - rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_libvpx_build_vp9=true \ - rtc_enable_symbol_export=true \ + rtc_build_tools=false \ rtc_enable_objc_symbol_export=true \ - is_component_build=false \ - use_rtti=true \ + rtc_enable_symbol_export=true \ + rtc_include_tests=false \ + rtc_libvpx_build_vp9=true \ + rtc_use_perfetto=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/macos-x64/Makefile b/build/macos-x64/Makefile index 0786b6d5..303ecb6b 100644 --- a/build/macos-x64/Makefile +++ b/build/macos-x64/Makefile @@ -15,18 +15,19 @@ EXTRA_GN_ARGS := \ enable_stripping=true \ enable_dsyms=true \ is_debug=false \ + is_component_build=false \ treat_warnings_as_errors=false \ $(RTC_USE_H264) \ rtc_include_tests=false \ rtc_build_tools=false \ rtc_build_examples=false \ - rtc_libvpx_build_vp9=true \ rtc_enable_symbol_export=true \ rtc_enable_objc_symbol_export=true \ - is_component_build=false \ - use_rtti=true \ + rtc_libvpx_build_vp9=true \ + rtc_use_perfetto=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package From 52331af6ba787829ef35d9ca095b43e4d419d5db Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Wed, 14 Aug 2024 12:44:12 +0900 Subject: [PATCH 12/20] =?UTF-8?q?chore:=20128.6613.2.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 329bef73..c034c463 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.10.2 -WEBRTC_VERSION=m128.6613@{\#1} -WEBRTC_SEMANTIC_VERSION=128.6613.1.0 -WEBRTC_COMMIT=bef5d63112748d963af30b7ac39bf3628b6ce9ef +WEBRTC_VERSION=m128.6613@{\#2} +WEBRTC_SEMANTIC_VERSION=128.6613.2.0 +WEBRTC_COMMIT=e7686023a186ac233ed1284da45cc166c0df4e1a PACKAGE_NAMES= \ linux-arm \ From 1b94cedbdd843dc7505e293a04d5306e7700d2c4 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Tue, 20 Aug 2024 09:25:17 +0900 Subject: [PATCH 13/20] =?UTF-8?q?ci:=20macOS/iOS=E3=81=AE=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=92macOS=2014=E3=81=A7=E8=A1=8C?= =?UTF-8?q?=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xcode15.4が使用されるようにするため Signed-off-by: Zenichi Amano --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19d57ad0..3712194b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: name: - macos-arm64 - macos-x64 - runs-on: macos-12 + runs-on: macos-14 steps: - uses: actions/checkout@v4 - name: Build @@ -80,7 +80,7 @@ jobs: compression-level: 0 build-ios: - runs-on: macos-12 + runs-on: macos-14 steps: - uses: actions/checkout@v4 - name: Build From 5b58e930f47188b72646e7d853b282dffcd04aae Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 5 Sep 2024 11:22:20 +0900 Subject: [PATCH 14/20] =?UTF-8?q?chore:=20128.6613.3.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index c034c463..72092494 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.10.2 -WEBRTC_VERSION=m128.6613@{\#2} -WEBRTC_SEMANTIC_VERSION=128.6613.2.0 -WEBRTC_COMMIT=e7686023a186ac233ed1284da45cc166c0df4e1a +WEBRTC_VERSION=m128.6613@{\#3} +WEBRTC_SEMANTIC_VERSION=128.6613.3.0 +WEBRTC_COMMIT=f237dc146debcfde3d70038c2b66f71bfea8d24b PACKAGE_NAMES= \ linux-arm \ From 86a8937742fa2b69f2080a4f31022e82e417f43a Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 5 Sep 2024 11:23:54 +0900 Subject: [PATCH 15/20] =?UTF-8?q?chore:=20129.6668.1.0=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 72092494..bcfdd2da 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.10.2 -WEBRTC_VERSION=m128.6613@{\#3} -WEBRTC_SEMANTIC_VERSION=128.6613.3.0 -WEBRTC_COMMIT=f237dc146debcfde3d70038c2b66f71bfea8d24b +WEBRTC_VERSION=m129.6668@{\#1} +WEBRTC_SEMANTIC_VERSION=129.6668.1.0 +WEBRTC_COMMIT=21508e08e7545a03c8c35a9299923279e3def319 PACKAGE_NAMES= \ linux-arm \ From b9a0d269108af27df60104070b2d24f1a9d6d7b1 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 5 Sep 2024 12:51:50 +0900 Subject: [PATCH 16/20] =?UTF-8?q?ci:=20windows=E3=81=AE=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E3=82=92windows=20server=202022=E8=A1=8C=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows SDKのバージョンが古いとエラーが出ている Signed-off-by: Zenichi Amano --- .github/workflows/build.yml | 2 +- build.windows.ps1 | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3712194b..d478ae3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: compression-level: 0 build-windows: - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 - name: Disk Cleanup diff --git a/build.windows.ps1 b/build.windows.ps1 index 359de398..2c024594 100644 --- a/build.windows.ps1 +++ b/build.windows.ps1 @@ -26,15 +26,6 @@ if ($path) { $null = new-item -force -path "Env:\$($Matches[1])" -value $Matches[2] } } - - # dbghelp.dll が無いと怒られてしまうので所定の場所にコピーする (管理者権限で実行する必要がある) - foreach ($arch in @("x64", "x86")) { - $debuggerpath = join-path $path "Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\$arch\dbghelp.dll" - if (!(Test-Path "C:\Program Files (x86)\Windows Kits\10\Debuggers\$arch")) { - New-Item "C:\Program Files (x86)\Windows Kits\10\Debuggers\$arch" -ItemType Directory -Force - Copy-Item $debuggerpath "C:\Program Files (x86)\Windows Kits\10\Debuggers\$arch\dbghelp.dll" - } - } } $REPO_DIR = Resolve-Path "." From 922968e99a40456ceeff7e9f2134209edea26e8f Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 5 Sep 2024 12:58:52 +0900 Subject: [PATCH 17/20] =?UTF-8?q?fix:=20mac=E7=92=B0=E5=A2=83=E3=81=A7?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=82=B9=E3=82=AF=E5=AE=B9=E9=87=8F=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E3=80=81Android=20SDK=E3=81=AE?= =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=82=92=E8=A9=A6=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- .github/workflows/build.yml | 2 ++ disk_cleanup_mac.sh | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100755 disk_cleanup_mac.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d478ae3e..98d461bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,6 +48,8 @@ jobs: runs-on: macos-14 steps: - uses: actions/checkout@v4 + - name: Disk Cleanup + run: ./disk_cleanup_mac.sh - name: Build run: make -C build USE_CCACHE=0 ${{ matrix.name }} - name: Upload artifact diff --git a/disk_cleanup_mac.sh b/disk_cleanup_mac.sh new file mode 100755 index 00000000..6e4dbd66 --- /dev/null +++ b/disk_cleanup_mac.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +df -h + +# Android SDK の削除 +sudo rm -rf /Users/runner/Library/Android/sdk + +df -h From faca3474c6924060bd51b6bf0217b548ba11aee0 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 5 Sep 2024 13:28:26 +0900 Subject: [PATCH 18/20] =?UTF-8?q?fix:=20mac=E7=92=B0=E5=A2=83=E3=81=A7?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=82=B9=E3=82=AF=E5=AE=B9=E9=87=8F=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E3=80=81Android=20SDK=E3=81=AE?= =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=82=92=E8=A9=A6=E3=81=BF=E3=82=8B=20(iOS?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98d461bb..0f3cc293 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,6 +85,8 @@ jobs: runs-on: macos-14 steps: - uses: actions/checkout@v4 + - name: Disk Cleanup + run: ./disk_cleanup_mac.sh - name: Build run: make -C build USE_CCACHE=0 ios - name: Upload artifact From e73f64696cad22da01dc4d613de8e1ca64d00485 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Fri, 6 Sep 2024 15:05:09 +0900 Subject: [PATCH 19/20] =?UTF-8?q?fix:=20windows=E7=92=B0=E5=A2=83=E3=81=A7?= =?UTF-8?q?=E3=80=81borning=20ssl=E3=81=AE=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=81=8C=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=20string=E3=83=98?= =?UTF-8?q?=E3=83=83=E3=83=80=E3=83=BC=E3=82=92include=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=84=E3=81=9F=E3=82=81=E3=81=A8=E6=80=9D?= =?UTF-8?q?=E3=82=8F=E3=82=8C=E3=82=8B=20borning=20ssl=E3=81=AB=E3=83=91?= =?UTF-8?q?=E3=83=83=E3=83=81=E3=82=92=E5=BD=93=E3=81=A6=E3=82=8B=E3=81=A8?= =?UTF-8?q?=E3=80=81=E5=86=8D=E5=BA=A6=E3=83=93=E3=83=AB=E3=83=89=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=80=81=E3=83=91=E3=83=83=E3=83=81=E3=82=92=E6=88=BB=E3=81=99?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- build/common.mk | 3 ++- patch/borning_ssl_missing_string_header.patch | 10 ++++++++++ scripts/fetch_webrtc.sh | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 patch/borning_ssl_missing_string_header.patch diff --git a/build/common.mk b/build/common.mk index 76e733ab..38e03e3c 100644 --- a/build/common.mk +++ b/build/common.mk @@ -49,7 +49,8 @@ common-patch: cd $(SRC_DIR) && \ patch -p1 < $(PATCH_DIR)/nacl_armv6_2.patch && \ patch -p2 < $(PATCH_DIR)/4k.patch && \ - patch -p2 < $(PATCH_DIR)/add_licenses.patch + patch -p2 < $(PATCH_DIR)/add_licenses.patch && \ + patch -p2 < $(PATCH_DIR)/borning_ssl_missing_string_header.patch .PHONY: common-package common-package: copy diff --git a/patch/borning_ssl_missing_string_header.patch b/patch/borning_ssl_missing_string_header.patch new file mode 100644 index 00000000..275dd50f --- /dev/null +++ b/patch/borning_ssl_missing_string_header.patch @@ -0,0 +1,10 @@ +--- a/src/third_party/boringssl/src/pki/string_util.h ++++ b/src/third_party/boringssl/src/pki/string_util.h +@@ -6,6 +6,7 @@ + #define BSSL_PKI_STRING_UTIL_H_ + + #include ++#include + #include + #include + diff --git a/scripts/fetch_webrtc.sh b/scripts/fetch_webrtc.sh index 26992698..3c0d64c3 100755 --- a/scripts/fetch_webrtc.sh +++ b/scripts/fetch_webrtc.sh @@ -18,6 +18,11 @@ if [ -f $WEBRTC_DIR/.gclient ]; then git reset --hard; git clean -xdf; fi + if [ -d $WEBRTC_DIR/src/third_party/boringssl/src ]; then + cd $WEBRTC_DIR/src/third_party/boringssl/src; + git reset --hard; + git clean -xdf; + fi if [ -d $WEBRTC_DIR/src/build ]; then cd $WEBRTC_DIR/src/build; git reset --hard; From 6622a629bd28eb04dae38db42b4505a9595a6fcd Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Fri, 6 Sep 2024 15:11:12 +0900 Subject: [PATCH 20/20] =?UTF-8?q?fix:=20windows=E7=92=B0=E5=A2=83=E3=81=A7?= =?UTF-8?q?=E3=83=91=E3=83=83=E3=83=81=E9=81=A9=E7=94=A8=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- build.windows.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/build.windows.ps1 b/build.windows.ps1 index 2c024594..b256922a 100644 --- a/build.windows.ps1 +++ b/build.windows.ps1 @@ -75,6 +75,7 @@ Push-Location $WEBRTC_DIR git apply --ignore-whitespace -p 2 $PATCH_DIR\add_licenses.patch git apply --ignore-whitespace -p 2 $PATCH_DIR\windows_fix_towupper.patch git apply --ignore-whitespace $PATCH_DIR\windows_fix_abseil.patch + git apply --ignore-whitespace -p 2 $PATCH_DIR\borning_ssl_missing_string_header.patch Pop-Location Pop-Location