From nobody Tue Oct 19 18:48:16 2021 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 E8E8617F4383; Tue, 19 Oct 2021 18:48:16 +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 4HYjS06H8Jz3kj8; Tue, 19 Oct 2021 18:48:16 +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 B714D18C6D; Tue, 19 Oct 2021 18:48:16 +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 19JImGkf061788; Tue, 19 Oct 2021 18:48:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19JImG6I061787; Tue, 19 Oct 2021 18:48:16 GMT (envelope-from git) Date: Tue, 19 Oct 2021 18:48:16 GMT Message-Id: <202110191848.19JImG6I061787@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: ff6737503635 - main - audio/oss: Fix build on 14-CURRENT 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff67375036355e9cfb8b92b1d694cd936068c2cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff67375036355e9cfb8b92b1d694cd936068c2cf commit ff67375036355e9cfb8b92b1d694cd936068c2cf Author: Cy Schubert AuthorDate: 2021-10-19 17:32:17 +0000 Commit: Cy Schubert CommitDate: 2021-10-19 18:47:41 +0000 audio/oss: Fix build on 14-CURRENT As of dfff37765ce4ea4fd7db4d293b459dc84008f411 (1400010), struct device on 14-CURRENT was renamed to struct _device. This commit chases this change by adding a __FreeBSD_version CPP conditional. PR: 259275 Submitted by: cy Reported by: cy Reviewed by: crees Tested by: cy Approved by: crees MFH: 2021Q4 Differential Revision: https://reviews.freebsd.org/D32560 --- .../files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h b/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h index 9dfb8ff183fd..434fbd538dca 100644 --- a/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h +++ b/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h @@ -1,6 +1,18 @@ ---- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig 2019-03-06 07:52:21 UTC -+++ kernel/OS/FreeBSD/wrapper/bsddefs.h -@@ -93,8 +93,8 @@ extern void oss_udelay (unsigned long t); +--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig 2021-10-19 08:38:32.843953000 -0700 ++++ kernel/OS/FreeBSD/wrapper/bsddefs.h 2021-10-19 08:41:58.476795000 -0700 +@@ -32,7 +32,11 @@ + #endif + extern int oss_get_uid (void); + ++#if __FreeBSD_version > 1400009 ++typedef struct _device dev_info_t; ++#else + typedef struct device dev_info_t; ++#endif + typedef long long oss_int64_t; /* Signed 64 bit integer */ + typedef unsigned long long oss_uint64_t; /* Unsigned 64 bit integer */ + typedef unsigned long offset_t; +@@ -93,8 +97,8 @@ #ifdef _KERNEL #ifdef memset #undef memset