Index: head/multimedia/cmrtlib/Makefile =================================================================== --- head/multimedia/cmrtlib/Makefile (revision 516882) +++ head/multimedia/cmrtlib/Makefile (revision 516883) @@ -1,27 +1,27 @@ # $FreeBSD$ PORTNAME= cmrtlib DISTVERSIONPREFIX= intel-media- -DISTVERSION= 19.4.pre1 +DISTVERSION= 19.4.pre2 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= C for Metal Runtime LICENSE= MIT LICENSE_FILE= ${WRKSRC:H}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported LIB_DEPENDS= libva.so:multimedia/libva RUN_DEPENDS= libva-intel-media-driver>=${PORTVERSION}:multimedia/libva-intel-media-driver USES= cmake compiler:c++11-lib pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel GH_PROJECT= media-driver WRKSRC_SUBDIR= ${PORTNAME} .include Index: head/multimedia/cmrtlib/distinfo =================================================================== --- head/multimedia/cmrtlib/distinfo (revision 516882) +++ head/multimedia/cmrtlib/distinfo (revision 516883) @@ -1,3 +1,3 @@ -TIMESTAMP = 1571323883 -SHA256 (intel-media-driver-intel-media-19.4.pre1_GH0.tar.gz) = 713517a69a493166d64d90b60aff2b905a181c5ecab4e290ef34a17a50a59032 -SIZE (intel-media-driver-intel-media-19.4.pre1_GH0.tar.gz) = 15739399 +TIMESTAMP = 1572606055 +SHA256 (intel-media-driver-intel-media-19.4.pre2_GH0.tar.gz) = 5d306e1798ab7835d0c827cf74f277ba3eadfe5b1f0d191d2a428608a7d3995f +SIZE (intel-media-driver-intel-media-19.4.pre2_GH0.tar.gz) = 19897461 Index: head/multimedia/libva-intel-media-driver/Makefile =================================================================== --- head/multimedia/libva-intel-media-driver/Makefile (revision 516882) +++ head/multimedia/libva-intel-media-driver/Makefile (revision 516883) @@ -1,63 +1,59 @@ # $FreeBSD$ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- -DISTVERSION= 19.4.pre1 -PORTREVISION= 2 +DISTVERSION= 19.4.pre2 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 4d247bea67d4.patch:-p1 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.5.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} -e '/-D__linux__/d' \ ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake @if [ ${CHOSEN_COMPILER_TYPE} != gcc ]; then \ ${REINPLACE_CMD} -i .gcc.bak '/-fno-tree-pre/d' \ ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake; \ fi # Silence -Wmacro-redefined @${REINPLACE_CMD} -e '/__fastcall/d' \ ${WRKSRC}/media_driver/linux/common/cm/cm_mem_os.h 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 516882) +++ head/multimedia/libva-intel-media-driver/distinfo (revision 516883) @@ -1,5 +1,3 @@ -TIMESTAMP = 1571323883 -SHA256 (intel-media-driver-intel-media-19.4.pre1_GH0.tar.gz) = 713517a69a493166d64d90b60aff2b905a181c5ecab4e290ef34a17a50a59032 -SIZE (intel-media-driver-intel-media-19.4.pre1_GH0.tar.gz) = 15739399 -SHA256 (4d247bea67d4.patch) = 9c6825ff935964adf84733f7f102968fbb82411924d3091a736e7058df14736c -SIZE (4d247bea67d4.patch) = 2377 +TIMESTAMP = 1572606055 +SHA256 (intel-media-driver-intel-media-19.4.pre2_GH0.tar.gz) = 5d306e1798ab7835d0c827cf74f277ba3eadfe5b1f0d191d2a428608a7d3995f +SIZE (intel-media-driver-intel-media-19.4.pre2_GH0.tar.gz) = 19897461 Index: head/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat (revision 516882) +++ head/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat (revision 516883) @@ -1,33 +1,48 @@ media_driver/linux/common/codec/ddi/media_ddi_encode_hevc.cpp:472:84: error: no member named 'low_delay_seq' in '_VAEncSequenceParameterBufferHEVC::(anonymous struct at /usr/local/include/va/va_enc_hevc.h:202:9)' hevcSeqParams->LowDelayMode = seqParams->seq_fields.bits.low_delay_seq; ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ media_driver/linux/common/codec/ddi/media_ddi_encode_hevc.cpp:473:84: error: no member named 'hierachical_flag' in '_VAEncSequenceParameterBufferHEVC::(anonymous struct at /usr/local/include/va/va_enc_hevc.h:202:9)' hevcSeqParams->HierarchicalFlag = seqParams->seq_fields.bits.hierachical_flag; ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ media_driver/linux/common/codec/ddi/media_ddi_encode_hevc.cpp:559:52: error: no member named 'hierarchical_level_plus1' in '_VAEncPictureParameterBufferHEVC' hevcPicParams->HierarchLevelPlus1 = picParams->hierarchical_level_plus1; ~~~~~~~~~ ^ +media_driver/linux/gen12/codec/ddi/media_ddi_decode_hevc_g12.cpp:100:63: error: no member named 'slice_data_num_emu_prevn_bytes' in '_VASliceParameterBufferHEVC' + codecSlcParams->NumEmuPrevnBytesInSliceHdr = slc->slice_data_num_emu_prevn_bytes; + ~~~ ^ --- media_driver/linux/common/codec/ddi/media_ddi_encode_hevc.cpp.orig 2019-10-17 14:51:23 UTC +++ media_driver/linux/common/codec/ddi/media_ddi_encode_hevc.cpp @@ -469,8 +469,10 @@ VAStatus DdiEncodeHevc::ParseSeqParams(void *ptr) hevcSeqParams->SAO_enabled_flag = seqParams->seq_fields.bits.sample_adaptive_offset_enabled_flag; hevcSeqParams->pcm_enabled_flag = seqParams->seq_fields.bits.pcm_enabled_flag; hevcSeqParams->pcm_loop_filter_disable_flag = seqParams->seq_fields.bits.pcm_loop_filter_disabled_flag; +#if VA_CHECK_VERSION(1, 6, 0) hevcSeqParams->LowDelayMode = seqParams->seq_fields.bits.low_delay_seq; hevcSeqParams->HierarchicalFlag = seqParams->seq_fields.bits.hierachical_flag; +#endif hevcSeqParams->log2_max_coding_block_size_minus3 = seqParams->log2_diff_max_min_luma_coding_block_size + seqParams->log2_min_luma_coding_block_size_minus3; @@ -556,7 +558,9 @@ VAStatus DdiEncodeHevc::ParsePicParams( /* picParams->coding_type; App is always setting this to 0 */ hevcPicParams->CodingType = picParams->pic_fields.bits.coding_type; +#if VA_CHECK_VERSION(1, 6, 0) hevcPicParams->HierarchLevelPlus1 = picParams->hierarchical_level_plus1; +#endif /* Reset it to zero now */ hevcPicParams->NumSlices = 0; +--- media_driver/linux/gen12/codec/ddi/media_ddi_decode_hevc_g12.cpp.orig 2019-11-01 11:00:55 UTC ++++ media_driver/linux/gen12/codec/ddi/media_ddi_decode_hevc_g12.cpp +@@ -97,7 +97,9 @@ VAStatus DdiDecodeHEVCG12::ParseSliceParams( + } + + codecSlcParams->ByteOffsetToSliceData = slc->slice_data_byte_offset; ++#if VA_CHECK_VERSION(1, 6, 0) + codecSlcParams->NumEmuPrevnBytesInSliceHdr = slc->slice_data_num_emu_prevn_bytes; ++#endif + codecSlcParams->slice_segment_address = slc->slice_segment_address; + + for (i = 0; i < 2; i++)