diff options
50 files changed, 343 insertions, 46 deletions
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index df7666e7a8d0..436634e1ee80 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -7,7 +7,7 @@ PORTNAME= cmus PORTVERSION= 2.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/cmus/files/patch-ao.c b/audio/cmus/files/patch-ao.c new file mode 100644 index 000000000000..74c666053891 --- /dev/null +++ b/audio/cmus/files/patch-ao.c @@ -0,0 +1,10 @@ +--- ao.c.orig 2010-06-05 20:09:57.000000000 +0200 ++++ ao.c 2010-06-05 20:10:36.000000000 +0200 +@@ -71,6 +71,7 @@ static int op_ao_open(sample_format_t sf + return -OP_ERROR_ERRNO; + } + ++ memset(&format, 0, sizeof(format)); + format.bits = sf_get_bits(sf); + format.rate = sf_get_rate(sf); + format.channels = sf_get_channels(sf); diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile index c39d45a9079c..bee1a23f0ff9 100644 --- a/audio/flac123/Makefile +++ b/audio/flac123/Makefile @@ -7,7 +7,7 @@ PORTNAME= flac123 PORTVERSION= 0.0.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= SF/flac-tools/${PORTNAME}/${PORTVERSION} @@ -15,7 +15,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Command-line player for flac audio files LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \ - ao.3:${PORTSDIR}/audio/libao \ + ao.4:${PORTSDIR}/audio/libao \ popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile index 1367f0a03689..92637e2ecd7d 100644 --- a/audio/gnomoradio/Makefile +++ b/audio/gnomoradio/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomoradio PORTVERSION= 0.15.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= audio net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc b/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc new file mode 100644 index 000000000000..932cbbdb0ec2 --- /dev/null +++ b/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- roboradio/audio/ogg.cc.orig ++++ roboradio/audio/ogg.cc +@@ -193,6 +193,7 @@ + + int device_id = ao_default_driver_id(); + ao_sample_format output_fmt; ++ memset(&output_fmt, 0, sizeof(output_fmt)); + output_fmt.bits = 16; + output_fmt.rate = 44100; + output_fmt.channels = 2; diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile index 30eaf21befa8..022713a9533c 100644 --- a/audio/herrie/Makefile +++ b/audio/herrie/Makefile @@ -7,7 +7,7 @@ PORTNAME= herrie PORTVERSION= 2.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= http://herrie.info/distfiles/ \ http://www.stack.nl/~ed/projects/herrie/distfiles/ @@ -67,7 +67,7 @@ LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=no_http no_scrobbler .endif .if !defined(WITHOUT_LIBAO) -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao CONFIGURE_ARGS+=ao .endif .if !defined(WITHOUT_XCURSES) diff --git a/audio/liquidsoap/Makefile b/audio/liquidsoap/Makefile index 7d230b796cf7..d00dc8ec4bb1 100644 --- a/audio/liquidsoap/Makefile +++ b/audio/liquidsoap/Makefile @@ -7,7 +7,7 @@ PORTNAME= liquidsoap PORTVERSION= 0.9.2 -PORTREVISION?= 1 +PORTREVISION?= 2 DISTVERSIONPREFIX= full- CATEGORIES= audio net MASTER_SITES= SF/savonet/${PORTNAME}/${PORTVERSION} @@ -75,14 +75,14 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDS # alsa and portaudio disabled permanently - alsa is linux only, portaudio broken _ALL_PACKAGES= alsa ao faac faad gavl ladspa lame mad ogg vorbis speex theora samplerate soundtouch portaudio pulseaudio taglib xmlplaylist lastfm -LIB_DEPENDS_ao= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS_ao= ao.4:${PORTSDIR}/audio/libao LIB_DEPENDS_faac= faac.0:${PORTSDIR}/audio/faac LIB_DEPENDS_faad= faad.2:${PORTSDIR}/audio/faad LIB_DEPENDS_gavl= gavl.1:${PORTSDIR}/multimedia/gavl BUILD_DEPENDS_ladspa= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa LIB_DEPENDS_lame= mp3lame.0:${PORTSDIR}/audio/lame LIB_DEPENDS_mad= mad.2:${PORTSDIR}/audio/libmad -LIB_DEPENDS_ogg= ogg.6:${PORTSDIR}/audio/libogg +LIB_DEPENDS_ogg= ogg.7:${PORTSDIR}/audio/libogg LIB_DEPENDS_vorbis= vorbis.4:${PORTSDIR}/audio/libvorbis LIB_DEPENDS_speex= speex.1:${PORTSDIR}/audio/speex LIB_DEPENDS_theora= theora.0:${PORTSDIR}/multimedia/libtheora diff --git a/audio/liquidsoap/files/patch-ocaml-ao-0.1.10_src_ao__stubs.c b/audio/liquidsoap/files/patch-ocaml-ao-0.1.10_src_ao__stubs.c new file mode 100644 index 000000000000..b5536308f828 --- /dev/null +++ b/audio/liquidsoap/files/patch-ocaml-ao-0.1.10_src_ao__stubs.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- ocaml-ao-0.1.10/src/ao_stubs.c.orig ++++ ocaml-ao-0.1.10/src/ao_stubs.c +@@ -138,6 +138,7 @@ + value channels, + value byte_format) + { ++ memset(format, 0, sizeof(*format)); + format->bits = Int_val(bits); + format->rate = Int_val(rate); + format->channels = Int_val(channels); diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile index 2b77b798eb31..7c49630d0128 100644 --- a/audio/liteamp/Makefile +++ b/audio/liteamp/Makefile @@ -6,14 +6,14 @@ PORTNAME= liteamp PORTVERSION= 0.2.3.2 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= audio gnome MASTER_SITES= http://kldp.net/frs/download.php/547/ MAINTAINER= ports@FreeBSD.org COMMENT= Light-weight Music Player for GNOME2 -LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \ +LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \ mad.2:${PORTSDIR}/audio/mad \ vorbisfile.6:${PORTSDIR}/audio/libvorbis diff --git a/audio/liteamp/files/patch-src_playback.c b/audio/liteamp/files/patch-src_playback.c new file mode 100644 index 000000000000..17e83dfc69f8 --- /dev/null +++ b/audio/liteamp/files/patch-src_playback.c @@ -0,0 +1,10 @@ +--- src/playback.c.orig 2010-06-05 23:11:54.000000000 +0200 ++++ src/playback.c 2010-06-05 23:12:22.000000000 +0200 +@@ -275,6 +275,7 @@ void playback_open_playdevice(int srate, + and restore it afterwards */ + signal(SIGINT, SIG_DFL); + ++ memset(&format, 0, sizeof(format)); + format.bits = bitrate; + format.rate = srate; + format.channels = nch; diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile index 5af3d7da85ab..f8a1e70f04da 100644 --- a/audio/mpg321/Makefile +++ b/audio/mpg321/Makefile @@ -7,14 +7,14 @@ PORTNAME= mpg321 PORTVERSION= 0.2.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= SF MAINTAINER= naddy@FreeBSD.org COMMENT= A free command-line mp3 player, compatible with mpg123 -LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \ +LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \ id3tag.0:${PORTSDIR}/audio/libid3tag \ mad.2:${PORTSDIR}/audio/libmad diff --git a/audio/mpg321/files/patch-ao.c b/audio/mpg321/files/patch-ao.c new file mode 100644 index 000000000000..9691820d0e17 --- /dev/null +++ b/audio/mpg321/files/patch-ao.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- ao.c.orig ++++ ao.c +@@ -229,6 +229,7 @@ + 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); diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 317aca6ce67a..9047d9a9e370 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= musicpd PORTVERSION= 0.15.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio ipv6 MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION} DISTNAME= mpd-${PORTVERSION} @@ -184,7 +184,7 @@ CONFIGURE_ARGS+=--disable-ipv6 .if defined(WITH_AO) CONFIGURE_ARGS+=--enable-ao -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao .else CONFIGURE_ARGS+=--disable-ao .endif diff --git a/audio/musicpd/files/patch-src_output_ao__plugin.c b/audio/musicpd/files/patch-src_output_ao__plugin.c new file mode 100644 index 000000000000..70a3c967d53a --- /dev/null +++ b/audio/musicpd/files/patch-src_output_ao__plugin.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- src/output/ao_plugin.c.orig ++++ src/output/ao_plugin.c +@@ -175,6 +175,7 @@ + if (audio_format->bits > 16) + audio_format->bits = 16; + ++ memset(&format, 0, sizeof(format)); + format.bits = audio_format->bits; + format.rate = audio_format->sample_rate; + format.byte_format = AO_FMT_NATIVE; diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile index 08b6b85c28ba..9fbd73ccffd9 100644 --- a/audio/playgsf/Makefile +++ b/audio/playgsf/Makefile @@ -7,6 +7,7 @@ PORTNAME= playgsf PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://projects.raphnet.net/playgsf/ \ CRITICAL @@ -14,7 +15,7 @@ MASTER_SITES= http://projects.raphnet.net/playgsf/ \ MAINTAINER= ehaupt@FreeBSD.org COMMENT= A command line player for gsf audio files -LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile index 4af96eaf1d4a..c02794b6f544 100644 --- a/audio/py-ao/Makefile +++ b/audio/py-ao/Makefile @@ -7,6 +7,7 @@ PORTNAME= ao PORTVERSION= 0.82 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= http://ekyo.nerim.net/software/pyogg/ \ http://www.sourcefiles.org/Programming/Development/Modules/Python/ @@ -16,7 +17,7 @@ DISTNAME= pyao-${PORTVERSION} MAINTAINER= xride@FreeBSD.org COMMENT= A python wrapper for ao, an audio device abstraction library -LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/aomodule.so USE_PYTHON= yes diff --git a/audio/py-ao/files/patch-src_aomodule.c b/audio/py-ao/files/patch-src_aomodule.c new file mode 100644 index 000000000000..b4d686943e39 --- /dev/null +++ b/audio/py-ao/files/patch-src_aomodule.c @@ -0,0 +1,66 @@ +--- src/aomodule.c.orig 2010-06-06 18:41:04.000000000 +0200 ++++ src/aomodule.c 2010-06-06 18:45:01.000000000 +0200 +@@ -4,7 +4,7 @@ + static ao_option * + dict_to_options(PyObject *dict) + { +- int pos = 0; ++ Py_ssize_t pos = 0; + PyObject *key, *val; + ao_option *head = NULL; + int ret; +@@ -71,7 +71,7 @@ parse_args(PyObject *args, PyObject *kwa + + *overwrite = 0; + +- if(PyArg_ParseTupleAndKeywords(args, kwargs, "s|llllO!sl", ++ if(PyArg_ParseTupleAndKeywords(args, kwargs, "s|iiiiO!si", + (char **) driver_name_kwlist, + &driver_name, + &format->bits, +@@ -84,7 +84,7 @@ parse_args(PyObject *args, PyObject *kwa + *driver_id = ao_driver_id(driver_name); + } else { + PyErr_Clear(); +- if(!(PyArg_ParseTupleAndKeywords(args, kwargs, "i|llllO!sl", ++ if(!(PyArg_ParseTupleAndKeywords(args, kwargs, "i|iiiiO!si", + (char **) driver_id_kwlist, + driver_id, + &format->bits, +@@ -114,6 +114,7 @@ py_ao_new(PyObject *self, PyObject *args + ao_sample_format sample_format; + ao_Object *retobj; + ++ memset(&sample_format, 0, sizeof(sample_format)); + if (!parse_args(args, kwargs, + &sample_format, &py_options, + &filename, &driver_id, &overwrite)) +@@ -141,8 +142,9 @@ py_ao_new(PyObject *self, PyObject *args + return NULL; + } + +- retobj = (ao_Object *) PyObject_NEW(ao_Object, &ao_Type); ++ retobj = (ao_Object *) PyObject_New(ao_Object, &ao_Type); + retobj->dev = dev; ++ retobj->driver_id = driver_id; + return (PyObject *) retobj; + } + +@@ -150,7 +152,7 @@ static void + py_ao_dealloc(ao_Object *self) + { + ao_close(self->dev); +- PyMem_DEL(self); ++ PyObject_Del(self); + } + + static PyObject * +@@ -184,7 +186,7 @@ py_ao_driver_info(PyObject *self, PyObje + + /* It's a method */ + ao_Object *ao_self = (ao_Object *) self; +- info = ao_driver_info(ao_self->dev->driver_id); ++ info = ao_driver_info(ao_self->driver_id); + + } else { + diff --git a/audio/py-ao/files/patch-src_aomodule.h b/audio/py-ao/files/patch-src_aomodule.h new file mode 100644 index 000000000000..1309f423d2e8 --- /dev/null +++ b/audio/py-ao/files/patch-src_aomodule.h @@ -0,0 +1,10 @@ +--- src/aomodule.h.orig 2010-06-06 18:45:10.000000000 +0200 ++++ src/aomodule.h 2010-06-06 18:45:25.000000000 +0200 +@@ -9,6 +9,7 @@ + typedef struct { + PyObject_HEAD + ao_device *dev; ++ uint32_t driver_id; + } ao_Object; + + static PyObject *Py_aoError; diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile index 0c1bdfddc7f1..03719c7c908b 100644 --- a/audio/pytone/Makefile +++ b/audio/pytone/Makefile @@ -7,6 +7,7 @@ PORTNAME= pytone PORTVERSION= 3.0.2 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= http://www.luga.de/pytone/download/ \ http://redundancy.redundancy.org/mirror/ @@ -15,7 +16,7 @@ DISTNAME= PyTone-${PORTVERSION} MAINTAINER= lx@FreeBSD.org COMMENT= A music jukebox written in Python with a curses GUI -LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite23 \ ${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen diff --git a/audio/sox/Makefile b/audio/sox/Makefile index 736f98083a4c..47413d5fc355 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -7,7 +7,7 @@ PORTNAME= sox PORTVERSION= 14.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= SF @@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --with-distro="${CONFIGURE_TARGET} ${PKGNAME}" .if defined(WITH_AO) CONFIGURE_ARGS+= --with-ao -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao .else CONFIGURE_ARGS+= --without-ao .endif diff --git a/audio/squash/Makefile b/audio/squash/Makefile index cdda52ea6585..d9c29da5448c 100644 --- a/audio/squash/Makefile +++ b/audio/squash/Makefile @@ -6,7 +6,7 @@ PORTNAME= squash PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,7 +19,7 @@ LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac \ id3-3.8.3:${PORTSDIR}/audio/id3lib \ mad.2:${PORTSDIR}/audio/mad \ vorbis.4:${PORTSDIR}/audio/libvorbis \ - ao.3:${PORTSDIR}/audio/libao + ao.4:${PORTSDIR}/audio/libao RUN_DEPENDS= id3v2:${PORTSDIR}/audio/id3v2 USE_BZIP2= yes diff --git a/audio/squash/files/patch-src::player.c b/audio/squash/files/patch-src::player.c new file mode 100644 index 000000000000..580094e4c0f0 --- /dev/null +++ b/audio/squash/files/patch-src::player.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- src/player.c.orig ++++ src/player.c +@@ -118,6 +118,7 @@ + char *full_filename; + long start_position; + ++ memset(&sound_format, 0, sizeof(sound_format)); + play_state = STATE_BEFORE_SONG; + + /* make the compiler happy */ diff --git a/audio/uade/Makefile b/audio/uade/Makefile index 5d4062431784..fb0e5df1f739 100644 --- a/audio/uade/Makefile +++ b/audio/uade/Makefile @@ -7,6 +7,7 @@ PORTNAME= uade PORTVERSION= 2.13 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://zakalwe.fi/uade/uade2/ \ CRITICAL @@ -14,7 +15,7 @@ MASTER_SITES= http://zakalwe.fi/uade/uade2/ \ MAINTAINER= ehaupt@FreeBSD.org COMMENT= Unix Amiga Delitracker Emulator -LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao HAS_CONFIGURE= yes USE_BZIP2= yes diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile index c27a2ccf5a73..0b94be5f15c8 100644 --- a/audio/umodplayer/Makefile +++ b/audio/umodplayer/Makefile @@ -8,7 +8,7 @@ PORTNAME= umodplayer PORTVERSION= 0.${DISTVERSION:L} DISTVERSION= B5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/UModPlayer%20B5 DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Console module player LIB_DEPENDS= modplug.1:${PORTSDIR}/audio/libmodplug \ - ao.3:${PORTSDIR}/audio/libao + ao.4:${PORTSDIR}/audio/libao BUILD_DEPENDS= ${LOCALBASE}/lib/libaiff.a:${PORTSDIR}/audio/libaiff HAS_CONFIGURE= yes diff --git a/audio/umodplayer/files/patch-coresound.c b/audio/umodplayer/files/patch-coresound.c new file mode 100644 index 000000000000..840eea292329 --- /dev/null +++ b/audio/umodplayer/files/patch-coresound.c @@ -0,0 +1,10 @@ +--- coresound.c.orig 2010-06-06 14:23:02.000000000 +0200 ++++ coresound.c 2010-06-06 14:23:40.000000000 +0200 +@@ -132,6 +132,7 @@ CoreSound_InitAudio() + if (drv < 0) + return FALSE; + ++ memset(&fmt, 0, sizeof(fmt)); + fmt.rate = sets.samplerate; + fmt.bits = 16; + fmt.byte_format = AO_FMT_NATIVE; diff --git a/audio/waon/Makefile b/audio/waon/Makefile index 0dbd530804a6..db951714008f 100644 --- a/audio/waon/Makefile +++ b/audio/waon/Makefile @@ -7,7 +7,7 @@ PORTNAME= waon PORTVERSION= 0.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= SF @@ -15,7 +15,7 @@ MAINTAINER= kichiki@users.sourceforge.net COMMENT= A Wave-to-Notes transcriber and some utility tools LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 \ - ao.3:${PORTSDIR}/audio/libao \ + ao.4:${PORTSDIR}/audio/libao \ sndfile.1:${PORTSDIR}/audio/libsndfile \ samplerate.1:${PORTSDIR}/audio/libsamplerate diff --git a/audio/waon/files/patch-ao-wrapper.c b/audio/waon/files/patch-ao-wrapper.c new file mode 100644 index 000000000000..4b7aeb3d77f4 --- /dev/null +++ b/audio/waon/files/patch-ao-wrapper.c @@ -0,0 +1,10 @@ +--- ao-wrapper.c.orig 2010-06-06 14:28:59.000000000 +0200 ++++ ao-wrapper.c 2010-06-06 14:29:25.000000000 +0200 +@@ -53,6 +53,7 @@ ao_init_16_stereo (int samplerate, int v + + default_driver = ao_default_driver_id (); + ++ memset(&format, 0, sizeof(format)); + format.bits = 16; + format.channels = 2; + format.rate = samplerate; diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index 33191d46e10c..6ef5d28c588a 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -7,7 +7,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.6 -PORTREVISION= 5 +PORTREVISION= 6 DISTVERSIONSUFFIX=DrMattDestruction CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction @@ -97,7 +97,7 @@ PLIST_SUB+= AIRPLAY="@comment " .endif .if !defined(WITHOUT_AO) -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao PLIST_SUB+= AO="" .else EXCLUDE+= --without-plugins="ao" diff --git a/audio/xmms2/files/patch-src_plugins_ao_ao.c b/audio/xmms2/files/patch-src_plugins_ao_ao.c new file mode 100644 index 000000000000..c05085ab24f1 --- /dev/null +++ b/audio/xmms2/files/patch-src_plugins_ao_ao.c @@ -0,0 +1,10 @@ +--- src/plugins/ao/ao.c.orig ++++ src/plugins/ao/ao.c +@@ -160,6 +160,7 @@ + + /* 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; diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index 0d5cee1f0ac3..4ba55d838feb 100644 --- a/comms/aldo/Makefile +++ b/comms/aldo/Makefile @@ -7,6 +7,7 @@ PORTNAME= aldo PORTVERSION= 0.7.5 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/comms/aldo/files/patch-src_audioworkspace.cc b/comms/aldo/files/patch-src_audioworkspace.cc new file mode 100644 index 000000000000..8dc79addc8da --- /dev/null +++ b/comms/aldo/files/patch-src_audioworkspace.cc @@ -0,0 +1,10 @@ +--- src/audioworkspace.cc.orig 2010-06-06 14:43:58.000000000 +0200 ++++ src/audioworkspace.cc 2010-06-06 14:44:27.000000000 +0200 +@@ -104,6 +104,7 @@ oastream AudioWorkSpace::create_output_s + { + ao_sample_format format; + ++ memset(&format, 0, sizeof(format)); + format.bits = m_bits; + format.channels = m_channels; + format.rate = m_sample_rate; diff --git a/emulators/bsnes/Makefile b/emulators/bsnes/Makefile index 9e647e561da7..0e7af2873023 100644 --- a/emulators/bsnes/Makefile +++ b/emulators/bsnes/Makefile @@ -6,7 +6,7 @@ PORTNAME= bsnes PORTVERSION= 0.58 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://byuu.org/files/ \ ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/ @@ -73,7 +73,7 @@ AUDIO_DRIVER+= audio.pulseaudio .endif .if defined(WITH_SOUND_AO) -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao AUDIO_DRIVER+= audio.ao .endif diff --git a/emulators/bsnes/files/patch-src_lib_ruby_audio_ao.cpp b/emulators/bsnes/files/patch-src_lib_ruby_audio_ao.cpp new file mode 100644 index 000000000000..6cd66ebbde34 --- /dev/null +++ b/emulators/bsnes/files/patch-src_lib_ruby_audio_ao.cpp @@ -0,0 +1,10 @@ +--- src/lib/ruby/audio/ao.cpp.orig 2010-06-06 18:49:07.000000000 +0200 ++++ src/lib/ruby/audio/ao.cpp 2010-06-06 18:49:30.000000000 +0200 +@@ -51,6 +51,7 @@ public: + driver_id = ao_default_driver_id(); //ao_driver_id((const char*)driver) + if(driver_id < 0) return false; + ++ memset(&driver_format, 0, sizeof(driver_format)); + driver_format.bits = 16; + driver_format.channels = 2; + driver_format.rate = settings.frequency; diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index b179fbe23eb2..785ca8975acf 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -7,7 +7,7 @@ PORTNAME= fuse PORTVERSION= 0.10.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION} @@ -31,7 +31,7 @@ OPTIONS= AO "Use libao for audio output" off \ .if defined(WITH_AO) CONFIGURE_ARGS+=--with-libao -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao .endif .if !defined(WITHOUT_SAMPLERATE) diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index 747f09e2e6a0..02316eedb770 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -7,7 +7,7 @@ PORTNAME= zsnes PORTVERSION= 1.51 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ZSNES%20v${PORTVERSION} @@ -78,7 +78,7 @@ CONFIGURE_ARGS+= --disable-opengl .endif .if defined(WITH_LIBAO) -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao CONFIGURE_ARGS+= --enable-libao .else CONFIGURE_ARGS+= --disable-libao diff --git a/emulators/zsnes/files/patch-linux_audio.c b/emulators/zsnes/files/patch-linux_audio.c new file mode 100644 index 000000000000..a88985a34fa5 --- /dev/null +++ b/emulators/zsnes/files/patch-linux_audio.c @@ -0,0 +1,10 @@ +--- linux/audio.c.orig 2010-06-06 14:56:20.000000000 +0200 ++++ linux/audio.c 2010-06-06 14:56:41.000000000 +0200 +@@ -166,6 +166,7 @@ static int SoundInit_ao() + if (driver_id < 0) { driver_id = ao_default_driver_id(); } + + ao_sample_format driver_format; ++ memset(&driver_format, 0, sizeof(driver_format)); + driver_format.bits = 16; + driver_format.channels = StereoSound+1; + driver_format.rate = freqtab[SoundQuality = ((SoundQuality > 6) ? 1 : SoundQuality)]; diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index ed3ce1cd596b..43b478f0e858 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -7,7 +7,7 @@ PORTNAME= gcompris PORTVERSION= 9.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games gnome MASTER_SITES= SF DISTNAME= gcompris-9.2-2 @@ -19,7 +19,7 @@ BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html \ gnuchess:${PORTSDIR}/games/gnuchess \ ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20 LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ - ao.3:${PORTSDIR}/audio/libao \ + ao.4:${PORTSDIR}/audio/libao \ assetml.0:${PORTSDIR}/devel/libassetml \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ gnet-2.0.0:${PORTSDIR}/net/gnet2 \ diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index d30933b7e6f6..ab3b304b922e 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -7,7 +7,7 @@ PORTNAME= quake2forge PORTVERSION= 0.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= https://www.spoerlein.net/pub/ DISTNAME= quake2-${PORTVERSION} @@ -40,7 +40,7 @@ USE_XORG= xxf86dga .endif .if defined(WITH_AO) -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao CONFIGURE_ARGS+=--with-ao=${LOCALBASE} PLIST_SUB+= AO="" .else diff --git a/games/quake2forge/files/patch-src__snd_ao.c b/games/quake2forge/files/patch-src__snd_ao.c new file mode 100644 index 000000000000..66ea0431d7e1 --- /dev/null +++ b/games/quake2forge/files/patch-src__snd_ao.c @@ -0,0 +1,10 @@ +--- src/snd_ao.c.orig 2010-06-06 16:01:19.000000000 +0200 ++++ src/snd_ao.c 2010-06-06 16:01:46.000000000 +0200 +@@ -62,6 +62,7 @@ qboolean SNDDMA_Init(struct sndinfo * s) + } + } + ++ memset(&format, 0, sizeof(format)); + format.bits = si->dma->samplebits = si->bits->value; + format.rate = si->dma->speed = 44100; + format.channels = si->dma->channels = si->channels->value; diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile index b23a0e3af9ab..62e82d2343cb 100644 --- a/multimedia/dvbcut/Makefile +++ b/multimedia/dvbcut/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvbcut PORTVERSION= 0.6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://www.mr511.de/dvbcut/ @@ -16,7 +16,7 @@ COMMENT= Qt application for cutting of MPEG PS and MPEG TS streams (DVB) BUILD_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ - ao.3:${PORTSDIR}/audio/libao \ + ao.4:${PORTSDIR}/audio/libao \ mad.2:${PORTSDIR}/audio/libmad \ avutil.1:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS:= ${BUILD_DEPENDS} diff --git a/multimedia/dvbcut/files/patch-src_playaudio.cpp b/multimedia/dvbcut/files/patch-src_playaudio.cpp new file mode 100644 index 000000000000..bc3db4c00401 --- /dev/null +++ b/multimedia/dvbcut/files/patch-src_playaudio.cpp @@ -0,0 +1,10 @@ +--- src/playaudio.cpp.orig 2010-06-06 16:19:25.000000000 +0200 ++++ src/playaudio.cpp 2010-06-06 16:19:47.000000000 +0200 +@@ -55,6 +55,7 @@ public: + + ao_sample_format format; + ++ memset(&format, 0, sizeof(format)); + format.bits = 16; + format.channels = channels; + format.rate = samplerate; diff --git a/multimedia/shell-fm/Makefile b/multimedia/shell-fm/Makefile index 32313050720e..2805d9430800 100644 --- a/multimedia/shell-fm/Makefile +++ b/multimedia/shell-fm/Makefile @@ -7,7 +7,7 @@ PORTNAME= shell-fm PORTVERSION= 0.7 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= multimedia MASTER_SITES= http://nex.scrapping.cc/shell-fm/releases/ diff --git a/net/vyqchat/Makefile b/net/vyqchat/Makefile index 700f45d937cc..fc0e230506aa 100644 --- a/net/vyqchat/Makefile +++ b/net/vyqchat/Makefile @@ -7,7 +7,7 @@ PORTNAME= vyqchat PORTVERSION= 0.2.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= http://linux.bydg.org/~yogin/ diff --git a/net/vyqchat/files/patch-src-sound.cpp b/net/vyqchat/files/patch-src-sound.cpp new file mode 100644 index 000000000000..9119cf1d8d3a --- /dev/null +++ b/net/vyqchat/files/patch-src-sound.cpp @@ -0,0 +1,10 @@ +--- src/sound.cpp.orig 2010-06-06 16:28:57.000000000 +0200 ++++ src/sound.cpp 2010-06-06 16:29:34.000000000 +0200 +@@ -173,6 +173,7 @@ void SoundLibAo::play(VyEvent evt)/*{{{* + { + ao_sample_format frmt; + ++ memset(&frmt, 0, sizeof(frmt)); + frmt.bits = sizeof(short) << 3; + frmt.channels = sfinf[evt].channels; + frmt.rate = sfinf[evt].samplerate; diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index e6a86a7e4364..8d78daa8730d 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -7,7 +7,7 @@ PORTNAME?= cdrdao PORTVERSION= 1.2.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= sysutils audio MASTER_SITES= SF MASTER_SITE_SUBDIR= cdrdao/cdrdao/${PORTVERSION} @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -MP3OGG_LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \ +MP3OGG_LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \ mad.2:${PORTSDIR}/audio/libmad \ vorbis.4:${PORTSDIR}/audio/libvorbis diff --git a/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc b/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc new file mode 100644 index 000000000000..1134a8b59a9f --- /dev/null +++ b/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc @@ -0,0 +1,10 @@ +--- trackdb/FormatMp3.cc.orig 2010-06-06 16:45:00.000000000 +0200 ++++ trackdb/FormatMp3.cc 2010-06-06 16:45:36.000000000 +0200 +@@ -111,6 +111,7 @@ FormatSupport::Status FormatMp3::madInit + + // Initialize libao for WAV output; + ao_sample_format out_format; ++ memset(&out_format, 0, sizeof(out_format)); + out_format.bits = 16; + out_format.rate = 44100; + out_format.channels = 2; diff --git a/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc b/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc new file mode 100644 index 000000000000..6647a3309f0d --- /dev/null +++ b/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc @@ -0,0 +1,10 @@ +--- trackdb/FormatOgg.cc.orig 2010-06-06 16:45:05.000000000 +0200 ++++ trackdb/FormatOgg.cc 2010-06-06 16:48:23.000000000 +0200 +@@ -84,6 +84,7 @@ FormatSupport::Status FormatOgg::oggInit + return FS_WRONG_FORMAT; + } + ++ memset(&outFormat_, 0, sizeof(outFormat_)); + outFormat_.bits = 16; + outFormat_.rate = 44100; + outFormat_.channels = 2; diff --git a/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc b/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc new file mode 100644 index 000000000000..2e5bde7b6ebc --- /dev/null +++ b/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc @@ -0,0 +1,10 @@ +--- xdao/SoundIF-ao.cc.orig 2010-06-06 16:37:14.000000000 +0200 ++++ xdao/SoundIF-ao.cc 2010-06-06 16:42:17.000000000 +0200 +@@ -37,6 +37,7 @@ SoundIF::SoundIF() + + impl_ = new SoundIFImpl; + impl_->driverId = ao_default_driver_id(); ++ memset(&impl_->format, 0, sizeof(impl_->format)); + impl_->format.bits = 16; + impl_->format.rate = 44100; + impl_->format.channels = 2; diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index c1069a755710..175e63cf7c9e 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnustep-gui .if defined(WITH_GNUSTEP_DEVEL) PORTVERSION= 0.19.0 +PORTREVISION= 1 .else PORTVERSION= 0.17.1 PORTREVISION= 2 @@ -25,7 +26,7 @@ LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib .if defined(WITH_GNUSTEP_DEVEL) LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao BUILD_DEPENDS+= ${LOCALBASE}/lib/libflite.a:${PORTSDIR}/audio/flite .else LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile diff --git a/x11-toolkits/gnustep-gui/files/patch-Tools_sound_AudioOutputSink.m b/x11-toolkits/gnustep-gui/files/patch-Tools_sound_AudioOutputSink.m new file mode 100644 index 000000000000..4610c84a9431 --- /dev/null +++ b/x11-toolkits/gnustep-gui/files/patch-Tools_sound_AudioOutputSink.m @@ -0,0 +1,10 @@ +--- Tools/sound/AudioOutputSink.m.orig 2010-06-06 18:12:07.000000000 +0200 ++++ Tools/sound/AudioOutputSink.m 2010-06-06 18:12:53.000000000 +0200 +@@ -72,6 +72,7 @@ + return nil; + } + ++ memset(&_format, 0, sizeof(_format)); + _format.channels = (int)channelCount; + _format.rate = (int)sampleRate; + |