From c8a025a0ccf8ee4c5f994cdac0871a9c8a6fcb2e Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:35:59 -0400 Subject: [PATCH] build(linux): remove unused intel media sdk --- .github/workflows/CI.yml | 1 - cmake/dependencies/common.cmake | 6 --- docker/clion-toolchain.dockerfile | 4 -- docker/debian-bookworm.dockerfile | 4 -- docker/debian-bullseye.dockerfile | 4 -- docker/fedora-39.dockerfile | 3 -- docker/fedora-40.dockerfile | 3 -- docker/ubuntu-22.04.dockerfile | 4 -- docker/ubuntu-24.04.dockerfile | 4 -- docs/source/building/linux.rst | 4 -- packaging/linux/Arch/PKGBUILD | 1 - .../linux/flatpak/dev.lizardbyte.sunshine.yml | 44 ------------------- 12 files changed, 82 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d9840849020..6ad4378eb25 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -265,7 +265,6 @@ jobs: libevdev-dev \ libfuse2 \ libminiupnpc-dev \ - libmfx-dev \ libnotify-dev \ libnuma-dev \ libopus-dev \ diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake index 9065687005b..191343fbfa4 100644 --- a/cmake/dependencies/common.cmake +++ b/cmake/dependencies/common.cmake @@ -25,12 +25,6 @@ if(NOT DEFINED FFMPEG_PREPARED_BINARIES) set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl) elseif(UNIX AND NOT APPLE) set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 vdpau X11) - # TODO: remove mfx, it's not used and deprecated - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT SUNSHINE_BUILD_HOMEBREW) - list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) - set(CPACK_DEB_PLATFORM_PACKAGE_DEPENDS "libmfx1,") - set(CPACK_RPM_PLATFORM_PACKAGE_REQUIRES "intel-mediasdk >= 22.3.0,") - endif() endif() set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") diff --git a/docker/clion-toolchain.dockerfile b/docker/clion-toolchain.dockerfile index 204450bf1c9..910e37559d3 100644 --- a/docker/clion-toolchain.dockerfile +++ b/docker/clion-toolchain.dockerfile @@ -63,10 +63,6 @@ apt-get install -y --no-install-recommends \ wget \ x11-xserver-utils \ xvfb -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - apt-get install -y --no-install-recommends \ - libmfx-dev -fi apt-get clean rm -rf /var/lib/apt/lists/* _DEPS diff --git a/docker/debian-bookworm.dockerfile b/docker/debian-bookworm.dockerfile index 34cf29bedc9..ef5d2b4bdee 100644 --- a/docker/debian-bookworm.dockerfile +++ b/docker/debian-bookworm.dockerfile @@ -68,10 +68,6 @@ apt-get install -y --no-install-recommends \ wget \ x11-xserver-utils \ xvfb -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - apt-get install -y --no-install-recommends \ - libmfx-dev -fi apt-get clean rm -rf /var/lib/apt/lists/* _DEPS diff --git a/docker/debian-bullseye.dockerfile b/docker/debian-bullseye.dockerfile index 2a491559083..d909b9201aa 100644 --- a/docker/debian-bullseye.dockerfile +++ b/docker/debian-bullseye.dockerfile @@ -67,10 +67,6 @@ apt-get install -y --no-install-recommends \ wget \ x11-xserver-utils \ xvfb -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - apt-get install -y --no-install-recommends \ - libmfx-dev -fi apt-get clean rm -rf /var/lib/apt/lists/* _DEPS diff --git a/docker/fedora-39.dockerfile b/docker/fedora-39.dockerfile index 262b40fc7ac..6dd40092556 100644 --- a/docker/fedora-39.dockerfile +++ b/docker/fedora-39.dockerfile @@ -65,9 +65,6 @@ dnf -y install \ wget \ which \ xorg-x11-server-Xvfb -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - dnf -y install intel-mediasdk-devel -fi dnf clean all rm -rf /var/cache/yum _DEPS diff --git a/docker/fedora-40.dockerfile b/docker/fedora-40.dockerfile index 94a8a9fa733..d13bdf709c8 100644 --- a/docker/fedora-40.dockerfile +++ b/docker/fedora-40.dockerfile @@ -65,9 +65,6 @@ dnf -y install \ wget \ which \ xorg-x11-server-Xvfb -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - dnf -y install intel-mediasdk-devel -fi dnf clean all rm -rf /var/cache/yum _DEPS diff --git a/docker/ubuntu-22.04.dockerfile b/docker/ubuntu-22.04.dockerfile index e02ca1eba91..b78fe0ec7ae 100644 --- a/docker/ubuntu-22.04.dockerfile +++ b/docker/ubuntu-22.04.dockerfile @@ -67,10 +67,6 @@ apt-get install -y --no-install-recommends \ wget \ x11-xserver-utils \ xvfb -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - apt-get install -y --no-install-recommends \ - libmfx-dev -fi apt-get clean rm -rf /var/lib/apt/lists/* _DEPS diff --git a/docker/ubuntu-24.04.dockerfile b/docker/ubuntu-24.04.dockerfile index 7ef83bfba39..a2f2e684418 100644 --- a/docker/ubuntu-24.04.dockerfile +++ b/docker/ubuntu-24.04.dockerfile @@ -69,10 +69,6 @@ apt-get install -y --no-install-recommends \ wget \ x11-xserver-utils \ xvfb -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - apt-get install -y --no-install-recommends \ - libmfx-dev -fi apt-get clean rm -rf /var/lib/apt/lists/* _DEPS diff --git a/docs/source/building/linux.rst b/docs/source/building/linux.rst index d0d0af6ed9c..5e3d79b765a 100644 --- a/docs/source/building/linux.rst +++ b/docs/source/building/linux.rst @@ -25,7 +25,6 @@ Install Requirements libdrm-dev \ # KMS libevdev-dev \ libminiupnpc-dev \ - libmfx-dev \ # x86_64 only libnotify-dev \ libnuma-dev \ libopus-dev \ @@ -59,7 +58,6 @@ Install Requirements cmake \ gcc \ gcc-c++ \ - intel-mediasdk-devel \ # x86_64 only libappindicator-gtk3-devel \ libcap-devel \ libcurl-devel \ @@ -106,7 +104,6 @@ Install Requirements libdrm-dev \ # KMS libevdev-dev \ libminiupnpc-dev \ - libmfx-dev \ # x86_64 only libnotify-dev \ libnuma-dev \ libopus-dev \ @@ -147,7 +144,6 @@ Install Requirements libdrm-dev \ # KMS libevdev-dev \ libminiupnpc-dev \ - libmfx-dev \ # x86_64 only libnotify-dev \ libnuma-dev \ libopus-dev \ diff --git a/packaging/linux/Arch/PKGBUILD b/packaging/linux/Arch/PKGBUILD index 42e5843b029..e994f0e3a34 100644 --- a/packaging/linux/Arch/PKGBUILD +++ b/packaging/linux/Arch/PKGBUILD @@ -46,7 +46,6 @@ makedepends=('boost' 'npm') optdepends=('cuda: Nvidia GPU encoding support' 'libva-mesa-driver: AMD GPU encoding support' - 'intel-media-driver: Intel GPU encoding support' 'xorg-server-xvfb: Virtual X server for headless testing') provides=('sunshine') diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml index cba627807c3..fc946b51abb 100644 --- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml +++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml @@ -212,50 +212,6 @@ modules: name: gnome-common stable-only: true - - name: intel-mediasdk - disabled: false - buildsystem: cmake - config-opts: - - -DENABLE_OPENCL=ON - - -DENABLE_X11_DRI3=ON - - -DENABLE_WAYLAND=ON - - -DENABLE_ITT=OFF - - -DENABLE_TEXTLOG=OFF - - -DENABLE_STAT=OFF - - -DBUILD_ALL=OFF - - -DBUILD_RUNTIME=ON - - -DBUILD_SAMPLES=OFF - - -DBUILD_TESTS=OFF - - -DBUILD_TOOLS=OFF - - -DUSE_SYSTEM_GTEST=OFF - - -DMFX_ENABLE_KERNELS=ON - only-arches: - - x86_64 - sources: - - type: archive - url: http://archive.ubuntu.com/ubuntu/pool/universe/i/intel-mediasdk/intel-mediasdk_22.3.0.orig.tar.gz - sha256: e1e74229f409e969b70c2b35b1955068de3d40db85ecc42bd6ff501468bc76d7 - - type: archive - url: http://archive.ubuntu.com/ubuntu/pool/universe/i/intel-mediasdk/intel-mediasdk_22.3.0-1.debian.tar.xz - sha256: 024d98d2f63443d2765a90cfe997d104e7b897694889f199ca8fb4d9ffdcf1dc - - type: shell - commands: - - for n in $(cat patches/series); do if [[ $n != "#"* ]]; then patch -Np1 -i "patches/$n" -d .; fi; done - modules: - - name: libdrm - disabled: false - buildsystem: meson - sources: - - type: archive - url: http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm_2.4.110.orig.tar.xz - sha256: eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 - - type: archive - url: http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm_2.4.110-1ubuntu1.debian.tar.xz - sha256: 464b9553861f39beddfaee6b8924734b02a0febfae3968e4ca1360f2972bba8b - - type: shell - commands: - - for n in $(cat patches/series); do if [[ $n != "#"* ]]; then patch -Np1 -i "patches/$n" -d .; fi; done - - name: miniupnpc buildsystem: cmake config-opts: