diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-02-26 22:24:44 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-02-26 22:24:44 +0000 |
| commit | b7a3bd2dc08a9b069d5f92739bc0713b5f3b07ae (patch) | |
| tree | 025809356a1707de9e038769e5c4e94b4eff98dd /audio | |
| parent | 049705e8f8f0d3b834891ba702eab039dae8bf58 (diff) | |
Notes
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/umix/Makefile | 2 | ||||
| -rw-r--r-- | audio/umix/files/patch-src::driver_oss.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/audio/umix/Makefile b/audio/umix/Makefile index cdb3dd83c5e0..f426843c1303 100644 --- a/audio/umix/Makefile +++ b/audio/umix/Makefile @@ -7,7 +7,7 @@ PORTNAME= umix PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/umix/files/patch-src::driver_oss.c b/audio/umix/files/patch-src::driver_oss.c index c5c8c0231243..d7a1340b3dce 100644 --- a/audio/umix/files/patch-src::driver_oss.c +++ b/audio/umix/files/patch-src::driver_oss.c @@ -1,5 +1,5 @@ ---- src/driver_oss.c.orig Sun Aug 31 22:32:02 2003 -+++ src/driver_oss.c Thu Nov 6 01:22:48 2003 +--- src/driver_oss.c.orig Sun Aug 31 15:32:02 2003 ++++ src/driver_oss.c Tue Feb 20 22:44:43 2007 @@ -27,7 +27,7 @@ #if defined(__linux__) #include <sys/soundcard.h> @@ -20,7 +20,7 @@ int old_mixer; int ch; int i; -@@ -288,9 +290,11 @@ +@@ -288,9 +290,13 @@ mixer_ptr->numchan = SOUND_MIXER_NRDEVICES; mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES); @@ -28,11 +28,13 @@ /* get the mixer name */ eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); strncpy(mixer_ptr->name, oss_info.name, sizeof(mixer_ptr->name)); ++#else ++ strncpy(mixer_ptr->name, "", 1); +#endif mixer_ptr->curr_chan = 0; #ifdef UMIX_DEBUG -@@ -329,9 +333,11 @@ +@@ -329,9 +335,11 @@ oss_set_curr_chan(i); oss_update(OSS_UPD_READ); } @@ -44,7 +46,7 @@ #ifdef UMIX_DEBUG err_msg("oss_init: initialized #%d with %d channels", -@@ -388,6 +394,7 @@ +@@ -388,6 +396,7 @@ * the device and compares it to the old */ static int oss_check_update(void) { @@ -52,7 +54,7 @@ struct mixer_info oss_info; eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); -@@ -396,6 +403,7 @@ +@@ -396,6 +405,7 @@ mixer_ptr->modifycount = oss_info.modify_counter; return 1; } |