diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 1999-01-24 08:14:53 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 1999-01-24 08:14:53 +0000 |
| commit | 8eff868e1f6c667c26e67514386f0c858740cea9 (patch) | |
| tree | 1ceb8357817f08ed8aa5c2cece61ca597aec92e0 /audio | |
| parent | This replaces patch-aa to install enlightenment/config/tin-e/17/ (diff) | |
The audio/xamp port currently installs an xamp binary with
balance and volume controls that do nothing. This is because
BSD audio support seems to have been added to the software
as an afterthought.
PR: ports/9472
Submitted by: Sheldon Hearn <axl@iafrica.com>
Notes
Notes:
svn path=/head/; revision=16285
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/xamp/files/patch-aa | 49 | ||||
| -rw-r--r-- | audio/xamp/files/patch-ab | 13 |
2 files changed, 51 insertions, 11 deletions
diff --git a/audio/xamp/files/patch-aa b/audio/xamp/files/patch-aa index 696f55557556..71fe54545ac4 100644 --- a/audio/xamp/files/patch-aa +++ b/audio/xamp/files/patch-aa @@ -12,3 +12,52 @@ #include <sys/time.h> #include <sys/resource.h> #include <errno.h> +@@ -84,11 +84,11 @@ + splash->show(); + + // init mixer +-#ifdef OS_Linux ++#if defined(OS_Linux) || defined(OS_BSD) + if ((mixer = open("/dev/mixer", O_RDWR)) < 0) + die("Error opening /dev/mixer, exiting\n"); + ioctl(mixer, SOUND_MIXER_READ_PCM, &v); +-#endif OS_Linux ++#endif + + /* where mine resource file is located */ + char home[500]; +@@ -262,7 +262,7 @@ + + QtAMP::~QtAMP() + { +-#ifdef OS_Linux ++#if defined(OS_Linux) || defined(OS_BSD) + close(mixer); + #endif + real_quit(); +@@ -348,7 +348,7 @@ + sprintf(volum,"Volume: %d",vr); + playLabel->setText( volum ); + // printf("%d %d\n",tvr,tv); +-#ifdef OS_Linux ++#if defined(OS_Linux) || defined(OS_BSD) + int x = (tv*256 + tvl); + ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x); + #endif +@@ -884,14 +884,14 @@ + { + if (mute == 1) + { +-#ifdef OS_Linux ++#if defined(OS_Linux) || defined(OS_BSD) + int x = (tv*256 + tvl); + ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x); + #endif + } + if (mute == 0) + { +-#ifdef OS_Linux ++#if defined(OS_Linux) || defined(OS_BSD) + int x = (7*256 + 7); + ioctl(mixer, SOUND_MIXER_WRITE_PCM, &x); + #endif diff --git a/audio/xamp/files/patch-ab b/audio/xamp/files/patch-ab index cb704afa7b7d..8513fb1cab58 100644 --- a/audio/xamp/files/patch-ab +++ b/audio/xamp/files/patch-ab @@ -1,5 +1,5 @@ ---- configure Mon Oct 27 00:55:34 1997 -+++ configure Wed Jul 29 22:30:53 1998 +--- configure.orig Mon Oct 27 00:55:34 1997 ++++ configure Sun Jan 24 15:54:23 1999 @@ -992,9 +992,9 @@ qt_libdir=NO for i in $qt_libdirs; @@ -12,12 +12,3 @@ qt_libdir=$i break 2 fi -@@ -1711,7 +1711,7 @@ - if test "$OS_TYPE" = "FreeBSD" ; then - OS_TYPE="BSD" - fi -- CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}" -+ CFLAGS="-O2 -m486 -pipe -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}" - ;; - - SunOS) |