From 58dd83db8aa8353f17da2f9f99939685ba361f90 Mon Sep 17 00:00:00 2001
From: Martin Natano <natano@natano.net>
Date: Mon, 6 Jun 2022 14:52:33 +0200
Subject: [PATCH] Disable vaapi

One less dependency to worry about and ffmpeg works fine without it.
---
 .github/workflows/ci.yml   |  1 -
 CMake/Modules/FindVa.cmake | 19 -------------------
 CMake/SetupFfmpeg.cmake    |  3 +--
 StepmaniaCore.cmake        |  1 -
 4 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 CMake/Modules/FindVa.cmake

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f77a72ed70..162a672817 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,6 @@ jobs:
           libmad0-dev
           libpulse-dev
           libudev-dev
-          libva-dev
           libxinerama-dev
           libx11-dev
           libxrandr-dev
diff --git a/CMake/Modules/FindVa.cmake b/CMake/Modules/FindVa.cmake
deleted file mode 100644
index 0d0ec9781e..0000000000
--- a/CMake/Modules/FindVa.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# Find the Video Acceleration library.
-
-# The following will be set:
-
-# VA_INCLUDE_DIR VA_LIBRARY VA_FOUND
-# VA_DRM_INCLUDE_DIR VA_DRM_LIBRARY VA_DRM_FOUND
-
-find_path(VA_INCLUDE_DIR NAMES va/va.h)
-find_path(VA_DRM_INCLUDE_DIR NAMES va/va_drm.h)
-
-find_library(VA_LIBRARY NAMES "va" REQUIRED)
-find_library(VA_DRM_LIBRARY NAMES "va-drm" REQUIRED)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(VA DEFAULT_MSG VA_LIBRARY VA_INCLUDE_DIR)
-find_package_handle_standard_args(VA_DRM DEFAULT_MSG VA_DRM_LIBRARY VA_DRM_INCLUDE_DIR)
-
-mark_as_advanced(VA_LIBRARY VA_INCLUDE_DIR
-		 VA_DRM_LIBRARY VA_DRM_INCLUDE_DIR)
diff --git a/CMake/SetupFfmpeg.cmake b/CMake/SetupFfmpeg.cmake
index aa75a53475..7c2915c53b 100644
--- a/CMake/SetupFfmpeg.cmake
+++ b/CMake/SetupFfmpeg.cmake
@@ -21,6 +21,7 @@ list(APPEND FFMPEG_CONFIGURE
             "--disable-postproc"
             "--disable-programs"
             "--disable-swresample"
+            "--disable-vaapi"
             "--enable-bzlib"
             "--enable-gpl"
             "--enable-pthreads"
@@ -45,8 +46,6 @@ if(MACOSX)
       "Unsupported macOS architecture: ${CMAKE_OSX_ARCHITECTURES}, set CMAKE_OSX_ARCHITECTURES to either arm64 or x86_64"
     )
   endif()
-else()
-  list(APPEND FFMPEG_CONFIGURE "--enable-vaapi")
 endif()
 
 if(NOT WITH_EXTERNAL_WARNINGS)
diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index a6257b5b5c..b6b7a69f23 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -386,7 +386,6 @@ elseif(LINUX)
     )
   endif()
 
-  find_package("Va")
   include("${SM_CMAKE_DIR}/SetupFfmpeg.cmake")
 
   set(OpenGL_GL_PREFERENCE GLVND)