Attachment #57199 for bug #86333

View | Details | Raw Unified | Return to bug 86333
Collapse All | Expand All

Lines 6-15 Link Here

(-)./emu10kx/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= emu10kx	8	PORTNAME= emu10kx
9	PORTVERSION= 20050423	9	PORTVERSION= 20050919
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://chibis.persons.gfk.ru/audigy/emu10kx/	11	MASTER_SITES= http://chibis.persons.gfk.ru/audigy/emu10kx/
12	DISTNAME= ${PORTNAME}-2005-04-23	12	DISTNAME= ${PORTNAME}-2005-09-19
13		13
14	MAINTAINER= michaels@sdf.lonestar.org	14	MAINTAINER= michaels@sdf.lonestar.org
15	COMMENT= SBLive!, Audigy, and Audigy2 driver for FreeBSD	15	COMMENT= SBLive!, Audigy, and Audigy2 driver for FreeBSD

Lines 1-2 Link Here

(-)./emu10kx/distinfo (-2 / +2 lines)
1	MD5 (emu10kx-2005-04-23.tar.bz2) = 452081b711ff4f10fb987308be6dd886	1	MD5 (emu10kx-2005-09-19.tar.bz2) = 5b66f4febd3326c7c1c05e99e60dca24
2	SIZE (emu10kx-2005-04-23.tar.bz2) = 63332	2	SIZE (emu10kx-2005-09-19.tar.bz2) = 63853




--- 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",




--- 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

Return to bug 86333

Lines 1-26 Link Here

(-)./emu10kx/files/patch-emu10k1-pcm.c (-26 lines)
1	--- emu10k1-pcm.c Sat Apr 23 05:47:26 2005
2	+++ ../../emu10k1-pcm.c Sun Aug 14 17:54:02 2005
3	@@ -135,7 +135,6 @@
4	(sc->card->mixer->mix.volume[MIXER_P_VOLUME_RIGHT] == 0)) mute = 1;
5	left = V100_TOBIT6(sc->card->mixer->mix.volume[MIXER_P_VOLUME_LEFT]);
6	right = V100_TOBIT6(sc->card->mixer->mix.volume[MIXER_P_VOLUME_RIGHT]);
7	- if(mute == 1) left = right = 0;
8	emulated = AC97ENCODE(mute, left, right);
9	#ifdef EMU_AC97DEBUG
10	device_printf(sc->dev, "get MIX_MASTER: vol %d:%d ac97 m=%d l=%x r=%x e=%08x\n",
11	@@ -150,7 +149,6 @@
12	(sc->card->mixer->fxbuses[0].volume[MIXER_P_VOLUME_RIGHT] == 0)) mute = 1;
13	left = V100_TOBIT6(sc->card->mixer->fxbuses[0].volume[MIXER_P_VOLUME_LEFT]);
14	right = V100_TOBIT6(sc->card->mixer->fxbuses[0].volume[MIXER_P_VOLUME_RIGHT]);
15	- if(mute == 1) left = right = 0;
16	emulated = AC97ENCODE(mute, left, right);
17	#ifdef EMU_AC97DEBUG
18	device_printf(sc->dev, "get MIX_PCM: vol %d:%d ac97 m=%d l=%x r=%x e=%08x\n",
19	@@ -169,7 +167,6 @@
20	(sc->card->mixer->mix.volume[MIXER_R_VOLUME_RIGHT] == 0)) mute = 1;
21	left = 0x0f - V100_TOBIT4(sc->card->mixer->mix.volume[MIXER_R_VOLUME_LEFT]);
22	right = 0x0f - V100_TOBIT4(sc->card->mixer->mix.volume[MIXER_R_VOLUME_RIGHT]);
23	- if(mute == 1) left = right = 0;
24	emulated = AC97ENCODE(mute, left, right);
25	#ifdef EMU_AC97DEBUG
26	device_printf(sc->dev, "get MIX_RGAIN: vol %d:%d ac97 m=%d l=%x r=%x\n e=%08x",

Lines 1-15 Link Here

(-)./emu10kx/files/patch-emuctrl-Makefile (-15 lines)
1	--- emuctrl/Makefile.orig Sat Sep 17 16:17:51 2005
2	+++ emuctrl/Makefile Sat Sep 17 16:20:59 2005
3	@@ -3,8 +3,10 @@
4	# $FreeBSD: ports/audio/emu10kx/files/patch-emuctrl-Makefile,v 1.1 2005/09/18 10:07:00 vsevolod Exp $
5
6	PROG= emuctrl
7	-MAN= emuctrl.8
8	-BINDIR ?= /usr/sbin
9	+NO_MANCOMPRESS=YES
10	+MANDIR= ${PREFIX}/man/man
11	+MAN8= emuctrl.8
12	+BINDIR= ${PREFIX}/sbin
13
14	CSRCS= emuctrl.c
15	WARNS?= 6