From 1a2fb0341de3928e37594649755f280a2830a1e8 Mon Sep 17 00:00:00 2001 From: El Date: Sat, 19 Apr 2025 01:30:59 +0500 Subject: [PATCH] KASM-6984 Add FFmpeg support and update dependencies for benchmarking on oracle 9 --- builder/dockerfile.oracle_9.build | 1 + common/rfb/CMakeLists.txt | 1 + common/rfb/benchmark.cxx | 1 + 3 files changed, 3 insertions(+) diff --git a/builder/dockerfile.oracle_9.build b/builder/dockerfile.oracle_9.build index aaa9184..674e2f0 100644 --- a/builder/dockerfile.oracle_9.build +++ b/builder/dockerfile.oracle_9.build @@ -43,6 +43,7 @@ RUN dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion- # Install from new repos RUN dnf install -y \ giflib-devel \ + ffmpeg-devel \ lbzip2 \ libXfont2-devel \ libxkbfile-devel \ diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt index a99e548..1094ece 100644 --- a/common/rfb/CMakeLists.txt +++ b/common/rfb/CMakeLists.txt @@ -141,6 +141,7 @@ target_include_directories(rfb PRIVATE ${PNG_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/unix/kasmvncpasswd ${CMAKE_SOURCE_DIR}/third_party/tinyxml2 + ${FFMPEG_INCLUDE_DIRS} ) target_link_libraries(rfb PRIVATE ${RFB_LIBRARIES} tinyxml2_objs ${FFMPEG_LIBRARIES}) diff --git a/common/rfb/benchmark.cxx b/common/rfb/benchmark.cxx index c5d6f20..907a740 100644 --- a/common/rfb/benchmark.cxx +++ b/common/rfb/benchmark.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include void benchmark(const std::string &path) {