diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-09-03 15:48:33 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-09-03 15:48:33 +0000 |
| commit | e9791b91d43b0140cf2b03162f96f21db72f38c9 (patch) | |
| tree | 6e0193abbf6062102c2073f1767c2c181d4ecd54 /multimedia/cmrtlib | |
| parent | a0557955cb94d0001c7ef1515798d3cd0694f634 (diff) | |
| download | ports-e9791b91d43b0140cf2b03162f96f21db72f38c9.tar.gz ports-e9791b91d43b0140cf2b03162f96f21db72f38c9.zip | |
Notes
Diffstat (limited to 'multimedia/cmrtlib')
| -rw-r--r-- | multimedia/cmrtlib/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/cmrtlib/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/cmrtlib/files/patch-memalign | 33 |
3 files changed, 37 insertions, 4 deletions
diff --git a/multimedia/cmrtlib/Makefile b/multimedia/cmrtlib/Makefile index 34519133103c..358a3aed5caa 100644 --- a/multimedia/cmrtlib/Makefile +++ b/multimedia/cmrtlib/Makefile @@ -2,7 +2,7 @@ PORTNAME= cmrtlib DISTVERSIONPREFIX= intel-media- -DISTVERSION= 19.3.pre1 +DISTVERSION= 19.3.pre3 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/cmrtlib/distinfo b/multimedia/cmrtlib/distinfo index c0ea51089d43..31417238069e 100644 --- a/multimedia/cmrtlib/distinfo +++ b/multimedia/cmrtlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564657811 -SHA256 (intel-media-driver-intel-media-19.3.pre1_GH0.tar.gz) = 4492309a9218dddb45c70f250f366f8e3d205a71ef932c845094a0640fdc9d01 -SIZE (intel-media-driver-intel-media-19.3.pre1_GH0.tar.gz) = 15572933 +TIMESTAMP = 1567063600 +SHA256 (intel-media-driver-intel-media-19.3.pre3_GH0.tar.gz) = 42a09c3c490e7bdf8c766485799a22bddeb29d72b7f3e938e2a434753c793648 +SIZE (intel-media-driver-intel-media-19.3.pre3_GH0.tar.gz) = 15729431 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 @@ |