git: 3c56b0e6dab5 - main - emulators/wine: Allow choosing between OSS and ALSA

From: Gerald Pfeifer <gerald_at_FreeBSD.org>
Date: Sat, 30 Apr 2022 17:08:28 UTC
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c56b0e6dab581abf64156243b70d376e91413b7

commit 3c56b0e6dab581abf64156243b70d376e91413b7
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2022-04-30 10:37:41 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2022-04-30 17:07:51 +0000

    emulators/wine: Allow choosing between OSS and ALSA
    
    Backport ce1e733047cfa6bdea3d1bfb767814c7fa2a9809 and
    2895c1dc9c4efbdfaff99db514569da9ca2223b1 from wine-devel:
    
      Our Wine ports have solely relied on OSS for sound so far. Add
      support to optionally switch to ALSA by establishing two options,
      OSS and ALSA.
    
      This does not change default behavior (and packages created), rather
      it adds the ability to choose. It particularly may prove beneficial
      for USB MIDI keyboards.
    
    Submitted by:   hselasky
---
 emulators/wine/Makefile  | 11 ++++++++---
 emulators/wine/pkg-plist |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0d0be527e97f..7c8929e25563 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -33,7 +33,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose \
 		--disable-kerberos \
 		--disable-tests \
-		--without-alsa \
 		--without-capi \
 		--without-coreaudio \
 		--without-dbus \
@@ -49,7 +48,6 @@ CONFIGURE_ARGS+=--verbose \
 		--without-netapi \
 		--without-opencl \
 		--without-osmesa \
-		--with-oss \
 		--with-pcap \
 		--with-pthread \
 		--without-pulse \
@@ -73,7 +71,9 @@ SUB_FILES=	pkg-message
 PORTDATA=	wine.inf
 
 OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
-OPTIONS_DEFAULT=GNUTLS OPENAL X11
+OPTIONS_DEFAULT=GNUTLS OPENAL OSS X11
+OPTIONS_RADIO=	AUDIO
+OPTIONS_RADIO_AUDIO=	ALSA OSS
 OPTIONS_SUB=	yes
 
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
@@ -84,6 +84,9 @@ MONO_DESC=	Bundle Mono MSI package for Wine
 
 PORTSCOUT=	limit:^6\.0
 
+ALSA_CONFIGURE_ON=	--with-alsa --without-oss
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+
 CUPS_CONFIGURE_WITH=	cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
@@ -108,6 +111,8 @@ MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 OPENAL_CONFIGURE_WITH=	openal
 OPENAL_USES=		openal
 
+OSS_CONFIGURE_ON=	--without-alsa --with-oss
+
 V4L_CONFIGURE_WITH=	v4l2
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index cf8a5e08a1fe..4763f6a79674 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -2429,7 +2429,7 @@ lib/wine/fakedlls/winemapi.dll
 lib/wine/fakedlls/winemenubuilder.exe
 lib/wine/fakedlls/winemine.exe
 lib/wine/fakedlls/winemsibuilder.exe
-lib/wine/fakedlls/wineoss.drv
+%%OSS%%lib/wine/fakedlls/wineoss.drv
 lib/wine/fakedlls/winepath.exe
 lib/wine/fakedlls/wineps.drv
 %%WINE32%%lib/wine/fakedlls/wineps16.drv16
@@ -3168,7 +3168,7 @@ lib/wine/winemapi.dll.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
 lib/wine/winemsibuilder.exe.so
-lib/wine/wineoss.drv.so
+%%OSS%%lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 %%WINE32%%lib/wine/wineps16.drv16.so