diff --git a/BUILDING.md b/BUILDING.md index 4bacf0189e..7f47286c2e 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -62,7 +62,7 @@ _Note: if you ran docker with sudo, CasparCG server will not be able to run with 2. `git clone --single-branch --branch master https://github.com/CasparCG/server casparcg-server-master` 3. `cd casparcg-server-master` 4. Install dependencies, this can be done with `sudo ./tools/linux/install-dependencies` -5. Extract Boost, FFmpeg and CEF from the docker images via `sudo ./tools/linux/extract-deps-from-docker`. Alternatively these can be prepared manually by following the steps laid out in each Dockerfile +5. Extract Boost and FFmpeg from the docker images via `sudo ./tools/linux/extract-deps-from-docker`. Alternatively these can be prepared manually by following the steps laid out in each Dockerfile 6. `mkdir build && cd build` 7. `cmake ../src` 8. `make -j8` diff --git a/src/CMakeModules/FindCEF.cmake b/src/CMakeModules/FindCEF.cmake deleted file mode 100644 index 7528879cff..0000000000 --- a/src/CMakeModules/FindCEF.cmake +++ /dev/null @@ -1,69 +0,0 @@ -include(FindPackageHandleStandardArgs) - -SET(CEF_ROOT_DIR "" CACHE PATH "Path to a CEF distributed build") - -message(STATUS "Looking for Chromium Embedded Framework in ${CEF_ROOT_DIR}") - -find_path(CEF_INCLUDE_DIR "include/cef_version.h" - HINTS ${CEF_ROOT_DIR}) - -if(APPLE) - find_library(CEF_LIBRARY - NAMES cef libcef cef.lib libcef.o "Chromium Embedded Framework" - NO_DEFAULT_PATH - PATHS ${CEF_ROOT_DIR} ${CEF_ROOT_DIR}/Release) - find_library(CEFWRAPPER_LIBRARY - NAMES cef_dll_wrapper libcef_dll_wrapper - NO_DEFAULT_PATH - PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Release - ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Release - ${CEF_ROOT_DIR}/build/libcef_dll - ${CEF_ROOT_DIR}/build/libcef_dll_wrapper) -else() - find_library(CEF_LIBRARY - NAMES cef libcef cef.lib libcef.o "Chromium Embedded Framework" - PATHS ${CEF_ROOT_DIR} ${CEF_ROOT_DIR}/Release) - find_library(CEFWRAPPER_LIBRARY - NAMES cef_dll_wrapper libcef_dll_wrapper - PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Release - ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Release - ${CEF_ROOT_DIR}/build/libcef_dll - ${CEF_ROOT_DIR}/build/libcef_dll_wrapper - ${CEF_ROOT_DIR}/Release) - if(WIN32) - find_library(CEFWRAPPER_LIBRARY_DEBUG - NAMES cef_dll_wrapper libcef_dll_wrapper - PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Debug ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Debug) - endif() -endif() - -if(NOT CEF_LIBRARY) - set(CEF_FOUND FALSE) - message(FATAL_ERROR "Could not find the CEF shared library" ) - return() -endif() - -if(NOT CEFWRAPPER_LIBRARY) -set(CEF_FOUND FALSE) - message(FATAL_ERROR "Could not find the CEF wrapper library" ) - return() -endif() - -if(WIN32) - set(CEF_LIBRARIES - ${CEF_LIBRARY} - optimized ${CEFWRAPPER_LIBRARY}) - if (CEFWRAPPER_LIBRARY_DEBUG) - list(APPEND CEF_LIBRARIES - debug ${CEFWRAPPER_LIBRARY_DEBUG}) - endif() -else() - set(CEF_LIBRARIES - ${CEF_LIBRARY} - ${CEFWRAPPER_LIBRARY}) -endif() - -find_package_handle_standard_args(CEF DEFAULT_MSG CEF_LIBRARY - CEFWRAPPER_LIBRARY CEF_INCLUDE_DIR) -mark_as_advanced(CEF_LIBRARY CEF_WRAPPER_LIBRARY CEF_LIBRARIES - CEF_INCLUDE_DIR) diff --git a/tools/linux/Dockerfile b/tools/linux/Dockerfile index 292af505d8..48f872e8c6 100644 --- a/tools/linux/Dockerfile +++ b/tools/linux/Dockerfile @@ -1,16 +1,13 @@ ARG IMAGE_BASE ARG IMAGE_BOOST ARG IMAGE_FFMPEG -ARG IMAGE_CEF FROM ${IMAGE_BOOST} as boost FROM ${IMAGE_FFMPEG} as ffmpeg -FROM ${IMAGE_CEF} as cef FROM ${IMAGE_BASE} as build-casparcg COPY --from=boost /opt/boost /opt/boost COPY --from=ffmpeg /opt/ffmpeg /opt/ffmpeg - COPY --from=cef /opt/cef /opt/cef RUN mkdir /source && mkdir /build && mkdir /install diff --git a/tools/linux/build-base-images b/tools/linux/build-base-images index a6deab5b49..769aa8a19f 100755 --- a/tools/linux/build-base-images +++ b/tools/linux/build-base-images @@ -2,6 +2,6 @@ source $(dirname "$0")/image-versions -docker rmi $IMAGE_BASE $IMAGE_CEF $IMAGE_BOOST $IMAGE_FFMPEG +docker rmi $IMAGE_BASE $IMAGE_BOOST $IMAGE_FFMPEG $(dirname "$0")/ensure-base-images diff --git a/tools/linux/build-in-docker b/tools/linux/build-in-docker index 745764f4c4..c53f0e7fb4 100755 --- a/tools/linux/build-in-docker +++ b/tools/linux/build-in-docker @@ -10,7 +10,6 @@ docker build -t casparcg/server \ --build-arg PROC_COUNT \ --build-arg GIT_HASH \ --build-arg IMAGE_BASE \ - --build-arg IMAGE_CEF \ --build-arg IMAGE_BOOST \ --build-arg IMAGE_FFMPEG \ -f $PWD/tools/linux/Dockerfile $PWD diff --git a/tools/linux/cef/Dockerfile b/tools/linux/cef/Dockerfile deleted file mode 100644 index 91e9798a8a..0000000000 --- a/tools/linux/cef/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -ARG IMAGE_BASE - -FROM ${IMAGE_BASE} as BUILD - ARG PROC_COUNT=8 - - WORKDIR /opt - - ADD https://cdn-fastly.obsproject.com/downloads/cef_binary_4638_linux64.tar.bz2 /opt/cef.tar.bz2 - RUN tar -jxf cef.tar.bz2 && mv /opt/cef_binary_* /opt/cef - RUN mkdir /opt/build - WORKDIR /opt/build - RUN cmake /opt/cef && make -j $PROC_COUNT - RUN cp /opt/build/libcef_dll_wrapper/libcef_dll_wrapper.a /opt/cef/Release/ - RUN strip /opt/cef/Release/libcef.so - -FROM scratch - COPY --from=BUILD /opt/cef /opt/cef diff --git a/tools/linux/ensure-base-images b/tools/linux/ensure-base-images index 8b4b7f425a..e087b343ea 100755 --- a/tools/linux/ensure-base-images +++ b/tools/linux/ensure-base-images @@ -3,13 +3,11 @@ source $(dirname "$0")/image-versions docker pull $IMAGE_BASE || docker build --pull -f tools/linux/base/Dockerfile -t $IMAGE_BASE tools/linux -docker pull $IMAGE_CEF || docker build -t $IMAGE_CEF --build-arg PROC_COUNT --build-arg IMAGE_BASE tools/linux/cef docker pull $IMAGE_BOOST || docker build -t $IMAGE_BOOST --build-arg PROC_COUNT --build-arg IMAGE_BASE tools/linux/boost docker pull $IMAGE_FFMPEG || docker build -t $IMAGE_FFMPEG --build-arg PROC_COUNT --build-arg IMAGE_BASE tools/linux/ffmpeg if [ "$CASPARCG_PUSH_IMAGES" = true ]; then docker push $IMAGE_BASE - docker push $IMAGE_CEF docker push $IMAGE_BOOST docker push $IMAGE_FFMPEG fi diff --git a/tools/linux/extract-deps-from-docker b/tools/linux/extract-deps-from-docker index d0155d2c65..0be143bf90 100755 --- a/tools/linux/extract-deps-from-docker +++ b/tools/linux/extract-deps-from-docker @@ -2,13 +2,6 @@ source $(dirname "$0")/image-versions -# CEF -echo "Extracting CEF" -rm -Rf /opt/cef -tempContainer=$(docker create $IMAGE_CEF sh) -docker cp $tempContainer:/opt/cef /opt/cef -docker rm -v $tempContainer - # FFmpeg echo "Extracting FFmpeg" rm -Rf /opt/ffmpeg diff --git a/tools/linux/image-versions b/tools/linux/image-versions index d87e1fa96a..994afb6efa 100644 --- a/tools/linux/image-versions +++ b/tools/linux/image-versions @@ -3,6 +3,5 @@ export IMAGE_PREFIX=ghcr.io/casparcg/server/ export IMAGE_BASE=${IMAGE_PREFIX}base:jammy-0 -export IMAGE_CEF=${IMAGE_PREFIX}cef:95.0.4638.69-obs-2 export IMAGE_BOOST=${IMAGE_PREFIX}boost:1.67-2 export IMAGE_FFMPEG=${IMAGE_PREFIX}ffmpeg:5.1.3-1