Date: Tue, 18 Jul 2023 14:50:22 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: be1126b3ed28 - main - multimedia/gmmlib: restore upstreamable patch after 41f2281cb356 Message-ID: <202307181450.36IEoMta074600@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=be1126b3ed288f1606d91a71079ef39eb37720de commit be1126b3ed288f1606d91a71079ef39eb37720de Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-07-18 14:23:20 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-07-18 14:49:43 +0000 multimedia/gmmlib: restore upstreamable patch after 41f2281cb356 --- multimedia/gmmlib/Makefile | 1 + multimedia/gmmlib/distinfo | 4 ++-- .../files/patch-Source_GmmLib_GlobalInfo_GmmInfo.cpp | 20 -------------------- ...patch-Source_GmmLib_inc_External_Common_GmmInfo.h | 20 -------------------- 4 files changed, 3 insertions(+), 42 deletions(-) diff --git a/multimedia/gmmlib/Makefile b/multimedia/gmmlib/Makefile index d8265f318c4a..9db71d31f801 100644 --- a/multimedia/gmmlib/Makefile +++ b/multimedia/gmmlib/Makefile @@ -8,6 +8,7 @@ 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+= 8ebe65625f71.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 ab197818e4c8..817ae9048f93 100644 --- a/multimedia/gmmlib/distinfo +++ b/multimedia/gmmlib/distinfo @@ -9,8 +9,8 @@ SHA256 (a75809957583.patch) = 96fe52e6c1f2c995a2c70b36dbe627cc1b7482c0f5a0ce4939 SIZE (a75809957583.patch) = 900 SHA256 (978f7d56f88a.patch) = fb290b8d6f2119ad032a445e717f3ce94bb91c2353dbd45ad522d0b3e1be3ef8 SIZE (978f7d56f88a.patch) = 731 -SHA256 (9e844d7c052d.patch) = 27e67ca57a8b8af533af56b4b6f8f9e2166c21574ab28d03e2cf62e924fedbf7 -SIZE (9e844d7c052d.patch) = 3208 +SHA256 (8ebe65625f71.patch) = 497abaccf11ce380a05133ab22ab30261d49e08b118450287ff40d5ff2850349 +SIZE (8ebe65625f71.patch) = 3028 SHA256 (072810163a05.patch) = a803ac48e0b281adffd03977f9156477d89f8973d22ed5614fa494a7c485f671 SIZE (072810163a05.patch) = 18665 SHA256 (ab150305017a.patch) = ca80f780a84ee6f720181adac5bcfa593a2b452fe2b2f1f2319007457ecbb40c diff --git a/multimedia/gmmlib/files/patch-Source_GmmLib_GlobalInfo_GmmInfo.cpp b/multimedia/gmmlib/files/patch-Source_GmmLib_GlobalInfo_GmmInfo.cpp deleted file mode 100644 index 45093ae4ae57..000000000000 --- a/multimedia/gmmlib/files/patch-Source_GmmLib_GlobalInfo_GmmInfo.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index c1df2d89eed4..000000000000 --- a/multimedia/gmmlib/files/patch-Source_GmmLib_inc_External_Common_GmmInfo.h +++ /dev/null @@ -1,20 +0,0 @@ ---- 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?202307181450.36IEoMta074600>