diff --git a/.gitignore b/.gitignore index fb13127..bdb97f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libao-0.8.8.tar.gz +/libao-1.0.0.tar.gz diff --git a/libao-0.8.8-bigendianfix.patch b/libao-0.8.8-bigendianfix.patch deleted file mode 100644 index 8259e01..0000000 --- a/libao-0.8.8-bigendianfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libao-0.8.8/src/plugins/pulse/ao_pulse.c.orig 2007-05-24 10:19:07.000000000 +0100 -+++ libao-0.8.8/src/plugins/pulse/ao_pulse.c 2008-07-05 21:44:47.000000000 +0100 -@@ -75,7 +75,7 @@ - const char *fn; - struct pa_simple *s; - static const struct pa_sample_spec ss = { -- .format = PA_SAMPLE_S16LE, -+ .format = PA_SAMPLE_S16NE, - .rate = 44100, - .channels = 2 - }; diff --git a/libao-1.0.0-ao-pulse-fixes.patch b/libao-1.0.0-ao-pulse-fixes.patch new file mode 100644 index 0000000..ccc4ea7 --- /dev/null +++ b/libao-1.0.0-ao-pulse-fixes.patch @@ -0,0 +1,26 @@ +--- libao-1.0.0.org/src/plugins/pulse/ao_pulse.c 2010-08-28 21:58:41.342849694 +0530 ++++ libao-1.0.0/src/plugins/pulse/ao_pulse.c 2010-08-28 21:59:38.720849639 +0530 +@@ -227,7 +227,7 @@ + } + + +- if (!(internal->simple = pa_simple_new(internal->server, fn ? t : "libao", PA_STREAM_PLAYBACK, internal->sink, fn ? t2 : "libao playback stream", &ss, &map, NULL, NULL))) ++ if (!(internal->simple = pa_simple_new(internal->server, fn ? t : "libao", PA_STREAM_PLAYBACK, internal->sink, fn ? t2 : "libao playback stream", &ss, device->input_map ? &map : NULL, NULL, NULL))) + return 0; + + device->driver_byte_format = AO_FMT_NATIVE; +@@ -247,9 +247,11 @@ + assert(device && device->internal); + ao_pulse_internal *internal = (ao_pulse_internal *) device->internal; + +- pa_simple_drain(internal->simple, NULL); +- pa_simple_free(internal->simple); +- internal->simple = NULL; ++ if (internal->simple) { ++ pa_simple_drain(internal->simple, NULL); ++ pa_simple_free(internal->simple); ++ internal->simple = NULL; ++ } + + return 1; + } diff --git a/libao.spec b/libao.spec index b1c8c12..96a7320 100644 --- a/libao.spec +++ b/libao.spec @@ -1,13 +1,14 @@ Name: libao -Version: 0.8.8 -Release: 10%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Cross Platform Audio Output Library Group: System Environment/Libraries License: GPLv2+ URL: http://xiph.org/ao/ Source0: http://downloads.xiph.org/releases/ao/%{name}-%{version}.tar.gz Source1: ao.req -Patch0: libao-0.8.8-bigendianfix.patch +#libao-1.0.0 Pulse Audio Fix, patch from upstream +Patch0: libao-1.0.0-ao-pulse-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: esound-devel >= 0.2.8 BuildRequires: arts-devel @@ -87,6 +88,24 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 28 2010 Rakesh Pandit - 1.0.0-1 +- Updated to 1.0.0 + * AO returned to active development + * Added surround channel mapping API and capability + * Updated all drivers on modern installs + * New config file options + * Driver options may be specified in config file + * Support for MacOSX updated to 10.5 and later + * Build in WMM driver rather than using dlopen() + * Added Roar Audio driver + * Added OpenBSD SNDIO driver + * Workaround for ESD non-4096 byte write bug + * Workaround aRts server crash bug + * Workaround for VIA82xx click/crackle bugs under ALSA + * Remove dead/unused drivers (solaris, alasa05, mmsound) + * Numerous patches from multiple downstreams +- Patch from upstream: libao-1.0.0 Pulse Audio Fix + * Fri Jan 15 2010 Michael Schwendt - 0.8.8-10 - Replace the broken/expensive file dependency in release -8/-9 with an arch-specific base package dependency if %%_isa is defined. diff --git a/sources b/sources index 1443052..974dc01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b92cba3cbcf1ee9bc221118a85d23dcd libao-0.8.8.tar.gz +08283fbe1f587619053a156254afecec libao-1.0.0.tar.gz