5 files changed, 41 insertions, 8 deletions

diff --git a/multimedia/cmrtlib/Makefile b/multimedia/cmrtlib/Makefile
index ae40bacbaf5d..9c4c684529b7 100644
--- a/multimedia/cmrtlib/Makefile
+++ b/multimedia/cmrtlib/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cmrtlib
 DISTVERSIONPREFIX=	intel-media-
-DISTVERSION=	19.3.0
+DISTVERSION=	19.4.pre1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/cmrtlib/distinfo b/multimedia/cmrtlib/distinfo
index ad867c432624..638a21bd08db 100644
--- a/multimedia/cmrtlib/distinfo
+++ b/multimedia/cmrtlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568272878
-SHA256 (intel-media-driver-intel-media-19.3.0_GH0.tar.gz) = 43e679ae2023558a2f440e826688b225ffd0fec47371fc18b93bdfe0e480b7c9
-SIZE (intel-media-driver-intel-media-19.3.0_GH0.tar.gz) = 15714417
+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
diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile
index 1fe439faf96b..2ce4a00da697 100644
--- a/multimedia/libva-intel-media-driver/Makefile
+++ b/multimedia/libva-intel-media-driver/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	media-driver
 DISTVERSIONPREFIX=	intel-media-
-DISTVERSION=	19.3.0
+DISTVERSION=	19.4.pre1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-intel-
 
diff --git a/multimedia/libva-intel-media-driver/distinfo b/multimedia/libva-intel-media-driver/distinfo
index ad867c432624..638a21bd08db 100644
--- a/multimedia/libva-intel-media-driver/distinfo
+++ b/multimedia/libva-intel-media-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568272878
-SHA256 (intel-media-driver-intel-media-19.3.0_GH0.tar.gz) = 43e679ae2023558a2f440e826688b225ffd0fec47371fc18b93bdfe0e480b7c9
-SIZE (intel-media-driver-intel-media-19.3.0_GH0.tar.gz) = 15714417
+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
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
new file mode 100644
index 000000000000..123d0bdbee60
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat
@@ -0,0 +1,33 @@
+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/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;