From nobody Mon Mar 7 13:49:03 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1465B19FED05; Mon, 7 Mar 2022 13:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KC0Db6gGQz3DLJ; Mon, 7 Mar 2022 13:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646660944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t25PfpboUcCmyhcpBf8SNh4tlPANUSjdnckLLG9Hhqo=; b=FypdRcpccvOse3LWLBdmaljgD8ykcK8Lfy/dw3Si1sZkBRbAZSIp6E8Pjg3KraoNt5WXGe NS63f9qsFwjzgKp2O06GaGDP/oE2dcl1sFT+5KoVestRz13xa0gXWRlHTFztRH43AI0Rwk HWVf1JylkvrFDOLx5pX6YQyjysBT0scxuPOe57s+Dk0XzBwPEhvHgH71/ucj4WbJVcMgY+ +LzhjXMAejAjYS+0Xj716KVXBxEMZPMZHsUM0APnmi76XMe1mM8uO30zRo+nxXrI3a6Cml qEmvFB1EG+jiHCpiCQzG9XZ0kdRNnuQztcmyfb0QeMpEenL/tECrPR27R1qdaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5F57160C; Mon, 7 Mar 2022 13:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227Dn3lU087121; Mon, 7 Mar 2022 13:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227Dn3Zh087120; Mon, 7 Mar 2022 13:49:03 GMT (envelope-from git) Date: Mon, 7 Mar 2022 13:49:03 GMT Message-Id: <202203071349.227Dn3Zh087120@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 2f9fb661d6f5 - 2022Q1 - multimedia/onevpl: update to 2022.0.6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 2f9fb661d6f5dec3512fcad51ed4c3de847355ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646660944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t25PfpboUcCmyhcpBf8SNh4tlPANUSjdnckLLG9Hhqo=; b=Yeas+i1INcIfg2bNr+jGk0FEXWELWxj1jTUSRspj4SZP9bll8DlncTHzm5BXi8jDPS+Uwe dDO9cfThGJanfplNgCyhbrH/IyrFT4hE+QtNWf8L460/b1Mx/N9gZr+OS5RULPDYhWeHKK lJJj7O42175ofFwjKxOQ0wXLGcPge7NhdGzC2OdOgd8zYPK+5/ui+x7f/bpXD6kzpl8RqV U41TLatLnsw5yWF0r1Mfd2oqBDw72EEnLAelVRGiBUck6SmtfZAj9pBuNEDb2acXvbI9Nm VUbv30v2J46LzaqeMY7kdiXjT1G0gQccmE/TsmmMWiLjM+b41JlSTYDta8Vy2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646660944; a=rsa-sha256; cv=none; b=Pm1b7OC2Qg0Gf6IwpucL9V9LrXRGi9ZX8f6+ewg3+YxsZGUtDn119qrsxWrvGj4/bc6M1k BRyKUAbH5C+TqToXTqZ/25JrUK4ZLUBqfgiVI+a73ce0bk/zWOkMBpziA9+NJMTnt+AqhE fjOufZzG5ZVTY5PtXgTYvubuMXKdwt+8N26BArGHvKMB46J+/jkLRZDRMYf/X/Nqi08Anr R8My5y1lLZt3shKfxu/E3yYX+V5hnvMhaIF5vhBZRI9mFXerLwGTAV9ChgnZXLnldzMCoa bgsS2I1tNXnD1slMFtfEsQgO6e1RI1kV/1+xrU2PAO+6sNXvVRDGvkask1yW+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f9fb661d6f5dec3512fcad51ed4c3de847355ff commit 2f9fb661d6f5dec3512fcad51ed4c3de847355ff Author: Jan Beich AuthorDate: 2022-03-04 22:06:17 +0000 Commit: Jan Beich 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 #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