svn commit: r510955 - in head/multimedia: cmrtlib cmrtlib/files libva-intel-media-driver libva-intel-media-driver/files
Jan Beich
jbeich at FreeBSD.org
Tue Sep 3 15:48:36 UTC 2019
Author: jbeich
Date: Tue Sep 3 15:48:33 2019
New Revision: 510955
URL: https://svnweb.freebsd.org/changeset/ports/510955
Log:
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)
Added:
head/multimedia/libva-intel-media-driver/files/patch-diagnostics (contents, props changed)
Modified:
head/multimedia/cmrtlib/Makefile (contents, props changed)
head/multimedia/cmrtlib/distinfo (contents, props changed)
head/multimedia/cmrtlib/files/patch-memalign (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-clang (contents, props changed)
head/multimedia/libva-intel-media-driver/files/patch-memalign (contents, props changed)
Modified: head/multimedia/cmrtlib/Makefile
==============================================================================
--- head/multimedia/cmrtlib/Makefile Tue Sep 3 15:45:09 2019 (r510954)
+++ head/multimedia/cmrtlib/Makefile Tue Sep 3 15:48:33 2019 (r510955)
@@ -2,7 +2,7 @@
PORTNAME= cmrtlib
DISTVERSIONPREFIX= intel-media-
-DISTVERSION= 19.3.pre1
+DISTVERSION= 19.3.pre3
CATEGORIES= multimedia
MAINTAINER= jbeich at FreeBSD.org
Modified: head/multimedia/cmrtlib/distinfo
==============================================================================
--- head/multimedia/cmrtlib/distinfo Tue Sep 3 15:45:09 2019 (r510954)
+++ head/multimedia/cmrtlib/distinfo Tue Sep 3 15:48:33 2019 (r510955)
@@ -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
Modified: head/multimedia/cmrtlib/files/patch-memalign
==============================================================================
--- head/multimedia/cmrtlib/files/patch-memalign Tue Sep 3 15:45:09 2019 (r510954)
+++ head/multimedia/cmrtlib/files/patch-memalign Tue Sep 3 15:48:33 2019 (r510955)
@@ -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_r
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 @@
Modified: head/multimedia/libva-intel-media-driver/Makefile
==============================================================================
--- head/multimedia/libva-intel-media-driver/Makefile Tue Sep 3 15:45:09 2019 (r510954)
+++ head/multimedia/libva-intel-media-driver/Makefile Tue Sep 3 15:48:33 2019 (r510955)
@@ -2,7 +2,7 @@
PORTNAME= media-driver
DISTVERSIONPREFIX= intel-media-
-DISTVERSION= 19.3.pre2
+DISTVERSION= 19.3.pre3
CATEGORIES= multimedia
PKGNAMEPREFIX= libva-intel-
Modified: head/multimedia/libva-intel-media-driver/distinfo
==============================================================================
--- head/multimedia/libva-intel-media-driver/distinfo Tue Sep 3 15:45:09 2019 (r510954)
+++ head/multimedia/libva-intel-media-driver/distinfo Tue Sep 3 15:48:33 2019 (r510955)
@@ -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
Modified: head/multimedia/libva-intel-media-driver/files/patch-clang
==============================================================================
--- head/multimedia/libva-intel-media-driver/files/patch-clang Tue Sep 3 15:45:09 2019 (r510954)
+++ head/multimedia/libva-intel-media-driver/files/patch-clang Tue Sep 3 15:48:33 2019 (r510955)
@@ -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:
}
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(
Added: head/multimedia/libva-intel-media-driver/files/patch-diagnostics
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/libva-intel-media-driver/files/patch-diagnostics Tue Sep 3 15:48:33 2019 (r510955)
@@ -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 <stdio.h>
+ #include <assert.h>
+
Modified: head/multimedia/libva-intel-media-driver/files/patch-memalign
==============================================================================
--- head/multimedia/libva-intel-media-driver/files/patch-memalign Tue Sep 3 15:45:09 2019 (r510954)
+++ head/multimedia/libva-intel-media-driver/files/patch-memalign Tue Sep 3 15:48:33 2019 (r510955)
@@ -61,3 +61,13 @@ media_driver/linux/common/os/mos_utilities_specific.h:
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 <sstream>
+ #include <fcntl.h> //open
+-#include <malloc.h> // For memalign
+ #include <string.h> // memset
+ #include <stdlib.h> // atoi atol
+ #include <math.h>
More information about the svn-ports-all
mailing list