From nobody Tue Oct 24 22:16:39 2023 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 4SFRHC5sgqz4xbJ8; Tue, 24 Oct 2023 22:16:39 +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 4SFRHC5F6xz3Gr4; Tue, 24 Oct 2023 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698185799; 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=l10Nbxu1qt5z/0dAIpk9+75Op3Zczp4CozXfvYoEQ98=; b=oj/kBdC80v8ccUxWkUeroU4rb6EJxWu5qhMghyywIdPXlErx3DulRAnnR37R5BjVheR0fD +50DdEFrBd/3nxWxI2zOe2rcg8q/bKCVLhXCHI8+t/0IsS1LDKPZLdOnS4klaNL1rfXGPI 1Gr96Eanotff8ZVNkiGKEH02ofkugR4NlWWOo8mVKeTIAaFfTAF1lkZL7xLoXm5orLZDWs Q/6lxCVYn3R/R6t+bBLMAMcVJ//fuZF1kc7BedGwtzuzAf+aCPdWSl7y77NxH7zHHCEuS9 oVONfDW1DnOvpTwWT4ACDwqrHhnmZ4WuZDZ2mycBZKmSU/z26QsGiModV+vFfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698185799; a=rsa-sha256; cv=none; b=CsnM0yB8pAvx+qNnDIAef7KsmeapyFR/3RagfBowPZ/qYGAGMeeDgRPIDf/misCnavIm1g 1KklWTc5qrFJECbjgfDVETcAdzIY9at3EaCnErV5ZAszSdvSQL44b1uwFHuNTjCLmv2VcX F1JUMkRw/+l8a5FQCL7ufLL7yOrlT88ulYMjKo4d8+0Bf9BvAUdOnTpxLQv4Jxbf6W3yer pI7wa5joNzloBOEC9a0wALoJJ2kXrkaMqeCHFe4BulHfylNMm8EKjpPe8zIdWVbQ9OAEIM PB7s81SQmppRh2UNzaOKK7qh0zY6Tf7mEfrHwO284IKqyJr0AXVURLemLVO0yQ== 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=1698185799; 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=l10Nbxu1qt5z/0dAIpk9+75Op3Zczp4CozXfvYoEQ98=; b=XYBE+YYTE0uBuZAc84i9bGWb9bbSYW4BZP1Fs9u3drQfilpCzlMJgKezEaaKPwQw/9i0tn vJeJmE028B9/PBxAKLc1Z9hP0EfYiVKp+MhEK4GpgUJgs6K0vlb/2NtDzk4mOfrRmBVKzs FDULdFLVOieXcD3FWGLBmMDyXM+QfOSO7pfewjo+vgZPY3AYE+F8KsalLTNUdhl4aCxTyv azbxrbY0NQYppFj0lmNava3fy9Y5qLv4aFYWhClW3FHHPnJvlsharTq9fcrfk3vWZMz23O ffZ73AG7deo6zhht5L5nKCNXEOshz0lzqHwHG0EduaFaHJkw1bhFiEfQcmQ8Ng== 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 4SFRHC49JmzgCt; Tue, 24 Oct 2023 22:16:39 +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 39OMGdvQ058930; Tue, 24 Oct 2023 22:16:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OMGdss058927; Tue, 24 Oct 2023 22:16:39 GMT (envelope-from git) Date: Tue, 24 Oct 2023 22:16:39 GMT Message-Id: <202310242216.39OMGdss058927@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: 8241302dda49 - main - emulators/wine: Improve configuration for ALSA and OSS 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: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8241302dda4980341c3162f21aa8ded4e4a3b4d1 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=8241302dda4980341c3162f21aa8ded4e4a3b4d1 commit 8241302dda4980341c3162f21aa8ded4e4a3b4d1 Author: Gerald Pfeifer AuthorDate: 2023-10-24 22:16:18 +0000 Commit: Gerald Pfeifer CommitDate: 2023-10-24 22:16:18 +0000 emulators/wine: 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. (This back ports 944eff5cfa5f from the wine-devel port.) PR: 273987 --- emulators/wine/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index e79187ccad3b..50f1ca3df574 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -79,7 +79,7 @@ MONO_DESC= Bundle Mono MSI package for Wine PORTSCOUT= limit:^8\.0 -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 @@ -95,7 +95,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls MONO_RUN_DEPENDS= wine-mono>0:emulators/wine-mono -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