Index: head/multimedia/libva/Makefile =================================================================== --- head/multimedia/libva/Makefile (revision 520871) +++ head/multimedia/libva/Makefile (revision 520872) @@ -1,45 +1,45 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 2.5.0 +PORTVERSION= 2.6.0 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= c2a431cc3cab.patch:-p1 5cfcd31635b1.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT?= VAAPI wrapper and dummy driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libdrm.so:graphics/libdrm USES= meson pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel # -lpthread is not necessary if pthread_getthreadid_np is a libc stub LDFLAGS+= ${LDFLAGS_${OPSYS}_${OSREL}} LDFLAGS_FreeBSD_11.3= -lpthread LDFLAGS_FreeBSD_12.0= -lpthread OPTIONS_DEFINE= GLX WAYLAND X11 OPTIONS_DEFAULT=GLX WAYLAND X11 OPTIONS_EXCLUDE?=GLX # enslaved until subpackaging OPTIONS_SUB= yes GLX_LIB_DEPENDS= libva-x11.so:multimedia/libva GLX_USES= gl GLX_USE= GL=gl GLX_MESON_YES= with_glx GLX_IMPLIES= X11 WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_MESON_YES= with_wayland X11_USES= xorg X11_USE= XORG=x11,xorgproto,xext,xfixes X11_MESON_YES= with_x11 .include Index: head/multimedia/libva/distinfo =================================================================== --- head/multimedia/libva/distinfo (revision 520871) +++ head/multimedia/libva/distinfo (revision 520872) @@ -1,7 +1,7 @@ -TIMESTAMP = 1562332471 -SHA256 (intel-libva-2.5.0_GH0.tar.gz) = 9b6264dade6b6d3edb59c6c4f3c9217d1d5a195635fc07da875d565f58624418 -SIZE (intel-libva-2.5.0_GH0.tar.gz) = 226226 +TIMESTAMP = 1577288899 +SHA256 (intel-libva-2.6.0_GH0.tar.gz) = 5566755739503ef53beafad7fd7e155e68039e9af78e051e27f1715a420a0952 +SIZE (intel-libva-2.6.0_GH0.tar.gz) = 228808 SHA256 (c2a431cc3cab.patch) = d749a839b168529d2c424ffa78bd8859eebd831a5dfd50e8cdd1fc760907a232 SIZE (c2a431cc3cab.patch) = 835 SHA256 (5cfcd31635b1.patch) = 16344b56bf7e4bbc8a572183adbfd346d92d54d70a87dc6f30bae2ee946ccc84 SIZE (5cfcd31635b1.patch) = 1091 Index: head/multimedia/libva/pkg-plist =================================================================== --- head/multimedia/libva/pkg-plist (revision 520871) +++ head/multimedia/libva/pkg-plist (revision 520872) @@ -1,51 +1,51 @@ include/va/va.h include/va/va_backend.h %%GLX%%include/va/va_backend_glx.h include/va/va_backend_vpp.h %%WAYLAND%%include/va/va_backend_wayland.h include/va/va_compat.h include/va/va_dec_hevc.h include/va/va_dec_jpeg.h include/va/va_dec_vp8.h include/va/va_dec_vp9.h %%X11%%include/va/va_dri2.h %%X11%%include/va/va_dricommon.h include/va/va_drm.h include/va/va_drmcommon.h include/va/va_egl.h include/va/va_enc_h264.h include/va/va_enc_hevc.h include/va/va_enc_jpeg.h include/va/va_enc_mpeg2.h include/va/va_enc_vp8.h include/va/va_enc_vp9.h include/va/va_fei_h264.h include/va/va_fei_hevc.h include/va/va_fei.h %%GLX%%include/va/va_glx.h include/va/va_str.h include/va/va_tpi.h include/va/va_version.h include/va/va_vpp.h %%WAYLAND%%include/va/va_wayland.h %%X11%%include/va/va_x11.h lib/libva-drm.so lib/libva-drm.so.2 -lib/libva-drm.so.2.500.0 +lib/libva-drm.so.2.600.0 %%GLX%%lib/libva-glx.so %%GLX%%lib/libva-glx.so.2 -%%GLX%%lib/libva-glx.so.2.500.0 +%%GLX%%lib/libva-glx.so.2.600.0 %%WAYLAND%%lib/libva-wayland.so %%WAYLAND%%lib/libva-wayland.so.2 -%%WAYLAND%%lib/libva-wayland.so.2.500.0 +%%WAYLAND%%lib/libva-wayland.so.2.600.0 %%X11%%lib/libva-x11.so %%X11%%lib/libva-x11.so.2 -%%X11%%lib/libva-x11.so.2.500.0 +%%X11%%lib/libva-x11.so.2.600.0 lib/libva.so lib/libva.so.2 -lib/libva.so.2.500.0 +lib/libva.so.2.600.0 libdata/pkgconfig/libva-drm.pc %%GLX%%libdata/pkgconfig/libva-glx.pc %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc %%X11%%libdata/pkgconfig/libva-x11.pc libdata/pkgconfig/libva.pc Index: head/multimedia/libva-intel-media-driver/pkg-message =================================================================== --- head/multimedia/libva-intel-media-driver/pkg-message (revision 520871) +++ head/multimedia/libva-intel-media-driver/pkg-message (nonexistent) @@ -1,13 +0,0 @@ -[ -{ type: install - message: <=19.3.1:multimedia/gmmlib \ - libva>=2.5.0:multimedia/libva + libva>=2.6.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}" CFLAGS+= -Wno-macro-redefined # __fastcall 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 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/files/patch-libva-2.5-compat =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat (revision 520871) +++ head/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat (nonexistent) @@ -1,48 +0,0 @@ -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++) Property changes on: head/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property