svn commit: r414583 - in head/audio/umix: . files
Kurt Jaeger
pi at FreeBSD.org
Wed May 4 05:49:36 UTC 2016
Author: pi
Date: Wed May 4 05:49:34 2016
New Revision: 414583
URL: https://svnweb.freebsd.org/changeset/ports/414583
Log:
audio/umix: fix the "ioctl sign-extension ioctl ffffffffc0044d00" warning
PR: 209227
Submitted by: trasz
Added:
head/audio/umix/files/patch-src_error.c (contents, props changed)
head/audio/umix/files/patch-src_error.h (contents, props changed)
Modified:
head/audio/umix/Makefile
head/audio/umix/files/patch-src__driver_oss.c
Modified: head/audio/umix/Makefile
==============================================================================
--- head/audio/umix/Makefile Wed May 4 05:45:55 2016 (r414582)
+++ head/audio/umix/Makefile Wed May 4 05:49:34 2016 (r414583)
@@ -3,7 +3,7 @@
PORTNAME= umix
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF
Modified: head/audio/umix/files/patch-src__driver_oss.c
==============================================================================
--- head/audio/umix/files/patch-src__driver_oss.c Wed May 4 05:45:55 2016 (r414582)
+++ head/audio/umix/files/patch-src__driver_oss.c Wed May 4 05:49:34 2016 (r414583)
@@ -1,5 +1,5 @@
---- 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 <sys/soundcard.h>
@@ -9,7 +9,7 @@
#elif defined(__NetBSD__)
#include <soundcard.h>
#endif
-@@ -253,8 +253,10 @@
+@@ -253,8 +253,10 @@ int oss_open(const char *path)
* oss_open() before initializing. */
int oss_init(void)
{
@@ -20,7 +20,7 @@
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);
@@ -34,7 +34,7 @@
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);
}
@@ -46,7 +46,7 @@
#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)
{
@@ -54,7 +54,7 @@
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;
}
Added: head/audio/umix/files/patch-src_error.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/umix/files/patch-src_error.c Wed May 4 05:49:34 2016 (r414583)
@@ -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;
+
Added: head/audio/umix/files/patch-src_error.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/umix/files/patch-src_error.h Wed May 4 05:49:34 2016 (r414583)
@@ -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);
More information about the svn-ports-head
mailing list