diff --git a/multimedia/gmmlib/Makefile b/multimedia/gmmlib/Makefile
index 32c0c1e7970b..d8265f318c4a 100644
--- a/multimedia/gmmlib/Makefile
+++ b/multimedia/gmmlib/Makefile
@@ -1,41 +1,40 @@
 PORTNAME=	gmmlib
 DISTVERSIONPREFIX=	intel-${PORTNAME}-
-DISTVERSION=	22.3.6
+DISTVERSION=	22.3.9
 CATEGORIES=	multimedia
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	f17dd87c7f57.patch:-p1 # https://github.com/intel/gmmlib/pull/67
 PATCHFILES+=	4356a33c787c.patch:-p1 # https://github.com/intel/gmmlib/pull/68
 PATCHFILES+=	a75809957583.patch:-p1 # https://github.com/intel/gmmlib/pull/68
 PATCHFILES+=	978f7d56f88a.patch:-p1 # https://github.com/intel/gmmlib/pull/68
-PATCHFILES+=	9e844d7c052d.patch:-p1 # https://github.com/intel/gmmlib/pull/68
 PATCHFILES+=	072810163a05.patch:-p1 # https://github.com/intel/gmmlib/pull/68
 PATCHFILES+=	ab150305017a.patch:-p1 # https://github.com/intel/gmmlib/pull/68
 PATCHFILES+=	0d45ab8163e7.patch:-p1 # https://github.com/intel/gmmlib/pull/68
 PATCHFILES+=	4ae2fd0de966.patch:-p1 # https://github.com/intel/gmmlib/pull/68
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Intel Graphics Memory Management Library
 WWW=		https://01.org/intel-media-for-linux
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	only Intel GPUs on x86 are supported
 
 USES=		cmake:testing compiler:c++11-lib
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
 CMAKE_OFF+=	${CMAKE_TESTING_ON}
 CMAKE_TESTING_ON=	RUN_TEST_SUITE # XXX Unbundle googletest
 CMAKE_TESTING_TARGET=	Run_ULT
 CMAKE_ARGS=	-DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
 		-DGMMLIB_MARCH:STRING="${CPUTYPE}"
 
 post-install:
 # Clean up after PATTERN-based install
 	@${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete
 
 .include <bsd.port.mk>
diff --git a/multimedia/gmmlib/distinfo b/multimedia/gmmlib/distinfo
index f9e110d2aaf9..ab197818e4c8 100644
--- a/multimedia/gmmlib/distinfo
+++ b/multimedia/gmmlib/distinfo
@@ -1,21 +1,21 @@
-TIMESTAMP = 1686068750
-SHA256 (intel-gmmlib-intel-gmmlib-22.3.6_GH0.tar.gz) = be853a72be8cc0a9d34a8e1a80c97e8c655c548a9f3bdeba953186725d562839
-SIZE (intel-gmmlib-intel-gmmlib-22.3.6_GH0.tar.gz) = 843539
+TIMESTAMP = 1689680240
+SHA256 (intel-gmmlib-intel-gmmlib-22.3.9_GH0.tar.gz) = 62d2f8333f1da3361952546a83dd40d1eb23d8bddacf67a160e63f565b68b5a6
+SIZE (intel-gmmlib-intel-gmmlib-22.3.9_GH0.tar.gz) = 845228
 SHA256 (f17dd87c7f57.patch) = 0bdfd22e8f36a097c875796c7bbf7003a16cc7535fdf5d3caa3a7de9dc21c28e
 SIZE (f17dd87c7f57.patch) = 1485
 SHA256 (4356a33c787c.patch) = bfcb39e72f470bc695a6c356bc0ad06c7ac6b8f0f4b64b41deb3d0678ec29171
 SIZE (4356a33c787c.patch) = 951
 SHA256 (a75809957583.patch) = 96fe52e6c1f2c995a2c70b36dbe627cc1b7482c0f5a0ce4939fd03dc6918f5ea
 SIZE (a75809957583.patch) = 900
 SHA256 (978f7d56f88a.patch) = fb290b8d6f2119ad032a445e717f3ce94bb91c2353dbd45ad522d0b3e1be3ef8
 SIZE (978f7d56f88a.patch) = 731
 SHA256 (9e844d7c052d.patch) = 27e67ca57a8b8af533af56b4b6f8f9e2166c21574ab28d03e2cf62e924fedbf7
 SIZE (9e844d7c052d.patch) = 3208
 SHA256 (072810163a05.patch) = a803ac48e0b281adffd03977f9156477d89f8973d22ed5614fa494a7c485f671
 SIZE (072810163a05.patch) = 18665
 SHA256 (ab150305017a.patch) = ca80f780a84ee6f720181adac5bcfa593a2b452fe2b2f1f2319007457ecbb40c
 SIZE (ab150305017a.patch) = 2523
 SHA256 (0d45ab8163e7.patch) = a95fee3c6985e0735b8776ae2f68e31bb87d9bb6b198515bee50c3d8dacdf292
 SIZE (0d45ab8163e7.patch) = 1470
 SHA256 (4ae2fd0de966.patch) = 84910d2bcf915975feb9ec64af28e0ac76a97b874c56ac3a0b16562d6c313432
 SIZE (4ae2fd0de966.patch) = 1525
diff --git a/multimedia/gmmlib/files/patch-Source_GmmLib_GlobalInfo_GmmInfo.cpp b/multimedia/gmmlib/files/patch-Source_GmmLib_GlobalInfo_GmmInfo.cpp
new file mode 100644
index 000000000000..45093ae4ae57
--- /dev/null
+++ b/multimedia/gmmlib/files/patch-Source_GmmLib_GlobalInfo_GmmInfo.cpp
@@ -0,0 +1,20 @@
+--- Source/GmmLib/GlobalInfo/GmmInfo.cpp.orig	2023-07-18 11:43:35 UTC
++++ Source/GmmLib/GlobalInfo/GmmInfo.cpp
+@@ -937,7 +937,7 @@ int32_t GmmLib::Context::IncrementRefCount()
+ {
+     int32_t *Ref = &RefCount;
+ 
+-#if defined(__linux__)
++#if defined(__GNUC__)
+     // returns 0 only when registering the first client
+     return (__sync_fetch_and_add(Ref, 1));
+ #endif
+@@ -972,7 +972,7 @@ int32_t GmmLib::Context::DecrementRefCount()
+         {
+             break;
+         }
+-#if defined(__linux__)
++#if defined(__GNUC__)
+     } while(!__sync_bool_compare_and_swap(Ref, CurrentValue, TargetValue));
+ #endif
+     return TargetValue;
diff --git a/multimedia/gmmlib/files/patch-Source_GmmLib_inc_External_Common_GmmInfo.h b/multimedia/gmmlib/files/patch-Source_GmmLib_inc_External_Common_GmmInfo.h
new file mode 100644
index 000000000000..c1df2d89eed4
--- /dev/null
+++ b/multimedia/gmmlib/files/patch-Source_GmmLib_inc_External_Common_GmmInfo.h
@@ -0,0 +1,20 @@
+--- Source/GmmLib/inc/External/Common/GmmInfo.h.orig	2023-07-18 11:42:34 UTC
++++ Source/GmmLib/inc/External/Common/GmmInfo.h
+@@ -141,7 +141,7 @@ namespace GmmLib
+         {
+ #if defined(_WIN32)
+             return(InterlockedIncrement((LONG *)&RefCount) - 1);  //InterLockedIncrement() returns incremented value
+-#elif defined(__linux__)
++#elif defined(__GNUC__)
+             return(__sync_fetch_and_add(&RefCount, 1));
+ #endif
+         }
+@@ -163,7 +163,7 @@ namespace GmmLib
+                 }
+ #if defined(_WIN32)
+             } while (!(InterlockedCompareExchange((LONG *)&RefCount, TargetValue, CurrentValue) == CurrentValue));
+-#elif defined(__linux__)
++#elif defined(__GNUC__)
+             } while (!__sync_bool_compare_and_swap(&RefCount, CurrentValue, TargetValue));
+ #endif
+