onevpl: upgrade 2021.4.0 -> 2021.5.0

What's new in this release:
* Added option to build dispatcher as a static library
* Added ability to build dispatcher under MinGW
* Fixes for tools and samples

Added patch:
  0001-Fix-compile-issue-with-CMAKE_CXX_FLAGS-setting.patch

Dropped upstreamed patches:
  0001-Adding-Wayland-support-to-legacy-tools.patch
  0001-Adding-X11-DRI3-support.patch
  0001-Corrected-the-install-path.patch
  0001-Fix-sample_multi_transcode-join-issue.patch

Signed-off-by: Yew, Chang Ching <chang.ching.yew@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

recipes-multimedia/onevpl/onevpl/0001-Adding-X11-DRI3-support.patch

@@ -1,39 +0,0 @@
-From 5943f3dcca3ce715e7f721535a031d137255fb70 Mon Sep 17 00:00:00 2001
-From: "Yew, Chang Ching" <chang.ching.yew@intel.com>
-Date: Thu, 1 Jul 2021 11:16:33 +0800
-Subject: [PATCH] Adding X11 DRI3 support
-
-Upstream-Status: Backport
-inner-source #e8e7b97
-
-Signed-off-by: Teng, Jin Chung <jin.chung.teng@intel.com>
-Signed-off-by: Yew, Chang Ching <chang.ching.yew@intel.com>
----
- tools/legacy/sample_common/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/legacy/sample_common/CMakeLists.txt b/tools/legacy/sample_common/CMakeLists.txt
-index b4710f6..5fd97da 100644
---- a/tools/legacy/sample_common/CMakeLists.txt
-+++ b/tools/legacy/sample_common/CMakeLists.txt
-@@ -73,6 +73,7 @@ if(UNIX)
-   pkg_check_modules(PKG_LIBDRM libdrm)
-   pkg_check_modules(PKG_X11 x11)
-   pkg_check_modules(PKG_LIBVA_X11 libva-x11>=1.10.0)
-+  pkg_check_modules(PKG_XCB xcb xcb-dri3 x11-xcb xcb-present)
-   pkg_check_modules(PKG_WAYLAND_CLIENT wayland-client)
-   if(PKG_LIBVA_FOUND)
-     target_compile_definitions(${TARGET} PUBLIC -DLIBVA_SUPPORT)
-@@ -89,6 +90,9 @@ if(UNIX)
-   if(PKG_X11_FOUND)
-     target_compile_definitions(${TARGET} PUBLIC -DLIBVA_X11_SUPPORT)
-     target_include_directories(${TARGET} PUBLIC ${PKG_X11_LIBRARY_DIRS})
-+    if(PKG_XCB_FOUND)
-+      target_compile_definitions(${TARGET} PUBLIC -DX11_DRI3_SUPPORT)
-+    endif()
-   else()
-     message(WARNING "x11 modules not found: building without libVA X11 support")
-   endif()
--- 
-2.32.0
-

recipes-multimedia/onevpl/onevpl/0001-Corrected-the-install-path.patch

@@ -1,53 +0,0 @@
-From 0e2c56260a3ccddcccb5daa0c8aac3c6b92214ac Mon Sep 17 00:00:00 2001
-From: tengjinchung <jin.chung.teng@intel.com>
-Date: Thu, 17 Jun 2021 14:43:48 +0800
-Subject: [PATCH] Corrected the install path
-
-Fix CMake install path of libvpl_wayland.so to
-$LIBDIR
-
-Upstream-Status: Pending
-inner-source pr #133
-
-Signed-off-by: jinchung <jin.chung.teng@intel.com>
-Signed-off-by: Yew, Chang Ching <chang.ching.yew@intel.com>
----
- tools/legacy/sample_common/src/vaapi_utils.cpp  | 2 +-
- tools/legacy/sample_misc/wayland/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/legacy/sample_common/src/vaapi_utils.cpp b/tools/legacy/sample_common/src/vaapi_utils.cpp
-index 833b4c1..23edf86 100644
---- a/tools/legacy/sample_common/src/vaapi_utils.cpp
-+++ b/tools/legacy/sample_common/src/vaapi_utils.cpp
-@@ -163,7 +163,7 @@ Xcbpresent_Proxy::~Xcbpresent_Proxy() {}
-     #if defined(LIBVA_WAYLAND_SUPPORT)
-
- VA_WaylandClientProxy::VA_WaylandClientProxy()
--        : lib("libmfx_wayland.so"),
-+        : lib("libvpl_wayland.so"),
-           SIMPLE_LOADER_FUNCTION(WaylandCreate) {}
-
- VA_WaylandClientProxy::~VA_WaylandClientProxy() {}
-diff --git a/tools/legacy/sample_misc/wayland/CMakeLists.txt b/tools/legacy/sample_misc/wayland/CMakeLists.txt
-index 95057d4..90b55ca 100644
---- a/tools/legacy/sample_misc/wayland/CMakeLists.txt
-+++ b/tools/legacy/sample_misc/wayland/CMakeLists.txt
-@@ -2,7 +2,7 @@ if (NOT PKG_WAYLAND_CLIENT_FOUND)
-     return()
- endif()
-
--set(TARGET mfx_wayland)
-+set(TARGET vpl_wayland)
-
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(PKG_WAYLAND_CLIENT wayland-client)
-@@ -26,4 +26,4 @@ target_sources(${TARGET} PRIVATE
-
- target_link_libraries(${TARGET} sample_common wayland-client va drm drm_intel)
-
--install( TARGETS ${TARGETS} LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR} )
-+install( TARGETS ${TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
---
-2.32.0
-

recipes-multimedia/onevpl/onevpl/0001-Fix-compile-issue-with-CMAKE_CXX_FLAGS-setting.patch

@@ -0,0 +1,31 @@
+From f6af035d8cfee4a40a5d02349bf111c3af25432e Mon Sep 17 00:00:00 2001
+From: "Yew, Chang Ching" <chang.ching.yew@intel.com>
+Date: Thu, 12 Aug 2021 07:33:39 +0800
+Subject: [PATCH] Fix compile issue with CMAKE_CXX_FLAGS setting
+
+Appends new options to CMAKE_CXX_FLAGS
+
+Upstream-Status: Submitted
+innersource PR #193
+
+Signed-off-by: Yew, Chang Ching <chang.ching.yew@intel.com>
+---
+ cmake/CompileOptions.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
+index 2a941b10..97c3f47a 100644
+--- a/cmake/CompileOptions.cmake
++++ b/cmake/CompileOptions.cmake
+@@ -50,7 +50,7 @@ else()
+     add_compile_options("-fstack-protector-strong")
+   endif()
+   if(NOT MINGW)
+-    set(CMAKE_CXX_FLAGS "-z relro -z now -z noexecstack")
++    set(CMAKE_CXX_FLAGS "-z relro -z now -z noexecstack ${CMAKE_CXX_FLAGS}")
+   endif()
+   add_compile_options("-Wall")
+   if(ENABLE_WARNING_AS_ERROR)
+-- 
+2.32.0
+

recipes-multimedia/onevpl/onevpl/0001-Fix-sample_multi_transcode-join-issue.patch

@@ -1,37 +0,0 @@
-From 607535701900cb0d46354d70e2cfceb1986e7051 Mon Sep 17 00:00:00 2001
-From: "Park, Seunghyuk H" <seunghyuk.h.park@intel.com>
-Date: Sat, 17 Jul 2021 10:37:08 -0700
-Subject: [PATCH] Fix sample_multi_transcode join issue
-
-Upstream-Status: Backport
-inner-source #157fadd2f
-
----
- .../sample_multi_transcode/src/pipeline_transcode.cpp       | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/legacy/sample_multi_transcode/src/pipeline_transcode.cpp b/tools/legacy/sample_multi_transcode/src/pipeline_transcode.cpp
-index fee3b9e0..50a000d0 100644
---- a/tools/legacy/sample_multi_transcode/src/pipeline_transcode.cpp
-+++ b/tools/legacy/sample_multi_transcode/src/pipeline_transcode.cpp
-@@ -342,14 +342,14 @@ mfxStatus CTranscodingPipeline::DecodePreInit(sInputParams *pParams) {
-             MSDK_CHECK_STATUS(sts, "InitDecMfxParams failed");
-         }
-     }
--#if !defined(MFX_ONEVPL)
-     else {
--        m_mfxDecParams         = m_pParentPipeline->GetDecodeParam(TargetID);
-+        m_mfxDecParams = m_pParentPipeline->GetDecodeParam(TargetID);
-+#if !defined(MFX_ONEVPL)
-         auto mvc               = m_mfxDecParams.AddExtBuffer<mfxExtMVCSeqDesc>();
-         *mvc                   = m_pParentPipeline->GetDecMVCSeqDesc();
-         m_bOwnMVCSeqDescMemory = false;
--    }
- #endif
-+    }
- 
-     if (pParams->nFPS) {
-         this->m_nReqFrameTime = 1000000 / pParams->nFPS;
--- 
-2.32.0
-

recipes-multimedia/onevpl/onevpl_2021.5.0.bb

@@ -9,21 +9,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \
                     file://third-party-programs.txt;md5=52d2c0c51bb5c0d9d9c16ae91d66c8fb"
 
 SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https \
-            file://0001-Adding-Wayland-support-to-legacy-tools.patch \
-            file://0001-Corrected-the-install-path.patch \
-            file://0001-Adding-X11-DRI3-support.patch \
-            file://0001-Fix-sample_multi_transcode-join-issue.patch \
             file://0001-Fix-the-rendering-to-X11-failures.patch \
+            file://0001-Fix-compile-issue-with-CMAKE_CXX_FLAGS-setting.patch \
             "
-SRCREV = "d5c072584ee6f81305ed85de8759658ab7854606"
+SRCREV = "dde640ef0872b645d6e0275a6aaec26c01a9c0b9"
 S = "${WORKDIR}/git"
 
 inherit cmake
-DEPENDS = "libva"
+DEPENDS += "libva"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 
-PACKAGES =+ "${PN}-examples"
+PACKAGES += "${PN}-examples"
 
 FILES:${PN}-examples = "${datadir}/oneVPL/examples \
                        "