5 files changed, 23 insertions, 14 deletions

diff --git a/multimedia/cmrtlib/Makefile b/multimedia/cmrtlib/Makefile
index 9c4c684529b7..534590613f2a 100644
--- a/multimedia/cmrtlib/Makefile
+++ b/multimedia/cmrtlib/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cmrtlib
 DISTVERSIONPREFIX=	intel-media-
-DISTVERSION=	19.4.pre1
+DISTVERSION=	19.4.pre2
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/cmrtlib/distinfo b/multimedia/cmrtlib/distinfo
index 638a21bd08db..519a0cec3ad9 100644
--- a/multimedia/cmrtlib/distinfo
+++ b/multimedia/cmrtlib/distinfo
@@ -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
diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile
index e0e58ffe676e..a845322e3af9 100644
--- a/multimedia/libva-intel-media-driver/Makefile
+++ b/multimedia/libva-intel-media-driver/Makefile
@@ -2,14 +2,10 @@
 
 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
 
diff --git a/multimedia/libva-intel-media-driver/distinfo b/multimedia/libva-intel-media-driver/distinfo
index ca2c9a9ad831..519a0cec3ad9 100644
--- a/multimedia/libva-intel-media-driver/distinfo
+++ b/multimedia/libva-intel-media-driver/distinfo
@@ -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
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
index 123d0bdbee60..0a219d43ab65 100644
--- a/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat
+++ b/multimedia/libva-intel-media-driver/files/patch-libva-2.5-compat
@@ -7,6 +7,9 @@ media_driver/linux/common/codec/ddi/media_ddi_encode_hevc.cpp:473:84: error: no
 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
@@ -31,3 +34,15 @@ media_driver/linux/common/codec/ddi/media_ddi_encode_hevc.cpp:559:52: error: no
  
      /* 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++)