git: b13ba26d1c9d - main - multimedia/onevpl: update to 2022.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 08 Dec 2021 02:57:55 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b13ba26d1c9d5c5cf590f983a96cb8ae2e541e91
commit b13ba26d1c9d5c5cf590f983a96cb8ae2e541e91
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-07 00:05:44 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-08 02:38:37 +0000
multimedia/onevpl: update to 2022.0.0
Changes: https://github.com/oneapi-src/oneVPL/releases/tag/v2022.0.0
---
multimedia/onevpl/Makefile | 5 +-
multimedia/onevpl/distinfo | 6 +-
multimedia/onevpl/files/patch-basename | 22 -----
multimedia/onevpl/files/patch-include | 16 ----
multimedia/onevpl/files/patch-includes | 42 ++++++++++
multimedia/onevpl/files/patch-unix | 148 ++++++++++++++++++++++++---------
multimedia/onevpl/pkg-plist | 39 ++++++++-
7 files changed, 192 insertions(+), 86 deletions(-)
diff --git a/multimedia/onevpl/Makefile b/multimedia/onevpl/Makefile
index 24d1bf33a9eb..e6c3c7c09505 100644
--- a/multimedia/onevpl/Makefile
+++ b/multimedia/onevpl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= oneVPL
DISTVERSIONPREFIX= v
-DISTVERSION= 2021.6.0
+DISTVERSION= 2022.0.0
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
@@ -16,9 +16,10 @@ LIB_DEPENDS= libdrm.so:graphics/libdrm \
libwayland-client.so:graphics/wayland \
libva.so:multimedia/libva
-USES= cmake:testing compiler:c++17-lang localbase:ldflags pkgconfig
+USES= cmake:testing compiler:c++17-lang localbase:ldflags pkgconfig xorg
USE_GITHUB= yes
USE_LDCONFIG= yes
+USE_XORG= x11 xcb
GH_ACCOUNT= oneapi-src
CMAKE_TESTING_ON= BUILD_TESTS
diff --git a/multimedia/onevpl/distinfo b/multimedia/onevpl/distinfo
index 7a88bb23c4ea..5c874e0f00f8 100644
--- a/multimedia/onevpl/distinfo
+++ b/multimedia/onevpl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631573462
-SHA256 (oneapi-src-oneVPL-v2021.6.0_GH0.tar.gz) = c83590c4b0d12c4a48f4cbf4b6e8d595bf1f6f96bb262d21457793d19f7b2b6a
-SIZE (oneapi-src-oneVPL-v2021.6.0_GH0.tar.gz) = 3034593
+TIMESTAMP = 1638835544
+SHA256 (oneapi-src-oneVPL-v2022.0.0_GH0.tar.gz) = cd0d34049e844602aed46928e8e110718e46a32fe76bc4f9f1e085ed7e54bc46
+SIZE (oneapi-src-oneVPL-v2022.0.0_GH0.tar.gz) = 3093492
diff --git a/multimedia/onevpl/files/patch-basename b/multimedia/onevpl/files/patch-basename
deleted file mode 100644
index e0c6ae560c26..000000000000
--- a/multimedia/onevpl/files/patch-basename
+++ /dev/null
@@ -1,22 +0,0 @@
-POSIX basename allows modifying the argument, so make a local copy
-
-tools/legacy/sample_common/src/vaapi_utils.cpp:30:28: error: no matching function for call to 'basename'
- so_handle = dlopen(basename(name), RTLD_GLOBAL | RTLD_NOW);
- ^~~~~~~~
-/usr/include/libgen.h:39:7: note: candidate function not viable: 1st argument ('const char *') would lose const qualifier
-char *basename(char *);
- ^
-
---- tools/legacy/sample_common/src/vaapi_utils.cpp.orig 2021-09-13 22:51:02 UTC
-+++ tools/legacy/sample_common/src/vaapi_utils.cpp
-@@ -26,7 +26,9 @@ SimpleLoader::SimpleLoader(const char* name) {
- dlerror();
- so_handle = dlopen(name, RTLD_GLOBAL | RTLD_NOW);
- if (NULL == so_handle) {
-- so_handle = dlopen(basename(name), RTLD_GLOBAL | RTLD_NOW);
-+ char dlname[PATH_MAX + 1];
-+ strncpy(dlname, name, sizeof(dlname));
-+ so_handle = dlopen(basename(dlname), RTLD_GLOBAL | RTLD_NOW);
- if (NULL == so_handle) {
- std::cerr << dlerror() << std::endl;
- throw std::runtime_error("Can't load library");
diff --git a/multimedia/onevpl/files/patch-include b/multimedia/onevpl/files/patch-include
deleted file mode 100644
index f3c3559e96e1..000000000000
--- a/multimedia/onevpl/files/patch-include
+++ /dev/null
@@ -1,16 +0,0 @@
-Add missing headers
-
-tools/legacy/sample_common/src/vaapi_utils.cpp:29:28: error: use of undeclared identifier 'basename'
- so_handle = dlopen(basename(name), RTLD_GLOBAL | RTLD_NOW);
- ^
-
---- tools/legacy/sample_common/src/vaapi_utils.cpp.orig 2021-09-13 22:51:02 UTC
-+++ tools/legacy/sample_common/src/vaapi_utils.cpp
-@@ -8,6 +8,7 @@
-
- #include "vaapi_utils.h"
- #include <dlfcn.h>
-+ #include <libgen.h>
- #include <stdexcept>
-
- //#if defined(LIBVA_DRM_SUPPORT)
diff --git a/multimedia/onevpl/files/patch-includes b/multimedia/onevpl/files/patch-includes
new file mode 100644
index 000000000000..def624979110
--- /dev/null
+++ b/multimedia/onevpl/files/patch-includes
@@ -0,0 +1,42 @@
+Adjust includes in various places.
+
+tools/legacy/sample_encode/src/sample_encode.cpp:1677:52: error: no member named 'ceil' in namespace 'std'
+ pParams->nBitRateMultiplier = (mfxU16)std::ceil(static_cast<double>(maxVal) / mfxU16Limit);
+ ~~~~~^
+tools/legacy/sample_multi_transcode/src/pipeline_transcode.cpp:3943:55: error: no member named 'ceil' in namespace 'std'
+ mfxU32 framesForEncode = std::min(mfxU32(std::ceil(m_MaxFramesForTranscode / frcFactor)),
+ ~~~~~^
+tools/legacy/sample_multi_transcode/src/transcode_utils.cpp:2894:26: error: no member named 'ceil' in namespace 'std'
+ (mfxU16)std::ceil(static_cast<double>(maxVal) / mfxU16Limit);
+ ~~~~~^
+
+--- tools/legacy/sample_encode/src/sample_encode.cpp.orig 2021-12-07 00:05:44 UTC
++++ tools/legacy/sample_encode/src/sample_encode.cpp
+@@ -8,6 +8,7 @@
+ #include "vpl_implementation_loader.h"
+
+ #include <stdarg.h>
++#include <cmath>
+ #include <memory>
+ #include <string>
+ #include "pipeline_encode.h"
+--- tools/legacy/sample_multi_transcode/src/pipeline_transcode.cpp.orig 2021-12-07 00:05:44 UTC
++++ tools/legacy/sample_multi_transcode/src/pipeline_transcode.cpp
+@@ -12,6 +12,7 @@
+
+ #include <assert.h>
+ #include <algorithm>
++#include <cmath>
+ #include <cstring>
+ #include <set>
+ #include "mfx_itt_trace.h"
+--- tools/legacy/sample_multi_transcode/src/transcode_utils.cpp.orig 2021-12-07 00:05:44 UTC
++++ tools/legacy/sample_multi_transcode/src/transcode_utils.cpp
+@@ -27,6 +27,7 @@
+
+ #include <algorithm>
+ #include <cctype>
++#include <cmath>
+ #include <cstdlib>
+ #include <cstring>
+ #include <fstream>
diff --git a/multimedia/onevpl/files/patch-unix b/multimedia/onevpl/files/patch-unix
index 1a5a4d2c1907..30e2036c3f9e 100644
--- a/multimedia/onevpl/files/patch-unix
+++ b/multimedia/onevpl/files/patch-unix
@@ -19,7 +19,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
if (libInfo->libNameFull.find(MSDK_LIB_NAME) != std::string::npos) {
^
---- api/vpl/mfxdefs.h.orig 2021-09-13 22:51:02 UTC
+--- api/vpl/mfxdefs.h.orig 2021-12-07 00:05:44 UTC
+++ api/vpl/mfxdefs.h
@@ -64,7 +64,7 @@ extern "C"
#define MFX_PACK_BEGIN_STRUCT_W_PTR() MFX_PACK_BEGIN_X(8)
@@ -39,7 +39,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#define MFX_DEPRECATED __attribute__((deprecated))
#if defined(__cplusplus)
#define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
---- dispatcher/vpl/mfx_dispatcher_vpl.h.orig 2021-09-13 22:51:02 UTC
+--- dispatcher/vpl/mfx_dispatcher_vpl.h.orig 2021-12-07 00:05:44 UTC
+++ dispatcher/vpl/mfx_dispatcher_vpl.h
@@ -47,7 +47,7 @@ typedef char CHAR_TYPE;
// Windows x64
@@ -50,9 +50,9 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
// Linux x64
#define MSDK_LIB_NAME "libmfxhw64."
#endif
---- dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp.orig 2021-09-13 22:51:02 UTC
+--- dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp.orig 2021-12-07 00:05:44 UTC
+++ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp
-@@ -400,7 +400,9 @@ mfxU32 LoaderCtxVPL::GetSearchPathsSystemDefault(std::
+@@ -401,7 +401,9 @@ mfxU32 LoaderCtxVPL::GetSearchPathsSystemDefault(std::
#ifdef __linux__
// Add the standard path for libmfx1 install in Ubuntu
searchDirs.push_back("/usr/lib/x86_64-linux-gnu");
@@ -62,7 +62,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
// Add other default paths
searchDirs.push_back("/lib");
searchDirs.push_back("/usr/lib");
-@@ -1057,7 +1059,7 @@ mfxStatus LoaderCtxVPL::QueryLibraryCaps() {
+@@ -1069,7 +1071,7 @@ mfxStatus LoaderCtxVPL::QueryLibraryCaps() {
// update number of valid MSDK adapters
numImplMSDK++;
@@ -71,7 +71,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
// currently only one adapter on Linux (avoid multiple copies)
break;
#endif
---- dispatcher/vpl/mfx_dispatcher_vpl_lowlatency.cpp.orig 2021-09-13 22:51:02 UTC
+--- dispatcher/vpl/mfx_dispatcher_vpl_lowlatency.cpp.orig 2021-12-07 00:05:44 UTC
+++ dispatcher/vpl/mfx_dispatcher_vpl_lowlatency.cpp
@@ -18,7 +18,7 @@
#define LIB_ONEVPL L"libmfx64-gen.dll"
@@ -82,7 +82,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
// Linux x64
#define LIB_ONEVPL "libmfx-gen.so.1.2"
#define LIB_MSDK "libmfxhw64.so.1"
---- dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp.orig 2021-09-13 22:51:02 UTC
+--- dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp.orig 2021-12-07 00:05:44 UTC
+++ dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp
@@ -10,7 +10,7 @@
#include "vpl/mfx_dispatcher_vpl_win.h"
@@ -111,7 +111,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
// require pthreads to be linked in for MSDK RT to load
pthread_key_t pkey;
if (pthread_key_create(&pkey, NULL) == 0) {
---- examples/coreAPI/legacy-decode/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/coreAPI/legacy-decode/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/coreAPI/legacy-decode/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -122,7 +122,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#include <unistd.h>
#endif
---- examples/coreAPI/legacy-encode/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/coreAPI/legacy-encode/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/coreAPI/legacy-encode/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -133,7 +133,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#include <unistd.h>
#endif
---- examples/coreAPI/legacy-vpp/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/coreAPI/legacy-vpp/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/coreAPI/legacy-vpp/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -144,7 +144,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#include <unistd.h>
#endif
---- examples/hello/hello-createsession/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/hello/hello-createsession/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/hello/hello-createsession/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -155,7 +155,18 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#include <unistd.h>
#endif
---- examples/hello/hello-decvpp/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/hello/hello-decode/src/util.h.orig 2021-12-07 00:05:44 UTC
++++ examples/hello/hello-decode/src/util.h
+@@ -30,7 +30,7 @@ enum {
+ #include "vpl/mfxdispatcher.h"
+ #endif
+
+-#ifdef __linux__
++#ifdef __unix__
+ #include <fcntl.h>
+ #include <unistd.h>
+ #endif
+--- examples/hello/hello-decvpp/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/hello/hello-decvpp/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -166,7 +177,18 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#include <unistd.h>
#endif
---- examples/hello/hello-transcode/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/hello/hello-encode/src/util.h.orig 2021-12-07 00:05:44 UTC
++++ examples/hello/hello-encode/src/util.h
+@@ -30,7 +30,7 @@ enum {
+ #include "vpl/mfxdispatcher.h"
+ #endif
+
+-#ifdef __linux__
++#ifdef __unix__
+ #include <fcntl.h>
+ #include <unistd.h>
+ #endif
+--- examples/hello/hello-transcode/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/hello/hello-transcode/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -177,7 +199,18 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#endif
---- examples/interop/advanced-decvpp-infer/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/hello/hello-vpp/src/util.h.orig 2021-12-07 00:05:44 UTC
++++ examples/hello/hello-vpp/src/util.h
+@@ -30,7 +30,7 @@ enum {
+ #include "vpl/mfxdispatcher.h"
+ #endif
+
+-#ifdef __linux__
++#ifdef __unix__
+ #include <fcntl.h>
+ #include <unistd.h>
+ #endif
+--- examples/interop/advanced-decvpp-infer/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/interop/advanced-decvpp-infer/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -188,7 +221,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#include <unistd.h>
#endif
---- examples/interop/hello-decode-infer/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/interop/hello-decode-infer/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/interop/hello-decode-infer/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -199,7 +232,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#endif
---- examples/interop/legacy-decode-infer/src/util.h.orig 2021-09-13 22:51:02 UTC
+--- examples/interop/legacy-decode-infer/src/util.h.orig 2021-12-07 00:05:44 UTC
+++ examples/interop/legacy-decode-infer/src/util.h
@@ -30,7 +30,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -210,7 +243,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#include <fcntl.h>
#include <unistd.h>
#endif
---- preview/cplusplus/examples/hello-decode-cpp/src/util.hpp.orig 2021-09-13 22:51:02 UTC
+--- preview/cplusplus/examples/hello-decode-cpp/src/util.hpp.orig 2021-12-07 00:05:44 UTC
+++ preview/cplusplus/examples/hello-decode-cpp/src/util.hpp
@@ -21,7 +21,7 @@
#include "vpl/mfxdispatcher.h"
@@ -230,7 +263,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#ifdef LIBVA_SUPPORT
#include "va/va.h"
#include "va/va_drm.h"
---- preview/cplusplus/examples/hello-encode-cpp/src/util.hpp.orig 2021-09-13 22:51:02 UTC
+--- preview/cplusplus/examples/hello-encode-cpp/src/util.hpp.orig 2021-12-07 00:05:44 UTC
+++ preview/cplusplus/examples/hello-encode-cpp/src/util.hpp
@@ -21,7 +21,7 @@
#include "vpl/mfxdispatcher.h"
@@ -250,7 +283,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#ifdef LIBVA_SUPPORT
#include "va/va.h"
#include "va/va_drm.h"
---- preview/python/binding/vpl_python.hpp.orig 2021-09-13 22:51:02 UTC
+--- preview/python/binding/vpl_python.hpp.orig 2021-12-07 00:05:44 UTC
+++ preview/python/binding/vpl_python.hpp
@@ -15,6 +15,6 @@
@@ -260,7 +293,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
+#ifdef __unix__
#define strncpy_s(dst, size, src, cnt) strncpy((dst), (src), cnt) // NOLINT
#endif
---- tools/cli/decvpp_tool/util.hpp.orig 2021-09-13 22:51:02 UTC
+--- tools/cli/decvpp_tool/util.hpp.orig 2021-12-07 00:05:44 UTC
+++ tools/cli/decvpp_tool/util.hpp
@@ -31,7 +31,7 @@ enum {
#include "vpl/mfxdispatcher.h"
@@ -298,23 +331,58 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
#ifdef LIBVA_SUPPORT
vaTerminate((VADisplay)accelHandle);
close(fd);
---- tools/legacy/sample_encode/src/sample_encode.cpp.orig 2021-09-13 22:51:02 UTC
-+++ tools/legacy/sample_encode/src/sample_encode.cpp
-@@ -53,7 +53,7 @@ void PrintHelp(msdk_char* strAppName, const msdk_char*
-
- msdk_printf(MSDK_STRING(" If codecid is jpeg, -q option is mandatory.)\n"));
- msdk_printf(MSDK_STRING("Options: \n"));
--#if __linux__
-+#if __unix__
- msdk_printf(MSDK_STRING(" [-device /path/to/device] - set graphics device for processing\n"));
- msdk_printf(
- MSDK_STRING(" For example: '-device /dev/dri/card0'\n"));
-@@ -532,7 +532,7 @@ mfxStatus ParseInputString(msdk_char* strInput[], mfxU
- return MFX_ERR_UNSUPPORTED;
- }
- }
--#if __linux__
-+#if __unix__
- else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-device"))) {
- if (!pParams->strDevicePath.empty()) {
- msdk_printf(MSDK_STRING("error: you can specify only one device\n"));
+--- tools/legacy/sample_common/CMakeLists.txt.orig 2021-12-07 00:05:44 UTC
++++ tools/legacy/sample_common/CMakeLists.txt
+@@ -63,7 +63,7 @@ find_package(VPL REQUIRED)
+ target_link_libraries(sample_common PUBLIC VPL::dispatcher
+ media_sdk_compatibility_headers)
+
+-if(CMAKE_SYSTEM_NAME MATCHES Linux)
++if(UNIX AND NOT APPLE)
+ target_compile_definitions(sample_common PUBLIC LINUX64)
+
+ find_package(PkgConfig REQUIRED)
+--- tools/legacy/sample_decode/CMakeLists.txt.orig 2021-12-07 00:05:44 UTC
++++ tools/legacy/sample_decode/CMakeLists.txt
+@@ -11,7 +11,7 @@ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 OLD)
+ endif()
+
+-if(CMAKE_SYSTEM_NAME MATCHES Linux)
++if(UNIX AND NOT APPLE)
+ if(NOT
+ (PKG_LIBVA_FOUND
+ AND PKG_LIBVA_DRM_FOUND
+--- tools/legacy/sample_encode/CMakeLists.txt.orig 2021-12-07 00:05:44 UTC
++++ tools/legacy/sample_encode/CMakeLists.txt
+@@ -11,7 +11,7 @@ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 OLD)
+ endif()
+
+-if(CMAKE_SYSTEM_NAME MATCHES Linux)
++if(UNIX AND NOT APPLE)
+ if(NOT (PKG_LIBVA_FOUND AND PKG_LIBVA_DRM_FOUND))
+ message("Skipping sample_encode build.")
+ return()
+--- tools/legacy/sample_multi_transcode/CMakeLists.txt.orig 2021-12-07 00:05:44 UTC
++++ tools/legacy/sample_multi_transcode/CMakeLists.txt
+@@ -11,7 +11,7 @@ endif()
+
+ find_package(VPL REQUIRED)
+
+-if(CMAKE_SYSTEM_NAME MATCHES Linux)
++if(UNIX AND NOT APPLE)
+ if(NOT
+ (PKG_LIBVA_FOUND
+ AND PKG_LIBVA_DRM_FOUND
+--- tools/legacy/sample_vpp/CMakeLists.txt.orig 2021-12-07 00:05:44 UTC
++++ tools/legacy/sample_vpp/CMakeLists.txt
+@@ -25,7 +25,7 @@ if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 OLD)
+ endif()
+
+-if(CMAKE_SYSTEM_NAME MATCHES Linux)
++if(UNIX AND NOT APPLE)
+ if(NOT (PKG_LIBVA_FOUND AND PKG_LIBVA_DRM_FOUND))
+ message("Skipping sample_vpp build.")
+ return()
diff --git a/multimedia/onevpl/pkg-plist b/multimedia/onevpl/pkg-plist
index 6acf53c668ee..88a364a34819 100644
--- a/multimedia/onevpl/pkg-plist
+++ b/multimedia/onevpl/pkg-plist
@@ -1,4 +1,7 @@
bin/decvpp_tool
+bin/hello-decode
+bin/hello-encode
+bin/hello-vpp
bin/sample_decode
bin/sample_encode
bin/sample_multi_transcode
@@ -31,14 +34,13 @@ include/vpl/preview/detail/variant.hpp
include/vpl/preview/exception.hpp
include/vpl/preview/extension_buffer.hpp
include/vpl/preview/extension_buffer_list.hpp
-include/vpl/preview/frame_pool.hpp
include/vpl/preview/frame_surface.hpp
include/vpl/preview/future.hpp
include/vpl/preview/impl_caps.hpp
include/vpl/preview/impl_selector.hpp
+include/vpl/preview/option_tree.hpp
include/vpl/preview/options.hpp
include/vpl/preview/payload.hpp
-include/vpl/preview/property_name.hpp
include/vpl/preview/session.hpp
include/vpl/preview/source_reader.hpp
include/vpl/preview/stat.hpp
@@ -49,7 +51,7 @@ lib/cmake/vpl/VPLConfig.cmake
lib/cmake/vpl/VPLConfigVersion.cmake
lib/libvpl.so
lib/libvpl.so.2
-lib/libvpl.so.2.5
+lib/libvpl.so.2.6
lib/oneVPL/libvpl_wayland.so
%%PYTHON%%%%PYTHON_LIBDIR%%/pyvpl%%PYTHON_EXT_SUFFIX%%.so
libdata/pkgconfig/vpl.pc
@@ -84,6 +86,13 @@ libdata/pkgconfig/vpl.pc
%%DATADIR%%/examples/hello/hello-createsession/sample.json
%%DATADIR%%/examples/hello/hello-createsession/src/hello-createsession.cpp
%%DATADIR%%/examples/hello/hello-createsession/src/util.h
+%%DATADIR%%/examples/hello/hello-decode/CMakeLists.txt
+%%DATADIR%%/examples/hello/hello-decode/License.txt
+%%DATADIR%%/examples/hello/hello-decode/PreLoad.cmake
+%%DATADIR%%/examples/hello/hello-decode/README.md
+%%DATADIR%%/examples/hello/hello-decode/sample.json
+%%DATADIR%%/examples/hello/hello-decode/src/hello-decode.cpp
+%%DATADIR%%/examples/hello/hello-decode/src/util.h
%%DATADIR%%/examples/hello/hello-decvpp/CMakeLists.txt
%%DATADIR%%/examples/hello/hello-decvpp/License.txt
%%DATADIR%%/examples/hello/hello-decvpp/PreLoad.cmake
@@ -91,25 +100,48 @@ libdata/pkgconfig/vpl.pc
%%DATADIR%%/examples/hello/hello-decvpp/sample.json
%%DATADIR%%/examples/hello/hello-decvpp/src/hello-decvpp.cpp
%%DATADIR%%/examples/hello/hello-decvpp/src/util.h
+%%DATADIR%%/examples/hello/hello-encode/CMakeLists.txt
+%%DATADIR%%/examples/hello/hello-encode/License.txt
+%%DATADIR%%/examples/hello/hello-encode/PreLoad.cmake
+%%DATADIR%%/examples/hello/hello-encode/README.md
+%%DATADIR%%/examples/hello/hello-encode/sample.json
+%%DATADIR%%/examples/hello/hello-encode/src/hello-encode.cpp
+%%DATADIR%%/examples/hello/hello-encode/src/util.h
%%DATADIR%%/examples/hello/hello-transcode/CMakeLists.txt
%%DATADIR%%/examples/hello/hello-transcode/License.txt
%%DATADIR%%/examples/hello/hello-transcode/README.md
%%DATADIR%%/examples/hello/hello-transcode/sample.json
%%DATADIR%%/examples/hello/hello-transcode/src/hello-transcode.cpp
%%DATADIR%%/examples/hello/hello-transcode/src/util.h
+%%DATADIR%%/examples/hello/hello-vpp/CMakeLists.txt
+%%DATADIR%%/examples/hello/hello-vpp/License.txt
+%%DATADIR%%/examples/hello/hello-vpp/PreLoad.cmake
+%%DATADIR%%/examples/hello/hello-vpp/README.md
+%%DATADIR%%/examples/hello/hello-vpp/sample.json
+%%DATADIR%%/examples/hello/hello-vpp/src/hello-vpp.cpp
+%%DATADIR%%/examples/hello/hello-vpp/src/util.h
%%DATADIR%%/examples/interop/advanced-decvpp-infer/CMakeLists.txt
%%DATADIR%%/examples/interop/advanced-decvpp-infer/CPPLINT.cfg
%%DATADIR%%/examples/interop/advanced-decvpp-infer/License.txt
%%DATADIR%%/examples/interop/advanced-decvpp-infer/PreLoad.cmake
%%DATADIR%%/examples/interop/advanced-decvpp-infer/README.md
+%%DATADIR%%/examples/interop/advanced-decvpp-infer/docker/Dockerfile
%%DATADIR%%/examples/interop/advanced-decvpp-infer/sample.json
%%DATADIR%%/examples/interop/advanced-decvpp-infer/src/advanced-decvpp-infer.cpp
%%DATADIR%%/examples/interop/advanced-decvpp-infer/src/util.h
+%%DATADIR%%/examples/interop/dpcpp-blur/CMakeLists.txt
+%%DATADIR%%/examples/interop/dpcpp-blur/License.txt
+%%DATADIR%%/examples/interop/dpcpp-blur/PreLoad.cmake
+%%DATADIR%%/examples/interop/dpcpp-blur/README.md
+%%DATADIR%%/examples/interop/dpcpp-blur/sample.json
+%%DATADIR%%/examples/interop/dpcpp-blur/src/dpcpp-blur.cpp
+%%DATADIR%%/examples/interop/dpcpp-blur/src/util.h
%%DATADIR%%/examples/interop/hello-decode-infer/CMakeLists.txt
%%DATADIR%%/examples/interop/hello-decode-infer/CPPLINT.cfg
%%DATADIR%%/examples/interop/hello-decode-infer/License.txt
%%DATADIR%%/examples/interop/hello-decode-infer/PreLoad.cmake
%%DATADIR%%/examples/interop/hello-decode-infer/README.md
+%%DATADIR%%/examples/interop/hello-decode-infer/docker/Dockerfile
%%DATADIR%%/examples/interop/hello-decode-infer/sample.json
%%DATADIR%%/examples/interop/hello-decode-infer/src/hello-decode-infer.cpp
%%DATADIR%%/examples/interop/hello-decode-infer/src/util.h
@@ -117,6 +149,7 @@ libdata/pkgconfig/vpl.pc
%%DATADIR%%/examples/interop/legacy-decode-infer/CPPLINT.cfg
%%DATADIR%%/examples/interop/legacy-decode-infer/License.txt
%%DATADIR%%/examples/interop/legacy-decode-infer/README.md
+%%DATADIR%%/examples/interop/legacy-decode-infer/docker/Dockerfile
%%DATADIR%%/examples/interop/legacy-decode-infer/sample.json
%%DATADIR%%/examples/interop/legacy-decode-infer/src/legacy-decode-infer.cpp
%%DATADIR%%/examples/interop/legacy-decode-infer/src/util.h