multimedia/libva: update to 2.6.0

Changes:	https://github.com/intel/libva/releases/tag/2.6.0
ABI:		https://abi-laboratory.pro/tracker/timeline/libva/
Reported by:	GitHub (watch releases)

6 files changed, 11 insertions, 72 deletions

diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile
index 439e31c67576..b3d43a30b091 100644
--- a/multimedia/libva-intel-media-driver/Makefile
+++ b/multimedia/libva-intel-media-driver/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	media-driver
 DISTVERSIONPREFIX=	intel-media-
 DISTVERSION=	19.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-intel-
 
@@ -18,7 +18,7 @@ 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
+		libva>=2.6.0:multimedia/libva
 LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess \
 		libigdgmm.so:multimedia/gmmlib \
 		libva.so:multimedia/libva
diff --git a/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat b/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat
deleted file mode 100644
index 0a219d43ab65..000000000000
--- a/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat
+++ /dev/null
@@ -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++)
diff --git a/multimedia/libva-intel-media-driver/pkg-message b/multimedia/libva-intel-media-driver/pkg-message
deleted file mode 100644
index fcc7a0e0655a..000000000000
--- a/multimedia/libva-intel-media-driver/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To enable the driver set up environ(7) e.g.,
-
-For sh/bash/ksh/zsh run and (optionally) add into ~/.profile:
-  export LIBVA_DRIVER_NAME=iHD
-
-For csh/tcsh run and (optionally) add into ~/.login:
-  setenv LIBVA_DRIVER_NAME iHD
-EOM
-}
-]
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index 69b3c782ac38..5e9a4fdff31d 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libva
-PORTVERSION=	2.5.0
+PORTVERSION=	2.6.0
 CATEGORIES=	multimedia
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index 9168f6e8b312..c1bb32d7dafd 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -1,6 +1,6 @@
-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
diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist
index 6b19ba6bbe4c..91b7550ef101 100644
--- a/multimedia/libva/pkg-plist
+++ b/multimedia/libva/pkg-plist
@@ -31,19 +31,19 @@ include/va/va_vpp.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