CI: use static ffmpeg for release

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

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
            sudo apt-get install -y libboost-all-dev libspdlog-dev
 
       - name: Install ffmpeg
-        run: ./scripts/install-ffmpeg
+        run: ./scripts/install-ffmpeg-static
 
       - name: Download Qt source
         env: 

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
+          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
           ./scripts/install-qt --root $PWD/3rdparty/Qt qt.qt6.661.gcc_64 qt.qt6.661.addons.qtmultimedia
 
       - name: Build project

diff --git a/cmake/Find.cmake b/cmake/Find.cmake
@@ -2,7 +2,7 @@
 
 # Functon wrapper around the `FindFFmpegPatched.cmake` script.
 function(find_ffmpeg)
-  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindFFmpegPatched.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/FindFFmpegPatched.cmake)
 endfunction()
 
 # Finds static libraries for `LIB_NAME` and sets the variable `OUT` to the

diff --git a/scripts/install-ffmpeg → scripts/install-ffmpeg-shared b/scripts/install-ffmpeg → scripts/install-ffmpeg-shared
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -5,7 +5,8 @@ find_package(spdlog REQUIRED)
 find_package(Boost REQUIRED COMPONENTS filesystem)
 find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia MultimediaWidgets
                                      WaylandClient)
-find_libva()
+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)
 set(QT6_LIB_TYPE
@@ -44,6 +45,7 @@ target_link_libraries(
   PUBLIC spdlog::spdlog_header_only
          Boost::boost
          Boost::filesystem
+         FFmpeg::FFmpeg
          Libva::va
          Libva::va-drm
          Libva::va-x11