1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

- Update to version 1.0.2

PR:		58959
Submitted by:	Ports Fury
This commit is contained in:
Kirill Ponomarev 2003-11-05 16:40:30 +00:00
parent 43c0eb1688
commit 73e1172f13
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=93162
4 changed files with 71 additions and 7 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= umix
PORTVERSION= 0.5
PORTREVISION= 2
PORTVERSION= 1.0.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,11 +14,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Advanced tool for adjusting soundcard mixers, replacement for aumix
LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -lintl"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= umix.1
post-patch:
@${REINPLACE_CMD} -e \
's|="/etc"|="$${prefix}/etc"|g' ${WRKSRC}/configure
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (umix-0.5.tar.gz) = 6495628535bcdc01da1a787db9056eda
MD5 (umix-1.0.2.tar.gz) = e38fc288273cc8b5b34f8769f06b32ee

View File

@ -0,0 +1,62 @@
--- src/driver_oss.c.orig Sun Aug 31 22:32:02 2003
+++ src/driver_oss.c Thu Nov 6 01:22:48 2003
@@ -27,7 +27,7 @@
#if defined(__linux__)
#include <sys/soundcard.h>
#elif defined(__FreeBSD__)
- #include "machine/soundcard.h"
+ #include <sys/soundcard.h>
#elif defined(__NetBSD__)
#include <soundcard.h>
#endif
@@ -253,8 +253,10 @@
* oss_open() before initializing. */
int oss_init(void)
{
+#ifdef SOUND_MIXER_INFO
/* 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,11 @@
mixer_ptr->numchan = SOUND_MIXER_NRDEVICES;
mixer_ptr->numchan = CLAMP(mixer_ptr->numchan,0,SOUND_MIXER_NRDEVICES);
+#ifdef SOUND_MIXER_INFO
/* get the mixer name */
eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info);
strncpy(mixer_ptr->name, oss_info.name, sizeof(mixer_ptr->name));
+#endif
mixer_ptr->curr_chan = 0;
#ifdef UMIX_DEBUG
@@ -329,9 +333,11 @@
oss_set_curr_chan(i);
oss_update(OSS_UPD_READ);
}
+#ifdef SOUND_MIXER_INFO
/* 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 +394,7 @@
* the device and compares it to the old */
static int oss_check_update(void)
{
+#ifdef SOUND_MIXER_INFO
struct mixer_info oss_info;
eioctl(mixer_ptr->fd, SOUND_MIXER_INFO, &oss_info);
@@ -396,6 +403,7 @@
mixer_ptr->modifycount = oss_info.modify_counter;
return 1;
}
+#endif
return 0;
}

View File

@ -1,2 +1 @@
bin/umix
share/locale/fi/LC_MESSAGES/umix.mo