From eabded1c394cbc5a78ef5895d17b8a558504ee90 Mon Sep 17 00:00:00 2001 From: Brendan Jones Date: Thu, 28 Apr 2011 07:55:50 +1000 Subject: [PATCH] Update to svn1983, rebuild using gold linker. Fixes #684392 --- libffado-add-link-flags | 26 ++++++++++++ libffado-libconfig145.patch | 12 ------ libffado-no-shebang.patch | 83 ------------------------------------- libffado.spec | 31 ++++++++------ sources | 2 +- 5 files changed, 46 insertions(+), 108 deletions(-) create mode 100644 libffado-add-link-flags delete mode 100644 libffado-libconfig145.patch delete mode 100644 libffado-no-shebang.patch 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-libconfig145.patch b/libffado-libconfig145.patch deleted file mode 100644 index a05e300..0000000 --- a/libffado-libconfig145.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libffado.old/src/libutil/Configuration.cpp 2010-06-19 14:31:27.000000000 -0400 -+++ libffado/src/libutil/Configuration.cpp 2010-07-14 01:37:57.000000000 -0400 -@@ -333,7 +333,8 @@ Configuration::getValueForDeviceSetting( - libconfig::Setting *s = getDeviceSetting( vendor_id, model_id ); - if(s) { - try { -- return s->lookupValue(setting, ref); -+ long long int refverylong = ref; -+ return s->lookupValue(setting, refverylong); - } catch (...) { - debugOutput(DEBUG_LEVEL_VERBOSE, "Setting %s not found\n", setting.c_str()); - return false; diff --git a/libffado-no-shebang.patch b/libffado-no-shebang.patch deleted file mode 100644 index 257afbe..0000000 --- a/libffado-no-shebang.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -rupN libffado.old/support/mixer-qt4/ffado/configuration.py libffado/support/mixer-qt4/ffado/configuration.py ---- libffado.old/support/mixer-qt4/ffado/configuration.py 2009-11-09 15:34:33.000000000 -0500 -+++ libffado/support/mixer-qt4/ffado/configuration.py 2010-06-05 21:45:12.000000000 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # - # Copyright (C) 2008-2009 by Arnold Krille - # -diff -rupN libffado.old/support/mixer-qt4/ffado/dbus_util.py libffado/support/mixer-qt4/ffado/dbus_util.py ---- libffado.old/support/mixer-qt4/ffado/dbus_util.py 2009-08-30 15:05:51.000000000 -0400 -+++ libffado/support/mixer-qt4/ffado/dbus_util.py 2010-06-05 21:44:01.000000000 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # - # Copyright (C) 2005-2008 by Pieter Palmers - # 2007-2008 by Arnold Krille -diff -rupN libffado.old/support/mixer-qt4/ffado/logginghandler.py libffado/support/mixer-qt4/ffado/logginghandler.py ---- libffado.old/support/mixer-qt4/ffado/logginghandler.py 2009-09-01 14:30:51.000000000 -0400 -+++ libffado/support/mixer-qt4/ffado/logginghandler.py 2010-06-05 21:44:41.000000000 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # - # Copyright (C) 2008 by Arnold Krille - # -diff -rupN libffado.old/support/mixer-qt4/ffado/mixer/nodevice.py libffado/support/mixer-qt4/ffado/mixer/nodevice.py ---- libffado.old/support/mixer-qt4/ffado/mixer/nodevice.py 2009-10-17 14:14:32.000000000 -0400 -+++ libffado/support/mixer-qt4/ffado/mixer/nodevice.py 2010-06-05 21:44:18.000000000 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # - # Copyright (C) 2005-2008 by Pieter Palmers - # 2007-2008 by Arnold Krille -diff -rupN libffado.old/support/mixer-qt4/ffado/panelmanager.py libffado/support/mixer-qt4/ffado/panelmanager.py ---- libffado.old/support/mixer-qt4/ffado/panelmanager.py 2010-02-17 17:08:15.000000000 -0500 -+++ libffado/support/mixer-qt4/ffado/panelmanager.py 2010-06-05 21:43:49.000000000 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # - # Copyright (C) 2005-2008 by Pieter Palmers - # 2007-2008 by Arnold Krille -diff -rupN libffado.old/support/mixer-qt4/ffado/registration.py libffado/support/mixer-qt4/ffado/registration.py ---- libffado.old/support/mixer-qt4/ffado/registration.py 2009-08-30 15:05:51.000000000 -0400 -+++ libffado/support/mixer-qt4/ffado/registration.py 2010-06-05 21:45:31.000000000 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # - # Copyright (C) 2008-2009 by Pieter Palmers - # 2009 by Arnold Krille -diff -rupN libffado.old/support/mixer-qt4/ffado/widgets/matrixmixer.py libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py ---- libffado.old/support/mixer-qt4/ffado/widgets/matrixmixer.py 2009-12-01 17:49:23.000000000 -0500 -+++ libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py 2010-06-05 21:43:31.000000000 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # coding=utf8 - # - # Copyright (C) 2009 by Arnold Krille -diff -rupN libffado.old/support/tools/ffado_diag_helpers.py libffado/support/tools/ffado_diag_helpers.py ---- libffado.old/support/tools/ffado_diag_helpers.py 2009-10-12 16:32:00.000000000 -0400 -+++ libffado/support/tools/ffado_diag_helpers.py 2010-06-05 21:42:49.000000000 -0400 -@@ -1,6 +1,3 @@ --#!/usr/bin/python --# -- - # - # Copyright (C) 2008 Pieter Palmers - # -diff -rupN libffado.old/support/tools/helpstrings.py libffado/support/tools/helpstrings.py ---- libffado.old/support/tools/helpstrings.py 2008-04-18 11:36:39.000000000 -0400 -+++ libffado/support/tools/helpstrings.py 2010-06-05 21:43:04.000000000 -0400 -@@ -1,6 +1,3 @@ --#!/usr/bin/python --# -- - # - # Copyright (C) 2008 Pieter Palmers - # -@@ -57,4 +54,4 @@ the user/group permissions. - - def show(self, sid): - print self.get(sid) -- -\ No newline at end of file -+ 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 - 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 - 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