From 59f0ae7b86c6acfd7c7a2f78fda1d92460759118 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Sun, 15 Jan 2023 13:29:30 -0500 Subject: [PATCH 1/4] Link mfx on Linux --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a764b77a823..ad8ed5ae75d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -463,7 +463,7 @@ else() else() set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-x86_64") endif() - set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) + set(FFMPEG_PLATFORM_LIBRARIES mfx va va-drm va-x11 vdpau X11) endif() set(FFMPEG_INCLUDE_DIRS ${FFMPEG_PREPARED_BINARIES}/include) From 4bf37b3aa3cbee54de2d195f22db1e72228fe0e7 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Sun, 15 Jan 2023 18:58:01 -0500 Subject: [PATCH 2/4] Exclude for aarch64, use official rpm --- CMakeLists.txt | 3 ++- docker/fedora-36.dockerfile | 6 +----- docker/fedora-37.dockerfile | 6 +----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad8ed5ae75d..7c8852516e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -458,12 +458,13 @@ elseif(APPLE) set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64") endif() else() + set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") else() set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-x86_64") + append(FFMPEG_PLATFORM_LIBRARIES mfx) endif() - set(FFMPEG_PLATFORM_LIBRARIES mfx va va-drm va-x11 vdpau X11) endif() set(FFMPEG_INCLUDE_DIRS ${FFMPEG_PREPARED_BINARIES}/include) diff --git a/docker/fedora-36.dockerfile b/docker/fedora-36.dockerfile index 4090382ffc8..3911dd031f3 100644 --- a/docker/fedora-36.dockerfile +++ b/docker/fedora-36.dockerfile @@ -22,6 +22,7 @@ dnf -y install \ cmake-3.22.2* \ gcc-12.0.1* \ gcc-c++-12.0.1* \ + intel-mediasdk-devel-22.3.0* \ libcap-devel-2.48* \ libcurl-devel-7.82.0* \ libdrm-devel-2.4.110* \ @@ -45,11 +46,6 @@ dnf -y install \ rpm-build-4.17.0* \ wget-1.21.3* \ which-2.21* -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - apt-get install -y --no-install-recommends \ - # libmfx-devel is not listed for fedora 36/37 - https://kojipkgs.fedoraproject.org//packages/libmfx/1.25/4.el8/x86_64/libmfx-devel-1.25-4.el8.x86_64.rpm -fi dnf clean all rm -rf /var/cache/yum _DEPS diff --git a/docker/fedora-37.dockerfile b/docker/fedora-37.dockerfile index 2a49dc3e26d..c03c6889a93 100644 --- a/docker/fedora-37.dockerfile +++ b/docker/fedora-37.dockerfile @@ -22,6 +22,7 @@ dnf -y install \ cmake-3.24.1* \ gcc-12.2.1* \ gcc-c++-12.2.1* \ + intel-mediasdk-devel-22.4.4* \ libcap-devel-2.48* \ libcurl-devel-7.85.0* \ libdrm-devel-2.4.112* \ @@ -45,11 +46,6 @@ dnf -y install \ rpm-build-4.18.0* \ wget-1.21.3* \ which-2.21* -if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then - apt-get install -y --no-install-recommends \ - # libmfx-devel is not listed for fedora 36/37 - https://kojipkgs.fedoraproject.org//packages/libmfx/1.25/4.el8/x86_64/libmfx-devel-1.25-4.el8.x86_64.rpm -fi dnf clean all rm -rf /var/cache/yum _DEPS From dec2f93aa19bec2863f82620b9fbe568fcb7d980 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Sun, 15 Jan 2023 20:18:04 -0500 Subject: [PATCH 3/4] Only install on amd64 --- docker/fedora-36.dockerfile | 4 +++- docker/fedora-37.dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/fedora-36.dockerfile b/docker/fedora-36.dockerfile index 3911dd031f3..f566db759f5 100644 --- a/docker/fedora-36.dockerfile +++ b/docker/fedora-36.dockerfile @@ -22,7 +22,6 @@ dnf -y install \ cmake-3.22.2* \ gcc-12.0.1* \ gcc-c++-12.0.1* \ - intel-mediasdk-devel-22.3.0* \ libcap-devel-2.48* \ libcurl-devel-7.82.0* \ libdrm-devel-2.4.110* \ @@ -46,6 +45,9 @@ dnf -y install \ rpm-build-4.17.0* \ wget-1.21.3* \ which-2.21* +if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then + dnf -y install intel-mediasdk-devel-22.3.0* +fi dnf clean all rm -rf /var/cache/yum _DEPS diff --git a/docker/fedora-37.dockerfile b/docker/fedora-37.dockerfile index c03c6889a93..7312e95fed7 100644 --- a/docker/fedora-37.dockerfile +++ b/docker/fedora-37.dockerfile @@ -22,7 +22,6 @@ dnf -y install \ cmake-3.24.1* \ gcc-12.2.1* \ gcc-c++-12.2.1* \ - intel-mediasdk-devel-22.4.4* \ libcap-devel-2.48* \ libcurl-devel-7.85.0* \ libdrm-devel-2.4.112* \ @@ -46,6 +45,9 @@ dnf -y install \ rpm-build-4.18.0* \ wget-1.21.3* \ which-2.21* +if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then + dnf -y install intel-mediasdk-devel-22.4.4* +fi dnf clean all rm -rf /var/cache/yum _DEPS From cd0f3bf903c4d9f56030ad95fa0f96130bd29f7f Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Sun, 15 Jan 2023 21:17:03 -0500 Subject: [PATCH 4/4] Fix library append --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c8852516e8..db58471d8cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -463,7 +463,7 @@ else() set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") else() set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-x86_64") - append(FFMPEG_PLATFORM_LIBRARIES mfx) + list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) endif() endif() set(FFMPEG_INCLUDE_DIRS