[packages/mpc123] - fixed defaults-alsa patch to initialize ao_dev when using default ao_driver - added ao patch to av

[qboosh]

commit f4ae2bb78b20021dbae005a3d234b90f2dd7bdc9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 2 21:00:18 2012 +0200

    - fixed defaults-alsa patch to initialize ao_dev when using default ao_driver
    - added ao patch to avoid trash in ao_sample_format.matrix field

 mpc123-ao.patch            | 10 ++++++++++
 mpc123-defaults-alsa.patch |  4 +++-
 mpc123.spec                |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/mpc123.spec b/mpc123.spec
index 844ca4c..dbecd71 100644
--- a/mpc123.spec
+++ b/mpc123.spec
@@ -10,6 +10,7 @@ Source0:	http://downloads.sourceforge.net/mpc123/%{name}-%{version}.tar.gz
 Patch0:		%{name}-defaults-alsa.patch
 Patch1:		%{name}-pl.po.patch
 Patch2:		%{name}-fixes.patch
+Patch3:		%{name}-ao.patch
 URL:		http://mpc123.sourceforge.net/
 BuildRequires:	gettext-devel
 BuildRequires:	libao-devel
@@ -39,6 +40,7 @@ funkcje to m.in:
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__make} \
diff --git a/mpc123-ao.patch b/mpc123-ao.patch
new file mode 100644
index 0000000..a811f50
--- /dev/null
+++ b/mpc123-ao.patch
@@ -0,0 +1,10 @@
+--- mpc123-0.2.4/ao.c.orig	2012-09-02 20:56:28.634622442 +0200
++++ mpc123-0.2.4/ao.c	2012-09-02 20:58:38.347953072 +0200
+@@ -134,6 +134,7 @@
+   ao_fmt.rate=streaminfo->sample_freq;
+   ao_fmt.channels=streaminfo->channels;
+   ao_fmt.byte_format=AO_FMT_LITTLE;
++  ao_fmt.matrix=NULL;
+ 
+   /* output audio params */
+   debugf("<ao_fmt> bits = %d", ao_fmt.bits);
diff --git a/mpc123-defaults-alsa.patch b/mpc123-defaults-alsa.patch
index affd679..e28d27a 100644
--- a/mpc123-defaults-alsa.patch
+++ b/mpc123-defaults-alsa.patch
@@ -11,13 +11,15 @@
      /* if the driver is set, but not the output device, use
 --- mpc123/ao.c.orig	2006-07-31 16:23:31.000000000 +0200
 +++ mpc123/ao.c	2007-11-16 21:43:43.149624990 +0100
-@@ -70,6 +70,11 @@ int mpc123_ao_init(void ** d, mpc_stream
+@@ -70,6 +70,13 @@ int mpc123_ao_init(void ** d, mpc_stream
    
    ao_initialize();
  
 +  if( !strcmp(options.ao_driver, "default") ){
 +    ao_dinfo = ao_driver_info(ao_default_driver_id());
 +    options.ao_driver = (ao_dinfo == NULL) ? "oss" : ao_dinfo->short_name;
++    if(!options.ao_dev)
++      mpc123_choose_default_dev_by_driver();
 +  }
 +
    ao_drvnum=ao_driver_id(options.ao_driver);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mpc123.git/commitdiff/028042eed2b49958903d9af964dc2b371706ac97