fix: failing tests.yml

BartSte · Jan 24, 2024 · c173154 · c173154
1 parent 4a1f9d0
commit c173154
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -31,7 +31,7 @@ jobs:
           QT_INSTALLER_JWT_TOKEN: ${{ secrets.QT_INSTALLER_JWT_TOKEN }}
         run: |
           sudo apt-get install -y libboost-all-dev libspdlog-dev
-          sudo apt-get install -y build-essential openssl libssl-dev libssl1.0 libgl1-mesa-dev libqt5x11extras5 '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libpulse-dev libwayland-dev libwayland-egl1-mesa libwayland-server0 ffmpeg
+          sudo apt-get install -y build-essential openssl libssl-dev libssl1.0 libgl1-mesa-dev libqt5x11extras5 '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libpulse-dev libwayland-dev libwayland-egl1-mesa libwayland-server0
           ./scripts/install-qt --root $PWD/3rdparty/Qt qt.qt6.661.gcc_64 qt.qt6.661.addons.qtmultimedia
 
       - name: Build project

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -5,7 +5,6 @@ find_package(spdlog REQUIRED)
 find_package(Boost REQUIRED COMPONENTS filesystem)
 find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia MultimediaWidgets
                                      WaylandClient)
-find_ffmpeg() # creates FFmpeg::FFmpeg
 find_libva() # creates Libva::va/va-drm/va-x11/va-wayland
 
 get_target_property(QT6_LIB_TYPE Qt6::Widgets TYPE)
@@ -40,12 +39,12 @@ set(PLATFORM_PLUGINS
     Qt6::QXcbIntegrationPlugin)
 set(MULTIMEDIA_PLUGINS Qt6::QFFmpegMediaPlugin)
 
+# FFmpeg is included in Qt6::Multimedia
 target_link_libraries(
   snapshotapp
   PUBLIC spdlog::spdlog_header_only
          Boost::boost
          Boost::filesystem
-         FFmpeg::FFmpeg
          Libva::va
          Libva::va-drm
          Libva::va-x11