From nobody Sun Oct 22 16:16:21 2023 X-Original-To: dev-commits-ports-all@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 4SD3NQ2NXXz4xVvv; Sun, 22 Oct 2023 16:16:22 +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 4SD3NQ1tRDz4V9b; Sun, 22 Oct 2023 16:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697991382; 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=TiW8qdOCheTdMcBByouQTfQD7OuZmcNsFDJT1DmCo2Q=; b=sZSEO1adpplGH+3u0yf/UjA8w1GpRV9OhhldjOuFhZnQ2u2gj4iPU/5gO4lkM381ENvBwi gVgTVm4e46yu6+McrhYMvHBLq02eXTOcq52+3mPvaZFm4v8001kkGFUE08UxT+/qbPsV52 BpV2KlP+ED2+e4HhWkw8MS+Fm3oSF+ifEsbcaIhyZqhvVai4C8MRf/GlXl7T2ztJsTYjpR Hfz0AVVs3E+QsO4O/vUpvzurnWsUTMAKlwAcfsZEdC/b4wYtFDpx+dfTxphilyLZ4F6SLh 8mbRC8Osj4fLmUBaFl97NDS4IA84suBeUBfQZ0+y5eHxAG72zzkqnUsyvBWTwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697991382; a=rsa-sha256; cv=none; b=rBRZpJfzz0dYiC26LL5wwtPt+oe9Mj4kdaReJOiG3QFtDut5ECzFmVDN3fAGSLUBoxwl0L TcKTSKaXHA8mhzONoSX6a4LVREno09uSjFx3VxeDFFhWdfo/veRsiRQ6ZhtXe9x/DnNYe9 I3YKHQogZZ8UoDlSrvf3cDMCKEoRAyoo6MPkX4hhVncIafZQ09hb7igzJK/T7NPOea7qWF QFHa8y+qzqRra/xa1mP5SKVg2UPhbm9ogk+SN8MG1puWRRi19UjoIkOetTK55930sz5Q0y w0hBMHDkWX0FMBrdN8nmayJ7h69RKMIcHJQlNYQ3t8IWpUMn9hT3s1VN3XGV1g== 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=1697991382; 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=TiW8qdOCheTdMcBByouQTfQD7OuZmcNsFDJT1DmCo2Q=; b=DwgVXygiKH1LesZn83x0f/SCjj2MfvzGmk5ophS0xgiLU1WrRYvWyHcxSFqTcEz9JMXgV8 ePo7gnCPYhfW3nU9v5pJ96QAGwTeK0KtceP+qlKJCLOg2ZKhItpXM/HT09L+ICZ0EvafcP GzAmdSTEon886+AuSw5PwC634JwpKdlxlZDRfolyoeBpi8O/rSmr96ZlRp0IElN8paDJoy stxzyEXzhkOJPVJMfvnBxRNIK49jMwKut3+eJf6fsePTY6RgkhjXXlcB6XSlpPzxpWsVx/ wbQScRQgrb+WYMsmCsroaSVkurgAev9py74olvi2znB5v8jq3XqHHeDf547xjA== 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 4SD3NQ0lGBz14P5; Sun, 22 Oct 2023 16:16:22 +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 39MGGLCA050514; Sun, 22 Oct 2023 16:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MGGLCw050511; Sun, 22 Oct 2023 16:16:21 GMT (envelope-from git) Date: Sun, 22 Oct 2023 16:16:21 GMT Message-Id: <202310221616.39MGGLCw050511@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: 63ef7d1ab018 - main - emulators/wine-devel: Use GStreamer when supporting sound List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 63ef7d1ab018109313476c9b03632c4fe1ab6633 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=63ef7d1ab018109313476c9b03632c4fe1ab6633 commit 63ef7d1ab018109313476c9b03632c4fe1ab6633 Author: Gerald Pfeifer AuthorDate: 2023-10-22 16:07:12 +0000 Commit: Gerald Pfeifer CommitDate: 2023-10-22 16:15:52 +0000 emulators/wine-devel: Use GStreamer when supporting sound When ALSA or OSS are enabled, i.e., we have sound enabled, pull in and use GStreamer as well. PR: 273987 Reported by: scf --- emulators/wine-devel/Makefile | 10 ++++++++++ emulators/wine-devel/pkg-plist | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index ac8a54161728..83fb3fd338b6 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -81,6 +81,7 @@ GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine ALSA_CONFIGURE_WITH= alsa +ALSA_USES= gstreamer ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins @@ -97,6 +98,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel OSS_CONFIGURE_WITH= oss +OSS_USES= gstreamer V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat @@ -113,6 +115,14 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ .include +.if ${PORT_OPTIONS:MALSA} || ${PORT_OPTIONS:MOSS} +CONFIGURE_ARGS+= --with-gstreamer +PLIST_SUB+= GSTREAMER="" +.else +CONFIGURE_ARGS+= --without-gstreamer +PLIST_SUB+= GSTREAMER="@comment " +.endif + .if (${LLVM_DEFAULT} == 10 || ${LLVM_DEFAULT} == 11) _LLVM_VERSION= 15 .else diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 36e82871ab0f..f310953a6e0d 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1644,6 +1644,7 @@ lib/wine/%%WINEARCH%%-unix/libfaultrep.a lib/wine/%%WINEARCH%%-unix/libgdi32.a lib/wine/%%WINEARCH%%-unix/libgdiplus.a lib/wine/%%WINEARCH%%-unix/libglu32.a +%%GSTREAMER%%lib/wine/%%WINEARCH%%-unix/libwinegstreamer.a lib/wine/%%WINEARCH%%-unix/libhal.a lib/wine/%%WINEARCH%%-unix/libhid.a lib/wine/%%WINEARCH%%-unix/libhidclass.a @@ -2145,6 +2146,8 @@ lib/wine/%%WINEARCH%%-unix/wined3d.dll.so lib/wine/%%WINEARCH%%-unix/winedbg.exe.so lib/wine/%%WINEARCH%%-unix/winedevice.exe.so lib/wine/%%WINEARCH%%-unix/winefile.exe.so +%%GSTREAMER%%lib/wine/%%WINEARCH%%-unix/winegstreamer.dll.so +%%GSTREAMER%%lib/wine/%%WINEARCH%%-unix/winegstreamer.so lib/wine/%%WINEARCH%%-unix/winehid.sys.so lib/wine/%%WINEARCH%%-unix/winemapi.dll.so lib/wine/%%WINEARCH%%-unix/winemenubuilder.exe.so @@ -2918,6 +2921,7 @@ lib/wine/%%WINEARCH%%-windows/wined3d.dll lib/wine/%%WINEARCH%%-windows/winedbg.exe lib/wine/%%WINEARCH%%-windows/winedevice.exe lib/wine/%%WINEARCH%%-windows/winefile.exe +%%GSTREAMER%%lib/wine/%%WINEARCH%%-windows/winegstreamer.dll lib/wine/%%WINEARCH%%-windows/winehid.sys lib/wine/%%WINEARCH%%-windows/winemapi.dll lib/wine/%%WINEARCH%%-windows/winemenubuilder.exe