From nobody Mon Apr 18 14:57:47 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 E6A6211DD11D; Mon, 18 Apr 2022 14:57:47 +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 4KhqmW68tqz4gMC; Mon, 18 Apr 2022 14:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650293867; 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=Xv9jcTbKPpvICnZGKJphjefVweTf342GfF5lbH6LKsM=; b=vzdLqb+JK7qg93yiJMRpxb7VG2vhkFr3RwKoaOf8kqQdrl46s+J/pTIDA2+WjuBoFLx8FF w/YwkoQCCWmKV62EXzwFY8AlvQKaloi8ELKS7IGRr258QLW+XoSx5e415QiWlQ3kkf7Ey2 2E3CcDrbcXSZ1VP4dGwEs1BVXck3arKYhwtopWUpyYhgvk5Wc2JuFNW4tnW3NQZnoSp+SI ++Mmf+Kddzk58GpzKtSRvTvraL5gvM7pSEBowJ3OfJtuf+Z2Oopn2PLK5lUzSQW4DS6I1Z ZKnbnARQYL7ZePiXtS5zWo1iyzEI7Zs6Q8/kJ3um5JKCRv6sbM2VJV2WUfuKEQ== 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 B357314CBD; Mon, 18 Apr 2022 14:57:47 +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 23IEvlHH050275; Mon, 18 Apr 2022 14:57:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IEvlvX050274; Mon, 18 Apr 2022 14:57:47 GMT (envelope-from git) Date: Mon, 18 Apr 2022 14:57:47 GMT Message-Id: <202204181457.23IEvlvX050274@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: ce1e733047cf - main - emulators/wine-devel: 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: ce1e733047cfa6bdea3d1bfb767814c7fa2a9809 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650293867; 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=Xv9jcTbKPpvICnZGKJphjefVweTf342GfF5lbH6LKsM=; b=McaKQmhYJAH1rpYeX2xQrN/MGNdOSiRHsL4MUmOj//DWi5qxPLS6pMsDwvuuczW9/ybNx6 1ZSntwPNKnpT2hnfGQHTdR6h9Kj03zzlL2XW+IXP4yJvU4whhIRbTk2TdnOaJrxn0uJwyt D8TsRz37Xi/L1jPV+ToEDkkIxYvSX/XqAA/FIYTFXj3ZjMYrUJ++Kmnu+X34QCRDmlfB4A LbdYR1ikCkOVDYq+DreoF34q4yokjdOWiVXs8xkuqsTW9y4NJfVb2yiW+UuEULchL8hLq4 Mz6nmvZWmT+uu/Hy3ND5obFoUWStwqM0XuWHRY0qs2thNuwnuE3nN0vHQUj1tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650293867; a=rsa-sha256; cv=none; b=PmwCvoDvVqZRNHlxWeJeO+EHQDB7xQzD/1xmi7M0zE9+2wzB9TaEDnoewrtSOiPy+6irpW 7hi8KwNsl5Jd9tQWIyI5fTlboV3SjowbaJeyG2I8WVos443VZv4f5ZXILRPdceBPfelRdz piXTI/fcUtFuNW0bxNzY84uw5x8OKcD6ovjCMBSnfmePwPCuytaNwzK7zvctLKbzWP+BGQ rrtpKlY+l/7zUUCBhDCoOY5oH1YgfeKxBHAqj4X8m0Ad2GDhuzmyTbMyBQCoiBb5Q7XMr+ JhYaQ9iMdB6XD8HbH1e5WF3YASDayWzrYzRVB0vFIIVJ8UofNJqaIkWtwWDfPQ== 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=ce1e733047cfa6bdea3d1bfb767814c7fa2a9809 commit ce1e733047cfa6bdea3d1bfb767814c7fa2a9809 Author: Gerald Pfeifer AuthorDate: 2022-04-18 14:18:19 +0000 Commit: Gerald Pfeifer CommitDate: 2022-04-18 14:48:37 +0000 emulators/wine-devel: Allow choosing between OSS and ALSA 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 Approved by: damjan.jov@gmail.com (maintainer) --- emulators/wine-devel/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index fb7aac124a23..7a798c18eebf 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -33,7 +33,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \ --disable-kerberos \ --disable-tests \ - --without-alsa \ --without-capi \ --without-coreaudio \ --without-dbus \ @@ -47,7 +46,6 @@ CONFIGURE_ARGS+=--verbose \ --without-netapi \ --without-opencl \ --without-osmesa \ - --with-oss \ --with-pcap \ --with-pthread \ --without-pulse \ @@ -72,7 +70,9 @@ SUB_FILES= pkg-message PORTDATA= wine.inf OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP OPENAL STAGING 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 @@ -81,6 +81,9 @@ 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_LIB_DEPENDS= libasound.so:audio/alsa-lib + CUPS_CONFIGURE_WITH= cups CUPS_LIB_DEPENDS= libcups.so:print/cups @@ -99,6 +102,8 @@ MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal +OSS_CONFIGURE_ON= --without-alsa --with-oss + STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging STAGING_DIST= v${DISTVERSION}.tar.gz STAGING_DISTFILES= ${STAGING_DIST}:staging