diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2026-09-30 21:30:09 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2026-09-30 21:30:09 +0000 |
| commit | f123739524656e4bdf6851f02e675ec395323a23 (patch) | |
| tree | aad6bdd076dc61d4c49da82d4e611e48b356e5ee | |
| parent | 9b044f5d9ebce50ffe459b5249619856a6e6f9f9 (diff) | |
multimedia/onevpl: Remove expired port
2026-09-30 multimedia/onevpl: Upstream has been renamed to libvpl and libvpl-tools. Use multimedia/libvpl and multimedia/libvpl-tools instead.
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | multimedia/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/onevpl/Makefile | 61 | ||||
| -rw-r--r-- | multimedia/onevpl/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/onevpl/files/patch-drm-to-pciid | 154 | ||||
| -rw-r--r-- | multimedia/onevpl/files/patch-includes | 42 | ||||
| -rw-r--r-- | multimedia/onevpl/files/patch-private-libs | 13 | ||||
| -rw-r--r-- | multimedia/onevpl/files/patch-sched | 33 | ||||
| -rw-r--r-- | multimedia/onevpl/files/patch-unix | 395 | ||||
| -rw-r--r-- | multimedia/onevpl/pkg-descr | 10 | ||||
| -rw-r--r-- | multimedia/onevpl/pkg-plist | 177 |
11 files changed, 1 insertions, 889 deletions
@@ -5681,3 +5681,4 @@ devel/electron40||2026-09-30|Has expired: EOLed upstream, switch to newer versio devel/lnphost||2026-09-30|Has expired: Deprecated upstream: Consider porting brickOS-bibo as a replacement german/eric6||2026-09-30|Has expired: Depends on deprecated Qt5 WebEngine biology/ddocent||2026-09-30|Has expired: No apparent interest, unable to maintain +multimedia/onevpl||2026-09-30|Has expired: Upstream has been renamed to libvpl and libvpl-tools. Use multimedia/libvpl and multimedia/libvpl-tools instead diff --git a/multimedia/Makefile b/multimedia/Makefile index 8fd11fc33cb8..ceb339803a4b 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -269,7 +269,6 @@ SUBDIR += oggvideotools SUBDIR += ogmtools SUBDIR += olive - SUBDIR += onevpl SUBDIR += openh264 SUBDIR += openshot SUBDIR += opentimelineio diff --git a/multimedia/onevpl/Makefile b/multimedia/onevpl/Makefile deleted file mode 100644 index eb5a5170669d..000000000000 --- a/multimedia/onevpl/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -PORTNAME= oneVPL -DISTVERSIONPREFIX= v -DISTVERSION= 2022.1.5 -PORTREVISION= 1 -CATEGORIES= multimedia - -MAINTAINER= ports@FreeBSD.org -COMMENT= oneAPI Video Processing Library dispatcher, tools, and examples -WWW= https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Upstream has been renamed to libvpl and libvpl-tools. Use multimedia/libvpl and multimedia/libvpl-tools instead. -EXPIRATION_DATE= 2026-09-30 - -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 \ - libva.so:multimedia/libva \ - libwayland-client.so:graphics/wayland - -USES= cmake:testing compiler:c++14-lang localbase:ldflags pkgconfig \ - xorg -USE_CXXSTD= c++14 -USE_GITHUB= yes -GH_ACCOUNT= oneapi-src -USE_LDCONFIG= yes -USE_XORG= x11 xcb - -CMAKE_TESTING_ON= BUILD_TESTS -CONFLICTS_INSTALL= libvpl -DATADIR= ${PREFIX}/share/vpl - -OPTIONS_DEFINE= PYTHON -OPTIONS_DEFAULT= PYTHON -OPTIONS_SUB= yes - -PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11 -PYTHON_USES= python -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 <bsd.port.mk> diff --git a/multimedia/onevpl/distinfo b/multimedia/onevpl/distinfo deleted file mode 100644 index d7ef7e4e6bd9..000000000000 --- a/multimedia/onevpl/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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-drm-to-pciid b/multimedia/onevpl/files/patch-drm-to-pciid deleted file mode 100644 index 81d91d027909..000000000000 --- a/multimedia/onevpl/files/patch-drm-to-pciid +++ /dev/null @@ -1,154 +0,0 @@ -/sys/class/drm/renderD*/device/device is Linux-only, so use a BSD extension -to get vendor/device identifiers from rendor nodes. Based on libdrm code. - -$ ffmpeg -hide_banner -init_hw_device qsv=auto -i foo.y4m -vf hwupload=extra_hw_frames=64,format=qsv -c:v h264_qsv -y foo.mkv -[AVHWDeviceContext @ 0x8062d0140] Error initializing an MFX session: -3. -Device creation failed: -1313558101. -Failed to set value 'qsv=auto' for option 'init_hw_device': Unknown error occurred -Error parsing global options: Unknown error occurred - ---- dispatcher/linux/device_ids.h.orig 2021-12-17 04:19:18 UTC -+++ dispatcher/linux/device_ids.h -@@ -377,7 +377,62 @@ static inline eMFXHWType get_platform(unsigned int dev - return MFX_HW_UNKNOWN; - } - -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) && __FreeBSD__ < 13 -+#include <sys/sysctl.h> -+#else -+#include <sys/ioctl.h> -+#include <fcntl.h> -+#include <unistd.h> -+#endif // defined(__FreeBSD__) && __FreeBSD__ < 13 -+ -+struct drm_pciinfo { -+ uint16_t domain; -+ uint8_t bus; -+ uint8_t dev; -+ uint8_t func; -+ uint16_t vendor_id; -+ uint16_t device_id; -+ uint16_t subvendor_id; -+ uint16_t subdevice_id; -+ uint8_t revision_id; -+}; -+ -+#define DRM_IOCTL_BASE 'd' -+#define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type) -+#define DRM_IOCTL_GET_PCIINFO DRM_IOR(0x15, struct drm_pciinfo) -+#endif -+ - static mfxStatus get_devices(std::vector<Device> &allDevices) { -+#ifdef DRM_IOCTL_GET_PCIINFO -+ std::vector <Device> result; -+ for (int i = 0; i < 64; ++i) { -+#if defined(__FreeBSD__) && __FreeBSD__ < 13 -+ std::string mib = "dev.drm." + std::to_string(128 + i) + ".PCI_ID"; -+ char pci_id[20]; -+ size_t len = sizeof(pci_id); -+ if (sysctlbyname(mib.c_str(), pci_id, &len, NULL, 0)) continue; -+ Device device; -+ sscanf(pci_id, "%x:%x", &device.vendor_id, &device.device_id); -+#else -+ std::string path = "/dev/dri/renderD" + std::to_string(128 + i); -+ int fd = open(path.c_str(), O_RDONLY); -+ if (fd == -1) continue; -+ struct drm_pciinfo pinfo; -+ if (ioctl(fd, DRM_IOCTL_GET_PCIINFO, &pinfo)) { -+ close(fd); -+ continue; -+ } -+ Device device = { .vendor_id = pinfo.vendor_id, .device_id = pinfo.device_id }; -+ close(fd); -+#endif // defined(__FreeBSD__) && __FreeBSD__ < 13 -+ if (device.vendor_id != 0x8086) { // Filter out non-Intel devices -+ continue; -+ } -+ device.platform = get_platform(device.device_id); -+ allDevices.emplace_back(device); -+ } -+#else - const char *dir = "/sys/class/drm"; - const char *device_id_file = "/device/device"; - const char *vendor_id_file = "/device/vendor"; -@@ -413,6 +468,7 @@ static mfxStatus get_devices(std::vector<Device> &allD - - allDevices.emplace_back(device); - } -+#endif - - // sort by platform, unknown will appear at beginning - std::sort(allDevices.begin(), allDevices.end(), [](const Device &a, const Device &b) { ---- dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp.orig 2022-03-04 22:06:17 UTC -+++ dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp -@@ -446,6 +446,32 @@ mfxStatus LoaderCtxMSDK::CheckD3D9Support(mfxU64 luid, - #endif - } - -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) && __FreeBSD__ < 13 -+#include <sys/sysctl.h> -+#else -+#include <sys/ioctl.h> -+#include <fcntl.h> -+#include <unistd.h> -+#endif // defined(__FreeBSD__) && __FreeBSD__ < 13 -+ -+struct drm_pciinfo { -+ uint16_t domain; -+ uint8_t bus; -+ uint8_t dev; -+ uint8_t func; -+ uint16_t vendor_id; -+ uint16_t device_id; -+ uint16_t subvendor_id; -+ uint16_t subdevice_id; -+ uint8_t revision_id; -+}; -+ -+#define DRM_IOCTL_BASE 'd' -+#define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type) -+#define DRM_IOCTL_GET_PCIINFO DRM_IOR(0x15, struct drm_pciinfo) -+#endif -+ - mfxStatus LoaderCtxMSDK::GetRenderNodeDescription(mfxU32 adapterID, - mfxU32 &vendorID, - mfxU16 &deviceID) { -@@ -456,6 +482,28 @@ - mfxU32 DRMRenderNodeNum = 128 + adapterID; - std::string nodeStr = std::to_string(DRMRenderNodeNum); - -+#ifdef DRM_IOCTL_GET_PCIINFO -+#if defined(__FreeBSD__) && __FreeBSD__ < 13 -+ std::string mib = "dev.drm." + nodeStr + ".PCI_ID"; -+ char pci_id[20]; -+ size_t len = sizeof(pci_id); -+ if (!sysctlbyname(mib.c_str(), pci_id, &len, NULL, 0)) -+ sscanf(pci_id, "%x:%hx", &vendorID, &deviceID); -+#else -+ std::string path = "/dev/dri/renderD" + nodeStr; -+ int fd = open(path.c_str(), O_RDONLY); -+ if (fd != -1) { -+ struct drm_pciinfo pinfo; -+ if (!ioctl(fd, DRM_IOCTL_GET_PCIINFO, &pinfo)) { -+ vendorID = pinfo.vendor_id; -+ deviceID = pinfo.device_id; -+ } -+ close(fd); -+ } -+#endif // defined(__FreeBSD__) && __FreeBSD__ < 13 -+ if (vendorID != 0x8086) -+ return MFX_ERR_UNSUPPORTED; -+#else - std::string vendorPath = "/sys/class/drm/renderD" + nodeStr + "/device/vendor"; - std::string devPath = "/sys/class/drm/renderD" + nodeStr + "/device/device"; - -@@ -481,6 +529,7 @@ mfxStatus LoaderCtxMSDK::GetRenderNodeDescription(mfxU - deviceID = (mfxU32)u32; - fclose(devFile); - } -+#endif - - if (deviceID == 0) - return MFX_ERR_UNSUPPORTED; diff --git a/multimedia/onevpl/files/patch-includes b/multimedia/onevpl/files/patch-includes deleted file mode 100644 index def624979110..000000000000 --- a/multimedia/onevpl/files/patch-includes +++ /dev/null @@ -1,42 +0,0 @@ -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-private-libs b/multimedia/onevpl/files/patch-private-libs deleted file mode 100644 index 43874cd594c7..000000000000 --- a/multimedia/onevpl/files/patch-private-libs +++ /dev/null @@ -1,13 +0,0 @@ -Reduce overlinking when not using static library - ---- dispatcher/CMakeLists.txt.orig 2021-09-13 22:51:02 UTC -+++ dispatcher/CMakeLists.txt -@@ -174,7 +174,7 @@ if(BUILD_DEV) - if(NOT MSVC) - set(CXX_LIB "-lstdc++") - endif() -- set(VPL_PKGCONFIG_DEPENDENT_LIBS -+ set(VPL_PKGCONFIG_PRIVATE_LIBS - "${DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_LIBS} ${CXX_LIB}") - configure_file("pkgconfig/vpl.pc.in" "pkgconfig/vpl.pc" @ONLY) - install( diff --git a/multimedia/onevpl/files/patch-sched b/multimedia/onevpl/files/patch-sched deleted file mode 100644 index 8012f025d8bb..000000000000 --- a/multimedia/onevpl/files/patch-sched +++ /dev/null @@ -1,33 +0,0 @@ -Disable non-POSIX scheduling policies if not supported - -tools/legacy/sample_common/src/vm/thread_linux.cpp:279:16: error: use of undeclared identifier 'SCHED_BATCH' - type = SCHED_BATCH; - ^ -tools/legacy/sample_common/src/vm/thread_linux.cpp:282:16: error: use of undeclared identifier 'SCHED_IDLE' - type = SCHED_IDLE; - ^ - ---- tools/legacy/sample_common/src/vm/thread_linux.cpp.orig 2021-09-13 22:51:02 UTC -+++ tools/legacy/sample_common/src/vm/thread_linux.cpp -@@ -275,15 +275,21 @@ mfxStatus msdk_thread_get_schedtype(const msdk_char* s - else if (!msdk_strcmp(str, MSDK_STRING("other"))) { - type = SCHED_OTHER; - } -+#ifdef SCHED_BATCH - else if (!msdk_strcmp(str, MSDK_STRING("batch"))) { - type = SCHED_BATCH; - } -+#endif -+#ifdef SCHED_IDLE - else if (!msdk_strcmp(str, MSDK_STRING("idle"))) { - type = SCHED_IDLE; - } -+#endif -+ //#ifdef SCHED_DEADLINE - // else if (!msdk_strcmp(str, MSDK_STRING("deadline"))) { - // type = SCHED_DEADLINE; - // } -+ //#endif - else { - return MFX_ERR_UNSUPPORTED; - } diff --git a/multimedia/onevpl/files/patch-unix b/multimedia/onevpl/files/patch-unix deleted file mode 100644 index 0df3b6b4a4f0..000000000000 --- a/multimedia/onevpl/files/patch-unix +++ /dev/null @@ -1,395 +0,0 @@ -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) { - ^ - ---- 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" - #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 <pthread.h> - #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 <fcntl.h> - #include <unistd.h> - #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 <fcntl.h> - #include <unistd.h> - #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 <fcntl.h> - #include <unistd.h> - #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 <fcntl.h> - #include <unistd.h> - #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 <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" - #endif - --#ifdef __linux__ -+#ifdef __unix__ - #include <fcntl.h> - #include <unistd.h> - #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 <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" - #endif - --#ifdef __linux__ -+#ifdef __unix__ - #include <fcntl.h> - #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 <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" - #endif - --#ifdef __linux__ -+#ifdef __unix__ - #include <fcntl.h> - #include <unistd.h> - #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 <fcntl.h> - #include <unistd.h> - #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 <fcntl.h> - #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 <fcntl.h> - #include <unistd.h> - #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 <fcntl.h> - #include <unistd.h> - #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 <fcntl.h> - #include <unistd.h> - #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 <fcntl.h> - #include <unistd.h> - #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-06-10 23:31:59 UTC -+++ tools/legacy/sample_common/CMakeLists.txt -@@ -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(${TARGET} PUBLIC LINUX64) - - if(NOT ENABLE_VA) diff --git a/multimedia/onevpl/pkg-descr b/multimedia/onevpl/pkg-descr deleted file mode 100644 index 36b89a8b38a7..000000000000 --- a/multimedia/onevpl/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The oneAPI Video Processing Library (oneVPL) provides a single video -processing API for encode, decode, and video processing that works -across a wide range of accelerators. - -This package contains the following components of oneVPL: - -- Copies of the oneVPL Specification API header files -- oneVPL dispatcher -- Examples demonstrating API usage -- oneVPL command line tools diff --git a/multimedia/onevpl/pkg-plist b/multimedia/onevpl/pkg-plist deleted file mode 100644 index f0f6423905ff..000000000000 --- a/multimedia/onevpl/pkg-plist +++ /dev/null @@ -1,177 +0,0 @@ -bin/decvpp_tool -bin/sample_decode -bin/sample_encode -bin/sample_multi_transcode -bin/sample_vpp -bin/vpl-inspect -etc/modulefiles/vpl -etc/vpl/vars.sh -include/vpl/mfx.h -include/vpl/mfxadapter.h -include/vpl/mfxbrc.h -include/vpl/mfxcommon.h -include/vpl/mfxdefs.h -include/vpl/mfxdispatcher.h -include/vpl/mfxdispatcherprefixedfunctions.h -include/vpl/mfxencodestats.h -include/vpl/mfximplcaps.h -include/vpl/mfxjpeg.h -include/vpl/mfxmvc.h -include/vpl/mfxpcp.h -include/vpl/mfxsession.h -include/vpl/mfxstructures.h -include/vpl/mfxsurfacepool.h -include/vpl/mfxvideo++.h -include/vpl/mfxvideo.h -include/vpl/mfxvp8.h -include/vpl/preview/README.txt -include/vpl/preview/bitstream.hpp -include/vpl/preview/defs.hpp -include/vpl/preview/detail/frame_interface.hpp -include/vpl/preview/detail/sdk_callable.hpp -include/vpl/preview/detail/string_helpers.hpp -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_surface.hpp -include/vpl/preview/future.hpp -include/vpl/preview/impl_caps.hpp -include/vpl/preview/impl_selector.hpp -include/vpl/preview/legacy/README.txt -include/vpl/preview/legacy/mfxvideo++.h -include/vpl/preview/option_tree.hpp -include/vpl/preview/options.hpp -include/vpl/preview/payload.hpp -include/vpl/preview/session.hpp -include/vpl/preview/source_reader.hpp -include/vpl/preview/stat.hpp -include/vpl/preview/surface_pool.hpp -include/vpl/preview/video_param.hpp -include/vpl/preview/vpl.hpp -lib/cmake/vpl/VPLConfig.cmake -lib/cmake/vpl/VPLConfigVersion.cmake -lib/libvpl.so -lib/libvpl.so.2 -lib/libvpl.so.2.7 -%%PYTHON%%%%PYTHON_LIBDIR%%/pyvpl%%PYTHON_TAG%%.so -lib/vpl/libvpl_wayland.so -libdata/pkgconfig/vpl.pc -%%DATADIR%%/examples/content/cars_320x240.h265 -%%DATADIR%%/examples/content/cars_320x240.i420 -%%DATADIR%%/examples/content/cars_320x240.mjpeg -%%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 -%%DATADIR%%/examples/coreAPI/legacy-decode/sample.json -%%DATADIR%%/examples/coreAPI/legacy-decode/src/legacy-decode.cpp -%%DATADIR%%/examples/coreAPI/legacy-decode/src/util.h -%%DATADIR%%/examples/coreAPI/legacy-encode/CMakeLists.txt -%%DATADIR%%/examples/coreAPI/legacy-encode/License.txt -%%DATADIR%%/examples/coreAPI/legacy-encode/PreLoad.cmake -%%DATADIR%%/examples/coreAPI/legacy-encode/README.md -%%DATADIR%%/examples/coreAPI/legacy-encode/sample.json -%%DATADIR%%/examples/coreAPI/legacy-encode/src/legacy-encode.cpp -%%DATADIR%%/examples/coreAPI/legacy-encode/src/util.h -%%DATADIR%%/examples/coreAPI/legacy-vpp/CMakeLists.txt -%%DATADIR%%/examples/coreAPI/legacy-vpp/License.txt -%%DATADIR%%/examples/coreAPI/legacy-vpp/README.md -%%DATADIR%%/examples/coreAPI/legacy-vpp/sample.json -%%DATADIR%%/examples/coreAPI/legacy-vpp/src/legacy-vpp.cpp -%%DATADIR%%/examples/coreAPI/legacy-vpp/src/util.h -%%DATADIR%%/examples/hello/hello-createsession/CMakeLists.txt -%%DATADIR%%/examples/hello/hello-createsession/License.txt -%%DATADIR%%/examples/hello/hello-createsession/PreLoad.cmake -%%DATADIR%%/examples/hello/hello-createsession/README.md -%%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 -%%DATADIR%%/examples/hello/hello-decvpp/README.md -%%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 -%%DATADIR%%/examples/interop/legacy-decode-infer/CMakeLists.txt -%%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 -%%DATADIR%%/examples/preview/cplusplus/hello-decode-cpp/CMakeLists.txt -%%DATADIR%%/examples/preview/cplusplus/hello-decode-cpp/License.txt -%%DATADIR%%/examples/preview/cplusplus/hello-decode-cpp/README.md -%%DATADIR%%/examples/preview/cplusplus/hello-decode-cpp/src/hello-decode.cpp -%%DATADIR%%/examples/preview/cplusplus/hello-decode-cpp/src/util.hpp -%%DATADIR%%/examples/preview/cplusplus/hello-encode-cpp/CMakeLists.txt -%%DATADIR%%/examples/preview/cplusplus/hello-encode-cpp/License.txt -%%DATADIR%%/examples/preview/cplusplus/hello-encode-cpp/README.md -%%DATADIR%%/examples/preview/cplusplus/hello-encode-cpp/src/hello-encode.cpp -%%DATADIR%%/examples/preview/cplusplus/hello-encode-cpp/src/util.hpp -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-decode-py/License.txt -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-decode-py/README.md -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-decode-py/hello-decode.py -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-encode-py/License.txt -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-encode-py/README.md -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-encode-py/hello-encode.py -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-vpp-py/License.txt -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-vpp-py/README.md -%%PYTHON%%%%DATADIR%%/examples/preview/python/hello-vpp-py/hello-vpp.py -%%DATADIR%%/licensing/license.txt -%%DATADIR%%/licensing/third-party-programs.txt |
