diff --git a/docker/ubuntu-20.04/Dockerfile b/docker/ubuntu-20.04/Dockerfile index 5dece21..4213f0c 100644 --- a/docker/ubuntu-20.04/Dockerfile +++ b/docker/ubuntu-20.04/Dockerfile @@ -35,6 +35,8 @@ RUN mkdir build WORKDIR /root/webrtc-native-build/build RUN cmake ../ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} +RUN patch -u ../3rdParty/webrtc_native/webrtc/src/third_party/libvpx/BUILD.gn ../patches/libvpx_BUILD.gn.patch +RUN cmake ../ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} RUN export PATH=/root/webrtc-native-build/3rdParty/depot_tools:$PATH && make -j2 RUN make install diff --git a/docker/ubuntu-22.04/Dockerfile b/docker/ubuntu-22.04/Dockerfile index da026f1..399d1ab 100644 --- a/docker/ubuntu-22.04/Dockerfile +++ b/docker/ubuntu-22.04/Dockerfile @@ -27,6 +27,8 @@ RUN mkdir build WORKDIR /root/webrtc-native-build/build +RUN cmake ../ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} +RUN patch -u ../3rdParty/webrtc_native/webrtc/src/third_party/libvpx/BUILD.gn ../patches/libvpx_BUILD.gn.patch RUN cmake ../ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} RUN export PATH=/root/webrtc-native-build/3rdParty/depot_tools:$PATH && make -j2 RUN make install diff --git a/patches/libvpx_BUILD.gn.patch b/patches/libvpx_BUILD.gn.patch new file mode 100644 index 0000000..5c18c28 --- /dev/null +++ b/patches/libvpx_BUILD.gn.patch @@ -0,0 +1,9 @@ +@@ -369,7 +369,7 @@ if (current_cpu == "arm64") { + # SVE is disabled for Windows due to a limitation with clang-cl-18: + # third_party\llvm-build\Release+Asserts\lib\clang\18\include\arm_sve.h(271,1): + # error: cannot mangle this built-in __SVInt8_t type yet +- if (!is_win) { ++ if (!is_win && is_clang) { + source_set("libvpx_intrinsics_sve") { + check_includes = false + configs -= [ "//build/config/compiler:chromium_code" ]