svn commit: r512438 - in head/multimedia: gmmlib gmmlib/files libva-intel-media-driver

Jan Beich jbeich at FreeBSD.org
Fri Sep 20 19:58:02 UTC 2019 

Author: jbeich
Date: Fri Sep 20 19:58:00 2019
New Revision: 512438
URL: https://svnweb.freebsd.org/changeset/ports/512438

Log:
  multimedia/gmmlib: update to 19.3.2
  
  - Expose runtime debugging via option
  
  Changes:	https://github.com/intel/gmmlib/compare/intel-gmmlib-19.2.4...intel-gmmlib-19.3.2
  Reported by:	portscout

Added:
  head/multimedia/gmmlib/files/patch-malloc   (contents, props changed)
  head/multimedia/gmmlib/files/patch-nullptr   (contents, props changed)
  head/multimedia/gmmlib/files/patch-unix   (contents, props changed)
Modified:
  head/multimedia/gmmlib/Makefile   (contents, props changed)
  head/multimedia/gmmlib/distinfo   (contents, props changed)
  head/multimedia/gmmlib/files/patch-thread-id   (contents, props changed)
  head/multimedia/gmmlib/pkg-plist   (contents, props changed)
  head/multimedia/libva-intel-media-driver/Makefile   (contents, props changed)

Modified: head/multimedia/gmmlib/Makefile
==============================================================================
--- head/multimedia/gmmlib/Makefile	Fri Sep 20 19:50:07 2019	(r512437)
+++ head/multimedia/gmmlib/Makefile	Fri Sep 20 19:58:00 2019	(r512438)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gmmlib
 DISTVERSIONPREFIX=	intel-${PORTNAME}-
-DISTVERSION=	19.2.4
+DISTVERSION=	19.3.2
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -21,8 +21,10 @@ GH_ACCOUNT=	intel
 CMAKE_ARGS=	-DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
 		-DGMMLIB_MARCH:STRING="${CPUTYPE}"
 
-OPTIONS_DEFINE=	TEST
+OPTIONS_DEFINE=	DEBUG TEST
 
+DEBUG_CFLAGS=	-D_DEBUG
+
 # XXX Unbundle googletest
 TEST_CMAKE_BOOL=	RUN_TEST_SUITE
 TEST_TEST_TARGET=	Run_ULT
@@ -31,6 +33,12 @@ post-patch:
 # Silence -Wmacro-redefined
 	@${REINPLACE_CMD} -e '/__fastcall/d' \
 		${WRKSRC}/Source/inc/portable_compiler.h
+# XXX Uncomment and drop patches if upstream doesn't regain sanity
+.if !exists(${.CURDIR}/files/patch-gcc-atomics) && !exists(${.CURDIR}/files/patch-unix)
+# Avoid platform whitelists for generic non-Windows code
+	@${GREP} --exclude='*/os.h*' --exclude='*/googletest/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
+		${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__unix__/'
+.endif
 
 post-install:
 # Clean up after PATTERN-based install

Modified: head/multimedia/gmmlib/distinfo
==============================================================================
--- head/multimedia/gmmlib/distinfo	Fri Sep 20 19:50:07 2019	(r512437)
+++ head/multimedia/gmmlib/distinfo	Fri Sep 20 19:58:00 2019	(r512438)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567144491
-SHA256 (intel-gmmlib-intel-gmmlib-19.2.4_GH0.tar.gz) = 180defcdb2ace03176307d3241ab58f075cd70a150ad9513df9cfa932c598e5b
-SIZE (intel-gmmlib-intel-gmmlib-19.2.4_GH0.tar.gz) = 633227
+TIMESTAMP = 1568629827
+SHA256 (intel-gmmlib-intel-gmmlib-19.3.2_GH0.tar.gz) = 719b6db3052355830b50fb264fe9e2ff889e537375e876d1c5b8410c8561a718
+SIZE (intel-gmmlib-intel-gmmlib-19.3.2_GH0.tar.gz) = 706648

Added: head/multimedia/gmmlib/files/patch-malloc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/gmmlib/files/patch-malloc	Fri Sep 20 19:58:00 2019	(r512438)
@@ -0,0 +1,16 @@
+In file included from Source/GmmLib/ULT/GmmAuxTableULT.cpp:25:
+In file included from Source/GmmLib/ULT/./GmmAuxTableULT.h:33:
+/usr/include/malloc.h:3:2: error: "<malloc.h> has been replaced by <stdlib.h>"
+#error "<malloc.h> has been replaced by <stdlib.h>"
+ ^
+
+--- Source/GmmLib/ULT/GmmAuxTableULT.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/ULT/GmmAuxTableULT.h
+@@ -30,7 +30,6 @@ OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "GmmGen10ResourceULT.h"
+ #include <stdlib.h>
+-#include <malloc.h>
+ 
+ #ifndef ALIGN
+ #define ALIGN(v, a) (((v) + ((a)-1)) & ~((a)-1))

Added: head/multimedia/gmmlib/files/patch-nullptr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/gmmlib/files/patch-nullptr	Fri Sep 20 19:58:00 2019	(r512438)
@@ -0,0 +1,31 @@
+FreeBSD and OpenBSD define NULL as nullptr for C++11 or later.
+https://github.com/freebsd/freebsd/commit/c8ed04c26b6758354853a6bed4629f71d0d01a7d
+https://github.com/openbsd/src/commit/6ecde746dea9a5d17abf3bafa06c232b9189b33b
+
+Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp:415:21: error: non-pointer operand type 'GMM_GFX_ADDRESS' (aka 'unsigned long') incompatible with nullptr
+    return AuxTTObj ? AuxTTObj->GetL3Address() : NULL;
+                    ^ ~~~~~~~~~~~~~~~~~~~~~~~~
+Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp:474:28: error: invalid operands to binary expression ('GMM_GFX_ADDRESS' (aka 'unsigned long') and 'nullptr_t')
+    if(GetAuxL3TableAddr() == NULL)
+       ~~~~~~~~~~~~~~~~~~~ ^  ~~~~
+
+--- Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
+@@ -412,7 +412,7 @@ ERROR_CASE:
+ /////////////////////////////////////////////////////////////////////////////////////
+ GMM_GFX_ADDRESS GmmLib::GmmPageTableMgr::GetAuxL3TableAddr()
+ {
+-    return AuxTTObj ? AuxTTObj->GetL3Address() : NULL;
++    return AuxTTObj ? AuxTTObj->GetL3Address() : 0;
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////////////
+@@ -471,7 +471,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::InitContextAuxTabl
+ /////////////////////////////////////////////////////////////////////////////////////
+ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(const GMM_DDI_UPDATEAUXTABLE *UpdateReq)
+ {
+-    if(GetAuxL3TableAddr() == NULL)
++    if(GetAuxL3TableAddr() == 0)
+     {
+         GMM_ASSERTDPF(0, "Invalid AuxTable update request, AuxTable is not initialized");
+         return GMM_INVALIDPARAM;

Modified: head/multimedia/gmmlib/files/patch-thread-id
==============================================================================
--- head/multimedia/gmmlib/files/patch-thread-id	Fri Sep 20 19:50:07 2019	(r512437)
+++ head/multimedia/gmmlib/files/patch-thread-id	Fri Sep 20 19:58:00 2019	(r512438)
@@ -1,13 +1,16 @@
 Add more BSDs and update to modern way to get thread ID
+https://github.com/gabime/spdlog/pull/1234
 
 --- Source/GmmLib/Utility/GmmLog/spdlog/details/os.h.orig	2018-09-28 18:59:39 UTC
 +++ Source/GmmLib/Utility/GmmLog/spdlog/details/os.h
-@@ -39,9 +39,16 @@
+@@ -39,9 +39,21 @@
  #include <unistd.h>
  #include <chrono>
  
 -#elif __FreeBSD__
 -#include <sys/thr.h> //Use thr_self() syscall under FreeBSD to get thread id
++#elif defined(_AIX)
++#include <pthread.h>     // for pthread_getthreadid_np
  
 +#elif defined(__DragonFly__) || defined(__FreeBSD__)
 +#include <pthread_np.h>  // for pthread_getthreadid_np
@@ -15,13 +18,25 @@ Add more BSDs and update to modern way to get thread I
 +#elif defined(__NetBSD__)
 +#include <lwp.h>         // for _lwp_self
 +
++#elif defined(__OpenBSD__)
++#include <unistd.h>      // for getthrid
++
 +#elif defined(__sun)
 +#include <thread.h>      // for thr_self
 +
  #else
  #include <thread>
  
-@@ -302,10 +308,14 @@ inline size_t thread_id()
+@@ -213,7 +225,7 @@ inline size_t filesize(FILE *f)
+ #else // unix
+     int fd = fileno(f);
+     //64 bits(but not in osx, where fstat64 is deprecated)
+-#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__))
++#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+     struct stat64 st;
+     if (fstat64(fd, &st) == 0)
+         return static_cast<size_t>(st.st_size);
+@@ -302,10 +314,14 @@ inline size_t thread_id()
  #  define SYS_gettid __NR_gettid
  # endif
      return  static_cast<size_t>(syscall(SYS_gettid));
@@ -29,14 +44,14 @@ Add more BSDs and update to modern way to get thread I
 -    long tid;
 -    thr_self(&tid);
 -    return static_cast<size_t>(tid);
-+#elif defined(__DragonFly__) || defined(__FreeBSD__)
++#elif defined(_AIX) || defined(__DragonFly__) || defined(__FreeBSD__)
 +    return static_cast<size_t>(pthread_getthreadid_np());
 +#elif defined(__NetBSD__)
 +    return static_cast<size_t>(_lwp_self());
 +#elif defined(__OpenBSD__)
-+    return getthrid();
++    return static_cast<size_t>(getthrid());
 +#elif defined(__sun)
-+    return thr_self();
++    return static_cast<size_t>(thr_self());
  #else //Default to standard C++11 (OSX and other Unix)
      return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
  #endif

Added: head/multimedia/gmmlib/files/patch-unix
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/gmmlib/files/patch-unix	Fri Sep 20 19:58:00 2019	(r512438)
@@ -0,0 +1,308 @@
+Relax recent Linux checks for the code works on any non-Windows platform.
+https://github.com/intel/gmmlib/commit/a09c68fd3244 - example offender
+
+In file included from Source/GmmLib/CachePolicy/GmmCachePolicy.cpp:23:
+In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:58:
+In file included from Source/GmmLib/inc/External/Common/GmmResourceInfo.h:91:
+In file included from Source/GmmLib/inc/External/Common/../Linux/GmmResourceInfoLin.h:26:
+In file included from Source/GmmLib/inc/External/Common/../Linux/../Common/GmmResourceInfoCommon.h:32:
+Source/GmmLib/inc/External/Common/GmmClientContext.h:59:5: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT'
+    GMM_DEVICE_CALLBACKS_INT     *pDeviceCb;
+    ^
+Source/GmmLib/inc/External/Common/GmmClientContext.h:85:9: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT'
+        GMM_DEVICE_CALLBACKS_INT          DeviceCB;       //OS-specific defn: Will be used by Clients to send as input arguments.
+        ^
+Source/GmmLib/inc/External/Common/GmmClientContext.h:139:80: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT'
+        GMM_VIRTUAL GMM_PAGETABLE_MGR* GMM_STDCALL      CreatePageTblMgrObject(GMM_DEVICE_CALLBACKS_INT* pDevCb, uint32_t TTFlags);
+                                                                               ^
+Source/GmmLib/inc/External/Common/GmmClientContext.h:154:57: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT'
+                                                        GMM_DEVICE_CALLBACKS_INT* pDevCb,
+                                                        ^
+In file included from Source/GmmLib/CachePolicy/GmmCachePolicy.cpp:23:
+In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:62:
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:56:5: error: unknown type name 'GMM_UMD_SYNCCONTEXT'; did you mean 'GMM_UMD_CONTEXT'?
+    GMM_UMD_SYNCCONTEXT * UmdContext;     // [in]  pointer to thread-specific data, specifying BBQHandle/Fence etc
+    ^~~~~~~~~~~~~~~~~~~
+    GMM_UMD_CONTEXT
+Source/GmmLib/inc/External/Common/GmmInfo.h:58:3: note: 'GMM_UMD_CONTEXT' declared here
+} GMM_UMD_CONTEXT;
+  ^
+In file included from Source/GmmLib/CachePolicy/GmmCachePolicy.cpp:23:
+In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:62:
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:72:9: error: unknown type name 'HANDLE'
+        HANDLE BBQueueHandle;
+        ^
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:75:21: error: unknown type name 'HANDLE'
+        SyncInfoLin(HANDLE Handle, uint64_t Fence) {}
+                    ^
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:115:9: error: unknown type name 'GMM_DEVICE_CALLBACKS'
+        GMM_DEVICE_CALLBACKS DeviceCb;       //OS-specific defn: Will be used by Clients to send as input arguments for TR-TT APIs
+        ^
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:116:9: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT'
+        GMM_DEVICE_CALLBACKS_INT DeviceCbInt;       //OS-specific defn: Will be used internally GMM lib
+        ^
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:117:9: error: unknown type name 'GMM_TRANSLATIONTABLE_CALLBACKS'
+        GMM_TRANSLATIONTABLE_CALLBACKS TTCb; //OS-specific defn
+        ^
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:118:9: error: unknown type name 'HANDLE'
+        HANDLE hCsr;  // OCL per-device command stream receiver handle for aubcapture
+        ^
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:121:25: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT'
+        GmmPageTableMgr(GMM_DEVICE_CALLBACKS_INT *, uint32_t TTFlags, GmmClientContext  *pClientContextIn); // Allocates memory for indicate TT’s root-tables, initializes common node-pool
+                        ^
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:128:60: error: unknown type name 'HANDLE'
+        GMM_VIRTUAL GMM_STATUS InitContextAuxTableRegister(HANDLE initialBBHandle, GMM_ENGINE_TYPE engType); //Clients call it to update Aux-Table pointer in context-image, engType reqd. if @ context level
+                                                           ^
+Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:133:46: error: unknown type name 'GMM_UMD_SYNCCONTEXT'; did you mean 'GMM_UMD_CONTEXT'?
+        GMM_VIRTUAL void __ReleaseUnusedPool(GMM_UMD_SYNCCONTEXT *UmdContext);
+                                             ^~~~~~~~~~~~~~~~~~~
+                                             GMM_UMD_CONTEXT
+Source/GmmLib/inc/External/Common/GmmInfo.h:58:3: note: 'GMM_UMD_CONTEXT' declared here
+} GMM_UMD_CONTEXT;
+  ^
+
+--- Source/GmmLib/CachePolicy/GmmGen8CachePolicy.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/CachePolicy/GmmGen8CachePolicy.h
+@@ -143,7 +143,7 @@ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_REF_EN
+ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_HME_DOWNSAMPLED_ENCODE                    , 1   , 1    , 1  , 0  , 1);
+ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_HME_DOWNSAMPLED_ENCODE_DST                , 1   , 1    , 0  , 0  , 1);
+ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_ME_DISTORTION_ENCODE                      , 1   , 1    , 1  , 0  , 1);
+-#if defined(__linux__) && !defined(ANDROID)
++#if !defined(_WIN32) && !defined(ANDROID)
+ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_MV_DATA_ENCODE                            , 1   , 1    , 0  , 0  , 1);
+ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_BRC_ME_DISTORTION_ENCODE                  , 1   , 1    , 0  , 0  , 1);
+ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_PAK_OBJECT_ENCODE                                 , 1   , 1    , 0  , 0  , 1);
+--- Source/GmmLib/Resource/Linux/GmmResourceInfoLinCWrapper.cpp.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/Resource/Linux/GmmResourceInfoLinCWrapper.cpp
+@@ -22,7 +22,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "Internal/Common/GmmLibInc.h"
+ 
+-#if defined(__linux__) && !LHDM
++#if !defined(_WIN32) && !LHDM
+ #include "Internal/Linux/GmmResourceInfoLinInt.h"
+ 
+ /////////////////////////////////////////////////////////////////////////////////////
+@@ -176,4 +176,4 @@ GMM_TRANSLATIONTABLE_CALLBACKS DummyTTCB = {
+ .pfWriteL3Adr             = DummyWriteL3Adr,
+ };
+ 
+-#endif /*__linux__*/
++#endif /*!_WIN32*/
+--- Source/GmmLib/Texture/GmmTextureAlloc.cpp.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/Texture/GmmTextureAlloc.cpp
+@@ -762,7 +762,7 @@ GMM_STATUS GmmLib::GmmTextureCalc::FillTexPitchAndSize
+         }
+         else
+         {
+-#if defined(__GMM_KMD__) || defined(__linux__)
++#if defined(__GMM_KMD__) || !defined(_WIN32)
+             GMM_ASSERTDPF(0, "Surface too large!");
+ #endif
+             Status = GMM_ERROR;
+--- Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
+@@ -28,7 +28,7 @@ Description: UMD-TT manager (manages both TR-TT and AU
+ #include "../TranslationTable/GmmUmdTranslationTable.h"
+ #include "External/Common/GmmClientContext.h"
+ 
+-#if defined(__linux__)
++#if !defined(_WIN32)
+ #include "Internal/Linux/GmmResourceInfoLinInt.h"
+ #endif
+ 
+@@ -44,7 +44,7 @@ Description: UMD-TT manager (manages both TR-TT and AU
+         LeaveCriticalSection(&PoolLock); \
+     }
+ 
+-#if defined(__linux__)
++#if !defined(_WIN32)
+ GMM_STATUS GmmLib::__GmmDeviceAlloc(GmmClientContext *        pClientContext,
+                                     GMM_DEVICE_CALLBACKS_INT *pDeviceCbInt,
+                                     GMM_DEVICE_ALLOC *        pAlloc)
+@@ -606,7 +606,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(con
+     return GMM_SUCCESS;
+ }
+ 
+-#if defined(__linux__) && !_WIN32
++#if !defined(_WIN32)
+ /////////////////////////////////////////////////////////////////////////////////////
+ /// Gets size of PageTable buffer object (BOs) list
+ ///
+--- Source/GmmLib/TranslationTable/GmmUmdTranslationTable.cpp.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/TranslationTable/GmmUmdTranslationTable.cpp
+@@ -31,7 +31,7 @@ Description: Contains functions of internal classes 
+ 
+ #if !defined(__GMM_KMD)
+ 
+-#if defined(__linux__)
++#if !defined(_WIN32)
+ #include "Internal/Linux/GmmResourceInfoLinInt.h"
+ 
+ #define _aligned_free(ptr) free(ptr)
+--- Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h
+@@ -27,7 +27,7 @@ Description: This file contains the class definitions 
+ #pragma once
+ #include "External/Common/GmmPageTableMgr.h"
+ 
+-#ifdef __linux__
++#ifndef _WIN32
+ #include <pthread.h>
+ #include <string.h>
+ 
+@@ -433,7 +433,7 @@ namespace GmmLib
+     public:
+ #ifdef _WIN32
+         CRITICAL_SECTION    TTLock;                  //synchronized access of PageTable obj
+-#elif defined __linux__
++#else
+         pthread_mutex_t TTLock;
+ #endif
+ 
+--- Source/GmmLib/ULT/GmmAuxTableULT.cpp.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/ULT/GmmAuxTableULT.cpp
+@@ -20,7 +20,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWAR
+ OTHER DEALINGS IN THE SOFTWARE.
+ ============================================================================*/
+ 
+-#ifdef __linux__
++#ifndef _WIN32
+ 
+ #include "GmmAuxTableULT.h"
+ 
+@@ -262,4 +262,4 @@ TEST_F(CTestAuxTable, TestAuxTableContent)
+     pGmmULTClientContext->DestroyPageTblMgrObject(mgr);
+ }
+ 
+-#endif /* __linux__ */
++#endif /* !_WIN32 */
+--- Source/GmmLib/ULT/GmmAuxTableULT.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/ULT/GmmAuxTableULT.h
+@@ -22,7 +22,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #pragma once
+ 
+-#ifdef __linux__
++#ifndef _WIN32
+ 
+ #ifndef _ISOC11_SOURCE
+ #define _ISOC11_SOURCE 1
+@@ -249,4 +249,4 @@ class CTestAuxTable : public CTestGen10Resource (publi
+     };
+ };
+ 
+-#endif /* __linux__ */
++#endif /* !_WIN32 */
+--- Source/GmmLib/Utility/GmmLog/GmmLog.cpp.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/Utility/GmmLog/GmmLog.cpp
+@@ -183,12 +183,9 @@ bool GmmLib::Logger::GmmLogInit()
+ #elif defined(__ANDROID__)
+             // Log to logcat
+             SpdLogger   = spdlog::android_logger(GMM_LOGGER_NAME, GMM_LOG_TAG);
+-#elif defined(__linux__)
++#else
+             // Log to syslog
+             SpdLogger = spdlog::syslog_logger(GMM_LOGGER_NAME, GMM_LOG_TAG, 1 /*Log Pid*/);
+-#else
+-            __GMM_ASSERT(0);
+-            return false;
+ #endif
+         }
+     }
+--- Source/GmmLib/Utility/GmmLog/spdlog/tweakme.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/Utility/GmmLog/spdlog/tweakme.h
+@@ -97,7 +97,7 @@
+ ///////////////////////////////////////////////////////////////////////////////
+ // Uncomment to enable syslog (disabled by default)
+ //
+-#if __linux__
++#ifndef _WIN32
+ #define SPDLOG_ENABLE_SYSLOG
+ #endif
+ ///////////////////////////////////////////////////////////////////////////////
+--- Source/GmmLib/inc/External/Common/GmmCommonExt.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/inc/External/Common/GmmCommonExt.h
+@@ -72,7 +72,7 @@ extern const SWIZZLE_DESCRIPTOR INTEL_64KB_UNDEFINED_6
+ #define GMM_NO_FENCE_REG        0xDEADBEEF
+ #define GMM_MAX_DISPLAYS        3
+ 
+-#if defined __linux__
++#ifndef _WIN32
+ typedef void* HANDLE;
+ #endif
+ 
+--- Source/GmmLib/inc/External/Common/GmmPageTableMgr.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h
+@@ -28,7 +28,7 @@ Description: This file contains the class definitions 
+ #pragma once
+ #include "GmmHw.h"
+ 
+-#ifdef __linux__
++#ifndef _WIN32
+ #include <pthread.h>
+ #endif
+ 
+@@ -108,7 +108,7 @@ namespace GmmLib
+         GmmClientContext    *pClientContext;    ///< ClientContext of the client creating this Object
+ 
+          //OS-specific defn
+-#if defined  __linux__
++#ifndef _WIN32
+ 	pthread_mutex_t PoolLock;
+ #endif
+     public:
+@@ -134,7 +134,7 @@ namespace GmmLib
+         GMM_VIRTUAL GMM_PAGETABLEPool * __GetFreePoolNode(uint32_t * FreePoolNodeIdx, POOL_TYPE PoolType);
+ 
+ 
+-#if defined __linux__
++#ifndef _WIN32
+         //returns number of BOs for indicated TTs = NumNodePoolElements+1 BOs for root table and pools
+         GMM_VIRTUAL int GetNumOfPageTableBOs(uint8_t TTFlags);
+         //returns BO* list for indicated TT in client allocated memory
+--- Source/GmmLib/inc/External/Common/GmmResourceInfoExt.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/inc/External/Common/GmmResourceInfoExt.h
+@@ -181,7 +181,7 @@ typedef struct GMM_RESOURCE_ALIGNMENT_REC
+ // TBD - Place holder for GMM_RESOURCE_FLAG definition.
+ //---------------------------------------------------------------------------
+ #include "GmmResourceFlags.h"
+-#if defined __linux__
++#ifndef _WIN32
+     #include "External/Linux/GmmResourceInfoLinExt.h"
+ #endif
+ 
+--- Source/GmmLib/inc/External/Linux/GmmResourceInfoLinExt.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/inc/External/Linux/GmmResourceInfoLinExt.h
+@@ -21,7 +21,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+ ============================================================================*/
+ #pragma once
+ 
+-#ifdef __linux__
++#ifndef _WIN32
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -93,4 +93,4 @@ typedef struct GMM_UMD_SYNCCONTEXT_REC
+ }
+ #endif /*__cplusplus*/
+ 
+-#endif /*__linux__*/
++#endif /*!_WIN32*/
+--- Source/GmmLib/inc/Internal/Linux/GmmResourceInfoLinInt.h.orig	2019-09-16 10:30:27 UTC
++++ Source/GmmLib/inc/Internal/Linux/GmmResourceInfoLinInt.h
+@@ -22,7 +22,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #pragma once
+ 
+-#if defined(__linux__) && !LHDM
++#if !defined(_WIN32) && !LHDM
+ 
+ // GMM Lib Client Exports
+ #include "External/Common/GmmCommonExt.h"
+@@ -68,4 +68,4 @@ int GmmCheckForNullDevCbPfn(GMM_CLIENT ClientType, GMM
+ 
+ extern GMM_TRANSLATIONTABLE_CALLBACKS DummyTTCB;
+ 
+-#endif /*__linux__*/
++#endif /*!_WIN32*/

Modified: head/multimedia/gmmlib/pkg-plist
==============================================================================
--- head/multimedia/gmmlib/pkg-plist	Fri Sep 20 19:50:07 2019	(r512437)
+++ head/multimedia/gmmlib/pkg-plist	Fri Sep 20 19:58:00 2019	(r512438)
@@ -3,16 +3,19 @@ include/igdgmm/GmmLib/CachePolicy/GmmCachePolicyResour
 include/igdgmm/GmmLib/CachePolicy/GmmCachePolicyUndefineConditionals.h
 include/igdgmm/GmmLib/CachePolicy/GmmGen10CachePolicy.h
 include/igdgmm/GmmLib/CachePolicy/GmmGen11CachePolicy.h
+include/igdgmm/GmmLib/CachePolicy/GmmGen12CachePolicy.h
 include/igdgmm/GmmLib/CachePolicy/GmmGen8CachePolicy.h
 include/igdgmm/GmmLib/CachePolicy/GmmGen9CachePolicy.h
 include/igdgmm/GmmLib/Platform/GmmPlatforms.h
 include/igdgmm/GmmLib/Texture/GmmTexture.h
+include/igdgmm/GmmLib/TranslationTable/GmmUmdTranslationTable.h
 include/igdgmm/GmmLib/Utility/CpuSwizzleBlt/CpuSwizzleBlt.c
 include/igdgmm/GmmLib/Utility/CpuSwizzleBlt/assert.h
 include/igdgmm/GmmLib/Utility/GmmLog/GmmLog.h
 include/igdgmm/GmmLib/Utility/GmmUtility.h
 include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen10.h
 include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen11.h
+include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen12.h
 include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen8.h
 include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen9.h
 include/igdgmm/GmmLib/inc/External/Common/GmmCachePolicy.h
@@ -23,12 +26,14 @@ include/igdgmm/GmmLib/inc/External/Common/GmmCommonExt
 include/igdgmm/GmmLib/inc/External/Common/GmmConst.h
 include/igdgmm/GmmLib/inc/External/Common/GmmDebug.h
 include/igdgmm/GmmLib/inc/External/Common/GmmFormatTable.h
+include/igdgmm/GmmLib/inc/External/Common/GmmHw.h
 include/igdgmm/GmmLib/inc/External/Common/GmmInfo.h
 include/igdgmm/GmmLib/inc/External/Common/GmmInfoExt.h
 include/igdgmm/GmmLib/inc/External/Common/GmmInternal.h
 include/igdgmm/GmmLib/inc/External/Common/GmmLibDll.h
 include/igdgmm/GmmLib/inc/External/Common/GmmLibDllName.h
 include/igdgmm/GmmLib/inc/External/Common/GmmMemAllocator.hpp
+include/igdgmm/GmmLib/inc/External/Common/GmmPageTableMgr.h
 include/igdgmm/GmmLib/inc/External/Common/GmmPlatformExt.h
 include/igdgmm/GmmLib/inc/External/Common/GmmProto.h
 include/igdgmm/GmmLib/inc/External/Common/GmmResourceFlags.h
@@ -38,6 +43,7 @@ include/igdgmm/GmmLib/inc/External/Common/GmmResourceI
 include/igdgmm/GmmLib/inc/External/Common/GmmTextureExt.h
 include/igdgmm/GmmLib/inc/External/Common/GmmUtil.h
 include/igdgmm/GmmLib/inc/External/Linux/GmmResourceInfoLin.h
+include/igdgmm/GmmLib/inc/External/Linux/GmmResourceInfoLinExt.h
 include/igdgmm/GmmLib/inc/GmmLib.h
 include/igdgmm/igdgmm.h
 include/igdgmm/inc/common/gfxmacro.h
@@ -52,6 +58,6 @@ include/igdgmm/inc/umKmInc/sharedata.h
 include/igdgmm/util/g_gfxDebug.h
 include/igdgmm/util/gfxDebug.h
 lib/libigdgmm.so
-lib/libigdgmm.so.9
-lib/libigdgmm.so.9.0.0
+lib/libigdgmm.so.11
+lib/libigdgmm.so.11.0.0
 libdata/pkgconfig/igdgmm.pc

Modified: head/multimedia/libva-intel-media-driver/Makefile
==============================================================================
--- head/multimedia/libva-intel-media-driver/Makefile	Fri Sep 20 19:50:07 2019	(r512437)
+++ head/multimedia/libva-intel-media-driver/Makefile	Fri Sep 20 19:58:00 2019	(r512438)
@@ -3,6 +3,7 @@
 PORTNAME=	media-driver
 DISTVERSIONPREFIX=	intel-media-
 DISTVERSION=	19.3.pre4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-intel-

More information about the svn-ports-head mailing list