Date: Thu, 22 Nov 2018 00:08:37 +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: r485572 - head/multimedia/libva-intel-media-driver/files Message-ID: <201811220008.wAM08bNL070298@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Nov 22 00:08:36 2018 New Revision: 485572 URL: https://svnweb.freebsd.org/changeset/ports/485572 Log: multimedia/libva-intel-media-driver: expand patch comments Modified: 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-intel-media-driver/files/patch-i386-atomics (contents, props changed) head/multimedia/libva-intel-media-driver/files/patch-memalign (contents, props changed) head/multimedia/libva-intel-media-driver/files/patch-thread-id (contents, props changed) Modified: head/multimedia/libva-intel-media-driver/files/patch-fbres ============================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-fbres Thu Nov 22 00:08:23 2018 (r485571) +++ head/multimedia/libva-intel-media-driver/files/patch-fbres Thu Nov 22 00:08:36 2018 (r485572) @@ -1,5 +1,18 @@ Get framebuffer resolution on more platforms +media_driver/linux/common/codec/ddi/media_libva_decoder.cpp:48:10: fatal error: 'linux/fb.h' file not found +#include <linux/fb.h> + ^~~~~~~~~~~~ +media_driver/linux/common/codec/ddi/media_libva_decoder.cpp:55:43: error: variable has incomplete type 'struct fb_var_screeninfo' + struct fb_var_screeninfo vsinfo; + ^ +media_driver/linux/common/codec/ddi/media_libva_decoder.cpp:62:22: error: use of undeclared identifier 'FBIOGET_VSCREENINFO' + if(ioctl(fd, FBIOGET_VSCREENINFO, &vsinfo) < 0) + ^ +media_driver/linux/common/ddi/media_libva.cpp:39:10: fatal error: 'linux/fb.h' file not found +#include <linux/fb.h> + ^~~~~~~~~~~~ + --- media_driver/linux/common/codec/ddi/media_libva_decoder.cpp.orig 2018-10-01 21:39:52 UTC +++ media_driver/linux/common/codec/ddi/media_libva_decoder.cpp @@ -45,7 +45,39 @@ Modified: head/multimedia/libva-intel-media-driver/files/patch-glibc ============================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-glibc Thu Nov 22 00:08:23 2018 (r485571) +++ head/multimedia/libva-intel-media-driver/files/patch-glibc Thu Nov 22 00:08:36 2018 (r485572) @@ -1,5 +1,12 @@ 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 +#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 @@ -47,13 +47,15 @@ Modified: head/multimedia/libva-intel-media-driver/files/patch-i386-atomics ============================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-i386-atomics Thu Nov 22 00:08:23 2018 (r485571) +++ head/multimedia/libva-intel-media-driver/files/patch-i386-atomics Thu Nov 22 00:08:36 2018 (r485572) @@ -1,7 +1,11 @@ +FreeBSD doesn't ship libatomic, so use __sync* builtins instead: + media_driver/CMakeFiles/iHD_drv_video_OBJ.dir/linux/common/os/mos_context_specific.cpp.o: In function `OsContextSpecific::SetSliceCount(unsigned int*)': media_driver/linux/common/os/mos_context_specific.cpp:441: undefined reference to `__atomic_load_8' media_driver/linux/common/os/mos_context_specific.cpp:444: undefined reference to `__atomic_store_8' c++: error: linker command failed with exit code 1 (use -v to see invocation) + +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220822 --- media_driver/linux/common/os/mos_context_specific.cpp.orig 2018-10-01 21:39:52 UTC +++ media_driver/linux/common/os/mos_context_specific.cpp Modified: head/multimedia/libva-intel-media-driver/files/patch-memalign ============================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-memalign Thu Nov 22 00:08:23 2018 (r485571) +++ head/multimedia/libva-intel-media-driver/files/patch-memalign Thu Nov 22 00:08:36 2018 (r485572) @@ -1,5 +1,16 @@ memalign is Linux-specific, so use C11 aligned_alloc instead +In file included from media_driver/agnostic/common/os/mos_utilities.c:36: +/usr/include/malloc.h:3:2: error: "<malloc.h> has been replaced by <stdlib.h>" +#error "<malloc.h> has been replaced by <stdlib.h>" + ^ +media_driver/agnostic/common/os/mos_utilities.c:3096:11: error: use of undeclared identifier 'memalign' + ptr = _aligned_malloc(size, alignment); + ^ +media_driver/linux/common/os/mos_utilities_specific.h:91:43: note: expanded from macro '_aligned_malloc' +#define _aligned_malloc(size, alignment) memalign(alignment, size) + ^ + --- media_driver/agnostic/common/os/mos_utilities.c.orig 2018-10-01 21:39:52 UTC +++ media_driver/agnostic/common/os/mos_utilities.c @@ -33,7 +33,6 @@ Modified: head/multimedia/libva-intel-media-driver/files/patch-thread-id ============================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-thread-id Thu Nov 22 00:08:23 2018 (r485571) +++ head/multimedia/libva-intel-media-driver/files/patch-thread-id Thu Nov 22 00:08:36 2018 (r485572) @@ -1,5 +1,18 @@ Get thread ID on more platforms +media_driver/agnostic/common/cm/cm_task_internal.cpp:851:39: error: use of undeclared identifier 'SYS_gettid' + m_taskProfilingInfo.threadID = CmGetCurThreadId(); // Get Thread ID + ^ +media_driver/linux/common/cm/cm_innerdef_os.h:98:37: note: expanded from macro 'CmGetCurThreadId' +#define CmGetCurThreadId() syscall(SYS_gettid) + ^ +media_driver/agnostic/common/cm/cm_task_internal.cpp:952:39: error: use of undeclared identifier 'SYS_gettid' + m_taskProfilingInfo.threadID = CmGetCurThreadId(); // Get Thread ID + ^ +media_driver/linux/common/cm/cm_innerdef_os.h:98:37: note: expanded from macro 'CmGetCurThreadId' +#define CmGetCurThreadId() syscall(SYS_gettid) + ^ + --- media_driver/linux/common/cm/cm_innerdef_os.h.orig 2018-10-01 21:39:52 UTC +++ media_driver/linux/common/cm/cm_innerdef_os.h @@ -35,8 +35,16 @@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811220008.wAM08bNL070298>