--- /dev/null
+From 0d033c074b63ab0ef0798128b94b364ce33da93a Mon Sep 17 00:00:00 2001
+From: Ed Baker <edward.baker@intel.com>
+Date: Wed, 8 Jan 2020 13:43:38 -0700
+Subject: [PATCH] Ifdef va_x11 in VP sample for usrptr
+
+When updating libva-utils from 2.4.0 to 2.6.0 in Chrome OS I bumped into
+the following error:
+portage/media-video/libva-utils-2.6.0-r1/work/libva-utils-2.6.0/videoprocess/vppscaling_n_out_usrptr.cpp:41:10: fatal error:
+ 'va/va_x11.h' file not found
+
+Downloaded from upstream PR:
+https://github.com/intel/libva-utils/pull/185
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+Signed-off-by: Edward Baker <edward.baker@intel.com>
+---
+ videoprocess/vppscaling_n_out_usrptr.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/videoprocess/vppscaling_n_out_usrptr.cpp b/videoprocess/vppscaling_n_out_usrptr.cpp
+index 4a3a222..a853442 100644
+--- a/videoprocess/vppscaling_n_out_usrptr.cpp
++++ b/videoprocess/vppscaling_n_out_usrptr.cpp
+@@ -38,7 +38,9 @@
+ #include <va/va.h>
+ #include <va/va_vpp.h>
+ #include "va_display.h"
++#if 0
+ #include <va/va_x11.h>
++#endif
+
+ #define MAX_LEN 1024
+