Index: head/audio/libao/Makefile =================================================================== --- head/audio/libao/Makefile (revision 419926) +++ head/audio/libao/Makefile (revision 419927) @@ -1,42 +1,46 @@ # Created by: t.vanklaveren@student.utwente.nl # $FreeBSD$ PORTNAME= libao PORTVERSION= 1.2.0 PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/ao/ MAINTAINER= naddy@FreeBSD.org COMMENT= Portable audio output library LICENSE= GPLv2 USES= libtool pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ + --disable-alsa \ --disable-arts INSTALL_TARGET= install-strip # do not install MAKE_ARGS= ckport_DATA="" -OPTIONS_DEFINE= DOCS ESOUND NAS PULSEAUDIO +OPTIONS_DEFINE= DOCS ESOUND NAS PULSEAUDIO SNDIO OPTIONS_SUB= yes NAS_LIB_DEPENDS=libaudio.so:audio/nas NAS_CONFIGURE_ENABLE= nas PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse ESOUND_CONFIGURE_ENABLE=esd ESOUND_USE= GNOME=esound + +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_USES= localbase post-patch: @${REINPLACE_CMD} -e 's|/etc/libao.conf|${PREFIX}&|' \ ${WRKSRC}/libao.conf.5 ${WRKSRC}/include/ao/ao_private.h \ ${WRKSRC}/doc/config.html .include Index: head/audio/libao/files/patch-src_plugins_sndio_ao__sndio.c =================================================================== --- head/audio/libao/files/patch-src_plugins_sndio_ao__sndio.c (nonexistent) +++ head/audio/libao/files/patch-src_plugins_sndio_ao__sndio.c (revision 419927) @@ -0,0 +1,58 @@ +$OpenBSD: patch-src_plugins_sndio_ao_sndio_c,v 1.3 2014/05/27 19:44:56 naddy Exp $ +--- src/plugins/sndio/ao_sndio.c.orig 2012-02-14 00:46:06 UTC ++++ src/plugins/sndio/ao_sndio.c +@@ -99,6 +99,7 @@ int ao_plugin_set_option(ao_device *devi + int ao_plugin_open(ao_device *device, ao_sample_format *format) + { + ao_sndio_internal *internal = (ao_sndio_internal *) device->internal; ++ struct sio_hdl *hdl; + struct sio_par par; + + if(!internal->dev && internal->id>=0){ +@@ -107,20 +108,26 @@ int ao_plugin_open(ao_device *device, ao + internal->dev = strdup(buf); + } + +- internal->hdl = sio_open(internal->dev, SIO_PLAY, 0); +- if (internal->hdl == NULL) ++ hdl = sio_open(internal->dev, SIO_PLAY, 0); ++ if (hdl == NULL) + return 0; ++ internal->hdl = hdl; + + sio_initpar(&par); + par.sig = 1; +- par.le = SIO_LE_NATIVE; ++ if (format->bits > 8) ++ par.le = device->client_byte_format == AO_FMT_LITTLE ? 1 : 0; + par.bits = format->bits; + par.rate = format->rate; + par.pchan = device->output_channels; +- if (!sio_setpar(internal->hdl, &par)) ++ if (!sio_setpar(hdl, &par)) + return 0; +- device->driver_byte_format = AO_FMT_NATIVE; +- if (!sio_start(internal->hdl)) ++ if (!sio_getpar(hdl, &par)) ++ return 0; ++ if (par.bits != format->bits) ++ return 0; ++ device->driver_byte_format = par.le ? AO_FMT_LITTLE : AO_FMT_BIG; ++ if (!sio_start(hdl)) + return 0; + + if(!device->inter_matrix){ +@@ -148,9 +155,10 @@ int ao_plugin_close(ao_device *device) + ao_sndio_internal *internal = (ao_sndio_internal *) device->internal; + struct sio_hdl *hdl = internal->hdl; + +- if(hdl) +- if (!sio_stop(hdl)) +- return 0; ++ if(hdl){ ++ sio_close(hdl); ++ internal->hdl = NULL; ++ } + return 1; + } + Property changes on: head/audio/libao/files/patch-src_plugins_sndio_ao__sndio.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/libao/pkg-plist =================================================================== --- head/audio/libao/pkg-plist (revision 419926) +++ head/audio/libao/pkg-plist (revision 419927) @@ -1,50 +1,51 @@ include/ao/ao.h include/ao/os_types.h include/ao/plugin.h lib/libao.a lib/libao.so lib/libao.so.4 lib/libao.so.4.1.0 lib/ao/plugins-4/liboss.so %%ESOUND%%lib/ao/plugins-4/libesd.so %%NAS%%lib/ao/plugins-4/libnas.so %%PULSEAUDIO%%lib/ao/plugins-4/libpulse.so +%%SNDIO%%lib/ao/plugins-4/libsndio.so libdata/pkgconfig/ao.pc man/man5/libao.conf.5.gz share/aclocal/ao.m4 %%PORTDOCS%%%%DOCSDIR%%/ao_append_option.html %%PORTDOCS%%%%DOCSDIR%%/ao_close.html %%PORTDOCS%%%%DOCSDIR%%/ao_default_driver_id.html %%PORTDOCS%%%%DOCSDIR%%/ao_device.html %%PORTDOCS%%%%DOCSDIR%%/ao_driver_id.html %%PORTDOCS%%%%DOCSDIR%%/ao_driver_info.html %%PORTDOCS%%%%DOCSDIR%%/ao_driver_info_list.html %%PORTDOCS%%%%DOCSDIR%%/ao_example.c %%PORTDOCS%%%%DOCSDIR%%/ao_file_extension.html %%PORTDOCS%%%%DOCSDIR%%/ao_free_options.html %%PORTDOCS%%%%DOCSDIR%%/ao_info.html %%PORTDOCS%%%%DOCSDIR%%/ao_initialize.html %%PORTDOCS%%%%DOCSDIR%%/ao_is_big_endian.html %%PORTDOCS%%%%DOCSDIR%%/ao_open_file.html %%PORTDOCS%%%%DOCSDIR%%/ao_open_live.html %%PORTDOCS%%%%DOCSDIR%%/ao_option.html %%PORTDOCS%%%%DOCSDIR%%/ao_play.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_close.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_device_clear.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_device_init.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_driver_info.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_file_extension.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_open.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_play.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_set_option.html %%PORTDOCS%%%%DOCSDIR%%/ao_plugin_test.html %%PORTDOCS%%%%DOCSDIR%%/ao_sample_format.html %%PORTDOCS%%%%DOCSDIR%%/ao_shutdown.html %%PORTDOCS%%%%DOCSDIR%%/config.html %%PORTDOCS%%%%DOCSDIR%%/drivers.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/libao-api.html %%PORTDOCS%%%%DOCSDIR%%/overview.html %%PORTDOCS%%%%DOCSDIR%%/plugin-api.html %%PORTDOCS%%%%DOCSDIR%%/plugin-overview.html %%PORTDOCS%%%%DOCSDIR%%/style.css