Index: head/multimedia/libva-intel-media-driver/Makefile =================================================================== --- head/multimedia/libva-intel-media-driver/Makefile (revision 542146) +++ head/multimedia/libva-intel-media-driver/Makefile (revision 542147) @@ -1,63 +1,63 @@ # $FreeBSD$ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- -DISTVERSION= 20.2.0 +DISTVERSION= 20.3.pre2 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 2bd42cddbe7c.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 0ef9d7bd97ac.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= b7b1ffbc5323.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 68360a8a07a0.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= c32a4a263b2d.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 79a852a14d7a.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 99a9f233a171.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 0c01a2d56aa2.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= bf8cbb1a04ea.patch:-p1 # https://github.com/intel/media-driver/pull/819 MAINTAINER= jbeich@FreeBSD.org COMMENT= VAAPI driver for Intel HD 5000 (Gen8) or newer LICENSE= MIT BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported BUILD_DEPENDS= gmmlib>=19.3.1:multimedia/gmmlib \ libva>=2.7.0:multimedia/libva LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ libigdgmm.so:multimedia/gmmlib \ libva.so:multimedia/libva USES= cmake compiler:c++11-lib localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= intel ARCH_SUFX= ${ARCH:S/i386/32/:S/amd//:S/x86_//} CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS BUILD_CMRTLIB CMAKE_ARGS= -DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DARCH:STRING="${ARCH_SUFX}" \ -DUFO_MARCH:STRING="${CPUTYPE}" PLIST_FILES= lib/dri/iHD_drv_video.so OPTIONS_DEFINE= TEST X11 OPTIONS_DEFAULT=X11 # XXX Unbundle googletest TEST_CMAKE_BOOL= MEDIA_RUN_TEST_SUITE TEST_TEST_TARGET= RunULT X11_LIB_DEPENDS= libva-x11.so:multimedia/libva post-patch: @${REINPLACE_CMD} 's/$${GIT_COMMIT}/${DISTVERSIONFULL}/' \ ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake post-patch-X11-off: @${REINPLACE_CMD} -i .nox11 '/find_package.*X11/d' \ ${WRKSRC}/media_driver/media_top_cmake.cmake .include Index: head/multimedia/libva-intel-media-driver/distinfo =================================================================== --- head/multimedia/libva-intel-media-driver/distinfo (revision 542146) +++ head/multimedia/libva-intel-media-driver/distinfo (revision 542147) @@ -1,21 +1,21 @@ -TIMESTAMP = 1593769296 -SHA256 (intel-media-driver-intel-media-20.2.0_GH0.tar.gz) = 1cdd40517d9fee51e3760beea23d2a19c2d5fcb1d6a9ed2bc0af7318d0d3100f -SIZE (intel-media-driver-intel-media-20.2.0_GH0.tar.gz) = 21860711 +TIMESTAMP = 1594284046 +SHA256 (intel-media-driver-intel-media-20.3.pre2_GH0.tar.gz) = 4d3b3ad31a64879454c7cd84866a2c87ee2e5b6dec07ff2efdbb869af4a496f8 +SIZE (intel-media-driver-intel-media-20.3.pre2_GH0.tar.gz) = 22256633 SHA256 (2bd42cddbe7c.patch) = 8ddca9a1e793dcbc6876aa53d6e93b900a2a32bc5183f92af66158d7fe16479f SIZE (2bd42cddbe7c.patch) = 1241 SHA256 (0ef9d7bd97ac.patch) = 1c159b93f2832b825811d8ca5386facfd430ba02f90b73877b5737292d9d881f SIZE (0ef9d7bd97ac.patch) = 1213 SHA256 (b7b1ffbc5323.patch) = 8e5e3f6e60454dc711ef92012d626e16f5bf18f1e1a69d5c71d43c9f3bff7317 SIZE (b7b1ffbc5323.patch) = 2195 SHA256 (68360a8a07a0.patch) = 52d65134f6d79851f73a4826d980e845485f5b6cf41099a414aeb70e27af6d4f SIZE (68360a8a07a0.patch) = 1993 SHA256 (c32a4a263b2d.patch) = b97facb9b7eecccb66ecea41b215869796bcf99b88be8bdd45088db0dab24dda SIZE (c32a4a263b2d.patch) = 3411 SHA256 (79a852a14d7a.patch) = d81c0df776915cc74ec66008a410a579634bf27b261034c29721da7e19d4d61e SIZE (79a852a14d7a.patch) = 6485 SHA256 (99a9f233a171.patch) = ce6ae0b716c9bd3badc1493dcf7cd9f1ace98d714eaff0fbc549bbc63e756441 SIZE (99a9f233a171.patch) = 2402 SHA256 (0c01a2d56aa2.patch) = 2ca055ad0202b2bd722847d0bc09317649757a15bda4a18c8424c2742490770a SIZE (0c01a2d56aa2.patch) = 3335 SHA256 (bf8cbb1a04ea.patch) = 65d975474e1c0c73f1546dafd8154575f6eb93732ed1fa8b417a0eb53352c555 SIZE (bf8cbb1a04ea.patch) = 800 Index: head/multimedia/libva-intel-media-driver/files/patch-libva-2.8 =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-libva-2.8 (nonexistent) +++ head/multimedia/libva-intel-media-driver/files/patch-libva-2.8 (revision 542147) @@ -0,0 +1,56 @@ +Drop after multimedia/libva is updated to 2.9.0. + +media_driver/linux/common/ddi/media_libva.cpp:3849:23: error: use of undeclared identifier 'VA_TIMEOUT_INFINITE' + if (timeout_ns == VA_TIMEOUT_INFINITE) + ^ +media_driver/linux/common/ddi/media_libva.cpp:3856:20: error: use of undeclared identifier 'VA_STATUS_ERROR_TIMEDOUT' + return VA_STATUS_ERROR_TIMEDOUT; + ^ +media_driver/linux/common/ddi/media_libva.cpp:3884:24: error: use of undeclared identifier 'VA_STATUS_ERROR_TIMEDOUT' + return VA_STATUS_ERROR_TIMEDOUT; + ^ +media_driver/linux/common/ddi/media_libva.cpp:3917:23: error: use of undeclared identifier 'VA_TIMEOUT_INFINITE' + if (timeout_ns == VA_TIMEOUT_INFINITE) + ^ +media_driver/linux/common/ddi/media_libva.cpp:3924:20: error: use of undeclared identifier 'VA_STATUS_ERROR_TIMEDOUT' + return VA_STATUS_ERROR_TIMEDOUT; + ^ +media_driver/linux/common/ddi/media_libva.cpp:3952:24: error: use of undeclared identifier 'VA_STATUS_ERROR_TIMEDOUT' + return VA_STATUS_ERROR_TIMEDOUT; + ^ +media_driver/linux/common/ddi/media_libva.cpp:6764:14: error: no member named 'vaSyncSurface2' in 'VADriverVTable' + pVTable->vaSyncSurface2 = DdiMedia_SyncSurface2; + ~~~~~~~ ^ +media_driver/linux/common/ddi/media_libva.cpp:6765:14: error: no member named 'vaSyncBuffer' in 'VADriverVTable' + pVTable->vaSyncBuffer = DdiMedia_SyncBuffer; + ~~~~~~~ ^ + +--- media_driver/linux/common/ddi/media_libva.cpp.orig 2020-07-09 08:40:46 UTC ++++ media_driver/linux/common/ddi/media_libva.cpp +@@ -3815,6 +3815,7 @@ static VAStatus DdiMedia_SyncSurface ( + return DdiMedia_StatusCheck(mediaCtx, surface, render_target); + } + ++#if VA_CHECK_VERSION(1,9,0) + /* + * This function blocks until all pending operations on the surface have been + * completed or exceed timeout. Upon return it is safe to use the render target for a +@@ -3956,6 +3957,7 @@ static VAStatus DdiMedia_SyncBuffer ( + + return VA_STATUS_SUCCESS; + } ++#endif + + /* + * Find out any pending ops on the render target +@@ -6761,8 +6763,10 @@ VAStatus __vaDriverInit(VADriverContextP ctx ) + pVTable->vaRenderPicture = DdiMedia_RenderPicture; + pVTable->vaEndPicture = DdiMedia_EndPicture; + pVTable->vaSyncSurface = DdiMedia_SyncSurface; ++#if VA_CHECK_VERSION(1,9,0) + pVTable->vaSyncSurface2 = DdiMedia_SyncSurface2; + pVTable->vaSyncBuffer = DdiMedia_SyncBuffer; ++#endif + pVTable->vaQuerySurfaceStatus = DdiMedia_QuerySurfaceStatus; + pVTable->vaQuerySurfaceError = DdiMedia_QuerySurfaceError; + pVTable->vaQuerySurfaceAttributes = DdiMedia_QuerySurfaceAttributes; Property changes on: head/multimedia/libva-intel-media-driver/files/patch-libva-2.8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property