Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Jul 2023 12:55:37 GMT
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 41f2281cb356 - main - multimedia/gmmlib: Update to 22.3.9
Message-ID:  <202307181255.36ICtbCB082918@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=41f2281cb356debadcea7cd0ad994cf38730bf8b

commit 41f2281cb356debadcea7cd0ad994cf38730bf8b
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2023-07-18 12:53:17 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2023-07-18 12:55:27 +0000

    multimedia/gmmlib: Update to 22.3.9
---
 multimedia/gmmlib/Makefile                           |  3 +--
 multimedia/gmmlib/distinfo                           |  6 +++---
 .../files/patch-Source_GmmLib_GlobalInfo_GmmInfo.cpp | 20 ++++++++++++++++++++
 ...patch-Source_GmmLib_inc_External_Common_GmmInfo.h | 20 ++++++++++++++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/multimedia/gmmlib/Makefile b/multimedia/gmmlib/Makefile
index 32c0c1e7970b..d8265f318c4a 100644
--- a/multimedia/gmmlib/Makefile
+++ b/multimedia/gmmlib/Makefile
@@ -1,6 +1,6 @@
 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/
@@ -8,7 +8,6 @@ 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
diff --git a/multimedia/gmmlib/distinfo b/multimedia/gmmlib/distinfo
index f9e110d2aaf9..ab197818e4c8 100644
--- a/multimedia/gmmlib/distinfo
+++ b/multimedia/gmmlib/distinfo
@@ -1,6 +1,6 @@
-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
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
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307181255.36ICtbCB082918>