mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

fix OSS song forwarding

Browse Source 
add OSS4 option
bump PORTREVISION

Submitted by:	Jan Sebosik <sebosik@demax.sk>
This commit is contained in:
Oliver Lehmann 2008-04-17 19:43:26 +00:00
parent b432abb63a
commit 8eeb97454d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=211472
4 changed files with 87 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
multimedia/audacious-plugins/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= audacious-plugins
PORTVERSION= 1.5.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.atheme.org/
EXTRACT_SUFX= .tgz
@ -58,6 +58,7 @@ OPTIONS= DBUS "Enable dbus support" on \
ARTS "Enable arts output plugin" off \
SID "Enable sid input plugin" off \
OSS "Enable OSS output plugin" on \
OSS4 "Enable OSS4 output plugin" off \
TIMIDITY "Enable timidity plugin" off \
CDAUDIO "Enable cdaudio-ng input plugin" on \
NEON "Enable neon support (experimental)" on \
@ -263,6 +264,14 @@ PLIST_SUB+= OSSPLUGIN="@comment "
CONFIGURE_ARGS+=--disable-oss
.endif
.if !defined(WITHOUT_OSS4)
PLIST_SUB+= OSS4PLUGIN=""
CONFIGURE_ARGS+=--enable-oss4
.else
PLIST_SUB+= OSS4PLUGIN="@comment "
CONFIGURE_ARGS+=--disable-oss4
.endif
.if defined(WITH_SID)
LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
PLIST_SUB+= SIDPLUGIN=""

38
multimedia/audacious-plugins/files/patch-src-OSS-audio.c Normal file
View File

@ -0,0 +1,38 @@
--- src/OSS/audio.c.original 2008-04-16 22:16:27.000000000 +0200
+++ src/OSS/audio.c 2008-04-16 22:16:50.000000000 +0200
@@ -497,7 +497,7 @@
do_pause = FALSE;
paused = TRUE;
- ioctl(fd, SNDCTL_DSP_SYNC, 0);
+ ioctl(fd, SNDCTL_DSP_RESET, 0);
}
else if (unpause && paused) {
unpause = FALSE;
@@ -514,7 +514,7 @@
* the driver to get fucked up by a reset
*/
- ioctl(fd, SNDCTL_DSP_SYNC, 0);
+ ioctl(fd, SNDCTL_DSP_RESET, 0);
close(fd);
fd = open(device_name, O_WRONLY);
oss_set_audio_params();
@@ -527,7 +527,7 @@
}
- ioctl(fd, SNDCTL_DSP_SYNC, 0);
+ ioctl(fd, SNDCTL_DSP_RESET, 0);
close(fd);
g_free(buffer);
return NULL;
@@ -540,7 +540,7 @@
struct timeval tv;
fd_set set;
- ioctl(fd, SNDCTL_DSP_SYNC, 0);
+ ioctl(fd, SNDCTL_DSP_RESET, 0);
frag = (NFRAGS << 16) | fragsize;
ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
/*

38
multimedia/audacious-plugins/files/patch-src-OSS4-audio.c Normal file
View File

@ -0,0 +1,38 @@
--- src/OSS4/audio.c.original 2008-04-16 22:12:24.000000000 +0200
+++ src/OSS4/audio.c 2008-04-16 22:13:22.000000000 +0200
@@ -555,7 +555,7 @@
* soundcard, but not yet played. I don't
* think this is worth fixing.
*/
- ioctl(fd, SNDCTL_DSP_SYNC, 0);
+ ioctl(fd, SNDCTL_DSP_RESET, 0);
}
else if (unpause && paused) {
unpause = FALSE;
@@ -572,7 +572,7 @@
* the driver to get fucked up by a reset
*/
- ioctl(fd, SNDCTL_DSP_SYNC, 0);
+ ioctl(fd, SNDCTL_DSP_RESET, 0);
close(fd);
fd = open(device_name, O_WRONLY);
oss_set_audio_params();
@@ -585,7 +585,7 @@
}
- ioctl(fd, SNDCTL_DSP_SYNC, 0);
+ ioctl(fd, SNDCTL_DSP_RESET, 0);
oss_set_volume(start_vol_l, start_vol_r);
close(fd);
g_free(buffer);
@@ -599,7 +599,7 @@
struct timeval tv;
fd_set set;
- ioctl(fd, SNDCTL_DSP_SYNC, 0);
+ ioctl(fd, SNDCTL_DSP_RESET, 0);
frag = (NFRAGS << 16) | fragsize;
ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
/*

1
multimedia/audacious-plugins/pkg-plist
View File

@ -38,6 +38,7 @@ lib/audacious/Input/vtx.so
%%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
%%WMAPLUGIN%%lib/audacious/Input/wma.so
%%OSSPLUGIN%%lib/audacious/Output/OSS.so
%%OSS4PLUGIN%%lib/audacious/Output/OSS4.so
%%ESDPLUGIN%%lib/audacious/Output/ESD.so
%%ARTSPLUGIN%%lib/audacious/Output/arts.so
lib/audacious/Output/filewriter.so