From michaels@sdf.lonestar.org  Mon Sep 19 13:27:56 2005
Return-Path: <michaels@sdf.lonestar.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6204716A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Sep 2005 13:27:56 +0000 (GMT)
	(envelope-from michaels@sdf.lonestar.org)
Received: from sdf.lonestar.org (mx.freeshell.ORG [192.94.73.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 177EF43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Sep 2005 13:27:55 +0000 (GMT)
	(envelope-from michaels@sdf.lonestar.org)
Received: from sdf.lonestar.org (IDENT:michaels@otaku.freeshell.org [192.94.73.2])
	by sdf.lonestar.org (8.13.1/8.12.10) with ESMTP id j8JDRoVY008664
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Sep 2005 13:27:50 GMT
Received: from localhost (localhost [[UNIX: localhost]])
	by sdf.lonestar.org (8.13.1/8.12.8/Submit) id j8JDRoww011467;
	Mon, 19 Sep 2005 13:27:50 GMT
Message-Id: <200509191327.j8JDRoww011467@sdf.lonestar.org>
Date: Mon, 19 Sep 2005 13:27:50 GMT
From: Michael Seyfert <michaels@sdf.lonestar.org>
Reply-To: Michael Seyfert <michaels@sdf.lonestar.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] audio/emu10kx update to 20050919
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         86333
>Category:       ports
>Synopsis:       [patch] audio/emu10kx update to 20050919
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vsevolod
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 19 13:30:14 GMT 2005
>Closed-Date:    Mon Sep 19 21:59:43 GMT 2005
>Last-Modified:  Mon Sep 19 21:59:43 GMT 2005
>Originator:     Michael Seyfert
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sat Sep 10 14:03:47 MDT 2005

>Description:
Update this port.

>How-To-Repeat:

>Fix:

diff -ruN /usr/ports/audio/emu10kx/Makefile ./emu10kx/Makefile
--- /usr/ports/audio/emu10kx/Makefile	Sun Sep 18 04:07:00 2005
+++ ./emu10kx/Makefile	Mon Sep 19 07:15:23 2005
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	emu10kx
-PORTVERSION=	20050423
+PORTVERSION=	20050919
 CATEGORIES=	audio
 MASTER_SITES=	http://chibis.persons.gfk.ru/audigy/emu10kx/
-DISTNAME=	${PORTNAME}-2005-04-23
+DISTNAME=	${PORTNAME}-2005-09-19
 
 MAINTAINER=	michaels@sdf.lonestar.org
 COMMENT=	SBLive!, Audigy, and Audigy2 driver for FreeBSD
diff -ruN /usr/ports/audio/emu10kx/distinfo ./emu10kx/distinfo
--- /usr/ports/audio/emu10kx/distinfo	Fri Sep 16 05:41:55 2005
+++ ./emu10kx/distinfo	Mon Sep 19 07:17:09 2005
@@ -1,2 +1,2 @@
-MD5 (emu10kx-2005-04-23.tar.bz2) = 452081b711ff4f10fb987308be6dd886
-SIZE (emu10kx-2005-04-23.tar.bz2) = 63332
+MD5 (emu10kx-2005-09-19.tar.bz2) = 5b66f4febd3326c7c1c05e99e60dca24
+SIZE (emu10kx-2005-09-19.tar.bz2) = 63853
diff -ruN /usr/ports/audio/emu10kx/files/patch-emu10k1-pcm.c ./emu10kx/files/patch-emu10k1-pcm.c
--- /usr/ports/audio/emu10kx/files/patch-emu10k1-pcm.c	Sun Sep 18 04:07:00 2005
+++ ./emu10kx/files/patch-emu10k1-pcm.c	Wed Dec 31 17:00:00 1969
@@ -1,26 +0,0 @@
---- emu10k1-pcm.c	Sat Apr 23 05:47:26 2005
-+++ ../../emu10k1-pcm.c	Sun Aug 14 17:54:02 2005
-@@ -135,7 +135,6 @@
-                (sc->card->mixer->mix.volume[MIXER_P_VOLUME_RIGHT] == 0)) mute = 1;
-             left = V100_TOBIT6(sc->card->mixer->mix.volume[MIXER_P_VOLUME_LEFT]);
-             right = V100_TOBIT6(sc->card->mixer->mix.volume[MIXER_P_VOLUME_RIGHT]);
--            if(mute == 1) left = right = 0;
-             emulated = AC97ENCODE(mute, left, right);
- #ifdef EMU_AC97DEBUG
-             device_printf(sc->dev, "get MIX_MASTER: vol  %d:%d ac97 m=%d l=%x r=%x e=%08x\n",
-@@ -150,7 +149,6 @@
-                (sc->card->mixer->fxbuses[0].volume[MIXER_P_VOLUME_RIGHT] == 0)) mute = 1;
-             left = V100_TOBIT6(sc->card->mixer->fxbuses[0].volume[MIXER_P_VOLUME_LEFT]);
-             right = V100_TOBIT6(sc->card->mixer->fxbuses[0].volume[MIXER_P_VOLUME_RIGHT]);
--            if(mute == 1) left = right = 0;
-             emulated = AC97ENCODE(mute, left, right);
- #ifdef EMU_AC97DEBUG
-             device_printf(sc->dev, "get MIX_PCM: vol  %d:%d ac97 m=%d l=%x r=%x e=%08x\n",
-@@ -169,7 +167,6 @@
-                (sc->card->mixer->mix.volume[MIXER_R_VOLUME_RIGHT] == 0)) mute = 1;
-             left = 0x0f - V100_TOBIT4(sc->card->mixer->mix.volume[MIXER_R_VOLUME_LEFT]);
-             right = 0x0f - V100_TOBIT4(sc->card->mixer->mix.volume[MIXER_R_VOLUME_RIGHT]);
--            if(mute == 1) left = right = 0;
-             emulated = AC97ENCODE(mute, left, right);
- #ifdef EMU_AC97DEBUG
-             device_printf(sc->dev, "get MIX_RGAIN: vol  %d:%d ac97 m=%d l=%x r=%x\n e=%08x",
diff -ruN /usr/ports/audio/emu10kx/files/patch-emuctrl-Makefile ./emu10kx/files/patch-emuctrl-Makefile
--- /usr/ports/audio/emu10kx/files/patch-emuctrl-Makefile	Sun Sep 18 04:07:00 2005
+++ ./emu10kx/files/patch-emuctrl-Makefile	Wed Dec 31 17:00:00 1969
@@ -1,15 +0,0 @@
---- emuctrl/Makefile.orig	Sat Sep 17 16:17:51 2005
-+++ emuctrl/Makefile	Sat Sep 17 16:20:59 2005
-@@ -3,8 +3,10 @@
- # $FreeBSD: ports/audio/emu10kx/files/patch-emuctrl-Makefile,v 1.1 2005/09/18 10:07:00 vsevolod Exp $
- 
- PROG=	emuctrl
--MAN=	emuctrl.8
--BINDIR ?= /usr/sbin
-+NO_MANCOMPRESS=YES
-+MANDIR=	${PREFIX}/man/man
-+MAN8=	emuctrl.8
-+BINDIR= ${PREFIX}/sbin
- 
- CSRCS=	emuctrl.c 
- WARNS?= 6
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->vsevolod 
Responsible-Changed-By: vsevolod 
Responsible-Changed-When: Mon Sep 19 14:53:11 GMT 2005 
Responsible-Changed-Why:  
Grab this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86333 
State-Changed-From-To: open->closed 
State-Changed-By: vsevolod 
State-Changed-When: Mon Sep 19 21:59:33 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86333 
>Unformatted:
