From nobody Thu Jul 21 20:19:37 2022 X-Original-To: dev-commits-ports-branches@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 4LpkST4j9mz4XRPn; Thu, 21 Jul 2022 20:19:37 +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 4LpkST4BGKz3js9; Thu, 21 Jul 2022 20:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658434777; 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=6wrKrd+VRZEkFI/16L3MtyW84MkROYyuuZVCKdWAn4E=; b=ouLkGHqGakSlwzYu3ankCXfj+wKNfXuYO8UQurtX3R4Fl7ddpx8dujWkPboKKdCyckGeY8 F0ttLNL+0/mYzIXmLW85xb6SW7pimNCdf7vCigFHgowN36cJnrwpqG4/Kc9ikeGzQZnLjW KfrxfIHIf7MgyTdiHh+PHotCE6pb0GmJcdCBaF3FAspB+uFHWtRhjOa28ZU8ygnYgr16tm +wD6XjJ2mob3iQ6OtasL8z6rM2DUL7bwLHDl/cdCWDq+vjmoukZheWuleUmGY5CBsLObvi H/AHqc4mnvU5lJYNc8DPlcxVOXnOodOGSfcIESuNyRaJVwfyOWwe4EbBs7oFtw== 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 4LpkST3FcczZdC; Thu, 21 Jul 2022 20:19:37 +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 26LKJb7S036210; Thu, 21 Jul 2022 20:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LKJbsG036209; Thu, 21 Jul 2022 20:19:37 GMT (envelope-from git) Date: Thu, 21 Jul 2022 20:19:37 GMT Message-Id: <202207212019.26LKJbsG036209@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 510e77cbcd3e - 2022Q3 - audio/zita-alsa-pcmi: Correct patch List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 510e77cbcd3eb4117352f5aa01921c41b4134a9f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658434777; 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=6wrKrd+VRZEkFI/16L3MtyW84MkROYyuuZVCKdWAn4E=; b=i3xC81KrUD2b43P0WmYi6xKGlu1cbkJmxTstSDBFhAQmx+X17D22yMSbGQglzG84J8HXJR SdxJ5AVV3PSO1gsCIpaybecO7RY7UWkJwhP4a+6SzkG2K4ahdBJI4IyU10TMY80WSbJeMb NXtqtaOoBU1dgDpfKVHkvVNLyaZDh+aI0KXiqrVY5w/BPPoYKDT9nh/AFPUHFevZk2k7+B IotJaoJ7nLK08G1QP04pQx/C4G5I+5ZbzEnfhIUCUsN//2xdIWHrUvrK14kINmvTXNLDIS l/4kF/WEq0LVTBLrS/Jveo3hKFWrJ0WHCuoayezADxHZvu97p9lerLHeMdi/qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658434777; a=rsa-sha256; cv=none; b=VufIBYQDKltI31zvQ/xJpu6ETSQuNQbcKnQffCdPoc1oTcDXLZzlb2yan1kAGrFE97W6po rAYRtu+A2+00/2hejqlAeFDcFehgAXj3FUnzJHes9coibfNPV+766NjLHXwn80G9g5BXTn nveITKK+kW2kw2LOWOT1iJzTy5gYN5txxJPjkaU79mUYcoW3xH1ift5PwWeqOQj3+EB/i5 fvx4okZQN7N30LzyTsGYm5JBrd9NjmIN20dG5Nu5OqNcRXCaahH9VDipuRm3v/3vqQ2C2I DReIu0rNMm6lrhl5IgSqd3c/ImaV7r+ZNrqgHyWHOnDinPtyML1mxQ6erBfSFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=510e77cbcd3eb4117352f5aa01921c41b4134a9f commit 510e77cbcd3eb4117352f5aa01921c41b4134a9f Author: Yuri Victorovich AuthorDate: 2022-07-21 20:18:26 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-21 20:19:30 +0000 audio/zita-alsa-pcmi: Correct patch ... such that it doesn't require infiniband/byteswap.h (cherry picked from commit 80122a73d56247a6df95419ab3d0144fd213bc78) --- audio/zita-alsa-pcmi/files/patch-source_zita-alsa-pcmi.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/audio/zita-alsa-pcmi/files/patch-source_zita-alsa-pcmi.cc b/audio/zita-alsa-pcmi/files/patch-source_zita-alsa-pcmi.cc index fffd2fc20f16..15eea497f5d1 100644 --- a/audio/zita-alsa-pcmi/files/patch-source_zita-alsa-pcmi.cc +++ b/audio/zita-alsa-pcmi/files/patch-source_zita-alsa-pcmi.cc @@ -1,18 +1,17 @@ --- source/zita-alsa-pcmi.cc.orig 2022-07-14 07:07:32 UTC +++ source/zita-alsa-pcmi.cc -@@ -18,9 +18,17 @@ +@@ -18,9 +18,16 @@ // ---------------------------------------------------------------------------- +#if defined(__FreeBSD__) -+#include ++# include ++# define bswap_32(x) bswap32(x) +#else #include +#endif #include -+#if defined(__FreeBSD__) -+#include -+#else ++#if !defined(__FreeBSD__) #include +#endif #include