Fix after recent libao update

ok naddy@
This commit is contained in:
pea 2010-06-03 16:07:02 +00:00
parent 8009f567a5
commit 68597a84fa
10 changed files with 66 additions and 15 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2008/10/30 14:46:59 naddy Exp $
# $OpenBSD: Makefile,v 1.21 2010/06/03 16:07:02 pea Exp $
# not very useful with static libao
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ SHARED_ONLY= Yes
COMMENT= free clone of mpg123, a command-line mp3 player
DISTNAME= mpg321-0.2.10
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= audio
HOMEPAGE= http://mpg321.sourceforge.net/

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ao_c,v 1.1 2008/10/30 14:46:59 naddy Exp $
--- ao.c.orig Thu Oct 30 15:41:11 2008
+++ ao.c Thu Oct 30 15:41:26 2008
$OpenBSD: patch-ao_c,v 1.2 2010/06/03 16:07:02 pea Exp $
--- ao.c.orig Sun Mar 24 06:49:47 2002
+++ ao.c Fri May 14 22:52:35 2010
@@ -94,7 +94,7 @@ void check_ao_default_play_device()
void check_default_play_device()
{
@ -10,3 +10,11 @@ $OpenBSD: patch-ao_c,v 1.1 2008/10/30 14:46:59 naddy Exp $
| MPG321_USE_NULL | MPG321_USE_WAV | MPG321_USE_ARTS | MPG321_USE_AU
| MPG321_USE_CDR | MPG321_USE_ALSA09 | MPG321_USE_USERDEF)))
{
@@ -229,6 +229,7 @@ void open_ao_playdevice(struct mad_header const *heade
and restore it afterwards */
signal(SIGINT, SIG_DFL);
+ memset(&format, 0, sizeof(format));
format.bits = 16;
format.rate = header->samplerate;
format.channels = (options.opt & MPG321_FORCE_STEREO) ? 2 : MAD_NCHANNELS(header);

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2004/08/09 15:58:46 espie Exp $
bin/mpg321
@comment $OpenBSD: PLIST,v 1.3 2010/06/03 16:07:02 pea Exp $
@bin bin/mpg321
@man man/man1/mpg321.1

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2009/03/10 23:21:15 espie Exp $
# $OpenBSD: Makefile,v 1.11 2010/06/03 16:11:10 pea Exp $
COMMENT= integer-only ogg vorbis command-line player
DISTNAME= vorbis-tools-1.0
PKGNAME= ${DISTNAME:S/vorbis/tremor/}p3
PKGNAME= ${DISTNAME:S/vorbis/tremor/}p4
CATEGORIES= audio
MASTER_SITES= http://www.vorbis.com/files/1.0/unix/

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-ogg123_callbacks_c,v 1.1 2010/06/03 16:11:10 pea Exp $
--- ogg123/callbacks.c.orig Sat May 15 18:00:25 2010
+++ ogg123/callbacks.c Sat May 15 18:00:52 2010
@@ -43,7 +43,8 @@ void audio_reopen_action (buf_t *buf, void *arg)
ao_sample_format format;
close_audio_devices (reopen_arg->devices);
-
+
+ memset(&format, 0, sizeof(format));
/* Record audio device settings and open the devices */
format.rate = reopen_arg->format->rate;
format.channels = reopen_arg->format->channels;

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/03 01:04:36 jolan Exp $
bin/igg123
@comment $OpenBSD: PLIST,v 1.2 2010/06/03 16:11:10 pea Exp $
@bin bin/igg123
@man man/man1/igg123.1
share/examples/tremor-tools/
share/examples/tremor-tools/igg123rc

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2010/05/26 21:45:01 jakemsr Exp $
# $OpenBSD: Makefile,v 1.8 2010/06/03 16:09:37 pea Exp $
COMMENT = audio player daemon with library management
V = 0.7
DISTNAME = xmms2-${V}DrNo
PKGNAME = xmms2-${V}p0
PKGNAME = xmms2-${V}p1
SHARED_LIBS += xmmsclient++ 1.0 # 4.0.0
SHARED_LIBS += xmmsclient++-glib 0.0 # 1.0.0

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_plugins_ao_ao_c,v 1.1 2010/06/03 16:09:37 pea Exp $
--- src/plugins/ao/ao.c.orig Mon May 17 16:03:33 2010
+++ src/plugins/ao/ao.c Mon May 17 16:07:34 2010
@@ -162,6 +162,7 @@ xmms_ao_new (xmms_output_t *output)
/* let's just use some common format to check if the device
* name is valid */
+ memset(&format, 0, sizeof(format));
format.bits = 16;
format.rate = 44100;
format.channels = 2;

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.27 2010/03/21 15:24:40 jakemsr Exp $
# $OpenBSD: Makefile,v 1.28 2010/06/03 16:12:48 pea Exp $
COMMENT= open source client for Windows Terminal Server
DISTNAME= rdesktop-1.6.0
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= x11 net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/}

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-rdpsnd_libao_c,v 1.1 2010/06/03 16:12:48 pea Exp $
--- rdpsnd_libao.c.orig Sat May 15 17:36:37 2010
+++ rdpsnd_libao.c Sat May 15 17:37:27 2010
@@ -72,6 +72,7 @@ libao_open(void)
default_driver = ao_default_driver_id();
}
+ memset(&format, 0, sizeof(format));
format.bits = 16;
format.channels = 2;
format.rate = 44100;
@@ -111,6 +112,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx)
{
ao_sample_format format;
+ memset(&format, 0, sizeof(format));
format.bits = pwfx->wBitsPerSample;
format.channels = pwfx->nChannels;
format.rate = 44100;