From owner-freebsd-bugs@FreeBSD.ORG Wed Dec 7 07:00:26 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3A801065670 for ; Wed, 7 Dec 2011 07:00:25 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D0C0E8FC14 for ; Wed, 7 Dec 2011 07:00:25 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB770PRa019234 for ; Wed, 7 Dec 2011 07:00:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB770P4u019232; Wed, 7 Dec 2011 07:00:25 GMT (envelope-from gnats) Resent-Date: Wed, 7 Dec 2011 07:00:25 GMT Resent-Message-Id: <201112070700.pB770P4u019232@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dzmitry Bialou Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D960F106564A for ; Wed, 7 Dec 2011 06:57:09 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id C90A78FC0A for ; Wed, 7 Dec 2011 06:57:09 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pB76v99E083662 for ; Wed, 7 Dec 2011 06:57:09 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pB76v9EU083661; Wed, 7 Dec 2011 06:57:09 GMT (envelope-from nobody) Message-Id: <201112070657.pB76v9EU083661@red.freebsd.org> Date: Wed, 7 Dec 2011 06:57:09 GMT From: Dzmitry Bialou To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/163104: missing extra patch file for audio/aureal-kmod X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 07:00:26 -0000 >Number: 163104 >Category: misc >Synopsis: missing extra patch file for audio/aureal-kmod >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Dec 07 07:00:25 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Dzmitry Bialou >Release: 8.2-RELEASE >Organization: >Environment: FreeBSD oemcomp.openair 8.2-RELEASE-p4 FreeBSD 8.2-RELEASE-p4 #0: Wed Oct 5 14:45:45 GMT+3 2011 root@oemcomp.openair:/usr/obj/usr/src/sys/TELIASONERA i386 >Description: File aureal-kmod/files/extra_800000_patch-au88x0.c was not commited in ports/162349 ===> License check disabled, port has not defined LICENSE ===> Extracting for aureal-kmod-1.5_6 => SHA256 Checksum OK for au88x0-1.5_4.tar.gz. ===> Patching for aureal-kmod-1.5_6 ===> Applying extra patch /usr/ports/audio/aureal-kmod/files/extra_800000_patch-au88x0.c cannot open /usr/ports/audio/aureal-kmod/files/extra_800000_patch-au88x0.c: No such file or directory *** Error code 2 Stop in /usr/ports/audio/aureal-kmod. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN aureal-kmod.orig/files/extra_800000_patch-au88x0.c aureal-kmod/files/extra_800000_patch-au88x0.c --- aureal-kmod.orig/files/extra_800000_patch-au88x0.c 1970-01-01 05:00:00.000000000 +0500 +++ aureal-kmod/files/extra_800000_patch-au88x0.c 2010-07-11 02:11:56.000000000 +0600 @@ -0,0 +1,121 @@ +--- ./au88x0.c.orig 2010-07-11 01:34:42.000000000 +0600 ++++ ./au88x0.c 2010-07-11 01:34:51.000000000 +0600 +@@ -24,6 +24,10 @@ + * SUCH DAMAGE. + */ + ++#ifdef HAVE_KERNEL_OPTION_HEADERS ++#include "opt_snd.h" ++#endif ++ + /* + * Part of this code was inspired by Aureal's linux driver + */ +@@ -198,28 +202,28 @@ + static struct au_info *find_device_core(void *core_obj); + + static u_int32_t au_playfmt[] = { +- AFMT_MU_LAW, +- AFMT_STEREO | AFMT_MU_LAW, +- AFMT_A_LAW, +- AFMT_STEREO | AFMT_A_LAW, +- AFMT_U8, +- AFMT_STEREO | AFMT_U8, +- AFMT_S16_LE, +- AFMT_STEREO | AFMT_S16_LE, ++ SND_FORMAT(AFMT_MU_LAW, 1, 0), ++ SND_FORMAT(AFMT_MU_LAW, 2, 0), ++ SND_FORMAT(AFMT_A_LAW, 1, 0), ++ SND_FORMAT(AFMT_A_LAW, 2, 0), ++ SND_FORMAT(AFMT_U8, 1, 0), ++ SND_FORMAT(AFMT_U8, 2, 0), ++ SND_FORMAT(AFMT_S16_LE, 1, 0), ++ SND_FORMAT(AFMT_S16_LE, 2, 0), + 0 + }; + + static struct pcmchan_caps au_playcaps = {4000, 48000, au_playfmt, 0}; + + static u_int32_t au_recfmt[] = { +- AFMT_MU_LAW, +- AFMT_STEREO | AFMT_MU_LAW, +- AFMT_A_LAW, +- AFMT_STEREO | AFMT_A_LAW, +- AFMT_U8, +- AFMT_STEREO | AFMT_U8, +- AFMT_S16_LE, +- AFMT_STEREO | AFMT_S16_LE, ++ SND_FORMAT(AFMT_MU_LAW, 1, 0), ++ SND_FORMAT(AFMT_MU_LAW, 2, 0), ++ SND_FORMAT(AFMT_A_LAW, 1, 0), ++ SND_FORMAT(AFMT_A_LAW, 2, 0), ++ SND_FORMAT(AFMT_U8, 1, 0), ++ SND_FORMAT(AFMT_U8, 2, 0), ++ SND_FORMAT(AFMT_S16_LE, 1, 0), ++ SND_FORMAT(AFMT_S16_LE, 2, 0), + 0 + }; + +@@ -491,7 +495,7 @@ + return left | (right << 8); + } + +-static int ++static u_int32_t + aumix_setrecsrc(struct snd_mixer *m, u_int32_t src) + { + struct au_info *au; +@@ -533,7 +537,7 @@ + KOBJMETHOD(mixer_init, aumix_init), + KOBJMETHOD(mixer_set, aumix_set), + KOBJMETHOD(mixer_setrecsrc, aumix_setrecsrc), +- { 0, 0 } ++ KOBJMETHOD_END + }; + MIXER_DECLARE(aumixer); + +@@ -603,15 +607,12 @@ + else if (format & AFMT_MU_LAW) + fmt->eEncoding = ASPFMTULAW; + +- if (format & AFMT_STEREO) +- fmt->wChannels = 2; +- else +- fmt->wChannels = 1; ++ fmt->wChannels = (AFMT_CHANNEL(format) > 1) ? 2 : 1; + SetWaveFormat(ch->wave, &ch->fmt); + return 0; + } + +-static int ++static u_int32_t + auchan_setspeed(kobj_t obj, void *data, u_int32_t speed) + { + struct au_chinfo *ch = data; +@@ -621,7 +622,7 @@ + return speed; + } + +-static int ++static u_int32_t + auchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) + { + return blocksize; +@@ -661,7 +662,7 @@ + return 0; + } + +-static int ++static u_int32_t + auchan_getptr(kobj_t obj, void *data) + { + struct au_chinfo *ch = data; +@@ -693,7 +694,7 @@ + KOBJMETHOD(channel_trigger, auchan_trigger), + KOBJMETHOD(channel_getptr, auchan_getptr), + KOBJMETHOD(channel_getcaps, auchan_getcaps), +- { 0, 0 } ++ KOBJMETHOD_END + }; + CHANNEL_DECLARE(auchan); + >Release-Note: >Audit-Trail: >Unformatted: