Skip to content

Commit

Permalink
try to fix build for arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
mpromonet committed Oct 26, 2024
1 parent 61e3ffb commit 189dd4b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ else()
add_definitions(-DWEBRTC_POSIX -fno-rtti)
if (CMAKE_SYSTEM_PROCESSOR MATCHES "armv6.*")
add_definitions(-marm -march=armv6 -mfpu=vfp -mfloat-abi=hard)
else(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
add_definitions(-march=armv9-a+sme)
endif()
if (EXISTS ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE}/obj/modules/desktop_capture/desktop_capture.ninja)
add_definitions(-DUSE_X11)
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKDIR /build/webrtc-streamer

COPY . .

ENV PATH /depot_tools:$PATH
ENV PATH /depot_tools:/build/webrtc/src/third_party/llvm-build/Release+Asserts/bin:$PATH

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget git python3 python3-pkg-resources g++ autoconf automake libtool xz-utils libpulse-dev libasound2-dev libgtk-3-dev libxtst-dev libssl-dev librtmp-dev cmake make pkg-config p7zip-full sudo \
&& useradd -m -s /bin/bash $USERNAME \
Expand All @@ -19,13 +19,14 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
&& sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS \
&& gclient sync \
&& cd ../webrtc-streamer \
&& cmake -DCMAKE_INSTALL_PREFIX=/app . && make \
&& cmake -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ . && make \
&& make install \
&& rm -rf ../webrtc/src/out \
&& apt-get clean && rm -rf /var/lib/apt/lists/

# run
FROM ubuntu:24.04
LABEL [email protected]

WORKDIR /app/webrtc-streamer

Expand Down
1 change: 1 addition & 0 deletions Dockerfile.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins

# run
FROM --platform=arm64 ubuntu:24.04
LABEL [email protected]

WORKDIR /app/webrtc-streamer

Expand Down
1 change: 1 addition & 0 deletions Dockerfile.rpi
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins

# run
FROM $IMAGE
LABEL [email protected]

WORKDIR /app/webrtc-streamer

Expand Down
1 change: 1 addition & 0 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ RUN powershell -c "sleep -Seconds 60" && time /t

# run
FROM mcr.microsoft.com/windows/server:ltsc2022
LABEL [email protected]

WORKDIR /app/webrtc-streamer

Expand Down
7 changes: 0 additions & 7 deletions src/PeerConnectionManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@
#include "VideoDecoderFactory.h"



// ugly workaound to define template belongs to webrtc
namespace rtc {
template <> std::string ToString(bool b) { return b ? "true" : "false"; }
}


// Names used for a IceCandidate JSON object.
const char kCandidateSdpMidName[] = "sdpMid";
const char kCandidateSdpMlineIndexName[] = "sdpMLineIndex";
Expand Down

0 comments on commit 189dd4b

Please sign in to comment.