From c776a9e6f9e610e8af38e2e2698bffd5db7bc0db Mon Sep 17 00:00:00 2001 From: voluntas Date: Mon, 25 Sep 2023 11:29:45 +0900 Subject: [PATCH 01/19] =?UTF-8?q?libwebrtc=20=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3b2212f0..40814b3f 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ SORA_CPP_SDK_VERSION=2023.13.1 -WEBRTC_BUILD_VERSION=m117.5938.2.0 +WEBRTC_BUILD_VERSION=m118.5993.2.0 BOOST_VERSION=1.83.0 CMAKE_VERSION=3.26.4 BAZEL_VERSION=5.3.2 From ca30b0cdc7d2080b6da2be883df9dde633f440c3 Mon Sep 17 00:00:00 2001 From: voluntas Date: Mon, 25 Sep 2023 11:30:22 +0900 Subject: [PATCH 02/19] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5e45d238..1ce96ced 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,8 +15,8 @@ - @voluntas - [UPDATE] Boost を 1.83.0 に上げる - @voluntas -- [UPDATE] WebRTC を m117.5938.2.0 に上げる - - @melpon @miosakuma +- [UPDATE] WebRTC を m118.5993.2.0 に上げる + - @melpon @miosakuma @voluntas ## 2023.13.1 (2023-09-12) From 13e24957a039efd9ba7c3e0e3ff8fe90078c4043 Mon Sep 17 00:00:00 2001 From: torikizi Date: Tue, 17 Oct 2023 11:37:29 +0900 Subject: [PATCH 03/19] =?UTF-8?q?=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=AB=E8=BF=BD=E5=BE=93=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.py | 10 +++++----- third_party/lyra/toolchain/android/BUILD.tpl | 4 ++-- third_party/lyra/toolchain/linux_x86_64/BUILD.tpl | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/run.py b/run.py index 06b5c294..75b07542 100644 --- a/run.py +++ b/run.py @@ -409,9 +409,9 @@ def build_install_webrtc(version, source_dir, build_dir, install_dir, platform, # インクルードディレクトリを増やしたくないので、 # __config_site を libc++ のディレクトリにコピーしておく libcxx_dir = os.path.join(source_dir, 'webrtc', 'src', 'buildtools', 'third_party', 'libc++') - if not os.path.exists(os.path.join(libcxx_dir, 'trunk', 'include', '__config_site')): + if not os.path.exists(os.path.join(libcxx_dir, 'src', 'include', '__config_site')): shutil.copyfile(os.path.join(libcxx_dir, '__config_site'), - os.path.join(libcxx_dir, 'trunk', 'include', '__config_site')) + os.path.join(libcxx_dir, 'src', 'include', '__config_site')) class WebrtcInfo(NamedTuple): @@ -434,7 +434,7 @@ def get_webrtc_info(webrtcbuild: bool, source_dir: str, build_dir: str, install_ webrtc_library_dir=os.path.join(webrtc_build_dir, 'obj') if platform.system() == 'Windows' else webrtc_build_dir, clang_dir=os.path.join( webrtc_source_dir, 'src', 'third_party', 'llvm-build', 'Release+Asserts'), - libcxx_dir=os.path.join(webrtc_source_dir, 'src', 'buildtools', 'third_party', 'libc++', 'trunk'),) + libcxx_dir=os.path.join(webrtc_source_dir, 'src', 'buildtools', 'third_party', 'libc++', 'src'),) else: return WebrtcInfo( version_file=os.path.join(webrtc_install_dir, 'VERSIONS'), @@ -1138,8 +1138,8 @@ def install_deps(platform: Platform, source_dir, build_dir, install_dir, debug, # LLVM tools_url = webrtc_version['WEBRTC_SRC_TOOLS_URL'] tools_commit = webrtc_version['WEBRTC_SRC_TOOLS_COMMIT'] - libcxx_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_TRUNK_URL'] - libcxx_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_TRUNK_COMMIT'] + libcxx_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_SRC_URL'] + libcxx_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_SRC_COMMIT'] buildtools_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_URL'] buildtools_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_COMMIT'] install_llvm_args = { diff --git a/third_party/lyra/toolchain/android/BUILD.tpl b/third_party/lyra/toolchain/android/BUILD.tpl index e425b7ee..ec131525 100644 --- a/third_party/lyra/toolchain/android/BUILD.tpl +++ b/third_party/lyra/toolchain/android/BUILD.tpl @@ -21,7 +21,7 @@ cc_toolchain_config( '%{android_ndk}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/%{clang_version}/include', '%sysroot%/usr/include', '%sysroot%/usr/local/include', - "%{webrtc_include_dir}/buildtools/third_party/libc++abi/trunk/include", + "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", "%{llvm_dir}/libcxx/include", ], tool_paths = { @@ -87,7 +87,7 @@ cc_toolchain_config( # conly_flags = [], cxx_flags = [ "-isystem%{llvm_dir}/libcxx/include", - "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/trunk/include", + "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", "-std=c++17", "-nostdinc++", "-D_LIBCPP_ABI_NAMESPACE=Cr", diff --git a/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl b/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl index 669727ac..6e59e04b 100644 --- a/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl +++ b/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl @@ -24,7 +24,7 @@ cc_toolchain_config( "/usr/include/x86_64-linux-gnu", "/usr/include", "%{llvm_dir}/libcxx/include", - "%{webrtc_include_dir}/buildtools/third_party/libc++abi/trunk/include", + "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", ], tool_paths = { "ar": "%{llvm_dir}/clang/bin/llvm-ar", @@ -84,7 +84,7 @@ cc_toolchain_config( # conly_flags = [], cxx_flags = [ "-isystem%{llvm_dir}/libcxx/include", - "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/trunk/include", + "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", "-std=c++17", "-nostdinc++", "-D_LIBCPP_ABI_NAMESPACE=Cr", @@ -145,7 +145,7 @@ cc_toolchain_config( "/usr/include/aarch64-linux-gnu", "/usr/include", "%{llvm_dir}/libcxx/include", - "%{webrtc_include_dir}/buildtools/third_party/libc++abi/trunk/include", + "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", ], tool_paths = { "ar": "%{llvm_dir}/clang/bin/llvm-ar", @@ -207,7 +207,7 @@ cc_toolchain_config( # conly_flags = [], cxx_flags = [ "-isystem%{llvm_dir}/libcxx/include", - "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/trunk/include", + "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", "-std=c++17", "-nostdinc++", "-D_LIBCPP_ABI_NAMESPACE=Cr", From 94e0856461b0908c05bc110bd0881481ed4b0698 Mon Sep 17 00:00:00 2001 From: torikizi Date: Fri, 20 Oct 2023 00:24:43 +0900 Subject: [PATCH 04/19] =?UTF-8?q?buildtools=20=E3=81=AE=E3=83=91=E3=82=B9?= =?UTF-8?q?=E3=82=92=E8=A6=8B=E7=9B=B4=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.py | 8 ++++---- third_party/lyra/toolchain/android/BUILD.tpl | 4 ++-- third_party/lyra/toolchain/linux_x86_64/BUILD.tpl | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/run.py b/run.py index 75b07542..f344afba 100644 --- a/run.py +++ b/run.py @@ -408,7 +408,7 @@ def build_install_webrtc(version, source_dir, build_dir, install_dir, platform, # インクルードディレクトリを増やしたくないので、 # __config_site を libc++ のディレクトリにコピーしておく - libcxx_dir = os.path.join(source_dir, 'webrtc', 'src', 'buildtools', 'third_party', 'libc++') + libcxx_dir = os.path.join(source_dir, 'webrtc', 'src', 'third_party', 'libc++') if not os.path.exists(os.path.join(libcxx_dir, 'src', 'include', '__config_site')): shutil.copyfile(os.path.join(libcxx_dir, '__config_site'), os.path.join(libcxx_dir, 'src', 'include', '__config_site')) @@ -434,7 +434,7 @@ def get_webrtc_info(webrtcbuild: bool, source_dir: str, build_dir: str, install_ webrtc_library_dir=os.path.join(webrtc_build_dir, 'obj') if platform.system() == 'Windows' else webrtc_build_dir, clang_dir=os.path.join( webrtc_source_dir, 'src', 'third_party', 'llvm-build', 'Release+Asserts'), - libcxx_dir=os.path.join(webrtc_source_dir, 'src', 'buildtools', 'third_party', 'libc++', 'src'),) + libcxx_dir=os.path.join(webrtc_source_dir, 'src', 'third_party', 'libc++', 'src'),) else: return WebrtcInfo( version_file=os.path.join(webrtc_install_dir, 'VERSIONS'), @@ -1138,8 +1138,8 @@ def install_deps(platform: Platform, source_dir, build_dir, install_dir, debug, # LLVM tools_url = webrtc_version['WEBRTC_SRC_TOOLS_URL'] tools_commit = webrtc_version['WEBRTC_SRC_TOOLS_COMMIT'] - libcxx_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_SRC_URL'] - libcxx_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_THIRD_PARTY_LIBCXX_SRC_COMMIT'] + libcxx_url = webrtc_version['WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC_URL'] + libcxx_commit = webrtc_version['WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC_COMMIT'] buildtools_url = webrtc_version['WEBRTC_SRC_BUILDTOOLS_URL'] buildtools_commit = webrtc_version['WEBRTC_SRC_BUILDTOOLS_COMMIT'] install_llvm_args = { diff --git a/third_party/lyra/toolchain/android/BUILD.tpl b/third_party/lyra/toolchain/android/BUILD.tpl index ec131525..0622aa05 100644 --- a/third_party/lyra/toolchain/android/BUILD.tpl +++ b/third_party/lyra/toolchain/android/BUILD.tpl @@ -21,7 +21,7 @@ cc_toolchain_config( '%{android_ndk}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/%{clang_version}/include', '%sysroot%/usr/include', '%sysroot%/usr/local/include', - "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", + "%{webrtc_include_dir}/third_party/libc++abi/src/include", "%{llvm_dir}/libcxx/include", ], tool_paths = { @@ -87,7 +87,7 @@ cc_toolchain_config( # conly_flags = [], cxx_flags = [ "-isystem%{llvm_dir}/libcxx/include", - "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", + "-isystem%{webrtc_include_dir}/third_party/libc++abi/src/include", "-std=c++17", "-nostdinc++", "-D_LIBCPP_ABI_NAMESPACE=Cr", diff --git a/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl b/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl index 6e59e04b..56a5aa87 100644 --- a/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl +++ b/third_party/lyra/toolchain/linux_x86_64/BUILD.tpl @@ -24,7 +24,7 @@ cc_toolchain_config( "/usr/include/x86_64-linux-gnu", "/usr/include", "%{llvm_dir}/libcxx/include", - "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", + "%{webrtc_include_dir}/third_party/libc++abi/src/include", ], tool_paths = { "ar": "%{llvm_dir}/clang/bin/llvm-ar", @@ -84,7 +84,7 @@ cc_toolchain_config( # conly_flags = [], cxx_flags = [ "-isystem%{llvm_dir}/libcxx/include", - "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", + "-isystem%{webrtc_include_dir}/third_party/libc++abi/src/include", "-std=c++17", "-nostdinc++", "-D_LIBCPP_ABI_NAMESPACE=Cr", @@ -145,7 +145,7 @@ cc_toolchain_config( "/usr/include/aarch64-linux-gnu", "/usr/include", "%{llvm_dir}/libcxx/include", - "%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", + "%{webrtc_include_dir}/third_party/libc++abi/src/include", ], tool_paths = { "ar": "%{llvm_dir}/clang/bin/llvm-ar", @@ -207,7 +207,7 @@ cc_toolchain_config( # conly_flags = [], cxx_flags = [ "-isystem%{llvm_dir}/libcxx/include", - "-isystem%{webrtc_include_dir}/buildtools/third_party/libc++abi/src/include", + "-isystem%{webrtc_include_dir}/third_party/libc++abi/src/include", "-std=c++17", "-nostdinc++", "-D_LIBCPP_ABI_NAMESPACE=Cr", From 436330a68874d09ab944f27d04cf89ceab82f3bf Mon Sep 17 00:00:00 2001 From: torikizi Date: Fri, 20 Oct 2023 22:33:42 +0900 Subject: [PATCH 05/19] =?UTF-8?q?m118.5993.2.1=20=E3=81=AB=E4=B8=8A?= =?UTF-8?q?=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0e5a15c7..7b29b311 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ SORA_CPP_SDK_VERSION=2023.14.0 -WEBRTC_BUILD_VERSION=m118.5993.2.0 +WEBRTC_BUILD_VERSION=m118.5993.2.1 BOOST_VERSION=1.83.0 CMAKE_VERSION=3.26.4 BAZEL_VERSION=5.3.2 From 55dbfddc8b126e0b23e7caaf56c4bd1ee58cb919 Mon Sep 17 00:00:00 2001 From: torikizi Date: Fri, 20 Oct 2023 23:57:40 +0900 Subject: [PATCH 06/19] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c471bed8..d6b2152b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,11 +11,14 @@ ## develop +- [UPDATE] WebRTC を m118.5993.2.1 に上げる + - @voluntas @torikizi + ## 2023.14.0 (2023-10-02) - [UPDATE] Boost を 1.83.0 に上げる - @voluntas -- [UPDATE] WebRTC を m118.5993.2.0 に上げる +- [UPDATE] WebRTC を m117.5938.2.0 に上げる - @melpon @miosakuma @voluntas - [FIX] `MacAudioOutputHelper` でコメントアウトしていた処理をコメントインする - 当初 libwebrtc のサンプルにはない処理で、消していた処理を復活させる From 47a74464ebe6e3ecc1bbd7e72572bd92262e0232 Mon Sep 17 00:00:00 2001 From: torikizi Date: Sat, 21 Oct 2023 12:21:53 +0900 Subject: [PATCH 07/19] =?UTF-8?q?m119.6045.2.0=20=E3=81=AB=E4=B8=8A?= =?UTF-8?q?=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7b29b311..fb89f97a 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ SORA_CPP_SDK_VERSION=2023.14.0 -WEBRTC_BUILD_VERSION=m118.5993.2.1 +WEBRTC_BUILD_VERSION=m119.6045.2.0 BOOST_VERSION=1.83.0 CMAKE_VERSION=3.26.4 BAZEL_VERSION=5.3.2 From 6c229025a742531f09c74d0e05caa871931e59c1 Mon Sep 17 00:00:00 2001 From: torikizi Date: Sat, 21 Oct 2023 17:09:25 +0900 Subject: [PATCH 08/19] =?UTF-8?q?CMAKE=20=E3=81=A8=20Android=20NDK=20?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=82?= =?UTF-8?q?=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index fb89f97a..cf35c6f2 100644 --- a/VERSION +++ b/VERSION @@ -1,12 +1,12 @@ SORA_CPP_SDK_VERSION=2023.14.0 WEBRTC_BUILD_VERSION=m119.6045.2.0 BOOST_VERSION=1.83.0 -CMAKE_VERSION=3.26.4 +CMAKE_VERSION=3.27.7 BAZEL_VERSION=5.3.2 LYRA_VERSION=1.3.0 LYRA_COMPATIBLE_VERSION=1.3.0 CUDA_VERSION=10.2.89-1 -ANDROID_NDK_VERSION=r25b +ANDROID_NDK_VERSION=r26b ANDROID_NATIVE_API_LEVEL=29 ANDROID_SDK_CMDLINE_TOOLS_VERSION=8092744 VPL_VERSION=v2023.3.1 From 7ed6fe037b63e713d7f4fd6d635d5d76cca156db Mon Sep 17 00:00:00 2001 From: torikizi Date: Sat, 21 Oct 2023 17:11:49 +0900 Subject: [PATCH 09/19] =?UTF-8?q?Android=20test=20=E3=81=AE=20cmake=20?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=82=E4=B8=8A?= =?UTF-8?q?=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/android/app/build.gradle b/test/android/app/build.gradle index 8cc9f25f..bb98a002 100644 --- a/test/android/app/build.gradle +++ b/test/android/app/build.gradle @@ -62,7 +62,7 @@ android { externalNativeBuild { cmake { path file('src/main/cpp/CMakeLists.txt') - version '3.26.4' + version '3.27.7' } } buildFeatures { From a6fd8bde2c3d9ba431ae841326c81813867608c0 Mon Sep 17 00:00:00 2001 From: voluntas Date: Fri, 27 Oct 2023 10:54:04 +0900 Subject: [PATCH 10/19] =?UTF-8?q?C++=20SDK=20=E3=81=A7=E3=81=AF=20Raspberr?= =?UTF-8?q?y=20pi=20=E5=AF=BE=E5=BF=9C=E3=81=AF=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index dccfaee3..8334a115 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,6 @@ https://github.com/shiguredo/sora-cpp-sdk-samples **詳細は Discord やメールなどでお気軽にお問い合わせください** -- Raspberry Pi OS 対応 - Windows arm64 対応 - AMD 系 HWA 対応 From 0a65895d7e7c9f9385aee5d1645d3a638a357fd0 Mon Sep 17 00:00:00 2001 From: torikizi Date: Sat, 21 Oct 2023 22:05:25 +0900 Subject: [PATCH 11/19] =?UTF-8?q?set=5Ftarget=5Fproperties=20=E3=81=AE?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E4=B8=8A?= =?UTF-8?q?=E3=81=92=E3=81=A6=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dd7dab9..1f368571 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,11 +80,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) # libsora.a を作る add_library(sora STATIC) -if (WIN32) - set_target_properties(sora PROPERTIES CXX_STANDARD 20 C_STANDARD 20) -else() - set_target_properties(sora PROPERTIES CXX_STANDARD 17 C_STANDARD 17) -endif() +set_target_properties(sora PROPERTIES CXX_STANDARD 20 C_STANDARD 20) string(SUBSTRING "${SORA_CPP_SDK_COMMIT}" 0 8 SORA_CPP_SDK_COMMIT_SHORT) string(SUBSTRING "${WEBRTC_COMMIT}" 0 8 WEBRTC_COMMIT_SHORT) From 08b120b2e38e74182af7ad63e579a66fb931a5c0 Mon Sep 17 00:00:00 2001 From: torikizi Date: Sun, 22 Oct 2023 12:06:19 +0900 Subject: [PATCH 12/19] =?UTF-8?q?clang=2015=20=E3=82=92=E4=BD=BF=E3=81=86?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=A6=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/run.py b/run.py index f344afba..1b23e4cb 100644 --- a/run.py +++ b/run.py @@ -1353,8 +1353,8 @@ def install_deps(platform: Platform, source_dir, build_dir, install_dir, debug, install_vpl_args['cmake_args'].append(f"-DCMAKE_CXX_FLAGS={' '.join(cxxflags)}") if platform.target.os == 'ubuntu': cmake_args = [] - cmake_args.append("-DCMAKE_C_COMPILER=clang-12") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12") + cmake_args.append("-DCMAKE_C_COMPILER=clang-15") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15") path = cmake_path(os.path.join(webrtc_info.libcxx_dir, 'include')) cmake_args.append(f"-DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES={path}") flags = [ @@ -1503,8 +1503,8 @@ def main(): cmake_args.append(f'-DCMAKE_SYSTEM_VERSION={WINDOWS_SDK_VERSION}') if platform.target.os == 'ubuntu': if platform.target.package_name in ('ubuntu-20.04_x86_64', 'ubuntu-22.04_x86_64'): - cmake_args.append("-DCMAKE_C_COMPILER=clang-12") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12") + cmake_args.append("-DCMAKE_C_COMPILER=clang-15") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15") else: cmake_args.append( f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}") @@ -1663,8 +1663,8 @@ def main(): cmake_args.append(f'-DCMAKE_SYSROOT={sysroot}') if platform.target.os == 'ubuntu': if platform.target.package_name in ('ubuntu-20.04_x86_64', 'ubuntu-22.04_x86_64'): - cmake_args.append("-DCMAKE_C_COMPILER=clang-12") - cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12") + cmake_args.append("-DCMAKE_C_COMPILER=clang-15") + cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15") else: cmake_args.append( f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}") From b65f043909c29f697cc6e00bb118b01f0c541663 Mon Sep 17 00:00:00 2001 From: torikizi Date: Fri, 27 Oct 2023 12:07:57 +0900 Subject: [PATCH 13/19] =?UTF-8?q?clang-15=20=E3=82=82=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5911b0c..4a5c8701 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,10 @@ name: build-workflow on: push: paths-ignore: - - 'doc/**' - - '**.md' - - 'LICENSE' - - 'NOTICE' + - "doc/**" + - "**.md" + - "LICENSE" + - "NOTICE" jobs: build-windows: @@ -170,7 +170,7 @@ jobs: sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /" sudo apt-get update - DEBIAN_FRONTEND=noninteractive sudo apt-get -y install cuda=$CUDA_VERSION clang-12 + DEBIAN_FRONTEND=noninteractive sudo apt-get -y install cuda=$CUDA_VERSION clang-12 clang-15 # Intel Media SDK のために libva-dev, libdrm-dev を入れる DEBIAN_FRONTEND=noninteractive sudo apt-get -y install libva-dev libdrm-dev - name: Install deps for Jetson series @@ -258,5 +258,4 @@ jobs: - name: Release uses: softprops/action-gh-release@v1 with: - files: - ${{ steps.env.outputs.package_paths }} + files: ${{ steps.env.outputs.package_paths }} From ca57edf89fb19a0b8d5314a2c48c4470abae205b Mon Sep 17 00:00:00 2001 From: torikizi Date: Fri, 27 Oct 2023 12:14:24 +0900 Subject: [PATCH 14/19] =?UTF-8?q?clang-15=20=E3=81=AE=20LLVM=20=E3=83=AA?= =?UTF-8?q?=E3=83=9D=E3=82=B8=E3=83=88=E3=83=AA=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a5c8701..fa6a151d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,6 +169,7 @@ jobs: sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600 sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /" + sudo add-apt-repository "deb http://apt.llvm.org/lunar/ llvm-toolchain-lunar-15 main" sudo apt-get update DEBIAN_FRONTEND=noninteractive sudo apt-get -y install cuda=$CUDA_VERSION clang-12 clang-15 # Intel Media SDK のために libva-dev, libdrm-dev を入れる From 639104867e468cd6ccc87532508fe437c745a18b Mon Sep 17 00:00:00 2001 From: enm10k Date: Sun, 29 Oct 2023 22:07:52 +0900 Subject: [PATCH 15/19] =?UTF-8?q?llvm.sh=20=E3=81=A7=20clang-15=20?= =?UTF-8?q?=E3=82=92=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa6a151d..eed88475 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,7 +161,7 @@ jobs: if: matrix.name == 'ubuntu-20.04_x86_64' || matrix.name == 'ubuntu-22.04_x86_64' run: | source VERSION - # clang-12 と CUDA を入れる + # clang-15 と CUDA を入れる sudo apt-get update sudo apt-get install -y software-properties-common # CUDA 10 なので ubuntu1804 で正しい @@ -169,9 +169,12 @@ jobs: sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600 sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /" - sudo add-apt-repository "deb http://apt.llvm.org/lunar/ llvm-toolchain-lunar-15 main" - sudo apt-get update - DEBIAN_FRONTEND=noninteractive sudo apt-get -y install cuda=$CUDA_VERSION clang-12 clang-15 + DEBIAN_FRONTEND=noninteractive sudo apt-get -y install cuda=$CUDA_VERSION + + wget https://apt.llvm.org/llvm.sh + chmod a+x llvm.sh + sudo ./llvm.sh 15 + # Intel Media SDK のために libva-dev, libdrm-dev を入れる DEBIAN_FRONTEND=noninteractive sudo apt-get -y install libva-dev libdrm-dev - name: Install deps for Jetson series From 753fb4710049f7dec612dc33130c939a1cf16638 Mon Sep 17 00:00:00 2001 From: melpon Date: Mon, 30 Oct 2023 13:12:29 +0900 Subject: [PATCH 16/19] lib64 -> lib --- third_party/lyra/toolchain/android/BUILD.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/lyra/toolchain/android/BUILD.tpl b/third_party/lyra/toolchain/android/BUILD.tpl index 0622aa05..a459ad79 100644 --- a/third_party/lyra/toolchain/android/BUILD.tpl +++ b/third_party/lyra/toolchain/android/BUILD.tpl @@ -18,7 +18,7 @@ cc_toolchain_config( abi_version = "local", abi_libc_version = "local", cxx_builtin_include_directories = [ - '%{android_ndk}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/%{clang_version}/include', + '%{android_ndk}/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/%{clang_version}/include', '%sysroot%/usr/include', '%sysroot%/usr/local/include', "%{webrtc_include_dir}/third_party/libc++abi/src/include", From 08dfb83c979834fba5da6791eba617a451e2a7c8 Mon Sep 17 00:00:00 2001 From: torikizi Date: Mon, 30 Oct 2023 18:39:16 +0900 Subject: [PATCH 17/19] =?UTF-8?q?WebRTC=20=E3=82=92=20m119.6045.2.1=20?= =?UTF-8?q?=E3=81=AB=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cf35c6f2..06a20767 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ SORA_CPP_SDK_VERSION=2023.14.0 -WEBRTC_BUILD_VERSION=m119.6045.2.0 +WEBRTC_BUILD_VERSION=m119.6045.2.1 BOOST_VERSION=1.83.0 CMAKE_VERSION=3.27.7 BAZEL_VERSION=5.3.2 From b41fb1f3c17e783828cd51aa1decde4d835f91cc Mon Sep 17 00:00:00 2001 From: torikizi Date: Mon, 30 Oct 2023 18:39:34 +0900 Subject: [PATCH 18/19] =?UTF-8?q?CHANGES=20=E3=81=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d6b2152b..755a8afc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,8 +11,14 @@ ## develop -- [UPDATE] WebRTC を m118.5993.2.1 に上げる - - @voluntas @torikizi +- [UPDATE] WebRTC を m119.6045.2.1 に上げる + - @voluntas @torikizi @melpon @enm10k +- [UPDATE] WebRTC を m119 に上げたことで必要になった関連するライブラリもバージョンを上げる + - Ubuntu で使用する clang のバージョンを 15 にアップデート + - すべてのプラットフォームで set_target_properties の CXX_STANDARD と C_STANDARD を 20 にアップデート + - ANDROID_NDK_VERSION を r26b にアップデート + - CMAKE_VERSION を 3.27.7 にアップデート + - @melpon @enm10k @torikizi ## 2023.14.0 (2023-10-02) From 89bd4cfbc64afc9c9debf8a82606b6a215061b92 Mon Sep 17 00:00:00 2001 From: miosakuma Date: Tue, 31 Oct 2023 11:37:29 +0900 Subject: [PATCH 19/19] =?UTF-8?q?2023.15.0=20=E3=83=AA=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E3=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 ++ VERSION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 755a8afc..36fb3fef 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ ## develop +## 2023.15.0 (2023-10-31) + - [UPDATE] WebRTC を m119.6045.2.1 に上げる - @voluntas @torikizi @melpon @enm10k - [UPDATE] WebRTC を m119 に上げたことで必要になった関連するライブラリもバージョンを上げる diff --git a/VERSION b/VERSION index 06a20767..b782a89c 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -SORA_CPP_SDK_VERSION=2023.14.0 +SORA_CPP_SDK_VERSION=2023.15.0 WEBRTC_BUILD_VERSION=m119.6045.2.1 BOOST_VERSION=1.83.0 CMAKE_VERSION=3.27.7