summaryrefslogtreecommitdiff
path: root/multimedia/cmrtlib/files/patch-memalign
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-09-03 15:48:33 +0000
committerJan Beich <jbeich@FreeBSD.org>2019-09-03 15:48:33 +0000
commite9791b91d43b0140cf2b03162f96f21db72f38c9 (patch)
tree6e0193abbf6062102c2073f1767c2c181d4ecd54 /multimedia/cmrtlib/files/patch-memalign
parentAdd a Python library for generating country, province and state specific sets (diff)
multimedia/libva-intel-media-driver: update to 19.3.p3
Changes: https://github.com/intel/media-driver/compare/intel-media-19.3.pre2...intel-media-19.3.pre3 Reported by: GitHub (watch releases)
Notes
Notes: svn path=/head/; revision=510955
Diffstat (limited to 'multimedia/cmrtlib/files/patch-memalign')
-rw-r--r--multimedia/cmrtlib/files/patch-memalign33
1 files changed, 33 insertions, 0 deletions
diff --git a/multimedia/cmrtlib/files/patch-memalign b/multimedia/cmrtlib/files/patch-memalign
index 88e8d2be665f..a5a1ccdda070 100644
--- a/multimedia/cmrtlib/files/patch-memalign
+++ b/multimedia/cmrtlib/files/patch-memalign
@@ -1,5 +1,16 @@
memalign is Linux-specific, so use C11 aligned_alloc instead
+In file included from cmrtlib/agnostic/share/cm_printf_host.cpp:25:
+In file included from cmrtlib/linux/../agnostic/share/cm_debug.h:26:
+In file included from cmrtlib/linux/../linux/share/cm_def_os.h:37:
+/usr/include/malloc.h:3:2: error: "<malloc.h> has been replaced by <stdlib.h>"
+#error "<malloc.h> has been replaced by <stdlib.h>"
+ ^
+In file included from cmrtlib/agnostic/share/cm_printf_host.cpp:25:
+In file included from cmrtlib/linux/../agnostic/share/cm_debug.h:26:
+cmrtlib/linux/../linux/share/cm_def_os.h:94:10: error: use of undeclared identifier 'memalign'
+ return memalign(alignment, size);
+ ^
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:
@@ -14,6 +25,28 @@ In file included from /usr/local/include/igfxcmrt/cm_rt_def_os.h:39:
return memalign(alignment, size);
^
+--- linux/share/cm_def_os.h.orig 2019-08-29 07:26:40 UTC
++++ linux/share/cm_def_os.h
+@@ -32,9 +32,9 @@
+ #define Display unsigned int
+ #endif
+
++#include <cstdlib>
+ #include <cstring>
+ #include "pthread.h"
+-#include <malloc.h>
+
+
+ ////////////////////////////////////////////////////////////////////////////////////
+@@ -91,7 +91,7 @@ typedef enum _VACMTEXTUREFILTERTYPE {
+
+ 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)
--- 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 @@