Disable vaapi
One less dependency to worry about and ffmpeg works fine without it.
This commit is contained in:
@@ -20,7 +20,6 @@ jobs:
|
|||||||
libmad0-dev
|
libmad0-dev
|
||||||
libpulse-dev
|
libpulse-dev
|
||||||
libudev-dev
|
libudev-dev
|
||||||
libva-dev
|
|
||||||
libxinerama-dev
|
libxinerama-dev
|
||||||
libx11-dev
|
libx11-dev
|
||||||
libxrandr-dev
|
libxrandr-dev
|
||||||
|
|||||||
@@ -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)
|
|
||||||
@@ -21,6 +21,7 @@ list(APPEND FFMPEG_CONFIGURE
|
|||||||
"--disable-postproc"
|
"--disable-postproc"
|
||||||
"--disable-programs"
|
"--disable-programs"
|
||||||
"--disable-swresample"
|
"--disable-swresample"
|
||||||
|
"--disable-vaapi"
|
||||||
"--enable-bzlib"
|
"--enable-bzlib"
|
||||||
"--enable-gpl"
|
"--enable-gpl"
|
||||||
"--enable-pthreads"
|
"--enable-pthreads"
|
||||||
@@ -45,8 +46,6 @@ if(MACOSX)
|
|||||||
"Unsupported macOS architecture: ${CMAKE_OSX_ARCHITECTURES}, set CMAKE_OSX_ARCHITECTURES to either arm64 or x86_64"
|
"Unsupported macOS architecture: ${CMAKE_OSX_ARCHITECTURES}, set CMAKE_OSX_ARCHITECTURES to either arm64 or x86_64"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
else()
|
|
||||||
list(APPEND FFMPEG_CONFIGURE "--enable-vaapi")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT WITH_EXTERNAL_WARNINGS)
|
if(NOT WITH_EXTERNAL_WARNINGS)
|
||||||
|
|||||||
@@ -386,7 +386,6 @@ elseif(LINUX)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package("Va")
|
|
||||||
include("${SM_CMAKE_DIR}/SetupFfmpeg.cmake")
|
include("${SM_CMAKE_DIR}/SetupFfmpeg.cmake")
|
||||||
|
|
||||||
set(OpenGL_GL_PREFERENCE GLVND)
|
set(OpenGL_GL_PREFERENCE GLVND)
|
||||||
|
|||||||
Reference in New Issue
Block a user