1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

Update to 2.1.4.

This commit is contained in:
Hajimu UMEMOTO 2002-10-05 19:47:25 +00:00
parent 4622622972
commit f1fb88f2a2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=67392
3 changed files with 3 additions and 50 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= gkrellmvolume
PORTVERSION= 2.0.1
PORTVERSION= 2.1.4
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
DISTNAME= gkrellm-volume-${PORTVERSION}
@ -16,7 +16,7 @@ MAINTAINER= ume@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
WRKSRC= ${WRKDIR}/gkrellm-volume2-${PORTVERSION}
WRKSRC= ${WRKDIR}/gkrellm-volume
USE_X_PREFIX= yes

View File

@ -1 +1 @@
MD5 (gkrellm-volume-2.0.1.tar.gz) = 9c85cc520819fdbc6dc03e9b1b3ad79b
MD5 (gkrellm-volume-2.1.4.tar.gz) = 34368b3713a56ead63adfb678aba9186

View File

@ -1,47 +0,0 @@
Index: unix_mixer.c
diff -u unix_mixer.c.orig unix_mixer.c
--- unix_mixer.c.orig Fri Aug 30 03:01:56 2002
+++ unix_mixer.c Fri Aug 30 21:56:54 2002
@@ -27,7 +27,8 @@
#include <string.h>
#include <glob.h>
-#ifdef __FreeBSD__
+#include <sys/param.h>
+#if defined(__FreeBSD__) && __FreeBSD_version < 500000
#include <machine/soundcard.h>
#else
#include <sys/soundcard.h>
@@ -41,19 +42,30 @@
mixer_t *mixer_open(char *id) {
mixer_t *result;
int fd,devices,nr,i;
+#ifdef SOUND_MIXER_INFO
mixer_info minfo;
+#endif
char *sound_labels[] = SOUND_DEVICE_LABELS;
if ((fd = open(id,O_RDWR)) == -1) return NULL;
- if ( (ioctl(fd,SOUND_MIXER_READ_DEVMASK,&devices) < 0) ||
- (ioctl(fd,SOUND_MIXER_INFO,&minfo) < 0)) {
+ if (ioctl(fd,SOUND_MIXER_READ_DEVMASK,&devices) < 0) {
+ close(fd);
+ return NULL;
+ }
+#ifdef SOUND_MIXER_INFO
+ if (ioctl(fd,SOUND_MIXER_INFO,&minfo) < 0) {
close(fd);
return NULL;
}
+#endif
result = malloc(sizeof(mixer_t));
result->fd = fd;
+#ifdef SOUND_MIXER_INFO
result->name = strdup(minfo.name);
+#else
+ result->name = strdup("mixer");
+#endif
/* get the nr of devices */
nr = 0;