Index: head/multimedia/intel-media-sdk/Makefile =================================================================== --- head/multimedia/intel-media-sdk/Makefile (revision 529256) +++ head/multimedia/intel-media-sdk/Makefile (revision 529257) @@ -1,67 +1,71 @@ # $FreeBSD$ PORTNAME= intel-media-sdk DISTVERSIONPREFIX= intel-mediasdk- DISTVERSION= 19.4.0 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}"/' \ ${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 529256) +++ head/multimedia/intel-media-sdk/distinfo (revision 529257) @@ -1,3 +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 +SHA256 (713312353ec3.patch) = cff44763c8ce97082b7df54de2ba2a1c5c8489794d36bca96dcdc8f0b5a6c7b5 +SIZE (713312353ec3.patch) = 3611 +SHA256 (19d11bf1cfd4.patch) = 19663c8f09c690e878dd5ba88d5f3d4e1055ae8faaab8487e0b655bb66a60d45 +SIZE (19d11bf1cfd4.patch) = 1217 Index: head/multimedia/intel-media-sdk/files/patch-libc++ =================================================================== --- head/multimedia/intel-media-sdk/files/patch-libc++ (revision 529256) +++ head/multimedia/intel-media-sdk/files/patch-libc++ (nonexistent) @@ -1,30 +0,0 @@ -https://github.com/Intel-Media-SDK/MediaSDK/issues/1843 - ---- samples/sample_hevc_fei_abr/include/dso/bs_reader2.h.orig 2019-10-30 19:56:10 UTC -+++ samples/sample_hevc_fei_abr/include/dso/bs_reader2.h -@@ -184,7 +184,11 @@ class File : public BufferUpdater (public) - - #define BS2_TRO - #define BS2_SET(val, var) { var = (val); } -+#ifdef _LIBCPP_VERSION -+#define BS2_TRACE(val, var) {} -+#else - #define BS2_TRACE(val, var) {std::ignore = (val);} -+#endif - #define BS2_TRACE_STR(str) {std::ignore = (str);} - #define BS2_SET_ARR_F(val, var, sz, split, format) \ - { for (Bs32u _i = 0; _i < (Bs32u)(sz); _i++) (var)[_i] = (val); } ---- tools/bs_parser_hevc/include/bs_reader2.h.orig 2019-10-30 19:56:10 UTC -+++ tools/bs_parser_hevc/include/bs_reader2.h -@@ -184,7 +184,11 @@ class File : public BufferUpdater (public) - - #define BS2_TRO - #define BS2_SET(val, var) { var = (val); } -+#ifdef _LIBCPP_VERSION -+#define BS2_TRACE(val, var) {} -+#else - #define BS2_TRACE(val, var) {std::ignore = (val);} -+#endif - #define BS2_TRACE_STR(str) {std::ignore = (str);} - #define BS2_SET_ARR_F(val, var, sz, split, format) \ - { for (Bs32u _i = 0; _i < (Bs32u)(sz); _i++) (var)[_i] = (val); } Property changes on: head/multimedia/intel-media-sdk/files/patch-libc++ ___________________________________________________________________ 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