Index: head/audio/umix/Makefile =================================================================== --- head/audio/umix/Makefile (revision 414582) +++ head/audio/umix/Makefile (revision 414583) @@ -1,22 +1,22 @@ # Created by: George Reid # $FreeBSD$ PORTNAME= umix PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Advanced tool for adjusting soundcard mixers, replacement for aumix GNU_CONFIGURE= yes PLIST_FILES= bin/umix \ man/man1/umix.1.gz post-patch: @${REINPLACE_CMD} -e \ 's|="/etc"|="$${prefix}/etc"|g' ${WRKSRC}/configure .include Index: head/audio/umix/files/patch-src__driver_oss.c =================================================================== --- head/audio/umix/files/patch-src__driver_oss.c (revision 414582) +++ head/audio/umix/files/patch-src__driver_oss.c (revision 414583) @@ -1,64 +1,64 @@ ---- src/driver_oss.c.orig Sun Aug 31 15:32:02 2003 -+++ src/driver_oss.c Tue Feb 20 22:44:43 2007 +--- src/driver_oss.c.orig 2003-08-31 13:32:02 UTC ++++ src/driver_oss.c @@ -27,7 +27,7 @@ #if defined(__linux__) #include #elif defined(__FreeBSD__) - #include "machine/soundcard.h" + #include #elif defined(__NetBSD__) #include #endif -@@ -253,8 +253,10 @@ +@@ -253,8 +253,10 @@ int oss_open(const char *path) * oss_open() before initializing. */ int oss_init(void) { +#if 0 /* this is an OSS structure, defined in soundcard.h */ struct mixer_info oss_info; +#endif int old_mixer; int ch; int i; -@@ -288,9 +290,13 @@ +@@ -288,9 +290,13 @@ int oss_init(void) mixer_ptr->numchan = SOUND_MIXER_NRDEVICES; mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES); +#if 0 /* 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 +335,11 @@ +@@ -329,9 +335,11 @@ int oss_init(void) oss_set_curr_chan(i); oss_update(OSS_UPD_READ); } +#if 0 /* init the modify counter */ eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); mixer_ptr->modifycount = oss_info.modify_counter; +#endif #ifdef UMIX_DEBUG err_msg("oss_init: initialized #%d with %d channels", -@@ -388,6 +396,7 @@ +@@ -388,6 +396,7 @@ int oss_opt_to_chan_num(const char *str) * the device and compares it to the old */ static int oss_check_update(void) { +#if 0 struct mixer_info oss_info; eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info); -@@ -396,6 +405,7 @@ +@@ -396,6 +405,7 @@ static int oss_check_update(void) mixer_ptr->modifycount = oss_info.modify_counter; return 1; } +#endif return 0; } Index: head/audio/umix/files/patch-src_error.c =================================================================== --- head/audio/umix/files/patch-src_error.c (nonexistent) +++ head/audio/umix/files/patch-src_error.c (revision 414583) @@ -0,0 +1,11 @@ +--- src/error.c.orig 2016-05-03 08:56:24 UTC ++++ src/error.c +@@ -54,7 +54,7 @@ static void error_handler(int strflag, c + fflush(stderr); + } + +-int eioctl(int fd, int request, void *arg) ++int eioctl(int fd, unsigned long request, void *arg) + { + int n; + Property changes on: head/audio/umix/files/patch-src_error.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/umix/files/patch-src_error.h =================================================================== --- head/audio/umix/files/patch-src_error.h (nonexistent) +++ head/audio/umix/files/patch-src_error.h (revision 414583) @@ -0,0 +1,11 @@ +--- src/error.h.orig 2016-05-03 08:56:07 UTC ++++ src/error.h +@@ -24,7 +24,7 @@ + #ifndef MY_ERROR_H + #define MY_ERROR_H + +-int eioctl(int fd, int request, void *arg); ++int eioctl(int fd, unsigned long request, void *arg); + void *emalloc(size_t size); + void *erealloc(void *ptr, size_t size); + char *estrdup(const char *str); Property changes on: head/audio/umix/files/patch-src_error.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property