Bug 1833855 [Linux] Build VA-API FFVPX support Linux/Gtk r=alwu

Differential Revision: https://phabricator.services.mozilla.com/D178636
Thaodan · Jun 22, 2023 · 0ad4303 · 0ad4303
1 parent a0ded01
commit 0ad4303
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/media/ffvpx/config_override.h b/media/ffvpx/config_override.h
@@ -20,7 +20,7 @@
 #undef CONFIG_VP9_VAAPI_HWACCEL
 #undef CONFIG_AV1_VAAPI_HWACCEL
 
-#if defined(MOZ_WAYLAND) && !defined(MOZ_FFVPX_AUDIOONLY)
+#if defined(MOZ_WIDGET_GTK) && !defined(MOZ_FFVPX_AUDIOONLY)
 #define CONFIG_VAAPI 1
 #define CONFIG_VAAPI_1 1
 #define CONFIG_VP8_VAAPI_HWACCEL 1

diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
@@ -113,7 +113,7 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
         'dav1d',
         'media_libdav1d_asm',
     ]
-    if CONFIG['MOZ_WAYLAND']:
+    if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
         LOCAL_INCLUDES += ['/media/mozva']
         SOURCES += [
             'vaapi_av1.c',

diff --git a/media/ffvpx/libavutil/moz.build b/media/ffvpx/libavutil/moz.build
@@ -63,7 +63,7 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
         'timecode.c',
         'video_enc_params.c'
     ]
-    if CONFIG["MOZ_WAYLAND"]:
+    if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
         LOCAL_INCLUDES += ['/media/mozva']
         SOURCES += [
             'hwcontext_vaapi.c',