From nobody Sat Apr 30 17:08:28 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 0F7D81ABF3DA; Sat, 30 Apr 2022 17:08:29 +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 4KrG5m3rVxz3GPv; Sat, 30 Apr 2022 17:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651338508; 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=+/ZsjccI0gPniORrxZxg2jrx+j8czGsrw0emKGVpmN0=; b=rLrZPvPmoN0Kp5aZ+ireTOOEYIiyCjiSLIt4tUuJsVJrKj1v8A2CMmMq/cWq9UcNUcZ+V+ rG/3NDnfqdgEghfkDgfMTVMHIBtK/2MmJKn75RLQyAwQr3Xm3z+wo0l831KPK5WyJpMmIW sQOWfu1nEyjVt9Quu1QqqlA0jkD5iA32dPjLYMZKQmLQ4uqP+mbO+MqbJIJkxYOimovPQH 7IhEWo6Li0nX3QuGLEMVr7LSjsY1jFI+TZFqFkYcOvNXAG/RlG29zZode3lKJlHIlUB/60 Y9sqGTT3mmTgJJtiTET7z0HQy1+2qqi63EtX7gPUxZlkChfv79S3efBzkeLyIg== 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 56F2824EFD; Sat, 30 Apr 2022 17:08:28 +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 23UH8SVW093886; Sat, 30 Apr 2022 17:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23UH8SZN093885; Sat, 30 Apr 2022 17:08:28 GMT (envelope-from git) Date: Sat, 30 Apr 2022 17:08:28 GMT Message-Id: <202204301708.23UH8SZN093885@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: 3c56b0e6dab5 - main - emulators/wine: Allow choosing between OSS and ALSA 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: 3c56b0e6dab581abf64156243b70d376e91413b7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651338508; 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=+/ZsjccI0gPniORrxZxg2jrx+j8czGsrw0emKGVpmN0=; b=BOAiKN5dlYXLXd84rRJgCW8YRWMINFYI6/dPlZZeOcFdxpZ+iydN0gqecWqIA81S4VdFAv M6kQM2sLKf75Bpl16vYCsa/HwpahJTZo00VhU1gQt2xHcGd6lkRcXQB5+BBpg2HDYW2xkk su5fJmb65GTOMB95KjZ+yaHGXWSPKBX0uePn+2LwGI5hw1WRq/6R+VNtBDzBUz5Yj7zhgD o6RHvVv0fzsuztm7QAa/9DR7UciX+LzG5ypy0GLdyLabbpq4QA5JphjfgJ9XxJfOmFER4J 8FORRstQN0QoYCXdD7xj0O4eSj6kjGeh7MfO2m7MCxgNbshelsail6tCsiKQTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651338508; a=rsa-sha256; cv=none; b=Ba1MRpRq+2ZKG/aYIPhIlco1XWV/r3ADRx+52IOxBmoi1m4E9LtKlaFiIjE0P8aSMAuFJ9 UOrQLcWniGrx8Z31WYB5Xlx9yNohTe2/s9x+ITmKpRSRpT6WSZ+kwxyRAAl4d8jThzqzvm uWz7CSLx4/yoi11L4AeAdjzcE1G3AuiVjNXvqWyPwwE/1iAQLhKPEnhAkMNsjG1JY4Y+XX R5P7MrksrhksADRcxHk0ZK9W7T5tdDtdTSFSMYv5qbxt3PUHbnZ41OeL9s7XtqQVj9NEK2 sNpzMnJ10tPAzjGdpol+NYmDcyAXj1WJwxKVX1wJXwmIF70RQBi0aQNkKUAxfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c56b0e6dab581abf64156243b70d376e91413b7 commit 3c56b0e6dab581abf64156243b70d376e91413b7 Author: Gerald Pfeifer AuthorDate: 2022-04-30 10:37:41 +0000 Commit: Gerald Pfeifer 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