multimedia/intel-media-sdk: update to 20.1.p3.19

Changes:	https://github.com/Intel-Media-SDK/MediaSDK/compare/intel-mediasdk-19.4.0...1b7d4964

5 files changed, 8 insertions, 52 deletions

diff --git a/multimedia/intel-media-sdk/Makefile b/multimedia/intel-media-sdk/Makefile
index 8400230e8cba..49929dc6183c 100644
--- a/multimedia/intel-media-sdk/Makefile
+++ b/multimedia/intel-media-sdk/Makefile
@@ -2,7 +2,8 @@
 
 PORTNAME=	intel-media-sdk
 DISTVERSIONPREFIX=	intel-mediasdk-
-DISTVERSION=	19.4.0
+DISTVERSION=	20.1.pre3-19
+DISTVERSIONSUFFIX=	-g1b7d4964
 CATEGORIES=	multimedia
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -56,7 +57,7 @@ post-patch:
 # Pick git commit from port and use reproducible time
 	@${REINPLACE_CMD} -e "/COMMAND/s/date/& -r `${AWK} '/TIMESTAMP/ \
 			{ print \$$3 }' ${DISTINFO_FILE}`/" \
-		-e '/set( git_commit/s/""/"${DISTVERSIONFULL}"/' \
+		-e '/set( *git_commit/s/"[^"]*"/"${DISTVERSIONFULL}"/' \
 		${WRKSRC}/builder/FindFunctions.cmake \
 		${WRKSRC}/builder/FindGlobals.cmake
 # Don't depend on lang/intel-compute-runtime during build
diff --git a/multimedia/intel-media-sdk/distinfo b/multimedia/intel-media-sdk/distinfo
index 960692fc87ee..369ada85542d 100644
--- a/multimedia/intel-media-sdk/distinfo
+++ b/multimedia/intel-media-sdk/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1577193616
-SHA256 (Intel-Media-SDK-MediaSDK-intel-mediasdk-19.4.0_GH0.tar.gz) = 289a40ffe73dc291461d97edf452bdc622f76e52666483fd1eb4f131d2921cd1
-SIZE (Intel-Media-SDK-MediaSDK-intel-mediasdk-19.4.0_GH0.tar.gz) = 10540514
+TIMESTAMP = 1585226635
+SHA256 (Intel-Media-SDK-MediaSDK-intel-mediasdk-20.1.pre3-19-g1b7d4964_GH0.tar.gz) = baec517bafa70969f7c80c484ebcf32ce81c995a9d5b65d7e28f8ec0d300e2e2
+SIZE (Intel-Media-SDK-MediaSDK-intel-mediasdk-20.1.pre3-19-g1b7d4964_GH0.tar.gz) = 10724212
 SHA256 (713312353ec3.patch) = cff44763c8ce97082b7df54de2ba2a1c5c8489794d36bca96dcdc8f0b5a6c7b5
 SIZE (713312353ec3.patch) = 3611
 SHA256 (19d11bf1cfd4.patch) = 19663c8f09c690e878dd5ba88d5f3d4e1055ae8faaab8487e0b655bb66a60d45
diff --git a/multimedia/intel-media-sdk/files/patch-includes b/multimedia/intel-media-sdk/files/patch-includes
deleted file mode 100644
index 8da0d3bcde3c..000000000000
--- a/multimedia/intel-media-sdk/files/patch-includes
+++ /dev/null
@@ -1,28 +0,0 @@
-Add missing includes in various places.
-
-tutorials/common/common_vaapi.cpp:100:17: error: implicit instantiation of undefined template 'std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >'
-    std::string adapterPath = DRI_PATH;
-                ^
-/usr/include/c++/v1/iosfwd:209:32: note: template is declared here
-    class _LIBCPP_TEMPLATE_VIS basic_string;
-                               ^
-tutorials/common/common_vaapi.cpp:107:57: error: no member named 'to_string' in namespace 'std'
-        std::string curAdapterPath = adapterPath + std::to_string(nodeIndex + i);
-                                                   ~~~~~^
-tutorials/common/common_vaapi.cpp:107:21: error: implicit instantiation of undefined template 'std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >'
-        std::string curAdapterPath = adapterPath + std::to_string(nodeIndex + i);
-                    ^
-/usr/include/c++/v1/iosfwd:209:32: note: template is declared here
-    class _LIBCPP_TEMPLATE_VIS basic_string;
-                               ^
-
---- tutorials/common/common_vaapi.cpp.orig	2019-10-30 19:56:10 UTC
-+++ tutorials/common/common_vaapi.cpp
-@@ -22,6 +22,7 @@
- #include <drm.h>
- #include <drm_fourcc.h>
- #include <map>
-+#include <string>
- 
- #include "common_vaapi.h"
- 
diff --git a/multimedia/intel-media-sdk/files/patch-sysinfo b/multimedia/intel-media-sdk/files/patch-sysinfo
deleted file mode 100644
index ef3f12856ec3..000000000000
--- a/multimedia/intel-media-sdk/files/patch-sysinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-sysinfo doesn't exist outside of Linux unlike sysconf.
-
-_studio/shared/umc/core/vm/src/vm_sys_info_linux32.c:28:10: fatal error: 'sys/sysinfo.h' file not found
-#include <sys/sysinfo.h>
-         ^~~~~~~~~~~~~~~
-
---- _studio/shared/umc/core/vm/src/vm_sys_info_linux32.c.orig	2019-10-30 19:56:10 UTC
-+++ _studio/shared/umc/core/vm/src/vm_sys_info_linux32.c
-@@ -25,8 +25,6 @@
- #include <sys/utsname.h>
- #include <unistd.h>
- 
--#include <sys/sysinfo.h>
--
- uint32_t vm_sys_info_get_cpu_num(void)
- {
- #if defined(ANDROID)
diff --git a/multimedia/intel-media-sdk/pkg-plist b/multimedia/intel-media-sdk/pkg-plist
index 1adbf7a537ff..5b62f131165e 100644
--- a/multimedia/intel-media-sdk/pkg-plist
+++ b/multimedia/intel-media-sdk/pkg-plist
@@ -30,10 +30,10 @@ include/mfx/mfxvp9.h
 include/mfx/mfxvstructures.h
 lib/libmfx.so
 lib/libmfx.so.1
-lib/libmfx.so.1.31
+lib/libmfx.so.1.32
 lib/libmfxhw%%ARCH_SUFX%%.so
 lib/libmfxhw%%ARCH_SUFX%%.so.1
-lib/libmfxhw%%ARCH_SUFX%%.so.1.31
+lib/libmfxhw%%ARCH_SUFX%%.so.1.32
 lib/mfx/libmfx_h264la_hw%%ARCH_SUFX%%.so
 lib/mfx/libmfx_hevc_fei_hw%%ARCH_SUFX%%.so
 lib/mfx/libmfx_hevcd_hw%%ARCH_SUFX%%.so