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: " has been replaced by " +#error " has been replaced by " + ^ +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 + #include + #include "pthread.h" +-#include + + + //////////////////////////////////////////////////////////////////////////////////// +@@ -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 @@ diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile index 148e4f354b87..60fd5a39079c 100644 --- a/multimedia/libva-intel-media-driver/Makefile +++ b/multimedia/libva-intel-media-driver/Makefile @@ -2,7 +2,7 @@ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- -DISTVERSION= 19.3.pre2 +DISTVERSION= 19.3.pre3 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- diff --git a/multimedia/libva-intel-media-driver/distinfo b/multimedia/libva-intel-media-driver/distinfo index 33a75ca9a577..31417238069e 100644 --- a/multimedia/libva-intel-media-driver/distinfo +++ b/multimedia/libva-intel-media-driver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565886223 -SHA256 (intel-media-driver-intel-media-19.3.pre2_GH0.tar.gz) = 3a1acaf76d56af0f90a46b8aea55a51db75a29144954febf3cdc1934b4a49477 -SIZE (intel-media-driver-intel-media-19.3.pre2_GH0.tar.gz) = 15590400 +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/libva-intel-media-driver/files/patch-clang b/multimedia/libva-intel-media-driver/files/patch-clang index 98f3767a5690..fa923ec2babb 100644 --- a/multimedia/libva-intel-media-driver/files/patch-clang +++ b/multimedia/libva-intel-media-driver/files/patch-clang @@ -1,6 +1,9 @@ media_driver/linux/common/os/mos_utilities_specific.c:2617:12: error: cast from pointer to smaller type 'uint32_t' (aka 'unsigned int') loses information return (uint32_t)pthread_self(); ^~~~~~~~~~~~~~~~~~~~~~~~ +media_driver/media_driver_next/linux/common/os/mos_utilities_specific_next.cpp:1761:12: error: cast from pointer to smaller type 'uint32_t' (aka 'unsigned int') loses information + return (uint32_t)pthread_self(); + ^~~~~~~~~~~~~~~~~~~~~~~~ --- media_driver/linux/common/os/mos_utilities_specific.c.orig 2018-10-01 21:39:52 UTC +++ media_driver/linux/common/os/mos_utilities_specific.c @@ -13,3 +16,14 @@ media_driver/linux/common/os/mos_utilities_specific.c:2617:12: error: cast from } MOS_STATUS MOS_WaitThread( +--- media_driver/media_driver_next/linux/common/os/mos_utilities_specific_next.cpp.orig 2019-08-29 07:26:40 UTC ++++ media_driver/media_driver_next/linux/common/os/mos_utilities_specific_next.cpp +@@ -1758,7 +1758,7 @@ uint32_t MosUtilities::MOS_GetThreadId( + + uint32_t MosUtilities::MOS_GetCurrentThreadId() + { +- return (uint32_t)pthread_self(); ++ return (uintptr_t)pthread_self(); + } + + MOS_STATUS MosUtilities::MOS_WaitThread( diff --git a/multimedia/libva-intel-media-driver/files/patch-diagnostics b/multimedia/libva-intel-media-driver/files/patch-diagnostics new file mode 100644 index 000000000000..f6ad0b8ccf93 --- /dev/null +++ b/multimedia/libva-intel-media-driver/files/patch-diagnostics @@ -0,0 +1,13 @@ +Enable skuwa debug messages + +--- media_driver/linux/common/os/linux_skuwa_debug.h.orig 2019-08-29 07:26:40 UTC ++++ media_driver/linux/common/os/linux_skuwa_debug.h +@@ -35,7 +35,7 @@ + #define DEVINFO_WARNING(msg) ALOGW(msg) + #define DEVINFO_ERROR(msg) ALOGE(msg) + +-#elif defined(__linux__) // Linux libskuwa ++#elif defined(__unix__) // Linux libskuwa + #include + #include + diff --git a/multimedia/libva-intel-media-driver/files/patch-memalign b/multimedia/libva-intel-media-driver/files/patch-memalign index 59f8aec24c51..fce225883072 100644 --- a/multimedia/libva-intel-media-driver/files/patch-memalign +++ b/multimedia/libva-intel-media-driver/files/patch-memalign @@ -61,3 +61,13 @@ media_driver/linux/common/os/mos_utilities_specific.h:91:43: note: expanded from static void FreeAlignedMemory(void *memory) { free(memory); } +--- media_driver/media_driver_next/agnostic/common/os/mos_utilities_next.cpp.orig 2019-08-29 07:26:40 UTC ++++ media_driver/media_driver_next/agnostic/common/os/mos_utilities_next.cpp +@@ -30,7 +30,6 @@ + #include "mos_util_user_interface_next.h" + #include + #include //open +-#include // For memalign + #include // memset + #include // atoi atol + #include