Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Oct 2023 08:29:43 GMT
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 944eff5cfa5f - main - emulators/wine-devel: Improve configuration for ALSA and OSS
Message-ID:  <202310160829.39G8ThVT071781@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=944eff5cfa5f0fe00d44a04f891b19928a34c335

commit 944eff5cfa5f0fe00d44a04f891b19928a34c335
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2023-10-16 08:23:03 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310160829.39G8ThVT071781>