Date: Mon, 7 Mar 2022 13:49:03 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 2f9fb661d6f5 - 2022Q1 - multimedia/onevpl: update to 2022.0.6 Message-ID: <202203071349.227Dn3Zh087120@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f9fb661d6f5dec3512fcad51ed4c3de847355ff commit 2f9fb661d6f5dec3512fcad51ed4c3de847355ff Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-03-04 22:06:17 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-03-07 13:48:57 +0000 multimedia/onevpl: update to 2022.0.6 Changes: https://github.com/oneapi-src/oneVPL/compare/v2022.0.5...v2022.0.6 Reported by: Repology (cherry picked from commit e1dfb1b154e482225e460bc996c124038e64e976) --- multimedia/onevpl/Makefile | 2 +- multimedia/onevpl/distinfo | 6 +++--- multimedia/onevpl/files/patch-unix | 34 +++++++++++++++++----------------- multimedia/onevpl/pkg-plist | 2 ++ 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/multimedia/onevpl/Makefile b/multimedia/onevpl/Makefile index 316d0e34b267..1bf61a874014 100644 --- a/multimedia/onevpl/Makefile +++ b/multimedia/onevpl/Makefile @@ -1,6 +1,6 @@ PORTNAME= oneVPL DISTVERSIONPREFIX= v -DISTVERSION= 2022.0.5 +DISTVERSION= 2022.0.6 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/onevpl/distinfo b/multimedia/onevpl/distinfo index bcf705262887..f0e5a79cf840 100644 --- a/multimedia/onevpl/distinfo +++ b/multimedia/onevpl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645223286 -SHA256 (oneapi-src-oneVPL-v2022.0.5_GH0.tar.gz) = 80b3f26aa3de5519252e0d43daf553420d1bb719a52c78204dbd53630bc4edf1 -SIZE (oneapi-src-oneVPL-v2022.0.5_GH0.tar.gz) = 3114761 +TIMESTAMP = 1646431577 +SHA256 (oneapi-src-oneVPL-v2022.0.6_GH0.tar.gz) = 80093925009ba32b1662c51468dffede04b8e877effde83c8128b13a8817c67e +SIZE (oneapi-src-oneVPL-v2022.0.6_GH0.tar.gz) = 7032044 diff --git a/multimedia/onevpl/files/patch-unix b/multimedia/onevpl/files/patch-unix index 5f3d22999285..776e4e19c84d 100644 --- a/multimedia/onevpl/files/patch-unix +++ b/multimedia/onevpl/files/patch-unix @@ -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." #define ONEVPL_PRIORITY_PATH_VAR "ONEVPL_PRIORITY_PATH" ---- dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp.orig 2021-12-07 00:05:44 UTC +--- dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp.orig 2022-03-04 22:06:17 UTC +++ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp -@@ -401,7 +401,9 @@ mfxU32 LoaderCtxVPL::GetSearchPathsSystemDefault(std:: +@@ -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"); @@ -62,15 +62,6 @@ 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"); -@@ -1069,7 +1071,7 @@ mfxStatus LoaderCtxVPL::QueryLibraryCaps() { - // update number of valid MSDK adapters - numImplMSDK++; - --#ifdef __linux__ -+#ifdef __unix__ - // currently only one adapter on Linux (avoid multiple copies) - break; - #endif --- 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 @@ @@ -82,7 +73,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 2022-02-05 00:35:54 UTC +--- 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" @@ -93,7 +84,7 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id #include <pthread.h> #define strncpy_s(dst, size, src, cnt) strcpy((dst), (src)) // NOLINT #endif -@@ -161,7 +161,7 @@ mfxAccelerationMode LoaderCtxMSDK::CvtAccelType(mfxIMP +@@ -161,7 +161,7 @@ mfxStatus LoaderCtxMSDK::GetDefaultAccelType(mfxU32 ad } mfxStatus LoaderCtxMSDK::GetDefaultAccelType(mfxU32 adapterID, mfxIMPL *implDefault, mfxU64 *luid) { @@ -102,24 +93,33 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id // VAAPI only *implDefault = MFX_IMPL_VIA_VAAPI; *luid = 0; -@@ -248,7 +248,7 @@ mfxStatus LoaderCtxMSDK::QueryMSDKCaps(STRING_TYPE lib - +@@ -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) { -@@ -483,7 +483,7 @@ mfxStatus LoaderCtxMSDK::QueryExtDeviceID(mfxExtendedD +@@ -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__) - // fill in Linux-specific properties 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 { diff --git a/multimedia/onevpl/pkg-plist b/multimedia/onevpl/pkg-plist index 88a364a34819..87eb21f3eb4a 100644 --- a/multimedia/onevpl/pkg-plist +++ b/multimedia/onevpl/pkg-plist @@ -60,6 +60,8 @@ libdata/pkgconfig/vpl.pc %%DATADIR%%/examples/content/cars_128x96.i420 %%DATADIR%%/examples/content/cars_128x96.mjpeg %%DATADIR%%/examples/content/cars_128x96.nv12 +%%DATADIR%%/examples/content/cars_320x240.i420 +%%DATADIR%%/examples/content/cars_320x240.nv12 %%DATADIR%%/examples/coreAPI/legacy-decode/CMakeLists.txt %%DATADIR%%/examples/coreAPI/legacy-decode/License.txt %%DATADIR%%/examples/coreAPI/legacy-decode/README.md
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203071349.227Dn3Zh087120>