add patch command

mpromonet · Mar 24, 2024 · 42c1881 · 42c1881
1 parent 63ccf0d
commit 42c1881
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,7 +89,7 @@ else()
         message(STATUS "patch live555")
         EXECUTE_PROCESS(COMMAND patch -d ${CMAKE_BINARY_DIR} -f -p 1 -i ${CMAKE_SOURCE_DIR}/patches/001_live555_sprintf_format RESULT_VARIABLE patch_result)
         if(NOT patch_result STREQUAL "0")
-            message(FATAL_ERROR "Patching live555 failed!")
+            message(FATAL_ERROR "Patching live555 failed! error:${patch_result}")
         endif()        
     endif()
     FILE(GLOB LIVESOURCE ${LIVE}/groupsock/*.c* ${LIVE}/liveMedia/*.c* ${LIVE}/UsageEnvironment/*.c* ${LIVE}/BasicUsageEnvironment/*.c*)

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /v4l2rtspserver
 COPY . /v4l2rtspserver
 
 RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates g++ autoconf automake libtool xz-utils cmake make pkg-config git wget libasound2-dev libssl-dev \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates g++ autoconf automake libtool xz-utils cmake make patch pkg-config git wget libasound2-dev libssl-dev \
     && cmake . && make install && apt-get clean && rm -rf /var/lib/apt/lists/
 
 FROM ubuntu:22.04

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -6,7 +6,7 @@ COPY . /v4l2rtspserver
 ARG ARCH=arm64
 
 RUN apt-get update \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates xz-utils cmake make pkg-config git wget gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libasound2-dev \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates xz-utils cmake make patch pkg-config git wget gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libasound2-dev \
         && cmake -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -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 . \
 	&& make install \
 	&& apt-get clean && rm -rf /var/lib/apt/lists/

diff --git a/Dockerfile.rpi b/Dockerfile.rpi
@@ -6,9 +6,9 @@ COPY . /v4l2rtspserver
 ARG ARCH=armv7l
 
 RUN apt-get update \
-        && apt-get install -y --no-install-recommends ca-certificates xz-utils cmake make pkg-config git wget \
-	&&  git clone --depth 1 https://github.com/raspberrypi/tools.git /rpi_tools \
-        &&  export PATH=/rpi_tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin:$PATH \
+        && apt-get install -y --no-install-recommends ca-certificates xz-utils cmake make patch pkg-config git wget \
+	&& git clone --depth 1 https://github.com/raspberrypi/tools.git /rpi_tools \
+        && export PATH=/rpi_tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin:$PATH \
         && cmake -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -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 install \
 	&& apt-get clean && rm -rf /var/lib/apt/lists/