3 files changed, 0 insertions, 118 deletions
diff --git a/packages/setmixer/devfs.patch b/packages/setmixer/devfs.patch
deleted file mode 100644
index d2b5c82df8..0000000000
--- a/packages/setmixer/devfs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- setmixer-27DEC94.orig/setmixer.c~devfs
-+++ setmixer-27DEC94.orig/setmixer.c
-@@ -27,7 +27,7 @@
- #include <sys/ioctl.h>
- #include <sys/soundcard.h>
- 
--#define MIXER "/dev/mixer"
-+#define MIXER "/dev/sound/mixer"
- 
- const char * dname[] = SOUND_DEVICE_NAMES;
-     
-@@ -65,7 +65,7 @@
-     }
- 
-     if ((mixer_fd = open(MIXER, O_RDWR)) < 0) {
--	fprintf(stderr, "Error opening /dev/mixer.");
-+	fprintf(stderr, "Error opening /dev/sound/mixer.");
- 	exit(1);
-     }
-     if (ioctl(mixer_fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
diff --git a/packages/setmixer/setmixer.patch b/packages/setmixer/setmixer.patch
deleted file mode 100644
index 535ba3b082..0000000000
--- a/packages/setmixer/setmixer.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- setmixer-27DEC94.orig/Makefile~setmixer
-+++ setmixer-27DEC94.orig/Makefile
-@@ -1,8 +1,8 @@
- DESTDIR =
- INSTALL = install
- CC=gcc
--CFLAGS= -O6 -fomit-frame-pointer -Wall -pipe -m486
--LDFLAGS= -Xlinker -N -s
-+CFLAGS= -O2 -fomit-frame-pointer -Wall -pipe
-+#LDFLAGS= -Xlinker -N -s
- PROG=setmixer
- 
- $(PROG): setmixer.o
---- setmixer-27DEC94.orig/setmixer.c~setmixer
-+++ setmixer-27DEC94.orig/setmixer.c
-@@ -36,7 +36,7 @@
- 
-     int devmask, stereod, i, d;
-     int mixer_fd;
--    int lcval,rcval;
-+    int lcval,rcval,oldlcval,oldrcval,val;
-     int verbose = 0;
-     size_t len;
-     char *endptr;
-@@ -52,9 +52,9 @@
- 	}
-     }
-     
--    if (!verbose && ((argc <= 0) || (argc & 1))) {
-+    if ((!verbose && ((argc <= 0) || (argc & 1))) || (verbose && argc % 2)) {
- 	fprintf(stderr, "usage: %s [-V] cntrl val [cntrl val ....]\n"
--       "where val is in 0-100 range and 'cntrl' is one of the following:\n\t",
-+       "where val is in [+-]0-100 range and 'cntrl' is one of the following:\n\t",
- 		prog);
- 	for (i = 0; i < SOUND_MIXER_NRDEVICES; i++)
- 	    fprintf(stderr, "%s ", dname[i]);
-@@ -84,16 +84,36 @@
-     
-     while (argc) {
- 	cntrl = *argv++;
-+	oldlcval = (('+' == **argv) || ('-' == **argv));
- 	lcval = strtol(*argv++, &endptr, 0);
- 	if (',' == *endptr) {
- 	    endptr += 1;
-+	    oldrcval = (('+' == *endptr) || ('-' == *endptr));
- 	    rcval = strtol((const char *)endptr, 0, 0);
- 	}
- 	else {
- 	    rcval = lcval;
-+	    oldrcval = oldlcval;
- 	}
- 	argc -= 2;
- 	len = strlen(cntrl);
-+	if (oldlcval || oldrcval) {
-+	    for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
-+	    	if (0 == strncmp(dname[i], cntrl, len)) {
-+		    d = (1 << i);
-+		    if (0 != (devmask & d)) {
-+			if (-1 == ioctl(mixer_fd, MIXER_READ(i), &val)) {
-+			    perror("MIXER_READ");
-+			}
-+			else {
-+			    lcval += oldlcval ? (val & 0x7f) : 0;
-+			    rcval += oldrcval ? ((val >> 8) & 0x7f) : 0;
-+			}
-+		    }
-+		    break;
-+		}
-+	    }
-+	}
- 	for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
- 	    if (0 == strncmp(dname[i], cntrl, len)) {
- 		d = (1 << i);
diff --git a/packages/setmixer/setmixer_27DEC94.bb b/packages/setmixer/setmixer_27DEC94.bb
deleted file mode 100644
index 25a07ce8ab..0000000000
--- a/packages/setmixer/setmixer_27DEC94.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "A text mode OSS soundmixer"
-LICENSE = "GPL"
-SECTION = "console/utils"
-PRIORITY = "optional"
-SRC_URI = "${DEBIAN_MIRROR}/main/s/setmixer/setmixer_${PV}.orig.tar.gz \
-	   file://setmixer.patch;patch=1"
-SRC_URI_append_mnci = " file://devfs.patch;patch=1"
-
-S = "${WORKDIR}/${PN}-${PV}.orig"
-
-
-do_install() {
-	mkdir -p ${D}${sbindir}
-	install -m 755 setmixer ${D}${sbindir}
-}