diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index ff4b92b..66ef270 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -10,7 +10,6 @@ RUN if [ "${ARCH}" = "aarch64" ]; then export DEBARCH="arm64"; export DEBGCC="gc elif [ "${ARCH}" = "x86_64" ]; then export DEBARCH="amd64"; export DEBGCC="gcc g++"; \ else export DEBARCH="${ARCH}"; export DEBGCC="gcc g++"; fi \ && dpkg --add-architecture $DEBARCH \ - && sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list.d/debian.sources \ && apt -y update \ && apt -y install $DEBGCC ninja-build nasm git wget pkg-config make autoconf libtool bison flex \ && apt -y install libpulse-dev:$DEBARCH \ @@ -47,9 +46,14 @@ RUN if [ "${ARCH}" = "aarch64" ]; then export DEBARCH="arm64"; export DEBGCC="gc && apt -y install libgbm-dev:$DEBARCH \ && apt -y install libva-dev:$DEBARCH \ && apt -y install libxkbcommon-dev:$DEBARCH \ - && apt -y install nvidia-cuda-toolkit:$DEBARCH \ && apt -y install libpolkit-agent-1-dev:$DEBARCH +RUN if [ "${ARCH}" = "x86_64" ]; \ + then sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list.d/debian.sources; \ + apt -y update; \ + apt -y install nvidia-cuda-toolkit; \ + fi + # Install newer version of CMake ENV CMAKE_VER=3.31.5 RUN wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VER/cmake-$CMAKE_VER-linux-$(uname -m).sh \ diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index f1d8958..0ffef43 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -10,6 +10,7 @@ function(compile_ffmpeg _target_name _system_name _system_processor) set(FFMPEG_CFLAGS "${CMAKE_C_FLAGS}") set(FFMPEG_LDFLAGS "${CMAKE_C_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}") set(FFMPEG_ENV "") + set(FFMPEG_DEPS "") set(FFMPEG_CONFIGURE_ARGS --enable-gpl --disable-all @@ -43,6 +44,7 @@ function(compile_ffmpeg _target_name _system_name _system_processor) BUILD_IN_SOURCE 1 ) + list(APPEND FFMPEG_DEPS nvcodec_headers) list(APPEND FFMPEG_ENV "PKG_CONFIG_PATH=${FFMPEG_INSTALL_DIR}/lib/pkgconfig") list(APPEND FFMPEG_CONFIGURE_ARGS # Enable VAAPI @@ -166,7 +168,7 @@ function(compile_ffmpeg _target_name _system_name _system_processor) PREFIX ${FFMPEG_PREFIX_DIR} GIT_REPOSITORY https://git.ffmpeg.org/ffmpeg.git GIT_TAG n7.1 - DEPENDS nvcodec_headers + DEPENDS ${FFMPEG_DEPS} CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${FFMPEG_ENV} "../${_target_name}/configure" ${FFMPEG_CONFIGURE_ARGS} BUILD_COMMAND ${CMAKE_COMMAND} -E env ${FFMPEG_ENV} make -j${CMAKE_BUILD_PARALLEL_LEVEL} UPDATE_COMMAND ""