From nobody Mon Aug 22 18:15:31 2022 X-Original-To: dev-commits-ports-main@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 4MBLBW2pZ1z4ZJlF; Mon, 22 Aug 2022 18:15:31 +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 4MBLBW202Jz3ZXh; Mon, 22 Aug 2022 18:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661192131; 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=LnntGxSowpZr3f4q7j5uIDjQUCYpOpeMuw/Tv3QN7+w=; b=jaxm0fD19vPmp9Qe2Dr19GYjHyrckDoKYPiWbFarqT4lPPAJU7WVFUWyBjNTLejt+9/u4q EqHyOsfvnFiLZ6ZeO+pKY3xgXuvTmUWbNfAabKa1g/snwpXgEHv36bMJVWN2XW+0kQlosC FcgTpeUU1+8y0knusmSb+kEGhl4Pwoh83GbTcWTSspGu8b7ueHLLYdzwnMjTb5DIr6Z8Ks 98DAz9JalN6LK59ICIc2STF6xOZMeZ2FjVHmZvqH8uzrZ2u1AaYlo5KhrftRgBX2nFf8vX VL/tomsJDOzEdF0w0zZiYXecOadiZalEi3BTXoFsSIjRVbyH1WE9HTDbJwLzTA== 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 4MBLBW0XBgz10Tv; Mon, 22 Aug 2022 18:15:31 +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 27MIFV3O011391; Mon, 22 Aug 2022 18:15:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MIFViA011390; Mon, 22 Aug 2022 18:15:31 GMT (envelope-from git) Date: Mon, 22 Aug 2022 18:15:31 GMT Message-Id: <202208221815.27MIFViA011390@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 81ad4dba9475 - main - audio/oss: Remove devclass from DRIVER_MODULE on recent main. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81ad4dba9475afeab3f602d2e27ccdb7b215364e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661192131; 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=LnntGxSowpZr3f4q7j5uIDjQUCYpOpeMuw/Tv3QN7+w=; b=ODj6vWzkB9BXXGcbg98ZPwfKZYzDr3PjCQYeWBBSbGsaNMS/nTpaFsEqOIKRzZYRdqnoCP 7XW+3sFobhfO321vryLwbbgJSGzdn+tx1yBe0wn1GIqQG77ckhr/mY0jw5W/ItK3paIhob dvdFHtSOkG7k8IUBabiPO2Tmxjhw5MeM25PUBRoWyhAIRwz5CQt0Iu7yLAnVo0qzygpXEd DwjzjroXxi3wA8p+EmJ1qRCZDndBwtWI29uTWkWytm8DnmVJaERRbvctmnUESDfNV1OqPN tWyCv0QsQ0tKgLg80KqEedCqTz+HRaFejV+SnBrmO002ObPOZfxJf4rGJ7L4qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661192131; a=rsa-sha256; cv=none; b=SqG6zRsdGYtgLmgMiqhunkxPFecrK6brkpoHxqRixcOXwK5UrHQufiRVGBO4+zm3o2/cxF vEvs4GgmN/hu8rfCV9ZC+60SAkdItvajKA+bPuQ20BYyuXCMSHEycrilXkprl/qNdRlJA0 Qwc6t6tiyp6mhwtFUc0FG5TkJlDOeQjCOq2V2x0dRBOb/EcoHG2Mw7d2lPPPlcbP3QVg/1 7+kgQxPPPfDBRJJAuvqcvyF2uUg7l2wEoj48va+y1UbZATSf5vfF0xfBattEqnA+KJycSI ErJnhMkX6SiDKsDYH1Ey07DhLU4g972oNfIlHUejsDgzedgUH/qRKz/4TepYgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=81ad4dba9475afeab3f602d2e27ccdb7b215364e commit 81ad4dba9475afeab3f602d2e27ccdb7b215364e Author: John Baldwin AuthorDate: 2022-08-22 18:15:07 +0000 Commit: John Baldwin CommitDate: 2022-08-22 18:15:07 +0000 audio/oss: Remove devclass from DRIVER_MODULE on recent main. Differential Revision: https://reviews.freebsd.org/D35957 --- .../oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc | 13 ++++++++++--- audio/oss/files/patch-setup_gen__driver__freebsd.inc | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc b/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc index 2abd09b8edcf..f608e82f8d96 100644 --- a/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc +++ b/audio/oss/files/patch-setup_FreeBSD_oss_build_bsdpci.inc @@ -1,6 +1,6 @@ ---- 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 @@ +--- setup/FreeBSD/oss/build/bsdpci.inc.orig 2014-02-14 22:59:55 UTC ++++ setup/FreeBSD/oss/build/bsdpci.inc +@@ -92,8 +92,6 @@ osspci_detach (device_t dev) osdev = device_list[i]; if (osdev->dip == dev) { @@ -9,3 +9,10 @@ if (!DRIVER_DETACH (osdev)) { printf (DRIVER_NICK ": Unloading busy device\n"); +@@ -150,4 +148,6 @@ static device_method_t osspci_methods[] = { + {0, 0} + }; + ++#if __FreeBSD_version < 1400058 + static devclass_t osspci_devclass; ++#endif diff --git a/audio/oss/files/patch-setup_gen__driver__freebsd.inc b/audio/oss/files/patch-setup_gen__driver__freebsd.inc new file mode 100644 index 000000000000..4f36c36b4045 --- /dev/null +++ b/audio/oss/files/patch-setup_gen__driver__freebsd.inc @@ -0,0 +1,18 @@ +--- setup/gen_driver_freebsd.inc.orig 2022-07-26 19:01:18 UTC ++++ setup/gen_driver_freebsd.inc +@@ -233,9 +233,15 @@ generate_driver (char *name, conf_t * conf, char *cfg_ + fprintf (src, + "DEFINE_CLASS_0(%s, osspci_driver, osspci_methods, sizeof(struct _oss_device_t));\n", + name); ++ fprintf (src, "#if __FreeBSD_version >= 1400058\n"); + fprintf (src, ++ "DRIVER_MODULE(%s, pci, osspci_driver, 0, 0);\n", ++ name); ++ fprintf (src, "#else\n"); ++ fprintf (src, + "DRIVER_MODULE(%s, pci, osspci_driver, osspci_devclass, 0, 0);\n", + name); ++ fprintf (src, "#endif\n"); + } + + for (i = 0; i < nopts; i++)