From ee107004c4609b00346eb05386b8d686ee371a75 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sat, 12 Nov 2022 09:39:17 +0900 Subject: [PATCH 01/49] =?UTF-8?q?109.5414.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 ef21c1b5..62949ec2 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.2 -WEBRTC_VERSION=m108.5359{\#5} -WEBRTC_SEMANTIC_VERSION=108.5359.5.0 -WEBRTC_COMMIT=93081d594f7efff72958a79251f53731b99e902b +WEBRTC_VERSION=m109.5414@{\#0} +WEBRTC_SEMANTIC_VERSION=109.5414.0.0 +WEBRTC_COMMIT=a3e51df5f3377bee71b4dcdd1ee8f50c520a9ea8 PACKAGE_NAMES= \ linux-arm \ From f15cc7982a1819c93d0993642f23adc0590c1d19 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sat, 12 Nov 2022 17:07:13 +0900 Subject: [PATCH 02/49] =?UTF-8?q?Android=E3=81=AE=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3=20use=20?= =?UTF-8?q?relative=20vtable=20ABI=E3=81=AE=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=82=92revert=20buildtools=E3=81=AE=E3=83=91?= =?UTF-8?q?=E3=83=83=E3=83=81=E9=81=A9=E7=94=A8=E5=BE=8C=E3=81=ABfetch?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=80=81reset=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/android/Makefile | 1 + ...ndroid_revert_use-relative-vtable-ABI.patch | 18 ++++++++++++++++++ scripts/fetch_webrtc.sh | 5 +++++ 3 files changed, 24 insertions(+) create mode 100644 patch/android_revert_use-relative-vtable-ABI.patch diff --git a/build/android/Makefile b/build/android/Makefile index 1b475d56..9fa6832a 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -60,6 +60,7 @@ patch: common-patch patch -p2 < $(PATCH_DIR)/disable_use_hermetic_xcode_on_linux.patch && \ patch -p2 < $(PATCH_DIR)/android_version.patch && \ patch -p2 < $(PATCH_DIR)/android_use_libunwind.patch && \ + patch -p2 < $(PATCH_DIR)/android_revert_use-relative-vtable-ABI.patch && \ $(SCRIPTS_DIR)/generate_android_version.sh $(SRC_DIR) $(WEBRTC_COMMIT) $(WEBRTC_SEMANTIC_VERSION) diff --git a/patch/android_revert_use-relative-vtable-ABI.patch b/patch/android_revert_use-relative-vtable-ABI.patch new file mode 100644 index 00000000..827fc7f5 --- /dev/null +++ b/patch/android_revert_use-relative-vtable-ABI.patch @@ -0,0 +1,18 @@ +diff --git a/src/build/config/android/BUILD.gn b/src/build/config/android/BUILD.gn +index f8d2e95c0..efdd3826e 100644 +--- a/src/build/config/android/BUILD.gn ++++ b/src/build/config/android/BUILD.gn +@@ -45,13 +45,6 @@ config("compiler") { + # by shrinking the alignment gap between segments. This also causes all + # segments to be mapped adjacently, which breakpad relies on. + ldflags += [ "-Wl,-z,max-page-size=4096" ] +- +- # Use non-standard (non-Itanium) ABI for Android64. This shrinks vtables +- # in half and places them to .rodata, which greatly improves memory +- # footprint. It should be safe, assuming all of C++ in Chromium is +- # compiled with this flag. +- cflags_cc = [ "-fexperimental-relative-c++-abi-vtables" ] +- ldflags += [ "-fexperimental-relative-c++-abi-vtables" ] + } + + if (current_cpu == "arm64") { diff --git a/scripts/fetch_webrtc.sh b/scripts/fetch_webrtc.sh index cecc0c44..26992698 100755 --- a/scripts/fetch_webrtc.sh +++ b/scripts/fetch_webrtc.sh @@ -23,6 +23,11 @@ if [ -f $WEBRTC_DIR/.gclient ]; then git reset --hard; git clean -xdf; fi + if [ -d $WEBRTC_DIR/src/buildtools ]; then + cd $WEBRTC_DIR/src/buildtools; + git reset --hard; + git clean -xdf; + fi else echo "Getting WEBRTC ..."; rm -f $DEPOT_TOOLS_DIR/metrics.cfg; From 7d7a3e680a29279d8edc6b49ee61b9be4f93e11e Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Fri, 2 Dec 2022 18:38:28 +0900 Subject: [PATCH 03/49] =?UTF-8?q?109.5414.1.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 62949ec2..3ec70a62 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.2 -WEBRTC_VERSION=m109.5414@{\#0} -WEBRTC_SEMANTIC_VERSION=109.5414.0.0 -WEBRTC_COMMIT=a3e51df5f3377bee71b4dcdd1ee8f50c520a9ea8 +WEBRTC_VERSION=m109.5414@{\#1} +WEBRTC_SEMANTIC_VERSION=109.5414.1.0 +WEBRTC_COMMIT=cb7d97e01276f3e810e1f57dc277dbe6624b8b27 PACKAGE_NAMES= \ linux-arm \ From e5b42fbe49ede253acd00627cfbecba4f615f43b Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sun, 18 Dec 2022 14:30:22 +0900 Subject: [PATCH 04/49] =?UTF-8?q?109.5414.2.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 3ec70a62..2ef4cf1e 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.2 -WEBRTC_VERSION=m109.5414@{\#1} -WEBRTC_SEMANTIC_VERSION=109.5414.1.0 -WEBRTC_COMMIT=cb7d97e01276f3e810e1f57dc277dbe6624b8b27 +WEBRTC_VERSION=m109.5414@{\#2} +WEBRTC_SEMANTIC_VERSION=109.5414.2.0 +WEBRTC_COMMIT=c71b34235eb0f1f8c7cd3b66a01bd003c1299e00 PACKAGE_NAMES= \ linux-arm \ From f15dc4583db97088b423bd542b1b2daa5454d9f1 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sun, 18 Dec 2022 14:31:47 +0900 Subject: [PATCH 05/49] =?UTF-8?q?110.5481.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 2ef4cf1e..065c609b 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.2 -WEBRTC_VERSION=m109.5414@{\#2} -WEBRTC_SEMANTIC_VERSION=109.5414.2.0 -WEBRTC_COMMIT=c71b34235eb0f1f8c7cd3b66a01bd003c1299e00 +WEBRTC_VERSION=m110.5481@{\#0} +WEBRTC_SEMANTIC_VERSION=110.5481.0.0 +WEBRTC_COMMIT=2e1a9a4ae0234d4b1ea7a6fd4188afa1fb20379d PACKAGE_NAMES= \ linux-arm \ From 87297fed0be859dc1025b6a1f87273aa676ed616 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sun, 18 Dec 2022 17:34:00 +0900 Subject: [PATCH 06/49] =?UTF-8?q?ccache=E3=82=924.7.4=E3=81=AB=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 065c609b..bebd5bec 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -CCACHE_VERSION=4.7.2 +CCACHE_VERSION=4.7.4 WEBRTC_VERSION=m110.5481@{\#0} WEBRTC_SEMANTIC_VERSION=110.5481.0.0 WEBRTC_COMMIT=2e1a9a4ae0234d4b1ea7a6fd4188afa1fb20379d From 4d2d85461d02eaa9e4cdc69fa596950660840c6e Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sun, 18 Dec 2022 18:02:29 +0900 Subject: [PATCH 07/49] =?UTF-8?q?use-relative-vtable-ABI=E3=81=AE=E5=AF=BE?= =?UTF-8?q?=E5=87=A6=E3=81=8C=E3=81=95=E3=82=8C=E3=81=9F=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=80=81=E3=83=91=E3=83=83=E3=83=81=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- build/android/Makefile | 1 - ...ndroid_revert_use-relative-vtable-ABI.patch | 18 ------------------ 2 files changed, 19 deletions(-) delete mode 100644 patch/android_revert_use-relative-vtable-ABI.patch diff --git a/build/android/Makefile b/build/android/Makefile index 9fa6832a..1b475d56 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -60,7 +60,6 @@ patch: common-patch patch -p2 < $(PATCH_DIR)/disable_use_hermetic_xcode_on_linux.patch && \ patch -p2 < $(PATCH_DIR)/android_version.patch && \ patch -p2 < $(PATCH_DIR)/android_use_libunwind.patch && \ - patch -p2 < $(PATCH_DIR)/android_revert_use-relative-vtable-ABI.patch && \ $(SCRIPTS_DIR)/generate_android_version.sh $(SRC_DIR) $(WEBRTC_COMMIT) $(WEBRTC_SEMANTIC_VERSION) diff --git a/patch/android_revert_use-relative-vtable-ABI.patch b/patch/android_revert_use-relative-vtable-ABI.patch deleted file mode 100644 index 827fc7f5..00000000 --- a/patch/android_revert_use-relative-vtable-ABI.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/build/config/android/BUILD.gn b/src/build/config/android/BUILD.gn -index f8d2e95c0..efdd3826e 100644 ---- a/src/build/config/android/BUILD.gn -+++ b/src/build/config/android/BUILD.gn -@@ -45,13 +45,6 @@ config("compiler") { - # by shrinking the alignment gap between segments. This also causes all - # segments to be mapped adjacently, which breakpad relies on. - ldflags += [ "-Wl,-z,max-page-size=4096" ] -- -- # Use non-standard (non-Itanium) ABI for Android64. This shrinks vtables -- # in half and places them to .rodata, which greatly improves memory -- # footprint. It should be safe, assuming all of C++ in Chromium is -- # compiled with this flag. -- cflags_cc = [ "-fexperimental-relative-c++-abi-vtables" ] -- ldflags += [ "-fexperimental-relative-c++-abi-vtables" ] - } - - if (current_cpu == "arm64") { From da66eb33e0bbf5e2bff02259396e2ac302715b5f Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 19 Jan 2023 19:46:18 +0900 Subject: [PATCH 08/49] =?UTF-8?q?110.5481.1.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 bebd5bec..ffd4ed18 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m110.5481@{\#0} -WEBRTC_SEMANTIC_VERSION=110.5481.0.0 -WEBRTC_COMMIT=2e1a9a4ae0234d4b1ea7a6fd4188afa1fb20379d +WEBRTC_VERSION=m110.5481@{\#1} +WEBRTC_SEMANTIC_VERSION=110.5481.1.0 +WEBRTC_COMMIT=dc7333f9d65239ef35a77b1eac93c3d0806314fd PACKAGE_NAMES= \ linux-arm \ From 1bca2192129baecca8a0ad192a79dacf795f7027 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Mon, 30 Jan 2023 19:44:31 +0900 Subject: [PATCH 09/49] =?UTF-8?q?110.5481.4.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 ffd4ed18..73ab82fc 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m110.5481@{\#1} -WEBRTC_SEMANTIC_VERSION=110.5481.1.0 -WEBRTC_COMMIT=dc7333f9d65239ef35a77b1eac93c3d0806314fd +WEBRTC_VERSION=m110.5481@{\#4} +WEBRTC_SEMANTIC_VERSION=110.5481.4.0 +WEBRTC_COMMIT=1e675c7835f188cd8be228f5da6d3467690355b8 PACKAGE_NAMES= \ linux-arm \ From e25738198e36d105bc0a0ec70f32f084583d7f8b Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Mon, 30 Jan 2023 19:45:59 +0900 Subject: [PATCH 10/49] =?UTF-8?q?111.5563.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 73ab82fc..5bc63660 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m110.5481@{\#4} -WEBRTC_SEMANTIC_VERSION=110.5481.4.0 -WEBRTC_COMMIT=1e675c7835f188cd8be228f5da6d3467690355b8 +WEBRTC_VERSION=m111.5563@{\#0} +WEBRTC_SEMANTIC_VERSION=111.5563.0.0 +WEBRTC_COMMIT=6c032cb8356b0d3f717c4fcf50796241f2bba6c2 PACKAGE_NAMES= \ linux-arm \ From 8876b8ede5bc21d9f534bf53f59e62ecbc0a2703 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Tue, 31 Jan 2023 18:11:49 +0900 Subject: [PATCH 11/49] =?UTF-8?q?macOS/iOS=E7=94=A8=E3=81=AEh.264=E3=83=91?= =?UTF-8?q?=E3=83=83=E3=83=81=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/ios/Makefile | 3 --- build/macos-arm64/Makefile | 2 -- build/macos-x64/Makefile | 2 -- patch/macos_h264_encoder.patch | 15 --------------- 4 files changed, 22 deletions(-) delete mode 100644 patch/macos_h264_encoder.patch diff --git a/build/ios/Makefile b/build/ios/Makefile index 318057ea..d5a0c961 100644 --- a/build/ios/Makefile +++ b/build/ios/Makefile @@ -28,9 +28,6 @@ package: .PHONY: patch patch: common-patch - echo "apply iOS patches ..." && \ - cd $(SRC_DIR) && \ - patch -p2 < $(PATCH_DIR)/macos_h264_encoder.patch .PHONY: build build: patch diff --git a/build/macos-arm64/Makefile b/build/macos-arm64/Makefile index 6105f5c3..e086bec5 100644 --- a/build/macos-arm64/Makefile +++ b/build/macos-arm64/Makefile @@ -48,8 +48,6 @@ copy: common-copy .PHONY: patch patch: common-patch - cd $(SRC_DIR) && \ - patch -p2 < $(PATCH_DIR)/macos_h264_encoder.patch .PHONY: build build: patch diff --git a/build/macos-x64/Makefile b/build/macos-x64/Makefile index cd780610..50291645 100644 --- a/build/macos-x64/Makefile +++ b/build/macos-x64/Makefile @@ -48,8 +48,6 @@ copy: common-copy .PHONY: patch patch: common-patch - cd $(SRC_DIR) && \ - patch -p2 < $(PATCH_DIR)/macos_h264_encoder.patch .PHONY: build build: patch diff --git a/patch/macos_h264_encoder.patch b/patch/macos_h264_encoder.patch deleted file mode 100644 index 48349503..00000000 --- a/patch/macos_h264_encoder.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2018-2019, Shiguredo Inc, tnoho and melpon and kdxu -# from https://github.com/shiguredo/momo/blob/develop/patch/macos_h264_encoder.patch - -diff --git a/src/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm b/src/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm -index 4028e7acee..585743e1aa 100644 ---- a/src/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm -+++ b/src/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm -@@ -554,6 +554,7 @@ NSUInteger GetMaxSampleRate(const webrtc::H264::ProfileLevelId &profile_level_id - OSType framePixelFormat = [self pixelFormatOfFrame:frame]; - - if (_compressionSession) { -+ _pixelBufferPool = VTCompressionSessionGetPixelBufferPool(_compressionSession); - // The pool attribute `kCVPixelBufferPixelFormatTypeKey` can contain either an array of pixel - // formats or a single pixel format. - NSDictionary *poolAttributes = From cd570c04108d690b7f8c160c530fb9bfc9ecff2d Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Wed, 8 Feb 2023 18:57:10 +0900 Subject: [PATCH 12/49] =?UTF-8?q?111.5563.1.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 5bc63660..5558d8f5 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m111.5563@{\#0} -WEBRTC_SEMANTIC_VERSION=111.5563.0.0 -WEBRTC_COMMIT=6c032cb8356b0d3f717c4fcf50796241f2bba6c2 +WEBRTC_VERSION=m111.5563@{\#1} +WEBRTC_SEMANTIC_VERSION=111.5563.1.0 +WEBRTC_COMMIT=5bdb4418e90cf0e9788aa7ca75082e5ea0746e3b PACKAGE_NAMES= \ linux-arm \ From eabd0a7d55939d501b72dc67156451e24fce88c8 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 16 Feb 2023 17:13:34 +0900 Subject: [PATCH 13/49] =?UTF-8?q?111.5563.2.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 5558d8f5..ed2c07ee 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m111.5563@{\#1} -WEBRTC_SEMANTIC_VERSION=111.5563.1.0 -WEBRTC_COMMIT=5bdb4418e90cf0e9788aa7ca75082e5ea0746e3b +WEBRTC_VERSION=m111.5563@{\#2} +WEBRTC_SEMANTIC_VERSION=111.5563.2.0 +WEBRTC_COMMIT=cb954cdb0814e2119b6cb0fe2512d532b5c1419c PACKAGE_NAMES= \ linux-arm \ From 06e715786951f5f5bc6a63b2396f9a0094ffeefb Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Tue, 28 Feb 2023 03:45:37 +0900 Subject: [PATCH 14/49] =?UTF-8?q?111.5563.4.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 ed2c07ee..b7cd2d3e 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m111.5563@{\#2} -WEBRTC_SEMANTIC_VERSION=111.5563.2.0 -WEBRTC_COMMIT=cb954cdb0814e2119b6cb0fe2512d532b5c1419c +WEBRTC_VERSION=m111.5563@{\#4} +WEBRTC_SEMANTIC_VERSION=111.5563.4.0 +WEBRTC_COMMIT=b6b9b1fc761c039195faa033cb8fdde4ed8ba0a9 PACKAGE_NAMES= \ linux-arm \ From 0e6ee71c6d57fcb4907c4829e044a65ee20644a3 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Tue, 28 Feb 2023 03:47:56 +0900 Subject: [PATCH 15/49] =?UTF-8?q?112.5615.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 b7cd2d3e..fef08648 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m111.5563@{\#4} -WEBRTC_SEMANTIC_VERSION=111.5563.4.0 -WEBRTC_COMMIT=b6b9b1fc761c039195faa033cb8fdde4ed8ba0a9 +WEBRTC_VERSION=m112.5615@{\#0} +WEBRTC_SEMANTIC_VERSION=112.5615.0.0 +WEBRTC_COMMIT=cdfeb4f7922f05007d88c8263842998ec79b6dd6 PACKAGE_NAMES= \ linux-arm \ From ef4d5d7cf70cbcf028ec0d9c712a4684bc30a585 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Wed, 1 Mar 2023 21:40:17 +0900 Subject: [PATCH 16/49] =?UTF-8?q?GitHub=20Actions=E3=81=8C=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=B9=E3=82=AF=E5=AE=B9=E9=87=8F=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=80=81Haskell=E9=96=A2=E9=80=A3=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E5=89=8A=E9=99=A4=E3=82=92?= =?UTF-8?q?=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 --- disk_cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/disk_cleanup.sh b/disk_cleanup.sh index 41195ff6..fa8967db 100755 --- a/disk_cleanup.sh +++ b/disk_cleanup.sh @@ -11,4 +11,7 @@ sudo rm -rf /usr/local/share/boost # .Net Core の削除 sudo rm -rf /usr/share/dotnet +# Haskell の削除 +sudo rm -rf /opt/ghc + df -h From bcee9ad4a259d4aabacea2fd4e16fb4fbc6bc001 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 2 Mar 2023 04:35:46 +0900 Subject: [PATCH 17/49] =?UTF-8?q?GitHub=20Actions=E3=81=8C=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=B9=E3=82=AF=E5=AE=B9=E9=87=8F=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=80=81Android=20SDK=E9=96=A2=E9=80=A3?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E5=89=8A=E9=99=A4?= =?UTF-8?q?=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 --- disk_cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/disk_cleanup.sh b/disk_cleanup.sh index fa8967db..33e0f558 100755 --- a/disk_cleanup.sh +++ b/disk_cleanup.sh @@ -14,4 +14,7 @@ sudo rm -rf /usr/share/dotnet # Haskell の削除 sudo rm -rf /opt/ghc +# Android SDK の削除 +sudo rm -rf /usr/local/lib/android + df -h From 474fcf17bef0d4c23a1364ad2ff2d6b624221b1a Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Mon, 20 Mar 2023 09:06:17 +0900 Subject: [PATCH 18/49] =?UTF-8?q?112.5615.1.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 fef08648..61c276b0 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m112.5615@{\#0} -WEBRTC_SEMANTIC_VERSION=112.5615.0.0 -WEBRTC_COMMIT=cdfeb4f7922f05007d88c8263842998ec79b6dd6 +WEBRTC_VERSION=m112.5615@{\#1} +WEBRTC_SEMANTIC_VERSION=112.5615.1.0 +WEBRTC_COMMIT=18a31880e3037f9938581c1210d2d73b9685f4aa PACKAGE_NAMES= \ linux-arm \ From c53a5a062b689c77d4cf0d868888431b24886480 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sun, 26 Mar 2023 06:56:45 +0900 Subject: [PATCH 19/49] =?UTF-8?q?113.5672.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 61c276b0..f3a25650 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m112.5615@{\#1} -WEBRTC_SEMANTIC_VERSION=112.5615.1.0 -WEBRTC_COMMIT=18a31880e3037f9938581c1210d2d73b9685f4aa +WEBRTC_VERSION=m113.5672@{\#0} +WEBRTC_SEMANTIC_VERSION=113.5672.0.0 +WEBRTC_COMMIT=d3e765e4eb4af8eba0c63b6bfe2e17a12dc670dc PACKAGE_NAMES= \ linux-arm \ From 2c3a3697496f26ce9b2fc87d28724c2d617653bb Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Fri, 31 Mar 2023 17:57:30 +0900 Subject: [PATCH 20/49] =?UTF-8?q?113.5672.1.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 f3a25650..cabb2a7f 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m113.5672@{\#0} -WEBRTC_SEMANTIC_VERSION=113.5672.0.0 -WEBRTC_COMMIT=d3e765e4eb4af8eba0c63b6bfe2e17a12dc670dc +WEBRTC_VERSION=m113.5672@{\#1} +WEBRTC_SEMANTIC_VERSION=113.5672.1.0 +WEBRTC_COMMIT=f6ab0b438e22ea30db7ad3fbf9f870b0d4506235 PACKAGE_NAMES= \ linux-arm \ From 017d5a58dad2d25ab1f1dc851ddba6902fa6ff87 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sat, 29 Apr 2023 06:42:11 +0900 Subject: [PATCH 21/49] =?UTF-8?q?114.5735.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 cabb2a7f..68e56c18 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.7.4 -WEBRTC_VERSION=m113.5672@{\#1} -WEBRTC_SEMANTIC_VERSION=113.5672.1.0 -WEBRTC_COMMIT=f6ab0b438e22ea30db7ad3fbf9f870b0d4506235 +WEBRTC_VERSION=m114.5735@{\#0} +WEBRTC_SEMANTIC_VERSION=114.5735.0.0 +WEBRTC_COMMIT=df7df199abd619e75b9f1d9a7e12fc3f3f748775 PACKAGE_NAMES= \ linux-arm \ From f9293803af7141f9bb29dc79a03b4264d1a81bc8 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Sat, 29 Apr 2023 06:42:40 +0900 Subject: [PATCH 22/49] =?UTF-8?q?ccache=E3=82=924.8=E3=81=AB=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 68e56c18..03704b10 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -CCACHE_VERSION=4.7.4 +CCACHE_VERSION=4.8 WEBRTC_VERSION=m114.5735@{\#0} WEBRTC_SEMANTIC_VERSION=114.5735.0.0 WEBRTC_COMMIT=df7df199abd619e75b9f1d9a7e12fc3f3f748775 From bbef177fd57de14df61408e3714adee857afa17c Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Fri, 19 May 2023 08:10:51 +0900 Subject: [PATCH 23/49] =?UTF-8?q?114.5735.2.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 03704b10..ec70b197 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8 -WEBRTC_VERSION=m114.5735@{\#0} -WEBRTC_SEMANTIC_VERSION=114.5735.0.0 -WEBRTC_COMMIT=df7df199abd619e75b9f1d9a7e12fc3f3f748775 +WEBRTC_VERSION=m114.5735@{\#2} +WEBRTC_SEMANTIC_VERSION=114.5735.2.0 +WEBRTC_COMMIT=ecab2a49da48f0279a3b6422dab602614630005e PACKAGE_NAMES= \ linux-arm \ From 87985d3888532d0b57f8c17e899769be6843793c Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Sat, 20 May 2023 08:58:05 +0900 Subject: [PATCH 24/49] =?UTF-8?q?GitHub=20Actions=E3=81=AEWindows2019?= =?UTF-8?q?=E3=82=A4=E3=83=A1=E3=83=BC=E3=82=B8=E3=81=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=9F=E4=BA=8B=E3=81=AB=E3=82=88=E3=82=8A?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=82=8B=E3=81=9F=E3=82=81=E5=AF=BE=E5=87=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * vswhere/7zがイメージに含まれるため、ダウンロードしない (ローカルではchocolateyを使用しインストールする) * powershellの起動方法変更 Signed-off-by: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> --- .github/workflows/build.yml | 3 +- build.windows.ps1 | 360 +++++++++++++++++------------------- 2 files changed, 175 insertions(+), 188 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e59e4fc1..d1f92a44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,8 @@ jobs: - name: Disk Cleanup run: .\disk_cleanup.bat - name: Build - run: .\build.windows.bat + run: powershell -NoProfile -ExecutionPolicy Unrestricted .\build.windows.ps1 + shell: pwsh - name: Upload artifact x64 uses: actions/upload-artifact@v3 with: diff --git a/build.windows.ps1 b/build.windows.ps1 index e005768a..7e7e6a48 100644 --- a/build.windows.ps1 +++ b/build.windows.ps1 @@ -1,187 +1,173 @@ -# Copyright 2019, Shiguredo Inc, melpon and enm10k -# Copyright 2019, Zenichi Amano -# original: https://github.com/shiguredo/shiguredo-webrtc-windows/blob/master/gabuild.ps1 - -$ErrorActionPreference = "Stop" - -# VERSIONファイル読み込み -$lines = get-content VERSION -foreach($line in $lines){ - # WEBRTC_COMMITの行のみ取得する - if ($line -match "^WEBRTC_") { - $name, $value = $line.split("=",2) - Invoke-Expression "`$$name='$value'" - } -} - -$7Z_DIR = Join-Path (Resolve-Path ".").Path "7z" - -# 処理前に以前のファイルを削除する -if (Test-Path vswhere.exe) { - Remove-Item vswhere.exe -Force -} -if (Test-Path $7Z_DIR) { - Remove-Item $7Z_DIR -Force -Recurse -} - -Invoke-WebRequest -Uri "https://github.com/microsoft/vswhere/releases/download/3.0.3/vswhere.exe" -OutFile vswhere.exe - -Invoke-WebRequest -Uri "https://jaist.dl.sourceforge.net/project/sevenzip/7-Zip/22.01/7z2201-x64.exe" -OutFile 7z-x64.exe -./7z-x64.exe /S /D="""$7Z_DIR""" - -# vsdevcmd.bat の設定を入れる -# https://github.com/microsoft/vswhere/wiki/Find-VC -$path = .\vswhere.exe -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -if ($path) { - $batpath = join-path $path 'Common7\Tools\vsdevcmd.bat' - if (test-path $batpath) { - cmd /s /c """$batpath"" $args && set" | Where-Object { $_ -match '(\w+)=(.*)' } | ForEach-Object { - $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 "." -$WEBRTC_DIR = "C:\webrtc" -$BUILD_DIR = "C:\webrtc_build" -$DEPOT_TOOLS_DIR = Join-Path $REPO_DIR.Path "depot_tools" -$PATCH_DIR = Join-Path $REPO_DIR.Path "patch" -$PACKAGE_DIR = Join-Path $REPO_DIR.Path "package" - -# WebRTC ビルドに必要な環境変数の設定 -$Env:GYP_MSVS_VERSION = "2019" -$Env:DEPOT_TOOLS_WIN_TOOLCHAIN = "0" -$Env:PYTHONIOENCODING = "utf-8" - -if (Test-Path $DEPOT_TOOLS_DIR) { - Remove-Item $DEPOT_TOOLS_DIR -Force -Recurse -} -if (Test-Path $WEBRTC_DIR) { - Remove-Item $WEBRTC_DIR -Force -Recurse -} -if (Test-Path $BUILD_DIR) { - Remove-Item $BUILD_DIR -Force -Recurse -} -if (Test-Path $PACKAGE_DIR) { - Remove-Item $PACKAGE_DIR -Force -Recurse -} - -# depot_tools -git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git - -$Env:PATH = "$DEPOT_TOOLS_DIR;$Env:PATH" -# Choco へのパスを削除 -$Env:PATH = $Env:Path.Replace("C:\ProgramData\Chocolatey\bin;", "") - -# WebRTC のソース取得 -New-Item $WEBRTC_DIR -ItemType Directory -Force -Push-Location $WEBRTC_DIR - fetch --nohooks webrtc - - New-Item $BUILD_DIR -ItemType Directory -Force - - Push-Location $WEBRTC_DIR\src - git checkout -f $WEBRTC_COMMIT - gclient sync - - git apply --ignore-whitespace -p 2 $PATCH_DIR\4k.patch - 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 - Pop-Location -Pop-Location - -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' - 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' - 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' - 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' - ninja -C "$BUILD_DIR\release_x86" -Pop-Location - -foreach ($build in @("debug_x64", "release_x64", "debug_x86", "release_x86")) { - ninja -C "$BUILD_DIR\$build" audio_device_module_from_input_and_output - - # このままだと webrtc.lib に含まれないファイルがあるので、いくつか追加する - Push-Location $BUILD_DIR\$build\obj - lib.exe ` - /out:$BUILD_DIR\$build\webrtc.lib webrtc.lib ` - api\task_queue\default_task_queue_factory\default_task_queue_factory_win.obj ` - rtc_base\rtc_task_queue_win\task_queue_win.obj ` - modules\audio_device\audio_device_module_from_input_and_output\audio_device_factory.obj ` - modules\audio_device\audio_device_module_from_input_and_output\audio_device_module_win.obj ` - modules\audio_device\audio_device_module_from_input_and_output\core_audio_base_win.obj ` - modules\audio_device\audio_device_module_from_input_and_output\core_audio_input_win.obj ` - modules\audio_device\audio_device_module_from_input_and_output\core_audio_output_win.obj ` - modules\audio_device\windows_core_audio_utility\core_audio_utility_win.obj ` - modules\audio_device\audio_device_name\audio_device_name.obj - Pop-Location - Move-Item $BUILD_DIR\$build\webrtc.lib $BUILD_DIR\$build\obj\webrtc.lib -Force -} - -# バージョンファイルコピー -New-Item $BUILD_DIR\package\webrtc -ItemType Directory -Force -$WEBRTC_VERSION | Out-File $BUILD_DIR\package\webrtc\VERSION - -# WebRTC のヘッダーだけをパッケージングする -New-Item $BUILD_DIR\package\webrtc\include -ItemType Directory -Force -robocopy "$WEBRTC_DIR\src" "$BUILD_DIR\package\webrtc\include" *.h *.hpp /S /NP /NS /NC /NFL /NDL - -# ライブラリディレクトリ作成 -New-Item $BUILD_DIR\package\webrtc\debug -ItemType Directory -Force -New-Item $BUILD_DIR\package\webrtc\release -ItemType Directory -Force - - -# ライセンス生成 (x64) -Push-Location $WEBRTC_DIR\src - vpython3 tools_webrtc\libs\generate_licenses.py --target :webrtc "$BUILD_DIR\" "$BUILD_DIR\debug_x64" "$BUILD_DIR\release_x64" -Pop-Location -Copy-Item "$BUILD_DIR\LICENSE.md" "$BUILD_DIR\package\webrtc\NOTICE" - -# x64用ライブラリコピー -Copy-Item $BUILD_DIR\debug_x64\obj\webrtc.lib $BUILD_DIR\package\webrtc\debug\ -Copy-Item $BUILD_DIR\release_x64\obj\webrtc.lib $BUILD_DIR\package\webrtc\release\ - -# ファイルを圧縮する -New-Item $PACKAGE_DIR -ItemType Directory -Force -Push-Location $BUILD_DIR\package\webrtc - cmd /s /c """$7Z_DIR\7z.exe""" a -bsp0 -t7z:r -ssc -ms+ $PACKAGE_DIR\libwebrtc-win-x64.7z * -Pop-Location - - -# ライセンス生成 (x86) -Push-Location $WEBRTC_DIR\src - vpython3 tools_webrtc\libs\generate_licenses.py --target :webrtc "$BUILD_DIR\" "$BUILD_DIR\debug_x86" "$BUILD_DIR\release_x86" -Pop-Location -Copy-Item "$BUILD_DIR\LICENSE.md" "$BUILD_DIR\package\webrtc\NOTICE" - -# x86用ファイル一式作成 -Copy-Item $BUILD_DIR\debug_x86\obj\webrtc.lib $BUILD_DIR\package\webrtc\debug\ -Copy-Item $BUILD_DIR\release_x86\obj\webrtc.lib $BUILD_DIR\package\webrtc\release\ - -# ファイルを圧縮する -New-Item $PACKAGE_DIR -ItemType Directory -Force -Push-Location $BUILD_DIR\package\webrtc - cmd /s /c """$7Z_DIR\7z.exe""" a -bsp0 -t7z:r -ssc -ms+ $PACKAGE_DIR\libwebrtc-win-x86.7z * -Pop-Location +# Copyright 2019, Shiguredo Inc, melpon and enm10k +# Copyright 2019, Zenichi Amano +# original: https://github.com/shiguredo/shiguredo-webrtc-windows/blob/master/gabuild.ps1 + +$ErrorActionPreference = "Stop" + +$PSVersionTable + +# VERSIONファイル読み込み +$lines = get-content VERSION +foreach ($line in $lines) { + # WEBRTC_COMMITの行のみ取得する + if ($line -match "^WEBRTC_") { + $name, $value = $line.split("=",2) + Invoke-Expression "`$$name='$value'" + } +} + +# vsdevcmd.bat の設定を入れる +# https://github.com/microsoft/vswhere/wiki/Find-VC +$path = vswhere.exe -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath +if ($path) { + $batpath = join-path $path 'Common7\Tools\vsdevcmd.bat' + if (test-path $batpath) { + cmd /s /c """$batpath"" $args && set" | Where-Object { $_ -match '(\w+)=(.*)' } | ForEach-Object { + $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 "." +$WEBRTC_DIR = "C:\webrtc" +$BUILD_DIR = "C:\webrtc_build" +$DEPOT_TOOLS_DIR = Join-Path $REPO_DIR.Path "depot_tools" +$PATCH_DIR = Join-Path $REPO_DIR.Path "patch" +$PACKAGE_DIR = Join-Path $REPO_DIR.Path "package" + +# WebRTC ビルドに必要な環境変数の設定 +$Env:GYP_MSVS_VERSION = "2019" +$Env:DEPOT_TOOLS_WIN_TOOLCHAIN = "0" +$Env:PYTHONIOENCODING = "utf-8" + +if (Test-Path $DEPOT_TOOLS_DIR) { + Remove-Item $DEPOT_TOOLS_DIR -Force -Recurse +} +if (Test-Path $WEBRTC_DIR) { + Remove-Item $WEBRTC_DIR -Force -Recurse +} +if (Test-Path $BUILD_DIR) { + Remove-Item $BUILD_DIR -Force -Recurse +} +if (Test-Path $PACKAGE_DIR) { + Remove-Item $PACKAGE_DIR -Force -Recurse +} + +# depot_tools +git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git + +$Env:PATH = "$DEPOT_TOOLS_DIR;$Env:PATH" +# Choco へのパスを削除 +$Env:PATH = $Env:Path.Replace("C:\ProgramData\Chocolatey\bin;", "") + +# WebRTC のソース取得 +New-Item $WEBRTC_DIR -ItemType Directory -Force +Push-Location $WEBRTC_DIR + fetch --nohooks webrtc + + New-Item $BUILD_DIR -ItemType Directory -Force + + Push-Location $WEBRTC_DIR\src + git checkout -f $WEBRTC_COMMIT + gclient sync + + git apply --ignore-whitespace -p 2 $PATCH_DIR\4k.patch + 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 + Pop-Location +Pop-Location + +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' + 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' + 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' + 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' + ninja -C "$BUILD_DIR\release_x86" +Pop-Location + +foreach ($build in @("debug_x64", "release_x64", "debug_x86", "release_x86")) { + ninja -C "$BUILD_DIR\$build" audio_device_module_from_input_and_output + + # このままだと webrtc.lib に含まれないファイルがあるので、いくつか追加する + Push-Location $BUILD_DIR\$build\obj + lib.exe ` + /out:$BUILD_DIR\$build\webrtc.lib webrtc.lib ` + api\task_queue\default_task_queue_factory\default_task_queue_factory_win.obj ` + rtc_base\rtc_task_queue_win\task_queue_win.obj ` + modules\audio_device\audio_device_module_from_input_and_output\audio_device_factory.obj ` + modules\audio_device\audio_device_module_from_input_and_output\audio_device_module_win.obj ` + modules\audio_device\audio_device_module_from_input_and_output\core_audio_base_win.obj ` + modules\audio_device\audio_device_module_from_input_and_output\core_audio_input_win.obj ` + modules\audio_device\audio_device_module_from_input_and_output\core_audio_output_win.obj ` + modules\audio_device\windows_core_audio_utility\core_audio_utility_win.obj ` + modules\audio_device\audio_device_name\audio_device_name.obj + Pop-Location + Move-Item $BUILD_DIR\$build\webrtc.lib $BUILD_DIR\$build\obj\webrtc.lib -Force +} + +# バージョンファイルコピー +New-Item $BUILD_DIR\package\webrtc -ItemType Directory -Force +$WEBRTC_VERSION | Out-File $BUILD_DIR\package\webrtc\VERSION + +# WebRTC のヘッダーだけをパッケージングする +New-Item $BUILD_DIR\package\webrtc\include -ItemType Directory -Force +robocopy "$WEBRTC_DIR\src" "$BUILD_DIR\package\webrtc\include" *.h *.hpp /S /NP /NS /NC /NFL /NDL + +# ライブラリディレクトリ作成 +New-Item $BUILD_DIR\package\webrtc\debug -ItemType Directory -Force +New-Item $BUILD_DIR\package\webrtc\release -ItemType Directory -Force + + +# ライセンス生成 (x64) +Push-Location $WEBRTC_DIR\src + vpython3 tools_webrtc\libs\generate_licenses.py --target :webrtc "$BUILD_DIR\" "$BUILD_DIR\debug_x64" "$BUILD_DIR\release_x64" +Pop-Location +Copy-Item "$BUILD_DIR\LICENSE.md" "$BUILD_DIR\package\webrtc\NOTICE" + +# x64用ライブラリコピー +Copy-Item $BUILD_DIR\debug_x64\obj\webrtc.lib $BUILD_DIR\package\webrtc\debug\ +Copy-Item $BUILD_DIR\release_x64\obj\webrtc.lib $BUILD_DIR\package\webrtc\release\ + +# ファイルを圧縮する +New-Item $PACKAGE_DIR -ItemType Directory -Force +Push-Location $BUILD_DIR\package\webrtc + cmd /s /c "7z.exe" a -bsp0 -t7z:r -ssc -ms+ $PACKAGE_DIR\libwebrtc-win-x64.7z * +Pop-Location + +# ライセンス生成 (x86) +Push-Location $WEBRTC_DIR\src + vpython3 tools_webrtc\libs\generate_licenses.py --target :webrtc "$BUILD_DIR\" "$BUILD_DIR\debug_x86" "$BUILD_DIR\release_x86" +Pop-Location +Copy-Item "$BUILD_DIR\LICENSE.md" "$BUILD_DIR\package\webrtc\NOTICE" + +# x86用ファイル一式作成 +Copy-Item $BUILD_DIR\debug_x86\obj\webrtc.lib $BUILD_DIR\package\webrtc\debug\ +Copy-Item $BUILD_DIR\release_x86\obj\webrtc.lib $BUILD_DIR\package\webrtc\release\ + +# ファイルを圧縮する +New-Item $PACKAGE_DIR -ItemType Directory -Force +Push-Location $BUILD_DIR\package\webrtc + cmd /s /c "7z.exe" a -bsp0 -t7z:r -ssc -ms+ $PACKAGE_DIR\libwebrtc-win-x86.7z * +Pop-Location From 1fa53fbbcdd48d0c6b668f33ff9ce108098d0f91 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Sun, 21 May 2023 04:22:44 +0900 Subject: [PATCH 25/49] =?UTF-8?q?7zip=E3=81=B8=E3=81=AE=E3=83=91=E3=82=B9?= =?UTF-8?q?=E3=81=8C=E9=80=9A=E3=81=A3=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- build.windows.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.windows.ps1 b/build.windows.ps1 index 7e7e6a48..9ee4b717 100644 --- a/build.windows.ps1 +++ b/build.windows.ps1 @@ -153,7 +153,7 @@ Copy-Item $BUILD_DIR\release_x64\obj\webrtc.lib $BUILD_DIR\package\webrtc\releas # ファイルを圧縮する New-Item $PACKAGE_DIR -ItemType Directory -Force Push-Location $BUILD_DIR\package\webrtc - cmd /s /c "7z.exe" a -bsp0 -t7z:r -ssc -ms+ $PACKAGE_DIR\libwebrtc-win-x64.7z * + cmd /s /c "C:\ProgramData\Chocolatey\bin\7z.exe" a -bsp0 -t7z:r -ssc -ms+ $PACKAGE_DIR\libwebrtc-win-x64.7z * Pop-Location # ライセンス生成 (x86) @@ -169,5 +169,5 @@ Copy-Item $BUILD_DIR\release_x86\obj\webrtc.lib $BUILD_DIR\package\webrtc\releas # ファイルを圧縮する New-Item $PACKAGE_DIR -ItemType Directory -Force Push-Location $BUILD_DIR\package\webrtc - cmd /s /c "7z.exe" a -bsp0 -t7z:r -ssc -ms+ $PACKAGE_DIR\libwebrtc-win-x86.7z * + cmd /s /c "C:\ProgramData\Chocolatey\bin\7z.exe" a -bsp0 -t7z:r -ssc -ms+ $PACKAGE_DIR\libwebrtc-win-x86.7z * Pop-Location From 56b1554cb42e9634b05fef9834579107f20b29d3 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Thu, 25 May 2023 21:19:10 +0900 Subject: [PATCH 26/49] =?UTF-8?q?115.5790.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index ec70b197..3ee39d7a 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8 -WEBRTC_VERSION=m114.5735@{\#2} -WEBRTC_SEMANTIC_VERSION=114.5735.2.0 -WEBRTC_COMMIT=ecab2a49da48f0279a3b6422dab602614630005e +WEBRTC_VERSION=m115.5790@{\#0} +WEBRTC_SEMANTIC_VERSION=115.5790.0.0 +WEBRTC_COMMIT=2eacbbc03a4a41ea658661225eb1c8fc07884c33 PACKAGE_NAMES= \ linux-arm \ From 336ae3dd1cde2191ab510e93dfda040059be818c Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Tue, 20 Jun 2023 18:15:55 +0900 Subject: [PATCH 27/49] =?UTF-8?q?GitHub=E3=81=AE=E3=83=88=E3=83=BC?= =?UTF-8?q?=E3=82=AF=E3=83=B3=E3=82=92=E8=87=AA=E5=8B=95=E7=94=9F=E6=88=90?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=9F=E3=83=88=E3=83=BC=E3=82=AF=E3=83=B3?= =?UTF-8?q?=E3=81=AB=E5=88=87=E3=82=8A=E6=9B=BF=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1f92a44..e211edd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,9 @@ on: - 'LICENSE' pull_request: +permissions: + contents: write + jobs: build-linux: strategy: @@ -145,4 +148,4 @@ jobs: prerelease: false artifactContentType: ${{ matrix.type }} artifacts: libwebrtc-${{ matrix.name }}.${{ matrix.ext }} - token: ${{ secrets.PERSONAL_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} From 94c1f70cf194eef1f521cb48787efa3cf3e0e0a8 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:43:29 +0900 Subject: [PATCH 28/49] =?UTF-8?q?115.5790.4.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 3ee39d7a..65941759 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8 -WEBRTC_VERSION=m115.5790@{\#0} -WEBRTC_SEMANTIC_VERSION=115.5790.0.0 -WEBRTC_COMMIT=2eacbbc03a4a41ea658661225eb1c8fc07884c33 +WEBRTC_VERSION=m115.5790@{\#4} +WEBRTC_SEMANTIC_VERSION=115.5790.4.0 +WEBRTC_COMMIT=f5ffd458556d7be6eafb4c644898f26f271388c0 PACKAGE_NAMES= \ linux-arm \ From a6efad317f573780705562a649fe6cee1a7ebcfb Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:44:53 +0900 Subject: [PATCH 29/49] =?UTF-8?q?116.5845.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 65941759..59d8d8b1 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8 -WEBRTC_VERSION=m115.5790@{\#4} -WEBRTC_SEMANTIC_VERSION=115.5790.4.0 -WEBRTC_COMMIT=f5ffd458556d7be6eafb4c644898f26f271388c0 +WEBRTC_VERSION=m116.5845@{\#0} +WEBRTC_SEMANTIC_VERSION=116.5845.0.0 +WEBRTC_COMMIT=f80cf814353d11a9f22bef5ce5e8868f2c72f0d0 PACKAGE_NAMES= \ linux-arm \ From 94abb9653cade4554f57d5ca8f8d8f693eaac2ff Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Sun, 2 Jul 2023 00:26:50 +0900 Subject: [PATCH 30/49] =?UTF-8?q?116.5845.1.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 59d8d8b1..504e3248 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8 -WEBRTC_VERSION=m116.5845@{\#0} -WEBRTC_SEMANTIC_VERSION=116.5845.0.0 -WEBRTC_COMMIT=f80cf814353d11a9f22bef5ce5e8868f2c72f0d0 +WEBRTC_VERSION=m116.5845@{\#1} +WEBRTC_SEMANTIC_VERSION=116.5845.1.0 +WEBRTC_COMMIT=ebf9a1faf81f30f9fb6d1a9390545e562c62ec06 PACKAGE_NAMES= \ linux-arm \ From 3973fafb6b4f7fae535e194cc8aa4cfb63187b77 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Wed, 9 Aug 2023 08:07:56 +0900 Subject: [PATCH 31/49] =?UTF-8?q?116.5845.6.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 504e3248..40493ae9 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8 -WEBRTC_VERSION=m116.5845@{\#1} -WEBRTC_SEMANTIC_VERSION=116.5845.1.0 -WEBRTC_COMMIT=ebf9a1faf81f30f9fb6d1a9390545e562c62ec06 +WEBRTC_VERSION=m116.5845@{\#6} +WEBRTC_SEMANTIC_VERSION=116.5845.6.0 +WEBRTC_COMMIT=44bc8e96ed88005fec89a1cc479e291fea30d1b3 PACKAGE_NAMES= \ linux-arm \ From 18217a2259e45073f542d3854e783f9eb014c160 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Mon, 14 Aug 2023 23:42:57 +0900 Subject: [PATCH 32/49] =?UTF-8?q?ccache=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 40493ae9..04fae3e0 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -CCACHE_VERSION=4.8 +CCACHE_VERSION=4.8.2 WEBRTC_VERSION=m116.5845@{\#6} WEBRTC_SEMANTIC_VERSION=116.5845.6.0 WEBRTC_COMMIT=44bc8e96ed88005fec89a1cc479e291fea30d1b3 From 67d4f583dad1ba57eeb03d08c4e0bf7624e81e66 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Mon, 14 Aug 2023 23:43:54 +0900 Subject: [PATCH 33/49] =?UTF-8?q?117.5938.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 04fae3e0..8f176a6f 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8.2 -WEBRTC_VERSION=m116.5845@{\#6} -WEBRTC_SEMANTIC_VERSION=116.5845.6.0 -WEBRTC_COMMIT=44bc8e96ed88005fec89a1cc479e291fea30d1b3 +WEBRTC_VERSION=m117.5938@{\#0} +WEBRTC_SEMANTIC_VERSION=117.5938.0.0 +WEBRTC_COMMIT=82e5f91a2bdf955aa870142008fbdc9ac12f6acd PACKAGE_NAMES= \ linux-arm \ From 9b81315556262bff99c622876c971781f6c64543 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Mon, 11 Sep 2023 07:33:07 +0900 Subject: [PATCH 34/49] =?UTF-8?q?118.5993.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 8f176a6f..8261c3b4 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8.2 -WEBRTC_VERSION=m117.5938@{\#0} -WEBRTC_SEMANTIC_VERSION=117.5938.0.0 -WEBRTC_COMMIT=82e5f91a2bdf955aa870142008fbdc9ac12f6acd +WEBRTC_VERSION=m118.5993@{\#0} +WEBRTC_SEMANTIC_VERSION=118.5993.0.0 +WEBRTC_COMMIT=5afcec093c1403fe9e3872706d04671cbc6d2983 PACKAGE_NAMES= \ linux-arm \ From fc740c9aaf90993827a118c1d05c4f4bd8c88b19 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Tue, 15 Aug 2023 10:14:02 +0900 Subject: [PATCH 35/49] =?UTF-8?q?libunwind=E3=83=91=E3=83=83=E3=83=81?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> --- patch/android_use_libunwind.patch | 16 +++++++++------- patch/android_version.patch | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/patch/android_use_libunwind.patch b/patch/android_use_libunwind.patch index 2442837b..1971b830 100644 --- a/patch/android_use_libunwind.patch +++ b/patch/android_use_libunwind.patch @@ -12,15 +12,17 @@ index 265d4bc07..71ec29437 100644 if (use_afl) { diff --git a/src/buildtools/third_party/libunwind/BUILD.gn b/src/buildtools/third_party/libunwind/BUILD.gn -index a8287bf..a948450 100644 --- a/src/buildtools/third_party/libunwind/BUILD.gn +++ b/src/buildtools/third_party/libunwind/BUILD.gn -@@ -20,7 +20,7 @@ config("libunwind_config") { +@@ -20,7 +20,10 @@ } source_set("libunwind") { -- visibility = [] -+ visibility = ["//build/config:common_deps"] - if (is_fuchsia) { - visibility += [ "//buildtools/third_party/libc++abi" ] - } else if (is_android) { +- visibility = [ "//buildtools/third_party/libc++abi" ] ++ visibility = [ ++ "//build/config:common_deps", ++ "//buildtools/third_party/libc++abi" ++ ] + if (is_android) { + visibility += [ "//services/tracing/public/cpp" ] + } diff --git a/patch/android_version.patch b/patch/android_version.patch index bd933c7b..8333b4c2 100644 --- a/patch/android_version.patch +++ b/patch/android_version.patch @@ -1,10 +1,10 @@ --- a/src/sdk/android/BUILD.gn 2020-02-29 14:04:06.000000000 +0000 +++ b/src/sdk/android/BUILD.gn 2020-03-01 06:47:09.791421994 +0000 -@@ -162,6 +162,7 @@ if (is_android) { +@@ -154,6 +154,7 @@ if (is_android) { sources = [ "api/org/webrtc/Predicate.java", "api/org/webrtc/RefCounted.java", + "api/org/webrtc/WebRtcVersion.java", + "src/java/org/webrtc/ApplicationContextProvider.java", "src/java/org/webrtc/CalledByNative.java", "src/java/org/webrtc/CalledByNativeUnchecked.java", - "src/java/org/webrtc/Histogram.java", From 12950de1fcfe3a1aa15dbbf0bf7964c1c90075ae Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:24:55 +0900 Subject: [PATCH 36/49] =?UTF-8?q?ccache=204.8.3=20=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8261c3b4..39d3f700 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -CCACHE_VERSION=4.8.2 +CCACHE_VERSION=4.8.3 WEBRTC_VERSION=m118.5993@{\#0} WEBRTC_SEMANTIC_VERSION=118.5993.0.0 WEBRTC_COMMIT=5afcec093c1403fe9e3872706d04671cbc6d2983 From 69a4661c61ef7ac9189b5f27c854434a7b2f7210 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:26:36 +0900 Subject: [PATCH 37/49] =?UTF-8?q?118.5993.3.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 39d3f700..3f7cf2e4 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8.3 -WEBRTC_VERSION=m118.5993@{\#0} -WEBRTC_SEMANTIC_VERSION=118.5993.0.0 -WEBRTC_COMMIT=5afcec093c1403fe9e3872706d04671cbc6d2983 +WEBRTC_VERSION=m118.5993@{\#3} +WEBRTC_SEMANTIC_VERSION=118.5993.3.0 +WEBRTC_COMMIT=d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d PACKAGE_NAMES= \ linux-arm \ From 6d4b2f5279de221f1f15765447f2f9c1377c21ad Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:27:40 +0900 Subject: [PATCH 38/49] =?UTF-8?q?119.6045.0.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 3f7cf2e4..fd074df6 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8.3 -WEBRTC_VERSION=m118.5993@{\#3} -WEBRTC_SEMANTIC_VERSION=118.5993.3.0 -WEBRTC_COMMIT=d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d +WEBRTC_VERSION=m119.6045@{\#0} +WEBRTC_SEMANTIC_VERSION=119.6045.0.0 +WEBRTC_COMMIT=bce7ce7ba054ac0e79fed49b84ef52fb24c31778 PACKAGE_NAMES= \ linux-arm \ From a273b6e87c9d84d1ca7e924136f201e2f9c28692 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Thu, 5 Oct 2023 17:45:52 +0900 Subject: [PATCH 39/49] =?UTF-8?q?jitpack=E5=90=91=E3=81=91=E3=81=ABaar?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E5=B1=95=E9=96=8B?= =?UTF-8?q?=E3=81=99=E3=82=8B=E9=9A=9B=E3=81=AB=E3=80=81aar=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E4=BB=A5=E5=A4=96=E3=82=92=E5=B1=95?= =?UTF-8?q?=E9=96=8B=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> --- .github/workflows/build.yml | 1 + publishAar.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e211edd1..a8e74062 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,7 @@ on: paths-ignore: - '**.md' - 'LICENSE' + - 'publishAar.sh' pull_request: permissions: diff --git a/publishAar.sh b/publishAar.sh index 8fbadaef..749fc80e 100755 --- a/publishAar.sh +++ b/publishAar.sh @@ -16,7 +16,7 @@ mkdir -p package cd package curl -L -O ${AAR_URL} -tar xf libwebrtc-android.tar.xz +tar xvf libwebrtc-android.tar.xz aar/libwebrtc.aar mvn install:install-file \ -Dfile=aar/libwebrtc.aar \ From 714a98316c304dc75b7bfd85caba92d6d25edee6 Mon Sep 17 00:00:00 2001 From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com> Date: Thu, 12 Oct 2023 09:12:13 +0900 Subject: [PATCH 40/49] =?UTF-8?q?119.6045.1.0=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=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 <2736571+crow-misia@users.noreply.github.com> --- VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index fd074df6..5065f1cb 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ CCACHE_VERSION=4.8.3 -WEBRTC_VERSION=m119.6045@{\#0} -WEBRTC_SEMANTIC_VERSION=119.6045.0.0 -WEBRTC_COMMIT=bce7ce7ba054ac0e79fed49b84ef52fb24c31778 +WEBRTC_VERSION=m119.6045@{\#1} +WEBRTC_SEMANTIC_VERSION=119.6045.1.0 +WEBRTC_COMMIT=71e3fbf5d750e84d181315a663eb5dbc29a5330c PACKAGE_NAMES= \ linux-arm \ From 0848d56ddb456e754096e473efe9602018108706 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Thu, 5 Oct 2023 17:40:34 +0900 Subject: [PATCH 41/49] =?UTF-8?q?issue=E3=82=92=E9=96=89=E3=81=98=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=82=8B=E3=81=9F=E3=82=81=E3=80=81=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=81=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=82=92=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- .github/ISSUE_TEMPLATE/bug_report.md | 28 --------------------- .github/workflows/close_inactive_issues.yml | 19 -------------- 2 files changed, 47 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/workflows/close_inactive_issues.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 2f6e0022..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -> **Warning** -> Do not write a request for help, as it is not a help center. - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Environment (please complete the following information):** - - OS: [e.g. Ubuntu 20.04] - - Commit Hash - - Used release package file name - -**Additional context** -Add any other context about the problem here. diff --git a/.github/workflows/close_inactive_issues.yml b/.github/workflows/close_inactive_issues.yml deleted file mode 100644 index 0eb34a9e..00000000 --- a/.github/workflows/close_inactive_issues.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Close inactive issues -on: - schedule: - - cron: "30 1 * * *" - -jobs: - close-issues: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v6 - with: - days-before-issue-stale: 30 - days-before-issue-close: 14 - stale-issue-label: "stale" - stale-issue-message: "This issue is stale because it has been open for 30 days with no activity." - close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale." - days-before-pr-stale: -1 - days-before-pr-close: -1 - repo-token: ${{ secrets.GITHUB_TOKEN }} From fe13825cbc7db3149e9957d80ff58507e5ed30a3 Mon Sep 17 00:00:00 2001 From: tyranron Date: Mon, 6 Nov 2023 05:33:49 +0000 Subject: [PATCH 42/49] Upgrade to 119.0.6045.105 version --- VERSION | 4 ++-- instrumentisto-libwebrtc-bin.podspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index bc31549c..d9a6f5a2 100644 --- a/VERSION +++ b/VERSION @@ -2,10 +2,10 @@ CCACHE_VERSION=4.6 # WebRTC doesn't have its own versioning, so we use Chromium versions: # https://chromiumdash.appspot.com/releases -WEBRTC_VERSION=118.0.5993.117 +WEBRTC_VERSION=119.0.6045.105 # Look for the concrete revision for WebRTC in: # https://chromium.googlesource.com/chromium/src/+/refs/tags//DEPS -WEBRTC_COMMIT=d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d +WEBRTC_COMMIT=52bc9f7c1205f4b731ea0289b059f7d240c1e228 PACKAGE_NAMES= \ linux-arm64 \ diff --git a/instrumentisto-libwebrtc-bin.podspec b/instrumentisto-libwebrtc-bin.podspec index a6256b60..f22e615f 100644 --- a/instrumentisto-libwebrtc-bin.podspec +++ b/instrumentisto-libwebrtc-bin.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "instrumentisto-libwebrtc-bin" - spec.version = "118.0.5993.117" + spec.version = "119.0.6045.105" spec.summary = "Pre-compiled `libwebrtc` library for Darwin used by Medea Flutter-WebRTC." spec.homepage = "https://github.com/instrumentisto/libwebrtc-bin" @@ -8,7 +8,7 @@ Pod::Spec.new do |spec| spec.author = { 'Instrumentisto Team' => 'developer@instrumentisto.com' } spec.ios.deployment_target = '10.0' - spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/118.0.5993.117/libwebrtc-ios.zip" } + spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/119.0.6045.105/libwebrtc-ios.zip" } spec.vendored_frameworks = "WebRTC.xcframework" spec.pod_target_xcconfig = { From ee4812f5db329fd25ce188565b94f5d03dfcf6a0 Mon Sep 17 00:00:00 2001 From: rogurotus Date: Tue, 14 Nov 2023 12:09:30 +0300 Subject: [PATCH 43/49] try --- build/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Makefile b/build/Makefile index 55ff51d7..f3f7f95d 100644 --- a/build/Makefile +++ b/build/Makefile @@ -76,6 +76,7 @@ $(foreach pkg, $(PACKAGE_NAMES), $(eval $(call generateRules,$(pkg)))) .PHONY: prepare prepare: mkdir -p $(THIRD_PARTY_DIR) + pip install setuptools -y .PHONY: depot_tools depot_tools: prepare From 9d6f60d646bbe29fd6c0960521a8f46987755ae5 Mon Sep 17 00:00:00 2001 From: rogurotus Date: Tue, 14 Nov 2023 12:11:59 +0300 Subject: [PATCH 44/49] retry --- build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Makefile b/build/Makefile index f3f7f95d..5ed36b4a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -76,7 +76,7 @@ $(foreach pkg, $(PACKAGE_NAMES), $(eval $(call generateRules,$(pkg)))) .PHONY: prepare prepare: mkdir -p $(THIRD_PARTY_DIR) - pip install setuptools -y + pip install setuptools .PHONY: depot_tools depot_tools: prepare From b070bce20c8b5be26fd32d68ffa7c3caafe112cb Mon Sep 17 00:00:00 2001 From: rogurotus Date: Tue, 14 Nov 2023 12:18:26 +0300 Subject: [PATCH 45/49] fix --- .github/workflows/ci.yml | 4 ++++ build/Makefile | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7345af2..2d172b26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,6 +46,10 @@ jobs: - run: powershell .\disk_cleanup.bat if: ${{ matrix.os == 'windows' }} + - name: Mac deps + run: pip install setuptools + if: ${{ matrix.os == 'ios' || matrix.os == 'macos' }} + - run: make -C docker ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }} if: ${{ matrix.os == 'android' || matrix.os == 'linux' }} - run: make -C build USE_CCACHE=0 ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }} diff --git a/build/Makefile b/build/Makefile index 5ed36b4a..55ff51d7 100644 --- a/build/Makefile +++ b/build/Makefile @@ -76,7 +76,6 @@ $(foreach pkg, $(PACKAGE_NAMES), $(eval $(call generateRules,$(pkg)))) .PHONY: prepare prepare: mkdir -p $(THIRD_PARTY_DIR) - pip install setuptools .PHONY: depot_tools depot_tools: prepare From 83b16d656332a938fdd412cfc659e23644135674 Mon Sep 17 00:00:00 2001 From: rogurotus Date: Tue, 14 Nov 2023 14:13:13 +0300 Subject: [PATCH 46/49] fix --- patch/android_use_libunwind.patch | 3 ++- patch/android_version.patch | 4 ++-- scripts/fetch_webrtc.sh | 5 ----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/patch/android_use_libunwind.patch b/patch/android_use_libunwind.patch index e4338317..d18d392b 100644 --- a/patch/android_use_libunwind.patch +++ b/patch/android_use_libunwind.patch @@ -12,6 +12,7 @@ index 265d4bc07..71ec29437 100644 if (use_afl) { diff --git a/src/buildtools/third_party/libunwind/BUILD.gn b/src/buildtools/third_party/libunwind/BUILD.gn +index a8287bf..a948450 100644 --- a/src/buildtools/third_party/libunwind/BUILD.gn +++ b/src/buildtools/third_party/libunwind/BUILD.gn @@ -21,7 +21,7 @@ @@ -22,4 +23,4 @@ diff --git a/src/buildtools/third_party/libunwind/BUILD.gn b/src/buildtools/thir + visibility = [ "//buildtools/third_party/libc++abi", "//build/config:common_deps" ] if (is_android) { visibility += [ "//services/tracing/public/cpp" ] - } + } \ No newline at end of file diff --git a/patch/android_version.patch b/patch/android_version.patch index 81fdf13e..f66482b8 100644 --- a/patch/android_version.patch +++ b/patch/android_version.patch @@ -4,7 +4,7 @@ sources = [ "api/org/webrtc/Predicate.java", "api/org/webrtc/RefCounted.java", - "api/org/webrtc/WebRtcVersion.java", ++ "api/org/webrtc/WebRtcVersion.java", "src/java/org/webrtc/ApplicationContextProvider.java", "src/java/org/webrtc/CalledByNative.java", - "src/java/org/webrtc/CalledByNativeUnchecked.java", + "src/java/org/webrtc/CalledByNativeUnchecked.java", \ No newline at end of file diff --git a/scripts/fetch_webrtc.sh b/scripts/fetch_webrtc.sh index 3d8131e6..405128ed 100755 --- a/scripts/fetch_webrtc.sh +++ b/scripts/fetch_webrtc.sh @@ -32,11 +32,6 @@ if [ -f "$WEBRTC_DIR/.gclient" ]; then git reset --hard; git clean -xdf; fi - if [ -d $WEBRTC_DIR/src/buildtools ]; then - cd $WEBRTC_DIR/src/buildtools; - git reset --hard; - git clean -xdf; - fi else echo "Getting WebRTC..."; rm -f "$DEPOT_TOOLS_DIR/metrics.cfg" From c78c8f978dd40e70ddcdd1c35b8369bcf03fd455 Mon Sep 17 00:00:00 2001 From: rogurotus Date: Tue, 14 Nov 2023 20:29:09 +0300 Subject: [PATCH 47/49] fix --- .github/workflows/ci.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d172b26..3b5ad893 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,27 +35,26 @@ jobs: arch: x64 - os: windows arch: x64 - runs-on: ${{ ((matrix.os == 'ios' || matrix.os == 'macos') && 'macos-11') - || (matrix.os == 'windows' && 'windows-2019') - || 'ubuntu-latest' }} + runs-on: ${{ (contains('ios macos', matrix.os) && 'macos-11') + || (contains('windows', matrix.os) && 'windows-2019') + || 'ubuntu-latest' }} steps: - uses: actions/checkout@v4 - run: ./disk_cleanup.sh - if: ${{ matrix.os == 'android' || matrix.os == 'linux' }} + if: ${{ contains('android linux', matrix.os) }} - run: powershell .\disk_cleanup.bat - if: ${{ matrix.os == 'windows' }} + if: ${{ contains('windows', matrix.os) }} - - name: Mac deps - run: pip install setuptools - if: ${{ matrix.os == 'ios' || matrix.os == 'macos' }} + - run: pip install setuptools + if: ${{ contains('ios macos', matrix.os) }} - run: make -C docker ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }} - if: ${{ matrix.os == 'android' || matrix.os == 'linux' }} + if: ${{ contains('android linux', matrix.os) }} - run: make -C build USE_CCACHE=0 ${{ matrix.os }}${{ matrix.arch != '' && format('-{0}', matrix.arch) || '' }} - if: ${{ matrix.os == 'ios' || matrix.os == 'macos' }} + if: ${{ contains('ios macos', matrix.os) }} - run: powershell .\build.windows.bat - if: ${{ matrix.os == 'windows' }} + if: ${{ contains('windows', matrix.os) }} - uses: actions/upload-artifact@v3 with: @@ -174,4 +173,4 @@ jobs: package/libwebrtc-*.zip package/libwebrtc-*.zip.sha256sum fail_on_unmatched_files: true - prerelease: ${{ contains(steps.release.outputs.version, '-') }} + prerelease: ${{ contains(steps.release.outputs.version, '-') }} \ No newline at end of file From 78df8f42030d0af0358288fe66d3dbd47c6bb591 Mon Sep 17 00:00:00 2001 From: tyranron Date: Tue, 14 Nov 2023 20:35:52 +0100 Subject: [PATCH 48/49] Fix lf --- .github/workflows/ci.yml | 2 +- patch/android_use_libunwind.patch | 2 +- patch/android_version.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b5ad893..33b7adee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,4 +173,4 @@ jobs: package/libwebrtc-*.zip package/libwebrtc-*.zip.sha256sum fail_on_unmatched_files: true - prerelease: ${{ contains(steps.release.outputs.version, '-') }} \ No newline at end of file + prerelease: ${{ contains(steps.release.outputs.version, '-') }} diff --git a/patch/android_use_libunwind.patch b/patch/android_use_libunwind.patch index d18d392b..ae054179 100644 --- a/patch/android_use_libunwind.patch +++ b/patch/android_use_libunwind.patch @@ -23,4 +23,4 @@ index a8287bf..a948450 100644 + visibility = [ "//buildtools/third_party/libc++abi", "//build/config:common_deps" ] if (is_android) { visibility += [ "//services/tracing/public/cpp" ] - } \ No newline at end of file + } diff --git a/patch/android_version.patch b/patch/android_version.patch index f66482b8..2b7c347b 100644 --- a/patch/android_version.patch +++ b/patch/android_version.patch @@ -7,4 +7,4 @@ + "api/org/webrtc/WebRtcVersion.java", "src/java/org/webrtc/ApplicationContextProvider.java", "src/java/org/webrtc/CalledByNative.java", - "src/java/org/webrtc/CalledByNativeUnchecked.java", \ No newline at end of file + "src/java/org/webrtc/CalledByNativeUnchecked.java", From 9575fcfd0aa294631710ff4acb9beac36ba87c4f Mon Sep 17 00:00:00 2001 From: tyranron Date: Tue, 14 Nov 2023 20:57:30 +0100 Subject: [PATCH 49/49] Backported stuff --- VERSION | 2 +- build.windows.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index d9a6f5a2..ade44b0e 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -CCACHE_VERSION=4.6 +CCACHE_VERSION=4.8.3 # WebRTC doesn't have its own versioning, so we use Chromium versions: # https://chromiumdash.appspot.com/releases diff --git a/build.windows.ps1 b/build.windows.ps1 index 2bf69adf..b964e4f7 100644 --- a/build.windows.ps1 +++ b/build.windows.ps1 @@ -24,7 +24,7 @@ function Exec # VERSIONファイル読み込み $lines = get-content VERSION -foreach($line in $lines){ +foreach ($line in $lines) { # WEBRTC_COMMITの行のみ取得する if ($line -match "^WEBRTC_") { $name, $value = $line.split("=",2)