From nobody Mon Oct 16 08:29:43 2023 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 4S89Jm0JTJz4x5Pf; Mon, 16 Oct 2023 08:29:44 +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 4S89Jl6yChz4fBQ; Mon, 16 Oct 2023 08:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697444984; 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=CtRBcgSj3BkYI5i2Z5A0Qio7ZA9uA+c0u7WSgmAQE5c=; b=PYGMiriPI+cDBbMh6c1i2mMmy7F4KDM5qS3YKpJ6eVLsBbrTkShuhqGFhF5eJoOlYLye0k Yici3MB1AsVZIZ9pcrkv/Cv+T6p6Fm6+JquFMiHezrASvR9iwRQT5rA04p1XqPfu2tL6rp ijc9Kt0hdvrgHH19MWtpNaxMOSj/jzMWJJSOZt1AILmcBd7znoDQSK6LNUhzMIl/Vvt7HN PVl0pEeEtG0PecTnIT2ZN4Jh9KAeJA7+CTR2oSsMp11m1EyhyyzUC7Q5lDCVKKtyA8QJvR t82EKeRIEtz0PL0SDXbj+YGS2C7XTnNBwwv7PQXXtwAE3Ksn/2UaGWh8+7GNhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697444984; a=rsa-sha256; cv=none; b=kHftIH//BSfXlTLnFoyZ4KYJqwOMZQKfZcMiOiOpUhI8AFfXYOojPH1wBVSi451k8XChW8 fdTQe2DpzPdV6bJ2kip6dwpmnM2U7JhsgXZE9EAuTGqCt/5ib5Cq1F3EMObRS34YYKZmm1 MpPoXHVfIY2FILsjWYsXf+InehMMfJjrll4PnpLfVKYgRjPVUVWHnPeIYCK+QM9U5DqXPp EpBpUmwU/NANMqabStM7XNT482X94GMRrSu3TcE21sFVAloiPEXXThnmwygNx4vOaOG9Z4 u+qCrjiGUFbeeGMU0IqfwEwx/ku+8Mkrfv41k2+wkd0/2H5RAvNSuxoNwB3dhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697444984; 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=CtRBcgSj3BkYI5i2Z5A0Qio7ZA9uA+c0u7WSgmAQE5c=; b=YLE4hCSasDX9dsfyBDE9defegUtWIF+KHu9+iZd7omyVsFQzyrsIhiRFvIl28zmhmWAcME a1Pl4ylwqqFXUDzLCbwxlP3pnUftvDW4dUoqqIYGIW0Ea1harMvaVuMI/Prdf3WRE/b49A NqUzEiZoEs0632JqhxNrtgLH99bi9SjWvJnx5NZdbvWYOcUTzO8Ssq25KbgPcCrvfNw0ae bQJdRoCM6DxY0OCR9YM4hDduALWhmwrap0HYrYf/JlfzmQJ862pptwP6Da3gwCDKvoHeTa rE/+JCBUgsAs/KELmvhBPMBX5Wj2QsQfVlFJqs2djfB2ZoRRiJj3+ClI8cL7Ag== 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 4S89Jl62qJzYlS; Mon, 16 Oct 2023 08:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39G8Thec071784; Mon, 16 Oct 2023 08:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G8ThVT071781; Mon, 16 Oct 2023 08:29:43 GMT (envelope-from git) Date: Mon, 16 Oct 2023 08:29:43 GMT Message-Id: <202310160829.39G8ThVT071781@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 944eff5cfa5f - main - emulators/wine-devel: Improve configuration for ALSA and OSS 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: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 944eff5cfa5f0fe00d44a04f891b19928a34c335 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=944eff5cfa5f0fe00d44a04f891b19928a34c335 commit 944eff5cfa5f0fe00d44a04f891b19928a34c335 Author: Gerald Pfeifer AuthorDate: 2023-10-16 08:23:03 +0000 Commit: Gerald Pfeifer CommitDate: 2023-10-16 08:23:03 +0000 emulators/wine-devel: Improve configuration for ALSA and OSS Use ALSA_CONFIGURE_WITH and OSS_CONFIGURE_WITH instead of the ALSA_CONFIGURE_ON and OSS_CONFIGURE_ON forms. This properly handles the case where neither the ALSA nor OSS option are set. It's more resilient to future changes. And shorter. PR: 273987 --- emulators/wine-devel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index ee4be09e5a89..ac8a54161728 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -80,7 +80,7 @@ WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine -ALSA_CONFIGURE_ON= --with-alsa --without-oss +ALSA_CONFIGURE_WITH= alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins @@ -96,7 +96,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel -OSS_CONFIGURE_ON= --without-alsa --with-oss +OSS_CONFIGURE_WITH= oss V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat