Index: head/multimedia/intel-media-sdk/Makefile =================================================================== --- head/multimedia/intel-media-sdk/Makefile (revision 529257) +++ head/multimedia/intel-media-sdk/Makefile (revision 529258) @@ -1,71 +1,72 @@ # $FreeBSD$ 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/ PATCHFILES+= 713312353ec3.patch:-p1 PATCHFILES+= 19d11bf1cfd4.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Hardware video decoding/encoding/filtering on Intel GPUs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported LIB_DEPENDS= libva.so:multimedia/libva RUN_DEPENDS= cmrtlib>0:multimedia/cmrtlib USES= cmake compiler:c++11-lib pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= Intel-Media-SDK GH_PROJECT= MediaSDK CMAKE_ON= BUILD_TOOLS PLIST_SUB= ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//} # https://github.com/Intel-Media-SDK/MediaSDK/issues/1844 LLD_UNSAFE= yes OPTIONS_DEFINE= OPENCL TEST WAYLAND X11 OPTIONS_DEFAULT=OPENCL WAYLAND X11 OPTIONS_SUB= yes OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_CMAKE_BOOL= ENABLE_OPENCL X11_BUILD_DEPENDS= ${LOCALBASE}/include/xcb/dri3.h:x11/libxcb X11_LIB_DEPENDS= libva-x11.so:multimedia/libva X11_CMAKE_BOOL= ENABLE_X11 ENABLE_X11_DRI3 WAYLAND_LIB_DEPENDS= libdrm_intel.so:graphics/libdrm \ libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND TEST_BUILD_DEPENDS= googletest>0:devel/googletest TEST_USES= localbase:ldflags TEST_CMAKE_BOOL= BUILD_TESTS USE_SYSTEM_GTEST TEST_TEST_TARGET= test 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 @${REINPLACE_CMD} -e 's,/etc[^[:space:]]*,/,' \ ${WRKSRC}/builder/FindOpenCL.cmake # Don't assume GCC and glibc libraries are available @${REINPLACE_CMD} -e 's/ -lstdc++ -ldl//' \ ${WRKSRC}/api/mfx_dispatch/linux/pkg-config*.cmake pre-install-TEST-on: do-test .include Index: head/multimedia/intel-media-sdk/distinfo =================================================================== --- head/multimedia/intel-media-sdk/distinfo (revision 529257) +++ head/multimedia/intel-media-sdk/distinfo (revision 529258) @@ -1,7 +1,7 @@ -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 SIZE (19d11bf1cfd4.patch) = 1217 Index: head/multimedia/intel-media-sdk/files/patch-sysinfo =================================================================== --- head/multimedia/intel-media-sdk/files/patch-sysinfo (revision 529257) +++ head/multimedia/intel-media-sdk/files/patch-sysinfo (nonexistent) @@ -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 - ^~~~~~~~~~~~~~~ - ---- _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 - #include - --#include -- - uint32_t vm_sys_info_get_cpu_num(void) - { - #if defined(ANDROID) Property changes on: head/multimedia/intel-media-sdk/files/patch-sysinfo ___________________________________________________________________ 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 Index: head/multimedia/intel-media-sdk/files/patch-includes =================================================================== --- head/multimedia/intel-media-sdk/files/patch-includes (revision 529257) +++ head/multimedia/intel-media-sdk/files/patch-includes (nonexistent) @@ -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, std::__1::allocator >' - 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, std::__1::allocator >' - 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 - #include - #include -+#include - - #include "common_vaapi.h" - Property changes on: head/multimedia/intel-media-sdk/files/patch-includes ___________________________________________________________________ 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 Index: head/multimedia/intel-media-sdk/pkg-plist =================================================================== --- head/multimedia/intel-media-sdk/pkg-plist (revision 529257) +++ head/multimedia/intel-media-sdk/pkg-plist (revision 529258) @@ -1,59 +1,59 @@ bin/asg-hevc bin/hevc_fei_extractor include/mfx/mfxadapter.h include/mfx/mfxastructures.h include/mfx/mfxaudio++.h include/mfx/mfxaudio.h include/mfx/mfxbrc.h include/mfx/mfxcamera.h include/mfx/mfxcommon.h include/mfx/mfxdefs.h include/mfx/mfxdispatcherprefixedfunctions.h include/mfx/mfxenc.h include/mfx/mfxfei.h include/mfx/mfxfeihevc.h include/mfx/mfxjpeg.h include/mfx/mfxla.h include/mfx/mfxmvc.h include/mfx/mfxpak.h include/mfx/mfxpcp.h include/mfx/mfxplugin++.h include/mfx/mfxplugin.h include/mfx/mfxsc.h include/mfx/mfxscd.h include/mfx/mfxsession.h include/mfx/mfxstructures.h include/mfx/mfxvideo++.h include/mfx/mfxvideo.h include/mfx/mfxvp8.h 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 lib/mfx/libmfx_hevce_hw%%ARCH_SUFX%%.so lib/mfx/libmfx_vp8d_hw%%ARCH_SUFX%%.so lib/mfx/libmfx_vp9d_hw%%ARCH_SUFX%%.so lib/mfx/libmfx_vp9e_hw%%ARCH_SUFX%%.so libdata/pkgconfig/libmfx.pc libdata/pkgconfig/libmfxhw%%ARCH_SUFX%%.pc libdata/pkgconfig/mfx.pc share/mfx/plugins.cfg %%WAYLAND%%share/mfx/samples/libmfx_wayland.so %%OPENCL%%share/mfx/samples/libsample_plugin_opencl.so share/mfx/samples/libsample_rotate_plugin.so share/mfx/samples/libvpp_plugin.a %%OPENCL%%share/mfx/samples/ocl_rotate.cl share/mfx/samples/sample_decode share/mfx/samples/sample_encode share/mfx/samples/sample_fei share/mfx/samples/sample_hevc_fei share/mfx/samples/sample_hevc_fei_abr share/mfx/samples/sample_multi_transcode share/mfx/samples/sample_vpp