[libao/f14/master] - Silence plugin load errors when arts or esd is not installed (#645924)

[Hans de Goede]

commit 2abfa3150b0e13c7db6bbdd79e916490bf707b0e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Nov 5 10:57:43 2010 +0100

    - Silence plugin load errors when arts or esd is not installed (#645924)

 libao-1.0.0-silence-plugin-loading.patch |   14 ++++++++++++++
 libao.spec                               |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/libao-1.0.0-silence-plugin-loading.patch b/libao-1.0.0-silence-plugin-loading.patch
new file mode 100644
index 0000000..84d75fe
--- /dev/null
+++ b/libao-1.0.0-silence-plugin-loading.patch
@@ -0,0 +1,14 @@
+diff -up libao-1.0.0/src/audio_out.c~ libao-1.0.0/src/audio_out.c
+--- libao-1.0.0/src/audio_out.c~	2010-03-24 05:11:42.000000000 +0100
++++ libao-1.0.0/src/audio_out.c	2010-11-05 10:38:29.098337997 +0100
+@@ -189,7 +189,9 @@ static driver_list *_get_plugin(char *pl
+ 
+ 
+ 	} else {
+-          aerror("Failed to load plugin %s => dlopen() failed\n",plugin_file);
++	  /* HDG: Silence plugin load errors when the needed libs are not
++	     installed */
++          /* aerror("Failed to load plugin %s => dlopen() failed\n",plugin_file); */
+           return NULL;
+ 	}
+ 
diff --git a/libao.spec b/libao.spec
index 96a7320..5654f9e 100644
--- a/libao.spec
+++ b/libao.spec
@@ -1,6 +1,6 @@
 Name:           libao
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross Platform Audio Output Library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -9,6 +9,8 @@ Source0:        http://downloads.xiph.org/releases/ao/%{name}-%{version}.tar.gz
 Source1:        ao.req
 #libao-1.0.0 Pulse Audio Fix, patch from upstream
 Patch0:         libao-1.0.0-ao-pulse-fixes.patch
+#silence errors when ie libesd or libarts are not installed, rhbz#645924
+Patch1:         libao-1.0.0-silence-plugin-loading.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel >= 0.2.8
 BuildRequires:  arts-devel
@@ -40,6 +42,7 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 sed -i "s/-O20/$RPM_OPT_FLAGS/" configure
 sed -i "s/-ffast-math//" configure
@@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov  5 2010 Hans de Goede <hdegoede at redhat.com> - 1.0.0-2
+- Silence plugin load errors when arts or esd is not installed (#645924)
+
 * Sat Aug 28 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 1.0.0-1
 - Updated to 1.0.0
    * AO returned to active development