From owner-svn-src-all@FreeBSD.ORG Wed Jun 29 00:53:16 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFF15106564A for ; Wed, 29 Jun 2011 00:53:16 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from relay01.pair.com (relay01.pair.com [209.68.5.15]) by mx1.freebsd.org (Postfix) with SMTP id 7E1BB8FC0A for ; Wed, 29 Jun 2011 00:53:16 +0000 (UTC) Received: (qmail 28000 invoked from network); 29 Jun 2011 00:26:32 -0000 Received: from 109.43.28.197 (HELO ip-109-43-28-197.web.vodafone.de) (109.43.28.197) by relay01.pair.com with SMTP; 29 Jun 2011 00:26:32 -0000 X-pair-Authenticated: 109.43.28.197 Date: Wed, 29 Jun 2011 02:26:31 +0200 (CEST) From: Gerald Pfeifer To: Andriy Gapon In-Reply-To: <4DEC748A.8000204@FreeBSD.org> Message-ID: References: <201106052101.p55L1feL097420@svn.freebsd.org> <86zklwezwb.fsf@gmail.com> <4DEC748A.8000204@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Gerald Pfeifer , Pan Tsu Subject: Re: svn commit: r222723 - head/sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2011 00:53:16 -0000 On Mon, 6 Jun 2011, Andriy Gapon wrote: > Woops! I admit I just copied the description and the patch from the PR. > How inattentive I could be while doing that? > > Gerald, should the patch have actually introduced SNDCTL_DSP_HALT as the > description says? Yikes! You are totally right, Pan Tsu and Andriy. Below you'll find the corresponding patch I got into Wine upstream, so clearly this should have been about SNDCTL_DSP_HALT. Sorry about the snafu on this and the delay in getting back to this; in between business travel and vacation I haven't been home for more than three weeks. Gerald ==== patch ==== From: Gerald Pfeifer To: wine-patches@winehq.org Cc: Andrew Eikum Date: Thu, 19 May 2011 08:24:23 -0600 (MDT) Subject: wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT. This is the last patch that is necessary to make vanilla Wine build on current versions of FreeBSD. I will also send a summary in response to Andrew's question around this Gerald --- dlls/wineoss.drv/mmdevdrv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7dec1e0..0edcb25 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,13 @@ #include "audiopolicy.h" #include "audioclient.h" + +/* Some implementations of OSS, such as FreeBSD older than 9.0, lack + SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */ +#ifndef SNDCTL_DSP_HALT +#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +#endif + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -- 1.7.4.1