From nobody Tue Jul 18 14:50:22 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R521V5Wpxz4grVB; Tue, 18 Jul 2023 14:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R521V50Mnz43kd; Tue, 18 Jul 2023 14:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689691822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fwqmo2mSnI6B6MysEmx8PPXIVVh5q0Sc7YHI+/MFS98=; b=FPnzCwIutjXGzqRBcxIQLaCuoQF9FIya1jj5JBB8MwQzzwB+E9TP6hrVKzC4YUoSMsm5E7 8uyTjYDbeyJNVAb5yjeOLrXKT1UFIgQCbS2IWJ2XQ9/slgbj8mMMePmRSJ3Ek4rPz4HV/G AF6kv/9N0mxoV/rnOMN0sFrWRliV2mCPs15vJtGpjUQBQJ6o6kpsSBHzAZy/dEGFdnO7NV bKq2WvLaG1fPeJW0ONheKSZC6Gu0Hglmy58dbQdx2LrjtsOMomAIO/4/bhcEH2p6zdbM9Z 6j9/eCPmvB+GIawBj8XgNy7YXHpp7QJe/cmjl7UzwYb4lx6Nv9u2b+qzleUJRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689691822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fwqmo2mSnI6B6MysEmx8PPXIVVh5q0Sc7YHI+/MFS98=; b=TCGyVg+KeSnJT1658aJMa7AHF5T7P/6QuTY0FCat0A3gljTO08+gUS6d2gf27GU2I+joGw RObAOosAIc9SMMv9PZ3Ds5KXpxv1IRj7hH4e1ofIIfpW45MEUHdDCHFmIZt/t3isELu6Fi 0NAXhQIW1XXB8/ZyKowfpSADsBLKZuueW1aTvr3inxiF+qUTpXXFkt6w/K6AYM8cHVq/Ud FFVgd59puis5gavSkCu77IoZ1/aegJap8cln9x9fD17hQMGbLYsZGWGtcUJ86/eFxgnyQn vZzLg1CwBHFpGL/MF6QJ0JViU0tvJVht8U57v2R6VnsqD8BS4zJnM81dXZsh7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689691822; a=rsa-sha256; cv=none; b=N7I6gpNYnh7QwyV8idTnetWi6nNcpZWJQHaDU3BapTDvtsqVHyQoDm5SjAmNKX9+oEcjME nEGhOC5JFSdIpGVIsSaS1J2yB9mZmRw7+tnccX2mWyXQoxuXoiZfD60QeVN0IBLHVOczzI PrrFbtFhzTimlM/Ti4cZNLio1JjpR+t/HK0PWcarW35ssC2dd3sLh0g5HqU0IGrEt+65ZG mve6/JcH5fGCwY6lS49apzDKdLeAhfas8CoHCmbtKxc2CYQu0Npv0SGI4OYLhop6lTF9kK YzQYFMtxEGxFs42DrvjOSua2Vp8nit5K0bPKa7Ie9rtFMMn2f+QvjAWanVHUDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R521V43DKz18KV; Tue, 18 Jul 2023 14:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36IEoMJK074601; Tue, 18 Jul 2023 14:50:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36IEoMta074600; Tue, 18 Jul 2023 14:50:22 GMT (envelope-from git) Date: Tue, 18 Jul 2023 14:50:22 GMT Message-Id: <202307181450.36IEoMta074600@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: be1126b3ed28 - main - multimedia/gmmlib: restore upstreamable patch after 41f2281cb356 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be1126b3ed288f1606d91a71079ef39eb37720de Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=be1126b3ed288f1606d91a71079ef39eb37720de commit be1126b3ed288f1606d91a71079ef39eb37720de Author: Jan Beich AuthorDate: 2023-07-18 14:23:20 +0000 Commit: Jan Beich 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 -