From owner-dev-commits-ports-all@freebsd.org Thu Aug 26 10:53:39 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E143F66725C; Thu, 26 Aug 2021 10:53:39 +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 4GwKTH58XPz4m02; Thu, 26 Aug 2021 10:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8180E674F; Thu, 26 Aug 2021 10:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17QArdQt084945; Thu, 26 Aug 2021 10:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17QArdXv084944; Thu, 26 Aug 2021 10:53:39 GMT (envelope-from git) Date: Thu, 26 Aug 2021 10:53:39 GMT Message-Id: <202108261053.17QArdXv084944@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 4d09bc786d2a - main - games/0ad: fix build on powerpc64le MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d09bc786d2a23a1589a5e581ac9da0e568e5315 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Aug 2021 10:53:40 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d09bc786d2a23a1589a5e581ac9da0e568e5315 commit 4d09bc786d2a23a1589a5e581ac9da0e568e5315 Author: Piotr Kubaj AuthorDate: 2021-08-26 10:53:38 +0000 Commit: Piotr Kubaj CommitDate: 2021-08-26 10:53:38 +0000 games/0ad: fix build on powerpc64le Remove already upstreamed patch. --- .../patch-source_lib_sysdep_arch_ppc64_ppc64.cpp | 53 ---------------------- 1 file changed, 53 deletions(-) diff --git a/games/0ad/files/patch-source_lib_sysdep_arch_ppc64_ppc64.cpp b/games/0ad/files/patch-source_lib_sysdep_arch_ppc64_ppc64.cpp deleted file mode 100644 index 15824cb51b73..000000000000 --- a/games/0ad/files/patch-source_lib_sysdep_arch_ppc64_ppc64.cpp +++ /dev/null @@ -1,53 +0,0 @@ ---- source/lib/sysdep/arch/ppc64/ppc64.cpp.orig 2021-02-28 23:47:02 UTC -+++ source/lib/sysdep/arch/ppc64/ppc64.cpp -@@ -0,0 +1,50 @@ -+/* Copyright (C) 2012 Wildfire Games -+ * Copyright (C) 2018 Raptor Engineering, LLC -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included -+ * in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/* -+ * routines specific to POWER -+ */ -+ -+#include "precompiled.h" -+ -+#include "lib/sysdep/cpu.h" -+ -+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment) -+{ -+ return __sync_fetch_and_add(location, increment); -+} -+ -+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue) -+{ -+ return __sync_bool_compare_and_swap(location, expected, newValue); -+} -+ -+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue) -+{ -+ return __sync_bool_compare_and_swap(location, expected, newValue); -+} -+ -+const char* cpu_IdentifierString() -+{ -+ return "IBM POWER"; // TODO -+}