CMake: Linux: update dependencies & use dynamic Boost

LizardByte · Jan 30, 2023 · 4c468fd · 4c468fd
1 parent 98d61b1
commit 4c468fd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,10 +72,8 @@ find_package(OpenSSL REQUIRED)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(CURL REQUIRED libcurl)
 
-if(NOT APPLE)
-    set(Boost_USE_STATIC_LIBS ON)  # cmake-lint: disable=C0103
-endif()
 if(WIN32)
+    set(Boost_USE_STATIC_LIBS ON)  # cmake-lint: disable=C0103
     # workaround to prevent link errors against icudata, icui18n
     set(Boost_NO_BOOST_CMAKE ON) # cmake-lint: disable=C0103
 endif()
@@ -795,25 +793,33 @@ elseif(UNIX)
                 libcurl4, \
                 libdrm2, \
                 libevdev2, \
+                libmfx1, \
+                libnuma1, \
                 libopus0, \
                 libpulse0, \
-                libxcb-shm0, \
-                libxcb-xfixes0, \
-                libxtst6, \
-                openssl")
+                libva2, \
+                libva-drm2, \
+                libvdpau1, \
+                libwayland-client0, \
+                libx11-6, \
+                openssl | libssl3")
         set(CPACK_RPM_PACKAGE_REQUIRES "\
                 boost-filesystem >= 1.67.0, \
                 boost-log >= 1.67.0, \
                 boost-program-options >= 1.67.0, \
                 boost-thread >= 1.67.0, \
+                intel-mediasdk >= 22.3.0, \
                 libcap >= 2.22, \
                 libcurl >= 7.0, \
                 libdrm >= 2.4.97, \
                 libevdev >= 1.5.6, \
                 libopusenc >= 0.2.1, \
-                libxcb >= 1.13, \
-                libXtst >= 1.2.3, \
-                openssl >= 1.1, \
+                libva >= 2.14.0, \
+                libvdpau >= 1.5, \
+                libwayland-client >= 1.20.0, \
+                libX11 >= 1.7.3.1, \
+                numactl-libs >= 2.0.14, \
+                openssl >= 3.0.2, \
                 pulseaudio-libs >= 10.0")
         # This should automatically figure out dependencies, doesn't work with the current config
         set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)

diff --git a/docker/fedora-36.dockerfile b/docker/fedora-36.dockerfile
@@ -20,7 +20,6 @@ dnf -y update
 dnf -y group install "Development Tools"
 dnf -y install \
   boost-devel-1.76.0* \
-  boost-static-1.76.0* \
   cmake-3.22.2* \
   gcc-12.0.1* \
   gcc-c++-12.0.1* \

diff --git a/docker/fedora-37.dockerfile b/docker/fedora-37.dockerfile
@@ -20,7 +20,6 @@ dnf -y update
 dnf -y group install "Development Tools"
 dnf -y install \
   boost-devel-1.78.0* \
-  boost-static-1.78.0* \
   cmake-3.24.1* \
   gcc-12.2.1* \
   gcc-c++-12.2.1* \

diff --git a/docker/ubuntu-22.04.dockerfile b/docker/ubuntu-22.04.dockerfile
@@ -28,7 +28,7 @@ apt-get install -y --no-install-recommends \
   libboost-thread-dev=1.74.0* \
   libcap-dev=1:2.44* \
   libcurl4-openssl-dev=7.81.0* \
-  libdrm-dev=2.4.110* \
+  libdrm-dev=2.4.113* \
   libevdev-dev=1.12.1* \
   libnuma-dev=2.0.14* \
   libopus-dev=1.3.1* \

diff --git a/docs/source/building/linux.rst b/docs/source/building/linux.rst
@@ -54,10 +54,10 @@ Install Requirements
       sudo dnf group install "Development Tools" && \
       sudo dnf install \
           boost-devel \
-          boost-static \
           cmake \
           gcc \
           gcc-c++ \
+          intel-mediasdk-devel \ # x86_64 only
           libcap-devel \
           libcurl-devel \
           libdrm-devel \
@@ -80,9 +80,7 @@ Install Requirements
           pulseaudio-libs-devel \
           rpm-build \  # if you want to build an RPM binary package
           wget \  # necessary for cuda install with `run` file
-          which \  # necessary for cuda install with `run` file
-          # libmfx-devel is not listed for fedora, this is for x86_64 only
-          https://kojipkgs.fedoraproject.org//packages/libmfx/1.25/4.el8/x86_64/libmfx-devel-1.25-4.el8.x86_64.rpm
+          which   # necessary for cuda install with `run` file
 
 Ubuntu 20.04
 ^^^^^^^^^^^^