git: fb36296fb894 - main - multimedia/onevpl: update to 2022.1.5

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sun, 19 Jun 2022 10:46:40 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fb36296fb8942eae35e8e23f066add98b15c094b

commit fb36296fb8942eae35e8e23f066add98b15c094b
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-06-10 23:31:59 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-06-19 10:46:26 +0000

    multimedia/onevpl: update to 2022.1.5
    
    Changes:        https://github.com/oneapi-src/oneVPL/compare/v2022.1.4...v2022.1.5
    Reported by:    Repology
---
 multimedia/onevpl/Makefile         |  2 +-
 multimedia/onevpl/distinfo         |  6 +++---
 multimedia/onevpl/files/patch-unix | 30 +++++++++++++++++++++++++-----
 multimedia/onevpl/pkg-plist        |  3 ---
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/multimedia/onevpl/Makefile b/multimedia/onevpl/Makefile
index b3aba3f0634b..281b08593df3 100644
--- a/multimedia/onevpl/Makefile
+++ b/multimedia/onevpl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	oneVPL
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2022.1.4
+DISTVERSION=	2022.1.5
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/onevpl/distinfo b/multimedia/onevpl/distinfo
index ca1f1b5a5a66..d7ef7e4e6bd9 100644
--- a/multimedia/onevpl/distinfo
+++ b/multimedia/onevpl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653690348
-SHA256 (oneapi-src-oneVPL-v2022.1.4_GH0.tar.gz) = 939f158ea7f011be14069326ee0a95be1776c364032e6ca800b01d2f2b2e9597
-SIZE (oneapi-src-oneVPL-v2022.1.4_GH0.tar.gz) = 5859910
+TIMESTAMP = 1654903919
+SHA256 (oneapi-src-oneVPL-v2022.1.5_GH0.tar.gz) = e43674d6d41f4d6f9218b5cbcfa1e1a3549185d0d7fe764f9e819a1cd9620832
+SIZE (oneapi-src-oneVPL-v2022.1.5_GH0.tar.gz) = 5864164
diff --git a/multimedia/onevpl/files/patch-unix b/multimedia/onevpl/files/patch-unix
index 68ab91e1c0ef..0df3b6b4a4f0 100644
--- a/multimedia/onevpl/files/patch-unix
+++ b/multimedia/onevpl/files/patch-unix
@@ -19,6 +19,17 @@ dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:583:43: error: use of undeclared id
             if (libInfo->libNameFull.find(MSDK_LIB_NAME) != std::string::npos) {
                                           ^
 
+--- CMakeLists.txt.orig	2022-06-10 23:31:59 UTC
++++ CMakeLists.txt
+@@ -219,7 +219,7 @@ message(STATUS "  BUILD_TOOLS                         
+ message(STATUS "  BUILD_DEV                            : ${BUILD_DEV}")
+ message(STATUS "  BUILD_DISPATCHER                     : ${BUILD_DISPATCHER}")
+ message(STATUS "  BUILD_TOOLS                          : ${BUILD_TOOLS}")
+-if(CMAKE_SYSTEM_NAME MATCHES Linux)
++if(UNIX AND NOT APPLE)
+   message(STATUS "  ENABLE_VA                            : ${ENABLE_VA}")
+   message(STATUS "  ENABLE_DRM                           : ${ENABLE_DRM}")
+   message(STATUS "  ENABLE_WAYLAND                       : ${ENABLE_WAYLAND}")
 --- api/vpl/mfxdefs.h.orig	2021-12-07 00:05:44 UTC
 +++ api/vpl/mfxdefs.h
 @@ -64,7 +64,7 @@ extern "C"
@@ -362,14 +373,23 @@ 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_common/CMakeLists.txt.orig	2022-05-27 22:25:48 UTC
+--- tools/legacy/sample_common/CMakeLists.txt.orig	2022-06-10 23:31:59 UTC
 +++ tools/legacy/sample_common/CMakeLists.txt
-@@ -61,7 +61,7 @@ endif()
-   target_compile_definitions(sample_common PUBLIC -DONEVPL_EXPERIMENTAL)
+@@ -4,7 +4,7 @@ set(TOOLS_DEFAULT ON)
+ # SPDX-License-Identifier: MIT
+ # ##############################################################################
+ set(TOOLS_DEFAULT ON)
+-if(CMAKE_SYSTEM_NAME MATCHES Linux)
++if(UNIX AND NOT APPLE)
+   # Check dependencies up-front so we can set option defaults
+   find_package(PkgConfig REQUIRED)
+   # note: pkg-config version for libva is *API* version
+@@ -161,7 +161,7 @@ endif()
+   target_compile_definitions(${TARGET} PUBLIC -DONEVPL_EXPERIMENTAL)
  endif()
  
 -if(CMAKE_SYSTEM_NAME MATCHES Linux)
 +if(UNIX AND NOT APPLE)
-   target_compile_definitions(sample_common PUBLIC LINUX64)
+   target_compile_definitions(${TARGET} PUBLIC LINUX64)
  
-   find_package(PkgConfig REQUIRED)
+   if(NOT ENABLE_VA)
diff --git a/multimedia/onevpl/pkg-plist b/multimedia/onevpl/pkg-plist
index a9b125bedc7f..0f8148480145 100644
--- a/multimedia/onevpl/pkg-plist
+++ b/multimedia/onevpl/pkg-plist
@@ -1,7 +1,4 @@
 bin/decvpp_tool
-bin/hello-decode
-bin/hello-encode
-bin/hello-vpp
 bin/sample_decode
 bin/sample_encode
 bin/sample_multi_transcode