Index: head/multimedia/libva-intel-media-driver/Makefile =================================================================== --- head/multimedia/libva-intel-media-driver/Makefile (revision 522734) +++ head/multimedia/libva-intel-media-driver/Makefile (revision 522735) @@ -1,57 +1,60 @@ # $FreeBSD$ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- DISTVERSION= 19.4.0 -PORTREVISION= 4 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= c203c89a9695.patch:-p1 12b7fcded6c7.patch:-p1 +PATCHFILES+= 12a0cac7047b.patch:-p1 # https://github.com/intel/media-driver/pull/819 +PATCHFILES+= 83338cf44f05.patch:-p1 # https://github.com/intel/media-driver/pull/819 +PATCHFILES+= 2e1b34f259d6.patch:-p1 # https://github.com/intel/media-driver/pull/819 +PATCHFILES+= c15003c2c732.patch:-p1 # https://github.com/intel/media-driver/pull/819 +PATCHFILES+= b83b1334f869.patch:-p1 # https://github.com/intel/media-driver/pull/819 +PATCHFILES+= 5dffdeded8bc.patch:-p1 # https://github.com/intel/media-driver/pull/819 +PATCHFILES+= 04890b2f9a59.patch:-p1 # https://github.com/intel/media-driver/pull/819 +PATCHFILES+= b585f7586dde.patch:-p1 # https://github.com/intel/media-driver/pull/819 +PATCHFILES+= 38d37bff5a68.patch:-p1 # https://github.com/intel/media-driver/pull/819 MAINTAINER= jbeich@FreeBSD.org COMMENT= VAAPI driver for Intel HD 5000 (Gen8) or newer LICENSE= MIT BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported BUILD_DEPENDS= gmmlib>=19.3.1:multimedia/gmmlib \ libva>=2.6.0:multimedia/libva LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ libigdgmm.so:multimedia/gmmlib \ libva.so:multimedia/libva USES= cmake compiler:c++11-lib localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= intel ARCH_SUFX= ${ARCH:S/i386/32/:S/amd//:S/x86_//} CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS BUILD_CMRTLIB CMAKE_ARGS= -DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DARCH:STRING="${ARCH_SUFX}" \ -DUFO_MARCH:STRING="${CPUTYPE}" -CFLAGS+= -Wno-macro-redefined # __fastcall PLIST_FILES= lib/dri/iHD_drv_video.so OPTIONS_DEFINE= TEST X11 OPTIONS_DEFAULT=X11 # XXX Unbundle googletest TEST_CMAKE_BOOL= MEDIA_RUN_TEST_SUITE TEST_TEST_TARGET= RunULT X11_LIB_DEPENDS= libva-x11.so:multimedia/libva - -post-patch: - @${REINPLACE_CMD} -e '/-D__linux__/d' \ - ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake post-patch-X11-off: @${REINPLACE_CMD} -i .nox11 '/find_package.*X11/d' \ ${WRKSRC}/media_driver/media_top_cmake.cmake .include Index: head/multimedia/libva-intel-media-driver/distinfo =================================================================== --- head/multimedia/libva-intel-media-driver/distinfo (revision 522734) +++ head/multimedia/libva-intel-media-driver/distinfo (revision 522735) @@ -1,7 +1,25 @@ TIMESTAMP = 1575968040 SHA256 (intel-media-driver-intel-media-19.4.0_GH0.tar.gz) = 977b43242ccbd397a31b92f11ac9e2bae319b3099dd01c4e9f507883c62084a5 SIZE (intel-media-driver-intel-media-19.4.0_GH0.tar.gz) = 20822884 SHA256 (c203c89a9695.patch) = 0be9104038c8df424089cded81c2a85b79a86bffd1f5b6bcc943399bcff455d9 SIZE (c203c89a9695.patch) = 2694 SHA256 (12b7fcded6c7.patch) = 023df49303f35c840b21b1548eca8a582939629ebca7593f8d1ceabb3d4f5799 SIZE (12b7fcded6c7.patch) = 717 +SHA256 (12a0cac7047b.patch) = 9dba924fb23247775cf6626b29bc27bf09eb29336c47b83434a06d7ebf61bec2 +SIZE (12a0cac7047b.patch) = 1241 +SHA256 (83338cf44f05.patch) = baf280af2971ad4b0c58b8fefd76139bd733ba73f1373a1c4264b25eedb296c1 +SIZE (83338cf44f05.patch) = 1193 +SHA256 (2e1b34f259d6.patch) = 96d6396c27736b467a8dcbaa2448ac4fe042f030a85da6083c496ef56e0d88be +SIZE (2e1b34f259d6.patch) = 2195 +SHA256 (c15003c2c732.patch) = b1e3853062d63f6bbf7d4757cdb6165ab5313198ca0077bf053f1e7c62bebc64 +SIZE (c15003c2c732.patch) = 1985 +SHA256 (b83b1334f869.patch) = 3040bdde1d36da5c065d65f9cc7d1ea13ec17c9eae308189c56280e83a34a478 +SIZE (b83b1334f869.patch) = 2153 +SHA256 (5dffdeded8bc.patch) = 985d6cbf0f76748a1d1dc19beb684d0a29c3891cbd538c4df836b1b765f4fa61 +SIZE (5dffdeded8bc.patch) = 6021 +SHA256 (04890b2f9a59.patch) = 5ca6337494b07101621a9ce3f219415ef3fb9bfd34e7523e452150609cd6123d +SIZE (04890b2f9a59.patch) = 2386 +SHA256 (b585f7586dde.patch) = 4d59db5a1075209647cf78fdf74dbaf1b73e0facd90ea1defe211ce7555b57f0 +SIZE (b585f7586dde.patch) = 3335 +SHA256 (38d37bff5a68.patch) = 5d070bdb0504180deb5f0231cddf3acee58a8d6bb8d3081f31e733223ca205ed +SIZE (38d37bff5a68.patch) = 800 Index: head/multimedia/libva-intel-media-driver/files/patch-memalign =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-memalign (revision 522734) +++ head/multimedia/libva-intel-media-driver/files/patch-memalign (nonexistent) @@ -1,73 +0,0 @@ -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: " has been replaced by " -#error " has been replaced by " - ^ -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 @@ - #endif - #include //open - --#include // For memalign - #include // memset - #include // atoi atol - #include ---- media_driver/agnostic/ult/cm/buffer_up_test.cpp.orig 2018-10-01 21:39:52 UTC -+++ media_driver/agnostic/ult/cm/buffer_up_test.cpp -@@ -21,7 +21,6 @@ - */ - - #include "cm_test.h" --#include - - class BufferUPTest: public CmTest - { ---- media_driver/linux/common/os/mos_utilities_specific.h.orig 2018-10-01 21:39:52 UTC -+++ media_driver/linux/common/os/mos_utilities_specific.h -@@ -88,7 +88,7 @@ - #define UFINT_PATH_LINUX "UFINT" - #define UFEXT_PATH_LINUX "UFEXT" - --#define _aligned_malloc(size, alignment) memalign(alignment, size) -+#define _aligned_malloc(size, alignment) aligned_alloc(alignment, size) - #define _aligned_free(ptr) free(ptr) - - #define __MOS_USER_FEATURE_KEY_MESSAGE_DEFAULT_VALUE_STR "1" ---- media_driver/linux/ult/ult_app/cm/cm_test.h.orig 2018-10-01 21:39:52 UTC -+++ media_driver/linux/ult/ult_app/cm/cm_test.h -@@ -23,7 +23,6 @@ - #ifndef MEDIADRIVER_LINUX_CODECHAL_ULT_ULTAPP_CMTEST_H_ - #define MEDIADRIVER_LINUX_CODECHAL_ULT_ULTAPP_CMTEST_H_ - --#include - #include "gtest/gtest.h" - #include "mock_device.h" - #include "../memory_leak_detector.h" -@@ -34,7 +33,7 @@ class CmTest: public testing::Test - { - public: - static void* AllocateAlignedMemory(size_t size, size_t alignment) -- { return memalign(alignment, size); } -+ { return aligned_alloc(alignment, size); } - - 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 Property changes on: head/multimedia/libva-intel-media-driver/files/patch-memalign ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libva-intel-media-driver/files/patch-glibc =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-glibc (revision 522734) +++ head/multimedia/libva-intel-media-driver/files/patch-glibc (nonexistent) @@ -1,52 +0,0 @@ -makedev() is defined in on BSDs and on Solaris - -media_driver/linux/common/os/i915/xf86drm.c:50:10: fatal error: 'sys/sysmacros.h' file not found -#include - ^~~~~~~~~~~~~~~~~ -media_driver/linux/ult/libdrm_mock/xf86drm_mock.c:50:10: fatal error: 'sys/sysmacros.h' file not found -#include - ^~~~~~~~~~~~~~~~~ - ---- media_driver/linux/common/os/i915/xf86drm.c.orig 2018-10-01 21:39:52 UTC -+++ media_driver/linux/common/os/i915/xf86drm.c -@@ -47,13 +47,15 @@ - #include - #include - #include -+#if defined(__GLIBC__) || defined(__linux__) - #include -+#endif - #include - #define stat_t struct stat - #include - #include - #include --#ifdef HAVE_SYS_MKDEV_H -+#ifdef __sun - # include /* defines major(), minor(), and makedev() on Solaris */ - #endif - ---- media_driver/linux/ult/libdrm_mock/xf86drm_mock.c.orig 2018-10-01 21:39:52 UTC -+++ media_driver/linux/ult/libdrm_mock/xf86drm_mock.c -@@ -47,16 +47,20 @@ - #include - #include - #include -+#if defined(__GLIBC__) || defined(__linux__) - #include -+#endif - #include - #define stat_t struct stat - #include - #include - #include --#ifdef HAVE_SYS_MKDEV_H -+#ifdef __sun - # include /* defines major(), minor(), and makedev() on Solaris */ - #endif -+#if defined(__GLIBC__) || defined(__linux__) - #include -+#endif - - /* Not all systems have MAP_FAILED defined */ - #ifndef MAP_FAILED Property changes on: head/multimedia/libva-intel-media-driver/files/patch-glibc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libva-intel-media-driver/files/patch-diagnostics =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-diagnostics (revision 522734) +++ head/multimedia/libva-intel-media-driver/files/patch-diagnostics (nonexistent) @@ -1,13 +0,0 @@ -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 - Property changes on: head/multimedia/libva-intel-media-driver/files/patch-diagnostics ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libva-intel-media-driver/files/patch-thread-id =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-thread-id (revision 522734) +++ head/multimedia/libva-intel-media-driver/files/patch-thread-id (nonexistent) @@ -1,54 +0,0 @@ -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,18 @@ - - #include "mos_os.h" - #include "media_libva_common.h" -+#if defined(__linux__) - #include - #include -+#elif defined(__DragonFly__) || defined(__FreeBSD__) -+#include -+#elif defined(__NetBSD__) -+#include -+#elif defined(__sun) -+#include -+#else // fallback -+#include -+#endif - #include - - //Require DRM VMAP patch, -@@ -95,5 +103,17 @@ inline void GetLocalTime(PSYSTEMTIME psystime) - #endif - - #define CmGetCurProcessId() getpid() -+#if defined(__linux__) - #define CmGetCurThreadId() syscall(SYS_gettid) -+#elif defined(__DragonFly__) || defined(__FreeBSD__) -+#define CmGetCurThreadId() pthread_getthreadid_np() -+#elif defined(__NetBSD__) -+#define CmGetCurThreadId() _lwp_self() -+#elif defined(__OpenBSD__) -+#define CmGetCurThreadId() getthrid() -+#elif defined(__sun) -+#define CmGetCurThreadId() thr_self() -+#else // fallback -+#define CmGetCurThreadId() (uintptr_t)pthread_self() -+#endif - Property changes on: head/multimedia/libva-intel-media-driver/files/patch-thread-id ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libva-intel-media-driver/files/patch-clang =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-clang (revision 522734) +++ head/multimedia/libva-intel-media-driver/files/patch-clang (nonexistent) @@ -1,29 +0,0 @@ -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 -@@ -2614,7 +2614,7 @@ uint32_t MOS_GetThreadId( - - uint32_t MOS_GetCurrentThreadId() - { -- return (uint32_t)pthread_self(); -+ return (uintptr_t)pthread_self(); - } - - 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( Property changes on: head/multimedia/libva-intel-media-driver/files/patch-clang ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libva-intel-media-driver/files/patch-fbres =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-fbres (revision 522734) +++ head/multimedia/libva-intel-media-driver/files/patch-fbres (nonexistent) @@ -1,77 +0,0 @@ -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 - ^~~~~~~~~~~~ -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 - ^~~~~~~~~~~~ - ---- 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 @@ - #include - #endif - -+#if defined(__linux__) - #include -+#define DEFAULT_FBDEV "/dev/graphics/fb0" -+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) -+#include -+# if defined(__sun) -+#define DEFAULT_FBDEV "/dev/fb" -+# else -+#define DEFAULT_FBDEV "/dev/ttyv0" -+# endif -+#define FBIOGET_VSCREENINFO FBIOGTYPE -+#define fb_var_screeninfo fbtype -+#define xres fb_width -+#define yres fb_height -+#elif defined(__NetBSD__) || defined(__OpenBSD__) -+#include -+# if defined(__OpenBSD__) -+#define DEFAULT_FBDEV "/dev/ttyC0" -+# else -+#define DEFAULT_FBDEV "/dev/ttyE0" -+# endif -+#define FBIOGET_VSCREENINFO WSDISPLAYIO_GINFO -+#define fb_var_screeninfo wsdisplay_fbinfo -+#define xres width -+#define yres height -+#else -+#define DEFAULT_FBDEV "/dev/fb0" -+#define FBIOGET_VSCREENINFO 0 -+struct fb_var_screeninfo { -+ uint32_t xres; -+ uint32_t yres; -+}; -+#endif - - typedef MediaDdiFactory DdiDecodeFactory; - static int32_t DdiDecode_GetDisplayInfo(VADriverContextP ctx) -@@ -56,7 +88,7 @@ static int32_t DdiDecode_GetDisplayInfo(VADriverContex - vsinfo.xres = 0; - vsinfo.yres = 0; - -- fd = open("/dev/graphics/fb0",O_RDONLY); -+ fd = open(DEFAULT_FBDEV,O_RDONLY); - if(fd > 0) - { - if(ioctl(fd, FBIOGET_VSCREENINFO, &vsinfo) < 0) ---- media_driver/linux/common/ddi/media_libva.cpp.orig 2018-11-26 07:05:55 UTC -+++ media_driver/linux/common/ddi/media_libva.cpp -@@ -36,8 +36,6 @@ - #include - #endif - --#include -- - #include "media_libva.h" - - #include "media_libva_util.h" Property changes on: head/multimedia/libva-intel-media-driver/files/patch-fbres ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property