Date: Wed, 26 Dec 2018 18:07:34 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488413 - in head/multimedia: . cmrtlib cmrtlib/files libva libva-intel-media-driver libva-intel-media-driver/files Message-ID: <201812261807.wBQI7Y98075907@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Dec 26 18:07:34 2018 New Revision: 488413 URL: https://svnweb.freebsd.org/changeset/ports/488413 Log: multimedia/libva-intel-media-driver: update to 18.4.p4.75 (prerelease snapshot) Changes: https://github.com/intel/media-driver/compare/intel-media-18.3.0...567da1b8 Added: head/multimedia/cmrtlib/ head/multimedia/cmrtlib/Makefile (contents, props changed) head/multimedia/cmrtlib/distinfo (contents, props changed) head/multimedia/cmrtlib/files/ head/multimedia/cmrtlib/files/patch-memalign (contents, props changed) head/multimedia/cmrtlib/pkg-descr (contents, props changed) head/multimedia/cmrtlib/pkg-plist (contents, props changed) Deleted: head/multimedia/libva-intel-media-driver/files/patch-i386-atomics Modified: head/multimedia/Makefile (contents, props changed) head/multimedia/libva-intel-media-driver/Makefile (contents, props changed) head/multimedia/libva-intel-media-driver/distinfo (contents, props changed) head/multimedia/libva-intel-media-driver/files/patch-fbres (contents, props changed) head/multimedia/libva-intel-media-driver/files/patch-glibc (contents, props changed) head/multimedia/libva/Makefile (contents, props changed) head/multimedia/libva/distinfo (contents, props changed) Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Wed Dec 26 18:05:34 2018 (r488412) +++ head/multimedia/Makefile Wed Dec 26 18:07:34 2018 (r488413) @@ -42,6 +42,7 @@ SUBDIR += clutter-gst SUBDIR += clutter-gst3 SUBDIR += cmrt + SUBDIR += cmrtlib SUBDIR += cuse4bsd-kmod SUBDIR += cx88 SUBDIR += dav1d Added: head/multimedia/cmrtlib/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/cmrtlib/Makefile Wed Dec 26 18:07:34 2018 (r488413) @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= cmrtlib +DISTVERSIONPREFIX= intel-media- +DISTVERSION= 18.4.pre4-75 +DISTVERSIONSUFFIX= -g567da1b8 +CATEGORIES= multimedia + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= C for Media Runtime + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC:H}/LICENSE.md + +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported + +LIB_DEPENDS= libva.so:multimedia/libva +RUN_DEPENDS= libva-intel-media-driver>=${PORTVERSION}:multimedia/libva-intel-media-driver + +USES= cmake compiler:c++11-lib pkgconfig +USE_GITHUB= yes +USE_LDCONFIG= yes +GH_ACCOUNT= intel +GH_PROJECT= media-driver +WRKSRC_SUBDIR= ${PORTNAME} + +.include <bsd.port.mk> Added: head/multimedia/cmrtlib/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/cmrtlib/distinfo Wed Dec 26 18:07:34 2018 (r488413) @@ -0,0 +1,3 @@ +TIMESTAMP = 1545793660 +SHA256 (intel-media-driver-intel-media-18.4.pre4-75-g567da1b8_GH0.tar.gz) = 32ca85c64f809879d11e35ed04afdc53a83a7841a2cf895efab88c05e23cf7bf +SIZE (intel-media-driver-intel-media-18.4.pre4-75-g567da1b8_GH0.tar.gz) = 14559556 Added: head/multimedia/cmrtlib/files/patch-memalign ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/cmrtlib/files/patch-memalign Wed Dec 26 18:07:34 2018 (r488413) @@ -0,0 +1,35 @@ +memalign is Linux-specific, so use C11 aligned_alloc instead + +In file included from media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.cpp:27: +In file included from media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.h:35: +In file included from media_driver/agnostic/gen9_skl/codec/cmrt_kernel/CMRTKernel_header_file.h:30: +In file included from media_driver/agnostic/gen9_skl/codec/cmrt_kernel/CMRTKernel_DownScaling.h:30: +In file included from media_driver/agnostic/gen9_skl/codec/cmrt_kernel/CMRTKernelBase.h:33: +In file included from /usr/local/include/igfxcmrt/cm_rt.h:185: +In file included from /usr/local/include/igfxcmrt/cm_rt_def_os.h:39: +/usr/include/malloc.h:3:2: error: "<malloc.h> has been replaced by <stdlib.h>" +#error "<malloc.h> has been replaced by <stdlib.h>" + ^ +/usr/local/include/igfxcmrt/cm_rt_def_os.h:153:10: error: use of undeclared identifier 'memalign' + return memalign(alignment, size); + ^ + +--- linux/share/cm_rt_def_os.h.orig 2018-12-20 08:52:32 UTC ++++ linux/share/cm_rt_def_os.h +@@ -36,7 +36,6 @@ + #include <stdlib.h> + #include <stdint.h> + #include <math.h> +-#include <malloc.h> + #include <string.h> + #include <sys/time.h> + #include <pthread.h> +@@ -150,7 +149,7 @@ template<> inline const char * CM_TYPE_NAME_UNMANGLED< + + inline void * CM_ALIGNED_MALLOC(size_t size, size_t alignment) + { +- return memalign(alignment, size); ++ return aligned_alloc(alignment, size); + } + + inline void CM_ALIGNED_FREE(void * memory) Added: head/multimedia/cmrtlib/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/cmrtlib/pkg-descr Wed Dec 26 18:07:34 2018 (r488413) @@ -0,0 +1,6 @@ +cmrtlib is a runtime library needed when user wants to execute their +own GPU kernels on render engine. It calls iHD media driver to load +the kernels and allocate the resources. It provides a set of APIs for +user to call directly from application. + +WWW: https://01.org/intel-media-for-linux Added: head/multimedia/cmrtlib/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/cmrtlib/pkg-plist Wed Dec 26 18:07:34 2018 (r488413) @@ -0,0 +1,12 @@ +include/igfxcmrt/cm_hw_vebox_cmd_g10.h +include/igfxcmrt/cm_rt.h +include/igfxcmrt/cm_rt_api_os.h +include/igfxcmrt/cm_rt_def_os.h +include/igfxcmrt/cm_rt_extension.h +include/igfxcmrt/cm_rt_g10.h +include/igfxcmrt/cm_rt_g8.h +include/igfxcmrt/cm_rt_g9.h +lib/libigfxcmrt.so +lib/libigfxcmrt.so.7 +lib/libigfxcmrt.so.7.2.0 +libdata/pkgconfig/igfxcmrt.pc Modified: head/multimedia/libva-intel-media-driver/Makefile ============================================================================== --- head/multimedia/libva-intel-media-driver/Makefile Wed Dec 26 18:05:34 2018 (r488412) +++ head/multimedia/libva-intel-media-driver/Makefile Wed Dec 26 18:07:34 2018 (r488413) @@ -2,8 +2,8 @@ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- -DISTVERSION= 18.3.0 -PORTREVISION= 3 +DISTVERSION= 18.4.pre4-75 +DISTVERSIONSUFFIX= -g567da1b8 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- @@ -17,20 +17,21 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported +BUILD_DEPENDS= gmmlib>=${PORTVERSION:C/([^.]*\.[^.]).*/\1/}:multimedia/gmmlib \ + libva>=2.3.0_2:multimedia/libva LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ libigdgmm.so:multimedia/gmmlib \ libva.so:multimedia/libva -USES= cmake compiler:c++11-lib pkgconfig +USES= cmake compiler:c++11-lib localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= intel ARCH_SUFX= ${ARCH:S/i386/32/:S/amd//:S/x86_//} -CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS INSTALL_DRIVER_SYSCONF +CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS BUILD_CMRTLIB CMAKE_ARGS= -DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DARCH:STRING="${ARCH_SUFX}" \ -DUFO_MARCH:STRING="${CPUTYPE}" -PLIST_FILES= lib/dri/iHD_drv_video.so \ - lib/igfxcmrt${ARCH_SUFX}.so +PLIST_FILES= lib/dri/iHD_drv_video.so OPTIONS_DEFINE= TEST @@ -39,10 +40,12 @@ TEST_CMAKE_BOOL= MEDIA_RUN_TEST_SUITE TEST_TEST_TARGET= RunULT post-patch: - @${REINPLACE_CMD} -e '/install.*igfxcmrt/s/64/${ARCH_SUFX}/' \ - ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/-D__linux__/d' \ ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake + @if [ ${CHOSEN_COMPILER_TYPE} != gcc ]; then \ + ${REINPLACE_CMD} -i .gcc.bak '/-fno-tree-pre/d' \ + ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake; \ + fi # Silence -Wmacro-redefined @${REINPLACE_CMD} -e '/__fastcall/d' \ ${WRKSRC}/media_driver/linux/common/cm/cm_mem_os.h Modified: head/multimedia/libva-intel-media-driver/distinfo ============================================================================== --- head/multimedia/libva-intel-media-driver/distinfo Wed Dec 26 18:05:34 2018 (r488412) +++ head/multimedia/libva-intel-media-driver/distinfo Wed Dec 26 18:07:34 2018 (r488413) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538429992 -SHA256 (intel-media-driver-intel-media-18.3.0_GH0.tar.gz) = df9af1cc796b4123508aacaf19d040cc5d8c5742c05199f45c9a3905ed8d1b52 -SIZE (intel-media-driver-intel-media-18.3.0_GH0.tar.gz) = 14422845 +TIMESTAMP = 1545793660 +SHA256 (intel-media-driver-intel-media-18.4.pre4-75-g567da1b8_GH0.tar.gz) = 32ca85c64f809879d11e35ed04afdc53a83a7841a2cf895efab88c05e23cf7bf +SIZE (intel-media-driver-intel-media-18.4.pre4-75-g567da1b8_GH0.tar.gz) = 14559556 Modified: head/multimedia/libva-intel-media-driver/files/patch-fbres ============================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-fbres Wed Dec 26 18:05:34 2018 (r488412) +++ head/multimedia/libva-intel-media-driver/files/patch-fbres Wed Dec 26 18:07:34 2018 (r488413) @@ -64,7 +64,7 @@ media_driver/linux/common/ddi/media_libva.cpp:39:10: f if(fd > 0) { if(ioctl(fd, FBIOGET_VSCREENINFO, &vsinfo) < 0) ---- media_driver/linux/common/ddi/media_libva.cpp.orig 2018-10-01 21:39:52 UTC +--- media_driver/linux/common/ddi/media_libva.cpp.orig 2018-11-26 07:05:55 UTC +++ media_driver/linux/common/ddi/media_libva.cpp @@ -36,8 +36,6 @@ #include <X11/Xutil.h> @@ -72,6 +72,6 @@ media_driver/linux/common/ddi/media_libva.cpp:39:10: f -#include <linux/fb.h> - + #include "media_libva.h" + #include "media_libva_util.h" - #include "media_libva_decoder.h" - #include "media_libva_encoder.h" Modified: head/multimedia/libva-intel-media-driver/files/patch-glibc ============================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-glibc Wed Dec 26 18:05:34 2018 (r488412) +++ head/multimedia/libva-intel-media-driver/files/patch-glibc Wed Dec 26 18:07:34 2018 (r488413) @@ -1,14 +1,14 @@ makedev() is defined in <sys/types.h> on BSDs and <sys/mkdev.h> on Solaris -mon/os/libdrm/xf86drm.c:50:10: fatal error: 'sys/sysmacros.h' file not found +media_driver/linux/common/os/i915/xf86drm.c:50:10: fatal error: 'sys/sysmacros.h' file not found #include <sys/sysmacros.h> ^~~~~~~~~~~~~~~~~ media_driver/linux/ult/libdrm_mock/xf86drm_mock.c:50:10: fatal error: 'sys/sysmacros.h' file not found #include <sys/sysmacros.h> ^~~~~~~~~~~~~~~~~ ---- media_driver/linux/common/os/libdrm/xf86drm.c.orig 2018-10-01 21:39:52 UTC -+++ media_driver/linux/common/os/libdrm/xf86drm.c +--- media_driver/linux/common/os/i915/xf86drm.c.orig 2018-10-01 21:39:52 UTC ++++ media_driver/linux/common/os/i915/xf86drm.c @@ -47,13 +47,15 @@ #include <signal.h> #include <time.h> Modified: head/multimedia/libva/Makefile ============================================================================== --- head/multimedia/libva/Makefile Wed Dec 26 18:05:34 2018 (r488412) +++ head/multimedia/libva/Makefile Wed Dec 26 18:07:34 2018 (r488413) @@ -2,8 +2,11 @@ PORTNAME= libva PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia + +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= cf11abe5e1b9.patch:-p1 # for media-driver 18.4+ MAINTAINER= madpilot@FreeBSD.org COMMENT= VAAPI wrapper and dummy driver Modified: head/multimedia/libva/distinfo ============================================================================== --- head/multimedia/libva/distinfo Wed Dec 26 18:05:34 2018 (r488412) +++ head/multimedia/libva/distinfo Wed Dec 26 18:07:34 2018 (r488413) @@ -1,3 +1,5 @@ TIMESTAMP = 1538516302 SHA256 (intel-libva-2.3.0_GH0.tar.gz) = 8d95e65c4d84d0f82097581e163d3770694c600cbb040ebd827f2d375e004f4b SIZE (intel-libva-2.3.0_GH0.tar.gz) = 222152 +SHA256 (cf11abe5e1b9.patch) = 1df514db32ae2bb49d556c561005315566e232e3ad0dbc82176f76285ef23c2b +SIZE (cf11abe5e1b9.patch) = 3301
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812261807.wBQI7Y98075907>