From nobody Sun Dec 19 21:55:13 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 223931902A2C; Sun, 19 Dec 2021 21:55:14 +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 4JHGjY6Bf2z3FvH; Sun, 19 Dec 2021 21:55:13 +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 B59832373; Sun, 19 Dec 2021 21:55:13 +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 1BJLtDHu045528; Sun, 19 Dec 2021 21:55:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJLtD07045527; Sun, 19 Dec 2021 21:55:13 GMT (envelope-from git) Date: Sun, 19 Dec 2021 21:55:13 GMT Message-Id: <202112192155.1BJLtD07045527@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Chris Rees Subject: git: 0f96234a6fbe - main - audio/oss: build fix following src/1c7d15b 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: crees X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f96234a6fbe1a99322b6adb8fcc66277c4dce18 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639950913; 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=FLIWSp/9Sy6/aenBiH2XwKy57sKJlQaC9YhmmsHoocg=; b=yE4u9i+FJ6XoIW92NgBAd8blTDnb+xsOYKlzXZXU0bTJD1h4C+ZwLxgatXIliAWSSAGzas 9wDyFN+Zo/OedSC8ywe5ey4fyeDN8lwkDnmTUy7E1FRfyF/zI3axjZIYFdkpc8gygoNh/Q 1pQX7C+23ItjNvPY3zFUlVbW/JfyqE96gLSu2HhNf7UqSYYpCTP26wGaI5OtaB7sKukRzF wFJKaxNyN+/Q4YoKr2fRf8M7At60S/BxcCemCeMu62MEp0fcw7UFKBQtlTCxlpYU1mzmUz uwGh2TRKEwFQmWBRT+Z6AVbxM99sKN/gjXGRz2ExbtJP5jgAJGKtmXmtXqpcFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639950913; a=rsa-sha256; cv=none; b=FFFG7fYTcNeoT+F4w2Kasl0hvo3f+IifSxURqG75oY0YVCcjIsn78ZlJ8SlL3TcGhGo1d2 M5OTzNF6IHviT1Gd3sVQtkJ4Fwc9XQia/ViLLfhrs8goeuozFaFQh71K0iQXTBAQJkwxEW I0r9pw2A83V+s0WfwIO0Kd9ZI7t5hm0cwrSweuzb+hmR3cL7yKUa6Cb77ILMxsd3Q83fHV pitlfpCXRWPEsdKhAyvvrScDNWjp3ZhB3wXdvhd0edkKOXTkMPDYvFQcqw8TOKLAsuINDt lbwQMIg39N/BJ4bKNEM15ml3Q2AwW/1R1S+R3wWskpUxplt7CQk+QIP1+XVvgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by crees: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f96234a6fbe1a99322b6adb8fcc66277c4dce18 commit 0f96234a6fbe1a99322b6adb8fcc66277c4dce18 Author: Chris Rees AuthorDate: 2021-12-19 21:43:16 +0000 Commit: Chris Rees CommitDate: 2021-12-19 21:55:01 +0000 audio/oss: build fix following src/1c7d15b https://cgit.freebsd.org/src/commit/?id=1c7d15b030718d9d8cc70916fe3216a1 Thanks to: cy, imp --- audio/oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc | 11 +++++++++++ audio/oss/files/patch-setup_FreeBSD_oss_build_bsdvirtual.inc | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc b/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc new file mode 100644 index 000000000000..2abd09b8edcf --- /dev/null +++ b/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc @@ -0,0 +1,11 @@ +--- setup/FreeBSD/oss/build/bsdpci.inc.orig 2014-02-14 22:59:55.000000000 +0000 ++++ setup/FreeBSD/oss/build/bsdpci.inc 2021-12-18 15:09:33.546812000 +0000 +@@ -92,8 +92,6 @@ + osdev = device_list[i]; + if (osdev->dip == dev) + { +- if (device_get_state(dev) == DS_BUSY) +- device_unbusy(dev); + if (!DRIVER_DETACH (osdev)) + { + printf (DRIVER_NICK ": Unloading busy device\n"); diff --git a/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdvirtual.inc b/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdvirtual.inc new file mode 100644 index 000000000000..4a8a04e0bbe0 --- /dev/null +++ b/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdvirtual.inc @@ -0,0 +1,11 @@ +--- setup/FreeBSD/oss/build/bsdvirtual.inc.orig 2021-12-18 15:12:47.018175000 +0000 ++++ setup/FreeBSD/oss/build/bsdvirtual.inc 2021-12-18 15:11:06.335823000 +0000 +@@ -34,8 +34,6 @@ + { + osdev = device_list[i]; + +- if (osdev->dip != NULL && device_get_state(osdev->dip) == DS_BUSY) +- device_unbusy(osdev->dip); + if (!DRIVER_DETACH (osdev)) + { + printf (DRIVER_NICK ": Unloading busy device\n");