multimedia/libva-intel-media-driver: update to 20.3.p2

Changes:	https://github.com/intel/media-driver/compare/intel-media-20.2.0...intel-media-20.3.pre2
Reported by:	GitHub (watch releases)

3 files changed, 60 insertions, 4 deletions

diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile
index 48fee38564d6..492db1c3a5aa 100644
--- a/multimedia/libva-intel-media-driver/Makefile
+++ b/multimedia/libva-intel-media-driver/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	media-driver
 DISTVERSIONPREFIX=	intel-media-
-DISTVERSION=	20.2.0
+DISTVERSION=	20.3.pre2
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-intel-
 
diff --git a/multimedia/libva-intel-media-driver/distinfo b/multimedia/libva-intel-media-driver/distinfo
index edf4033cbea6..da35df470f4c 100644
--- a/multimedia/libva-intel-media-driver/distinfo
+++ b/multimedia/libva-intel-media-driver/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1593769296
-SHA256 (intel-media-driver-intel-media-20.2.0_GH0.tar.gz) = 1cdd40517d9fee51e3760beea23d2a19c2d5fcb1d6a9ed2bc0af7318d0d3100f
-SIZE (intel-media-driver-intel-media-20.2.0_GH0.tar.gz) = 21860711
+TIMESTAMP = 1594284046
+SHA256 (intel-media-driver-intel-media-20.3.pre2_GH0.tar.gz) = 4d3b3ad31a64879454c7cd84866a2c87ee2e5b6dec07ff2efdbb869af4a496f8
+SIZE (intel-media-driver-intel-media-20.3.pre2_GH0.tar.gz) = 22256633
 SHA256 (2bd42cddbe7c.patch) = 8ddca9a1e793dcbc6876aa53d6e93b900a2a32bc5183f92af66158d7fe16479f
 SIZE (2bd42cddbe7c.patch) = 1241
 SHA256 (0ef9d7bd97ac.patch) = 1c159b93f2832b825811d8ca5386facfd430ba02f90b73877b5737292d9d881f
diff --git a/multimedia/libva-intel-media-driver/files/patch-libva-2.8 b/multimedia/libva-intel-media-driver/files/patch-libva-2.8
new file mode 100644
index 000000000000..290f5d60353f
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-libva-2.8
@@ -0,0 +1,56 @@
+Drop after multimedia/libva is updated to 2.9.0.
+
+media_driver/linux/common/ddi/media_libva.cpp:3849:23: error: use of undeclared identifier 'VA_TIMEOUT_INFINITE'
+    if (timeout_ns == VA_TIMEOUT_INFINITE)
+                      ^
+media_driver/linux/common/ddi/media_libva.cpp:3856:20: error: use of undeclared identifier 'VA_STATUS_ERROR_TIMEDOUT'
+            return VA_STATUS_ERROR_TIMEDOUT;
+                   ^
+media_driver/linux/common/ddi/media_libva.cpp:3884:24: error: use of undeclared identifier 'VA_STATUS_ERROR_TIMEDOUT'
+                return VA_STATUS_ERROR_TIMEDOUT;
+                       ^
+media_driver/linux/common/ddi/media_libva.cpp:3917:23: error: use of undeclared identifier 'VA_TIMEOUT_INFINITE'
+    if (timeout_ns == VA_TIMEOUT_INFINITE)
+                      ^
+media_driver/linux/common/ddi/media_libva.cpp:3924:20: error: use of undeclared identifier 'VA_STATUS_ERROR_TIMEDOUT'
+            return VA_STATUS_ERROR_TIMEDOUT;
+                   ^
+media_driver/linux/common/ddi/media_libva.cpp:3952:24: error: use of undeclared identifier 'VA_STATUS_ERROR_TIMEDOUT'
+                return VA_STATUS_ERROR_TIMEDOUT;
+                       ^
+media_driver/linux/common/ddi/media_libva.cpp:6764:14: error: no member named 'vaSyncSurface2' in 'VADriverVTable'
+    pVTable->vaSyncSurface2                  = DdiMedia_SyncSurface2;
+    ~~~~~~~  ^
+media_driver/linux/common/ddi/media_libva.cpp:6765:14: error: no member named 'vaSyncBuffer' in 'VADriverVTable'
+    pVTable->vaSyncBuffer                    = DdiMedia_SyncBuffer;
+    ~~~~~~~  ^
+
+--- media_driver/linux/common/ddi/media_libva.cpp.orig	2020-07-09 08:40:46 UTC
++++ media_driver/linux/common/ddi/media_libva.cpp
+@@ -3815,6 +3815,7 @@ static VAStatus DdiMedia_SyncSurface (
+     return DdiMedia_StatusCheck(mediaCtx, surface, render_target);
+ }
+ 
++#if VA_CHECK_VERSION(1,9,0)
+ /*
+  * This function blocks until all pending operations on the surface have been 
+  * completed or exceed timeout.  Upon return it is safe to use the render target for a
+@@ -3956,6 +3957,7 @@ static VAStatus DdiMedia_SyncBuffer (
+ 
+     return VA_STATUS_SUCCESS;
+ }
++#endif
+ 
+ /*
+  * Find out any pending ops on the render target
+@@ -6761,8 +6763,10 @@ VAStatus __vaDriverInit(VADriverContextP ctx )
+     pVTable->vaRenderPicture                 = DdiMedia_RenderPicture;
+     pVTable->vaEndPicture                    = DdiMedia_EndPicture;
+     pVTable->vaSyncSurface                   = DdiMedia_SyncSurface;
++#if VA_CHECK_VERSION(1,9,0)
+     pVTable->vaSyncSurface2                  = DdiMedia_SyncSurface2;
+     pVTable->vaSyncBuffer                    = DdiMedia_SyncBuffer;
++#endif
+     pVTable->vaQuerySurfaceStatus            = DdiMedia_QuerySurfaceStatus;
+     pVTable->vaQuerySurfaceError             = DdiMedia_QuerySurfaceError;
+     pVTable->vaQuerySurfaceAttributes        = DdiMedia_QuerySurfaceAttributes;