[libffado/f15/master] Update to svn1983, rebuild using gold linker. Fixes #684392

[Brendan Jones]

commit e74bff3de91b9eb095c6a8378974eb0944aec371
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Thu Apr 28 11:22:32 2011 +1000

    Update to svn1983, rebuild using gold linker. Fixes #684392

 .gitignore                  |    1 +
 libffado-add-link-flags     |   26 +++++++++++++
 libffado-libconfig145.patch |   12 ------
 libffado-no-shebang.patch   |   83 -------------------------------------------
 libffado.spec               |   31 ++++++++++------
 sources                     |    2 +-
 6 files changed, 47 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 065a8f3..2818779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libffado-2.0.1-svn1864.tar.bz2
 /libffado-2.1.0-svn1913.tar.bz2
+/libffado-2.1.0-svn1983.tar.bz2
diff --git a/libffado-add-link-flags b/libffado-add-link-flags
new file mode 100644
index 0000000..0ce8752
--- /dev/null
+++ b/libffado-add-link-flags
@@ -0,0 +1,26 @@
+diff -PNur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct
+--- libffado-2.1.0.orig/SConstruct	2011-04-21 21:32:11.000000000 +1000
++++ libffado-2.1.0/SConstruct	2011-04-25 23:42:12.000000000 +1000
+@@ -75,7 +75,7 @@
+     BoolVariable( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ),
+     BoolVariable( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ),
+     ( "COMPILE_FLAGS", "Add additional flags to the environment.\nOnly meant for distributors and gentoo-users who want to over-optimize their built.\n Using this is not supported by the ffado-devs!" ),
+-
++    ( "LINKFLAGS", "Add additional flags to the linker command line.","")
+     )
+ 
+ ## Load the builders in config
+diff -PNur libffado-2.1.0.orig/src/SConscript libffado-2.1.0/src/SConscript
+--- libffado-2.1.0.orig/src/SConscript	2010-09-11 07:50:58.000000000 +1000
++++ libffado-2.1.0/src/SConscript	2011-04-26 13:01:32.000000000 +1000
+@@ -280,6 +280,10 @@
+ 	if env['REQUIRE_LIBAVC']:
+ 		libenv.MergeFlags( env['LIBAVC1394_FLAGS'] )
+ 
++# Add additional linker flags
++if env['LINKFLAGS']:
++    libenv.MergeFlags( env['LINKFLAGS'] )
++
+ libname_versioned = "libffado.so.%s" % libenv['VERSION']
+ libname_versioned_short = "libffado.so.%s" % libenv['VERSION'].split('.')[0]
+ 
diff --git a/libffado.spec b/libffado.spec
index 1e3db7c..5df4729 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -5,15 +5,15 @@
 Summary:        Free firewire audio driver library
 Name:           libffado
 Version:        2.1.0
-Release:        0.2.20101015.svn1913%{?dist}
+Release:        0.3.20110426.svn1983%{?dist}
 # src/libutil/float_cast.h is LGPLv2+.
 # The rest is (GPLv2 or GPLv3)
 License:        LGPLv2+ and (GPLv2 or GPLv3)
 Group:          System Environment/Libraries
 URL:            http://www.ffado.org/
 # The trunk is tarballed as follows:
-# bash libffado-snapshot.sh 1913
-Source0:        %{name}-%{version}-svn1913.tar.bz2
+# bash libffado-snapshot.sh 1983
+Source0:        %{name}-%{version}-svn1983.tar.bz2
 # Additional README file until we have proper manpages
 Source1:        README.ffado
 # The fetch script
@@ -21,12 +21,8 @@ Source9:        libffado-snapshot.sh
 # We want the documentation for the library API only, not for the entire source:
 # http://subversion.ffado.org/ticket/293
 Patch0:         libffado-api-doc-only.patch
-# Clean the redundant shebangs
-# http://subversion.ffado.org/ticket/292
-Patch2:         libffado-no-shebang.patch
-# Make libffado compile against libconfig-1.4.5
-# http://subversion.ffado.org/ticket/290
-Patch4:         libffado-libconfig145.patch
+# Patch scons to receive additional LINK flags
+Patch1:         libffado-add-link-flags
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  dbus-c++-devel
@@ -81,17 +77,23 @@ Applications and utilities for use with libffado.
 %prep
 %setup -q
 %patch0 -p1 -b .api.doc.only
-%patch2 -p1
-%patch4 -p1 -b .libconfig145
+%patch1 -p1
 
 cp -a %{SOURCE1} .
 
 %build
+# use gold linker
+ln -s /usr/bin/ld.gold ld
+
 scons %{?_smp_mflags} \
       COMPILE_FLAGS="%{optflags} -ffast-math" \
       PREFIX=%{_prefix} \
       LIBDIR=%{_libdir} \
-      BUILD_TESTS=0
+      BUILD_TESTS=0 \
+      LINKFLAGS="-B%{_builddir}/%{name}-%{version}"
+
+# remove ld.gold symlink
+rm ld
 
 %install
 rm -rf %{buildroot}
@@ -152,6 +154,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/ffado/
 
 %changelog
+* Mon Apr 26 2011 Brendan Jones <brendan.jones.it at gmail.com> - 2.1.0-0.3.20110426.svn1983
+- Update to svn1983
+- Clean up redundant patches
+- Patch to rebuild using gold linker. Fixes RHBZ#684392
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-0.2.20101015.svn1913
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 3fdd77c..6766682 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce90eab1c3e3e309f359fa324f6210ce  libffado-2.1.0-svn1913.tar.bz2
+80fed375751ce6016ffee345ceec193a  libffado-2.1.0-svn1983.tar.bz2