diff --git a/multimedia/onevpl/Makefile b/multimedia/onevpl/Makefile index 9d62fdbe34d1..b3aba3f0634b 100644 --- a/multimedia/onevpl/Makefile +++ b/multimedia/onevpl/Makefile @@ -1,51 +1,52 @@ PORTNAME= oneVPL DISTVERSIONPREFIX= v -DISTVERSION= 2022.1.3 +DISTVERSION= 2022.1.4 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= oneAPI Video Processing Library dispatcher, tools, and examples LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= only Intel GPUs on x86 are supported +BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols 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 xorg USE_GITHUB= yes USE_LDCONFIG= yes USE_XORG= x11 xcb GH_ACCOUNT= oneapi-src CMAKE_TESTING_ON= BUILD_TESTS DATADIR= ${PREFIX}/share/vpl OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT=PYTHON OPTIONS_SUB= yes PYTHON_USES= python PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11 PYTHON_CMAKE_BOOL= BUILD_PYTHON_BINDING PYTHON_CMAKE_ON= -DPython3_EXECUTABLE:FILEPATH="${PYTHON_CMD}" post-patch: @${REINPLACE_CMD} -e '/pkgconfig/s,FULL_LIBDIR},PREFIX}/libdata,' \ ${WRKSRC}/dispatcher/CMakeLists.txt @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' \ ${WRKSRC}/dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp @${REINPLACE_CMD} -e '/PKG_CONFIG/s,_lib,_prefix/libdata,' \ ${WRKSRC}/modulefiles/vpl post-patch-PYTHON-on: @${REINPLACE_CMD} -e '/LIBDIR/s/python/&${PYTHON_VER}/' \ ${WRKSRC}/preview/python/binding/CMakeLists.txt post-install: @${FIND} ${STAGEDIR} -name \*.orig -delete .include diff --git a/multimedia/onevpl/distinfo b/multimedia/onevpl/distinfo index 4834cd93b972..ca1f1b5a5a66 100644 --- a/multimedia/onevpl/distinfo +++ b/multimedia/onevpl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652480904 -SHA256 (oneapi-src-oneVPL-v2022.1.3_GH0.tar.gz) = 283b92352fbf2dfe45afec8a1172226327cc2544a2c18eaa4bb62b6f53d9bdca -SIZE (oneapi-src-oneVPL-v2022.1.3_GH0.tar.gz) = 5858956 +TIMESTAMP = 1653690348 +SHA256 (oneapi-src-oneVPL-v2022.1.4_GH0.tar.gz) = 939f158ea7f011be14069326ee0a95be1776c364032e6ca800b01d2f2b2e9597 +SIZE (oneapi-src-oneVPL-v2022.1.4_GH0.tar.gz) = 5859910 diff --git a/multimedia/onevpl/files/patch-unix b/multimedia/onevpl/files/patch-unix index 776e4e19c84d..68ab91e1c0ef 100644 --- a/multimedia/onevpl/files/patch-unix +++ b/multimedia/onevpl/files/patch-unix @@ -1,408 +1,375 @@ Relax Linux checks for the code works on any non-Windows platform. dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp:171:16: error: use of undeclared identifier 'MFX' sts = MFX::SelectImplementationType(adapterID, &implTest, &VendorID, &DeviceID, luid); ^ dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp:322:5: error: use of undeclared identifier 'strncpy_s' strncpy_s(m_id.ImplName, sizeof(m_id.ImplName), strImplName, sizeof(strImplName)); ^ dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp:323:5: error: use of undeclared identifier 'strncpy_s' strncpy_s(m_id.License, sizeof(m_id.License), strLicense, sizeof(strLicense)); ^ dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp:324:5: error: use of undeclared identifier 'strncpy_s' strncpy_s(m_id.Keywords, sizeof(m_id.Keywords), strKeywords, sizeof(strKeywords)); ^ dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp:339:28: warning: suggest braces around initialization of subobject [-Wmissing-braces] if (IsVersionSupported(MAKE_MFX_VERSION(1, 19), m_id.ApiVersion)) { ^~~~~~~~~~~~~~~~~~~~~~~ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared identifier 'MSDK_LIB_NAME' if (libInfo->libNameFull.find(MSDK_LIB_NAME) != std::string::npos) { ^ --- 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) #define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(8) /* 32-bit ILP32 data model Windows* (Intel(r) architecture) */ -#elif defined(_WIN32) || defined(_M_IX86) && !defined(__linux__) +#elif defined(_WIN32) || defined(_M_IX86) && !defined(__unix__) #define MFX_PACK_BEGIN_STRUCT_W_PTR() MFX_PACK_BEGIN_X(4) #define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(8) /* 32-bit ILP32 data model Linux* */ @@ -99,7 +99,7 @@ extern "C" #define MFX_DEPRECATED __declspec(deprecated) #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg)) - #elif defined(__linux__) + #elif defined(__unix__) #define MFX_DEPRECATED __attribute__((deprecated)) #if defined(__cplusplus) #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated)) +--- dispatcher/test/unit/src/dispatcher_enum_impls.cpp.orig 2022-05-27 22:25:48 UTC ++++ dispatcher/test/unit/src/dispatcher_enum_impls.cpp +@@ -28,7 +28,7 @@ typedef enum { + #define STUB_RT "libvplstubrt64.dll" + #endif + #endif +-#elif defined(__linux__) ++#elif defined(__unix__) + #define STUB_RT "libvplstubrt1x64.so" + #endif + --- dispatcher/vpl/mfx_dispatcher_vpl.h.orig 2022-01-21 23:15:32 UTC +++ dispatcher/vpl/mfx_dispatcher_vpl.h @@ -48,7 +48,7 @@ typedef char CHAR_TYPE; #define MSDK_LIB_NAME L"libmfxhw64." #endif #define ONEVPL_PRIORITY_PATH_VAR L"ONEVPL_PRIORITY_PATH" -#elif defined(__linux__) +#elif defined(__unix__) // Linux x64 #define MSDK_LIB_NAME "libmfxhw64." #define ONEVPL_PRIORITY_PATH_VAR "ONEVPL_PRIORITY_PATH" --- dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp.orig 2022-03-04 22:06:17 UTC +++ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp @@ -413,7 +413,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"); +#endif +#ifdef __unix__ // Add other default paths searchDirs.push_back("/lib"); searchDirs.push_back("/usr/lib"); --- 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" #define LIB_MSDK L"libmfxhw64.dll" #endif -#elif defined(__linux__) +#elif defined(__unix__) // Linux x64 #define LIB_ONEVPL "libmfx-gen.so.1.2" #define LIB_MSDK "libmfxhw64.so.1" --- dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp.orig 2022-03-04 22:06:17 UTC +++ dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp @@ -10,7 +10,7 @@ #include "vpl/mfx_dispatcher_vpl_win.h" #endif -#ifdef __linux__ +#ifdef __unix__ #include #define strncpy_s(dst, size, src, cnt) strcpy((dst), (src)) // NOLINT #endif @@ -161,7 +161,7 @@ mfxStatus LoaderCtxMSDK::GetDefaultAccelType(mfxU32 ad } mfxStatus LoaderCtxMSDK::GetDefaultAccelType(mfxU32 adapterID, mfxIMPL *implDefault, mfxU64 *luid) { -#ifdef __linux__ +#ifdef __unix__ // VAAPI only *implDefault = MFX_IMPL_VIA_VAAPI; *luid = 0; @@ -249,7 +249,7 @@ mfxStatus LoaderCtxMSDK::QueryMSDKCaps(STRING_TYPE lib m_libNameFull = libNameFull; m_deviceID = 0; -#ifdef __linux__ +#ifdef __unix__ // require pthreads to be linked in for MSDK RT to load pthread_key_t pkey; if (pthread_key_create(&pkey, NULL) == 0) { @@ -452,7 +452,7 @@ mfxStatus LoaderCtxMSDK::GetRenderNodeDescription(mfxU vendorID = 0; deviceID = 0; -#if defined(__linux__) +#if defined(__unix__) mfxU32 DRMRenderNodeNum = 128 + adapterID; std::string nodeStr = std::to_string(DRMRenderNodeNum); @@ -540,7 +540,7 @@ mfxStatus LoaderCtxMSDK::QueryExtDeviceID(mfxExtendedD luidArr >>= 8; } } -#elif defined(__linux__) +#elif defined(__unix__) extDeviceID->DRMPrimaryNodeNum = adapterID; extDeviceID->DRMRenderNodeNum = 128 + adapterID; #endif --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif --- 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 #include #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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif --- 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 #include #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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #endif --- 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 #include #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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif --- examples/interop/dpcpp-blur/src/util.h.orig 2022-02-05 00:35:54 UTC +++ examples/interop/dpcpp-blur/src/util.h @@ -30,7 +30,7 @@ enum { #include "vpl/mfxdispatcher.h" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #endif --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif @@ -63,7 +63,7 @@ const struct { X = NULL; \ } \ } -#elif defined(__linux__) +#elif defined(__unix__) #ifdef LIBVA_SUPPORT #include "va/va.h" #include "va/va_drm.h" --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif @@ -63,7 +63,7 @@ const struct { X = NULL; \ } \ } -#elif defined(__linux__) +#elif defined(__unix__) #ifdef LIBVA_SUPPORT #include "va/va.h" #include "va/va_drm.h" --- preview/python/binding/vpl_python.hpp.orig 2021-12-07 00:05:44 UTC +++ preview/python/binding/vpl_python.hpp @@ -15,6 +15,6 @@ namespace py = pybind11; -#ifdef __linux__ +#ifdef __unix__ #define strncpy_s(dst, size, src, cnt) strncpy((dst), (src), cnt) // NOLINT #endif --- 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" #endif -#ifdef __linux__ +#ifdef __unix__ #include #include #endif @@ -62,7 +62,7 @@ const struct { X = NULL; \ } \ } -#elif defined(__linux__) +#elif defined(__unix__) #ifdef LIBVA_SUPPORT #include "va/va.h" #include "va/va_drm.h" @@ -541,7 +541,7 @@ mfxStatus InitAcceleratorHandle(mfxSession session, in if (sts != MFX_ERR_NONE) return sts; -#if defined(__linux) +#if defined(__unix) #ifdef LIBVA_SUPPORT if ((impl & MFX_IMPL_VIA_VAAPI) == MFX_IMPL_VIA_VAAPI) { if (!fd) @@ -579,7 +579,7 @@ mfxStatus InitAcceleratorHandle(mfxSession session, in } void FreeAcceleratorHandle(void *accelHandle, int fd) { -#if defined(__linux) +#if defined(__unix) #ifdef LIBVA_SUPPORT vaTerminate((VADisplay)accelHandle); close(fd); ---- tools/legacy/sample_common/CMakeLists.txt.orig 2022-02-05 00:35:54 UTC +--- tools/legacy/sample_common/CMakeLists.txt.orig 2022-05-27 22:25:48 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) - - if(BUILD_TOOLS_ONEVPL_EXPERIMENTAL) - add_definitions(-DONEVPL_EXPERIMENTAL) ---- 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 2022-02-05 00:35:54 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_LIBDRM_FOUND - AND PKG_LIBVA_FOUND ---- tools/legacy/sample_vpp/CMakeLists.txt.orig 2022-02-05 00:35:54 UTC -+++ tools/legacy/sample_vpp/CMakeLists.txt -@@ -25,7 +25,7 @@ if(POLICY CMP0074) - cmake_policy(SET CMP0074 OLD) +@@ -61,7 +61,7 @@ endif() + target_compile_definitions(sample_common PUBLIC -DONEVPL_EXPERIMENTAL) endif() -if(CMAKE_SYSTEM_NAME MATCHES Linux) +if(UNIX AND NOT APPLE) - if(NOT - (PKG_LIBDRM_FOUND - AND PKG_LIBVA_FOUND ---- 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) + target_compile_definitions(sample_common PUBLIC LINUX64) --if(CMAKE_SYSTEM_NAME MATCHES Linux) -+if(UNIX AND NOT APPLE) - if(NOT - (PKG_LIBVA_FOUND - AND PKG_LIBVA_DRM_FOUND + find_package(PkgConfig REQUIRED)