Add CONFIG_VAAPI_(DRM|GLX|X11)

so they can be disabled separately.  Gentoo removed the GLX
backend for libva to simplify packaging.

<GL/glx.h> is included by <va/va_glx.h>, so it doesn't need
to be checked separately.

Author: ulmus-scott

cmake/CheckExternalLibraries.cmake

@@ -107,12 +107,27 @@ if(ENABLE_VAAPI)
   add_build_config(PkgConfig::VDPAU "vaapi")
   if(TARGET PkgConfig::VAAPI)
     set(CONFIG_VAAPI TRUE)
-    pkg_check_modules(VA-DRM "libva-drm" REQUIRED IMPORTED_TARGET)
-    pkg_check_modules(VA-GLX "libva-glx" REQUIRED IMPORTED_TARGET)
-    pkg_check_modules(VA-X11 "libva-x11" REQUIRED IMPORTED_TARGET)
-    target_link_libraries(
-      PkgConfig::VAAPI INTERFACE PkgConfig::VA-X11 PkgConfig::VA-GLX
-                                 PkgConfig::VA-DRM)
+
+    pkg_check_modules(VA-DRM "libva-drm" IMPORTED_TARGET)
+    add_build_config(PkgConfig::VAAPI-DRM "vaapi_drm")
+    if(VA-DRM_FOUND)
+      set(CONFIG_VAAPI_DRM TRUE)
+      target_link_libraries(PkgConfig::VAAPI INTERFACE PkgConfig::VA-DRM)
+    endif()
+
+    pkg_check_modules(VA-GLX "libva-glx" IMPORTED_TARGET)
+    add_build_config(PkgConfig::VAAPI-GLX "vaapi_glx")
+    if(VA-GLX_FOUND)
+      set(CONFIG_VAAPI_GLX TRUE)
+      target_link_libraries(PkgConfig::VAAPI INTERFACE PkgConfig::VA-GLX)
+    endif()
+
+    pkg_check_modules(VA-X11 "libva-x11" IMPORTED_TARGET)
+    add_build_config(PkgConfig::VAAPI-X11 "vaapi_x11")
+    if(VA-X11_FOUND)
+      set(CONFIG_VAAPI_X11 TRUE)
+      target_link_libraries(PkgConfig::VAAPI INTERFACE PkgConfig::VA-X11)
+    endif()
   endif()
 endif()
 

mythtv/cmake/PrintConfig.cmake

@@ -167,7 +167,7 @@ if(ENABLE_FRONTEND)
   if(APPLE)
     message_vrbl("VideoToolBox support    " APPLE_VIDEOTOOLBOX_LIBRARY)
   endif()
-  message_trgt("VAAPI support           " PkgConfig::VAAPI)
+  message_trgt("VAAPI support           " PkgConfig::VAAPI "DRM ${CONFIG_VAAPI_DRM}, GLX ${CONFIG_VAAPI_GLX}, X11 ${CONFIG_VAAPI_X11}")
   message_trgt("DRM support             " PkgConfig::DRM)
   if(TARGET PkgConfig::DRM)
     message_trgt("DRM Qt integration      " Qt${QT_VERSION_MAJOR}::GuiPrivate)

mythtv/configure

@@ -1699,6 +1699,7 @@ HAVE_LIST="
     threads
     uwp
     vaapi_drm
+    vaapi_glx
     vaapi_x11
     vdpau_x11
     winrt
@@ -1750,6 +1751,9 @@ MYTHTV_CONFIG_LIST='
     qtdbus
     sqlite3
     taglib
+    vaapi_drm
+    vaapi_glx
+    vaapi_x11
     v4l2
     v4l2prime
     valgrind
@@ -5440,7 +5444,6 @@ enabled libaom   && use_pkg_config libaom "aom >= 2.0.0" aom/aom_codec.h aom_cod
 enabled libdav1d && use_pkg_config libdav1d "dav1d >= 0.4.0" "dav1d/dav1d.h" dav1d_version || disable libdav1d
 
 enabled vaapi && enabled opengl &&
-    check_header GL/glx.h &&
     check_lib vaapi va/va.h vaInitialize -lva &&
     $(pkg-config --atleast-version=1.2 libva) &&
     enable  vaapi ||
@@ -5449,6 +5452,9 @@ enabled vaapi && enabled opengl &&
 enabled vaapi &&
     check_lib vaapi_drm "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm
 
+enabled vaapi &&
+    check_lib vaapi_glx "va/va.h va/va_glx.h" vaGetDisplayGLX -lva -lva-glx
+
 enabled vaapi &&
     check_lib vaapi_x11 "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 -lX11
 
@@ -6644,7 +6650,7 @@ if enabled frontend; then
   if test x"$target_os" = x"darwin" ; then
     echo "VideoToolBox support      ${videotoolbox-no}"
   fi
-  echo "VAAPI support             ${vaapi-no}"
+  echo "VAAPI support             ${vaapi-no} (DRM ${vaapi_drm-no}, GLX ${vaapi_glx-no}, X11 ${vaapi_x11-no})"
   echo "DRM support               ${drm-no}"
   if enabled drm; then
     echo "DRM Qt integration        ${qtprivateheaders-no}"

mythtv/libs/libmythbase/mythconfig.h.in

@@ -75,6 +75,9 @@
 #cmakedefine01 CONFIG_V4L2
 #cmakedefine01 CONFIG_V4L2PRIME
 #cmakedefine01 CONFIG_VAAPI
+#cmakedefine01 CONFIG_VAAPI_DRM
+#cmakedefine01 CONFIG_VAAPI_GLX
+#cmakedefine01 CONFIG_VAAPI_X11
 #cmakedefine01 CONFIG_VALGRIND
 #cmakedefine01 CONFIG_VBOX
 #cmakedefine01 CONFIG_VDPAU

mythtv/libs/libmythtv/cmake/Frontend.cmake

@@ -245,9 +245,13 @@ if(TARGET any_opengl)
             visualisations/opengl/mythvisualmonoscopeopengl.cpp
             visualisations/opengl/mythvisualmonoscopeopengl.h)
   if(TARGET PkgConfig::VAAPI)
-    target_sources(
-      mythtv PRIVATE opengl/mythvaapiinterop.h opengl/mythvaapiglxinterop.h
-                     opengl/mythvaapiinterop.cpp opengl/mythvaapiglxinterop.cpp)
+    target_sources(mythtv PRIVATE opengl/mythvaapiinterop.h
+                                  opengl/mythvaapiinterop.cpp)
+    if(CONFIG_VAAPI_GLX)
+      target_sources(mythtv PRIVATE opengl/mythvaapiglxinterop.h
+                                    opengl/mythvaapiglxinterop.cpp)
+    endif()
+
     if(TARGET PkgConfig::VDPAU AND TARGET X11::X11)
       target_sources(mythtv PRIVATE opengl/mythvdpauinterop.h
                                     opengl/mythvdpauinterop.cpp)
@@ -276,7 +280,7 @@ if(TARGET any_opengl)
       target_sources(mythtv PRIVATE opengl/mythmmalinterop.cpp
                                     opengl/mythmmalinterop.h)
     endif()
-    if(TARGET PkgConfig::VAAPI)
+    if(CONFIG_VAAPI_DRM)
       target_sources(mythtv PRIVATE opengl/mythvaapidrminterop.cpp
                                     opengl/mythvaapidrminterop.h)
     endif()

mythtv/libs/libmythtv/libmythtv.pro

@@ -504,7 +504,7 @@ using_frontend {
     using_vaapi {
         HEADERS += decoders/mythvaapicontext.h
         SOURCES += decoders/mythvaapicontext.cpp
-        LIBS    += -lva -lva-x11 -lva-glx -lva-drm
+        LIBS    += -lva
     }
 
     using_nvdec {
@@ -568,8 +568,17 @@ using_frontend {
 
 
         using_vaapi {
-            HEADERS += opengl/mythvaapiinterop.h   opengl/mythvaapiglxinterop.h
-            SOURCES += opengl/mythvaapiinterop.cpp opengl/mythvaapiglxinterop.cpp
+            HEADERS += opengl/mythvaapiinterop.h
+            SOURCES += opengl/mythvaapiinterop.cpp
+            LIBS    += -lva
+            using_vaapi_glx {
+                HEADERS += opengl/mythvaapiglxinterop.h
+                SOURCES += opengl/mythvaapiglxinterop.cpp
+                LIBS    += -lva-glx
+                using_vaapi_x11 {
+                    LIBS    += -lva-x11
+                }
+            }
         }
 
         using_vdpau:using_x11 {
@@ -605,9 +614,10 @@ using_frontend {
                 SOURCES += opengl/mythmmalinterop.cpp
             }
 
-            using_vaapi {
+            using_vaapi_drm {
                 HEADERS += opengl/mythvaapidrminterop.h
                 SOURCES += opengl/mythvaapidrminterop.cpp
+                LIBS    += -lva-drm
             }
         }
 

mythtv/libs/libmythtv/opengl/mythvaapiglxinterop.cpp

@@ -1,5 +1,6 @@
 #include "opengl/mythvaapiglxinterop.h"
 
+#if CONFIG_VAAPI_X11
 #define Cursor XCursor // Prevent conflicts with Qt6.
 #define pointer Xpointer // Prevent conflicts with Qt6.
 #if defined(_X11_XLIB_H_) && !defined(Bool)
@@ -10,6 +11,8 @@
 #undef Cursor
 #undef pointer
 #undef Bool            // Interferes with cmake moc file compilation
+#endif // CONFIG_VAAPI_X11
+
 #include <va/va_glx.h>
 
 // MythTV
@@ -322,6 +325,7 @@ MythVAAPIInteropGLXCopy::Acquire(MythRenderOpenGL* Context,
     return result;
 }
 
+#if CONFIG_VAAPI_X11
 MythVAAPIInteropGLXPixmap::MythVAAPIInteropGLXPixmap(MythPlayerUI* Player, MythRenderOpenGL* Context)
   : MythVAAPIInteropGLX(Player, Context, GL_VAAPIGLXPIX)
 {
@@ -504,3 +508,4 @@ bool MythVAAPIInteropGLXPixmap::IsSupported(MythRenderOpenGL* Context)
     QByteArray extensions(glXQueryExtensionsString(display, screen));
     return extensions.contains("GLX_EXT_texture_from_pixmap");
 }
+#endif // CONFIG_VAAPI_X11

mythtv/libs/libmythtv/opengl/mythvaapiglxinterop.h

@@ -2,6 +2,8 @@
 #define MYTHVAAPIGLXNTEROP_H
 
 // MythTV
+#include "libmythbase/mythconfig.h"
+
 #include "libmythui/opengl/mythrenderopengl.h"
 
 #include "libmythtv/mythframe.h"
@@ -47,8 +49,19 @@ class MythVAAPIInteropGLXCopy : public MythVAAPIInteropGLX
     void* m_glxSurface { nullptr };
 };
 
-#include "GL/glx.h"
-#include "GL/glxext.h"
+#if CONFIG_VAAPI_X11
+#define Cursor XCursor // Prevent conflicts with Qt6.
+#define pointer Xpointer // Prevent conflicts with Qt6.
+#if defined(_X11_XLIB_H_) && !defined(Bool)
+#define Bool int
+#endif
+#include <GL/glx.h>
+#include <GL/glxext.h>
+#undef None            // X11/X.h defines this. Causes compile failure in Qt6.
+#undef Cursor
+#undef pointer
+#undef Bool            // Interferes with cmake moc file compilation
+
 using MYTH_GLXBINDTEXIMAGEEXT = void (*)(Display*, GLXDrawable, int, int*);
 using MYTH_GLXRELEASETEXIMAGEEXT = void (*)(Display*, GLXDrawable, int);
 
@@ -73,6 +86,6 @@ class MythVAAPIInteropGLXPixmap : public MythVAAPIInteropGLX
     MYTH_GLXBINDTEXIMAGEEXT    m_glxBindTexImageEXT    { nullptr };
     MYTH_GLXRELEASETEXIMAGEEXT m_glxReleaseTexImageEXT { nullptr };
 };
-
+#endif // CONFIG_VAAPI_X11
 
 #endif // MYTHVAAPIGLXNTEROP_H

mythtv/libs/libmythtv/opengl/mythvaapiinterop.cpp

@@ -13,8 +13,12 @@
 #include "mythplayerui.h"
 #include "mythvideocolourspace.h"
 #include "fourcc.h"
+#if CONFIG_VAAPI_DRM
 #include "mythvaapidrminterop.h"
+#endif
+#if CONFIG_VAAPI_GLX
 #include "mythvaapiglxinterop.h"
+#endif
 
 extern "C" {
 #include "libavfilter/buffersrc.h"
@@ -46,9 +50,9 @@ void MythVAAPIInterop::GetVAAPITypes(MythRenderOpenGL* Context, MythInteropGPU::
         return;
 
     OpenGLLocker locker(Context);
-    bool egl = Context->IsEGL();
-    bool opengles = Context->isOpenGLES();
-    bool wayland = qgetenv("XDG_SESSION_TYPE").contains("wayland");
+    [[maybe_unused]] bool egl = Context->IsEGL();
+    [[maybe_unused]] bool opengles = Context->isOpenGLES();
+    [[maybe_unused]] bool wayland = qgetenv("XDG_SESSION_TYPE").contains("wayland");
 
     // best first
     MythInteropGPU::InteropTypes vaapitypes;
@@ -58,17 +62,21 @@ void MythVAAPIInterop::GetVAAPITypes(MythRenderOpenGL* Context, MythInteropGPU::
         vaapitypes.emplace_back(DRM_DRMPRIME);
 #endif
 
-#if CONFIG_EGL
+#if CONFIG_VAAPI_DRM && CONFIG_EGL
     // zero copy
     if (egl && MythVAAPIInteropDRM::IsSupported(Context))
         vaapitypes.emplace_back(GL_VAAPIEGLDRM);
 #endif
+#if CONFIG_VAAPI_GLX
+#   if CONFIG_VAAPI_X11
     // 1x copy
     if (!egl && !wayland && MythVAAPIInteropGLXPixmap::IsSupported(Context))
         vaapitypes.emplace_back(GL_VAAPIGLXPIX);
+#   endif
     // 2x copy
     if (!egl && !opengles && !wayland)
         vaapitypes.emplace_back(GL_VAAPIGLXCOPY);
+#endif
 
     if (!vaapitypes.empty())
         Types[FMT_VAAPI] = vaapitypes;
@@ -82,16 +90,20 @@ MythVAAPIInterop* MythVAAPIInterop::CreateVAAPI(MythPlayerUI *Player, MythRender
     const auto & types = Player->GetInteropTypes();
     if (const auto & vaapi = types.find(FMT_VAAPI); vaapi != types.cend())
     {
-        for (auto type : vaapi->second)
+        for ([[maybe_unused]] auto type : vaapi->second)
         {
-#if CONFIG_EGL
+#if CONFIG_VAAPI_DRM && CONFIG_EGL
             if ((type == GL_VAAPIEGLDRM) || (type == DRM_DRMPRIME))
                 return new MythVAAPIInteropDRM(Player, Context, type);
 #endif
+#if CONFIG_VAAPI_GLX
+#   if CONFIG_VAAPI_X11
             if (type == GL_VAAPIGLXPIX)
                 return new MythVAAPIInteropGLXPixmap(Player, Context);
+#   endif
             if (type == GL_VAAPIGLXCOPY)
                 return new MythVAAPIInteropGLXCopy(Player, Context);
+#endif
         }
     }
     return nullptr;