Skip to content

Commit a8e8d0e

Browse files
mpromonetmpromonet
committed
pin webrtc searching for a way to build with latest
1 parent 9b6f493 commit a8e8d0e

File tree

12 files changed

+34
-122
lines changed

12 files changed

+34
-122
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
- checkout
5151
- run: apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget python3 python3-pkg-resources autoconf automake libtool git cmake make g++ xz-utils libgtk-3-dev libxtst-dev libasound2-dev libpulse-dev
5252
- run: echo 'export PATH=/depot_tools:$PATH' >> $BASH_ENV
53-
- run: cd ${WEBRTCROOT} && gclient sync
5453

5554
- run: cmake -DCMAKE_BUILD_TYPE=<< parameters.buildtype >> . && make && cpack
5655

@@ -84,8 +83,6 @@ jobs:
8483
apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget python3 python3-pkg-resources autoconf automake libtool git make cmake g++ xz-utils pkg-config
8584
wget -qO- ${CROSSCOMPILER} | tar xz -C /opt
8685
export PATH=$(ls -d /opt/cross-pi-gcc-*/bin):/depot_tools:$PATH
87-
${WEBRTCROOT}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=arm
88-
pushd ${WEBRTCROOT} && gclient sync && popd
8986
cmake -DCMAKE_BUILD_TYPE=<< parameters.buildtype >> -DCMAKE_SYSTEM_PROCESSOR=armv7l -DCMAKE_LIBRARY_ARCHITECTURE=arm-linux-gnueabihf -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY . && make
9087
cpack
9188
no_output_timeout: 1h
@@ -120,8 +117,6 @@ jobs:
120117
apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget python3 python3-pkg-resources autoconf automake libtool git cmake make g++ xz-utils pkg-config
121118
wget -qO- ${CROSSCOMPILER} | tar xz -C /opt
122119
export PATH=$(ls -d /opt/cross-pi-gcc-*/bin):/depot_tools:$PATH
123-
${WEBRTCROOT}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=arm
124-
pushd ${WEBRTCROOT} && gclient sync && popd
125120
cmake -DCMAKE_BUILD_TYPE=<< parameters.buildtype >> -DCMAKE_SYSTEM_PROCESSOR=armv6l -DCMAKE_LIBRARY_ARCHITECTURE=arm-linux-gnueabihf -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY . && make
126121
cpack
127122
@@ -155,8 +150,6 @@ jobs:
155150
command: |
156151
apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget python3 python3-pkg-resources autoconf automake libtool git cmake make g++ xz-utils pkg-config gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
157152
export PATH=/depot_tools:$PATH
158-
${WEBRTCROOT}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
159-
pushd ${WEBRTCROOT} && gclient sync && popd
160153
cmake -DCMAKE_BUILD_TYPE=<< parameters.buildtype >> -DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF . && make
161154
cpack
162155
no_output_timeout: 1h

‎.github/workflows/cpp-cross-linux-arm.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ jobs:
6868
mkdir webrtc
6969
pushd webrtc
7070
fetch --no-history --nohooks webrtc
71-
./src/build/linux/sysroot_scripts/install-sysroot.py --arch=${{ matrix.archtype }}
72-
sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS
73-
gclient sync
7471
popd
7572
7673
- name: build

‎.github/workflows/cpp-linux.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
mkdir webrtc
2828
pushd webrtc
2929
fetch --no-history --nohooks webrtc
30-
sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS
31-
gclient sync
3230
popd
3331
3432
- name: build

‎.github/workflows/cpp-macos.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
mkdir webrtc
2828
pushd webrtc
2929
fetch --no-history --nohooks webrtc
30-
sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS
31-
gclient sync
3230
popd
3331
3432
- name: build

‎.travis.yml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎CMakeLists.txt‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ project (webrtc-streamer)
44
set (WEBRTCROOT "${CMAKE_CURRENT_SOURCE_DIR}/../webrtc" CACHE STRING "WEBRTC root directory")
55
set (WEBRTCDESKTOPCAPTURE "ON" CACHE STRING "WEBRTC Desktop capture")
66
set (WEBRTCCHROMEBRANDED "ON" CACHE STRING "WEBRTC Chrome branded")
7+
set (WEBRTCVERSION "c23fe2f" CACHE STRING "WEBRTC version")
78

89
if(NOT CMAKE_BUILD_TYPE)
910
set (CMAKE_BUILD_TYPE "Release")
@@ -14,23 +15,6 @@ set (CMAKE_POSITION_INDEPENDENT_CODE ON)
1415
set (CMAKE_CXX_STANDARD 20)
1516
set (CMAKE_CXX_EXTENSIONS OFF)
1617

17-
# build version identifier
18-
find_package(Git)
19-
if(GIT_FOUND)
20-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} submodule update --init)
21-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty OUTPUT_VARIABLE PROJECTVERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
22-
set (VERSION "${PROJECTVERSION}/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
23-
24-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C civetweb describe --tags --always --dirty OUTPUT_VARIABLE CIVETVERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
25-
set (VERSION "${VERSION} civetweb@${CIVETVERSION}")
26-
27-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C ${WEBRTCROOT}/src describe --tags --always --dirty OUTPUT_VARIABLE WEBRTCVERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
28-
set (VERSION "${VERSION} webrtc@${WEBRTCVERSION}")
29-
30-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C live555helper describe --tags --always --dirty OUTPUT_VARIABLE LIVEVERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
31-
set (VERSION "${VERSION} live555helper@${LIVEVERSION}")
32-
endif()
33-
add_definitions(-DVERSION=\"${VERSION}\")
3418

3519
# set CMAKE_FIND_ROOT_PATH to search package in WebRTC sysroot
3620
if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*")
@@ -53,6 +37,20 @@ MESSAGE("PulseAudio_FOUND = ${PulseAudio_FOUND}")
5337
set (WEBRTCOBJS ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE}/obj)
5438

5539
if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_LIBRARY_SUFFIX})
40+
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src COMMAND git checkout ${WEBRTCVERSION})
41+
42+
file(READ ${WEBRTCROOT}/src/DEPS filecontent)
43+
string(REPLACE "'src/resources'],$" "'src/resources'],'condition':'rtc_include_tests==true'," filecontent "${filecontent}")
44+
file(WRITE ${WEBRTCROOT}/src/DEPS "${filecontent}")
45+
46+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*")
47+
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/build/linux/sysroot_scripts COMMAND install-sysroot.py --arch=arm)
48+
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
49+
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/build/linux/sysroot_scripts COMMAND install-sysroot.py --arch=arm64)
50+
endif()
51+
52+
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src COMMAND gclient sync)
53+
5654
set (WEBRTCARGS rtc_include_tests=false\nrtc_enable_protobuf=false\nrtc_build_examples=false\nrtc_build_tools=false\ntreat_warnings_as_errors=false\nenable_js_protobuf=false\nuse_glib=false\nuse_lld=false\n)
5755
set (WEBRTCARGS use_custom_libcxx=false\nlibyuv_use_sme=false\n${WEBRTCARGS})
5856
# debug/release
@@ -151,6 +149,25 @@ FILE(GLOB_RECURSE WEBRTJSONCPPCOBJS ${WEBRTCOBJS}/third_party/jsoncpp/jsoncpp/*$
151149
FILE(GLOB_RECURSE WEBRTP2POBJ ${WEBRTCOBJS}/p2p/p2p_server_utils/*${CMAKE_C_OUTPUT_EXTENSION})
152150
SET (WEBRTCEXTRAOBJS ${WEBRTJSONCPPCOBJS} ${WEBRTP2POBJ} ${WEBRTCCOMOBJ})
153151

152+
# build version identifier
153+
find_package(Git)
154+
if(GIT_FOUND)
155+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} submodule update --init)
156+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty OUTPUT_VARIABLE PROJECTVERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
157+
set (VERSION "${PROJECTVERSION}/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
158+
159+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C civetweb describe --tags --always --dirty OUTPUT_VARIABLE CIVETVERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
160+
set (VERSION "${VERSION} civetweb@${CIVETVERSION}")
161+
162+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C ${WEBRTCROOT}/src describe --tags --always --dirty OUTPUT_VARIABLE WEBRTCVERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
163+
set (VERSION "${VERSION} webrtc@${WEBRTCVERSION}")
164+
165+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C live555helper describe --tags --always --dirty OUTPUT_VARIABLE LIVEVERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
166+
set (VERSION "${VERSION} live555helper@${LIVEVERSION}")
167+
endif()
168+
add_definitions(-DVERSION=\"${VERSION}\")
169+
MESSAGE("VERSION = ${VERSION}")
170+
154171
# project target
155172
FILE(GLOB SOURCE src/*.cpp)
156173
add_executable (${CMAKE_PROJECT_NAME} ${SOURCE} ${WEBRTCEXTRAOBJS})

‎Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
1717
&& mkdir ../webrtc \
1818
&& cd ../webrtc \
1919
&& fetch --no-history --nohooks webrtc \
20-
&& sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS \
21-
&& gclient sync \
2220
&& cd ../webrtc-streamer \
2321
&& cmake -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ . && make \
2422
&& make install \

‎Dockerfile.arm64‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
1313
&& mkdir ../webrtc \
1414
&& cd ../webrtc \
1515
&& fetch --no-history --nohooks webrtc \
16-
&& sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS \
17-
&& src/build/linux/sysroot_scripts/install-sysroot.py --arch=arm64 \
18-
&& gclient sync \
1916
&& cd ../webrtc-streamer \
2017
&& cmake -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF . && make \
2118
&& make install \

‎Dockerfile.rpi‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
2020
&& mkdir ../webrtc \
2121
&& cd ../webrtc \
2222
&& fetch --no-history --nohooks webrtc \
23-
&& sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS \
24-
&& src/build/linux/sysroot_scripts/install-sysroot.py --arch=arm \
25-
&& gclient sync \
2623
&& cd ../webrtc-streamer \
2724
&& cmake -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_LIBRARY_ARCHITECTURE=arm-linux-gnueabihf -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF . && make \
2825
&& make install \

‎Dockerfile.windows‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ RUN git config --global core.autocrlf false \
3232
&& time /t \
3333
&& mkdir c:\webrtc && cd c:\webrtc \
3434
&& fetch --no-history --nohooks webrtc \
35-
&& sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS \
36-
&& gclient sync \
3735
&& time /t \
3836
&& cd C:\webrtc-streamer \
3937
&& cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_CXX_COMPILER=clang-cl.exe -DCMAKE_MAKE_PROGRAM=ninja.bat . \

0 commit comments

Comments
 (0)