- Remove ENABLE_ALL

- Improve the libffado-dont-use-bundled-libs.patch - Drop BR: expat-devel libavc1394-devel - Move configuration file to the library package - Minor enhancement in the .desktop file - Add links to upstream tickets for patches - Add -ffast-math to the compiler flags - Add patch to compile against libconfig-1.4.5 Tue Jul 13 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.0.1-2.20100706.svn1864 - Add ENABLE_ALL flag to support more devices - Don't bundle tests - Include some preliminary documentation for the tools until the manpages arrive - Patch out bundled libraries. Also fixes some rpmlints - Improve the instructions how to create the tarball Wed Jul 07 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.0.1-1.20100706.svn1864 - Update to trunk, post 2.0.1. Sat Jun 05 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.0.0-1.20100605.svn1845 - Update to trunk, post 2.0.0. Mon May 18 2009 Jarod Wilson <jarod@redhat.com> - 2.0-0.4.rc2 - Update to 2.0.0-rc2 Thu Nov 06 2008 Jarod Wilson <jarod@redhat.com> - 2.0-0.3.beta7 - Update to beta7 - Put arch-dependent helper/test binaries in libexecdir instead of datadir Sun Aug 10 2008 Jarod Wilson <jwilson@redhat.com> - 2.0-0.2.beta6 - Review clean-ups (#456353) Tue Jul 22 2008 Jarod Wilson <jwilson@redhat.com> - 2.0-0.1.beta6 - Initial Fedora build of libffado
15 years ago · 9648851c5f
parent 1923ad71a1
commit 9648851c5f
10 changed files with 1494 additions and 0 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -0,0 +1 @@
+libffado-2.0.1-svn1864.tar.bz2
--- a/README.ffado
+++ b/README.ffado
@ -0,0 +1,8 @@
+ffado-bridgeco-downloader  -- Firmware downloader application for BridgeCo devices
+ffado-diag                 -- FFADO diagnostic utility
+ffado-dbus-server          -- Expose the mixer features of connected FFADO devices through DBus
+ffado-fireworks-downloader -- Firmware downloader application for ECHO Fireworks devices
+ffado-mixer                -- Qt based FFADO device mixer
+
+FFADO is work in progress, hence there are no useful manpages.
+Please refer to http://www.ffado.org/ for more information.
--- a/import.log
+++ b/import.log
@ -0,0 +1 @@
+libffado-2_0_1-3_20100706_svn1864_fc13:HEAD:libffado-2.0.1-3.20100706.svn1864.fc13.src.rpm:1279487332
--- a/libffado-api-doc-only.patch
+++ b/libffado-api-doc-only.patch
@ -0,0 +1,26 @@
+diff -rupN libffado.old/doc/reference.doxygen.in libffado/doc/reference.doxygen.in
+--- libffado.old/doc/reference.doxygen.in	2009-12-18 13:52:13.000000000 -0500
+++ libffado/doc/reference.doxygen.in	2010-06-05 21:00:54.000000000 -0400
+@@ -568,9 +568,7 @@ WARN_LOGFILE           =
+ # directories like "/usr/src/myproject". Separate the files or directories
+ # with spaces.
+ 
+-INPUT                  = $top_srcdir/src \
+-                         $top_srcdir/doc \
+-                         $top_srcdir/libffado
+INPUT                  = $top_srcdir/libffado
+ 
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+diff -rupN libffado.old/SConstruct libffado/SConstruct
+--- libffado.old/SConstruct	2010-05-10 15:34:07.000000000 -0400
+++ libffado/SConstruct	2010-06-05 21:29:43.000000000 -0400
+@@ -583,7 +583,7 @@ if not env.GetOption('clean'):
+     Default( 'support' )
+     if env['BUILD_TESTS']:
+         Default( 'tests' )
+-
+    Default( 'doc' )
+ #
+ # Deal with the DESTDIR vs. xdg-tools conflict (which is basicely that the
+ # xdg-tools can't deal with DESTDIR, so the packagers have to deal with this
--- a/libffado-desktop.patch
+++ b/libffado-desktop.patch
@ -0,0 +1,17 @@
+diff -rupN libffado.old/support/xdg/ffado.org-ffadomixer.desktop libffado/support/xdg/ffado.org-ffadomixer.desktop
+--- libffado.old/support/xdg/ffado.org-ffadomixer.desktop	2008-11-16 18:30:46.000000000 -0500
+++ libffado/support/xdg/ffado.org-ffadomixer.desktop	2010-07-14 15:42:28.000000000 -0400
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Comment=
+Name=FFADO Mixer
+Comment=Audio mixer for Firewire devices
+ Exec=ffado-mixer
+-GenericName=
+GenericName=Firewire audio mixer
+ Icon=ffado
+-Name=ffado-mixer
+-Path=
+ Type=Application
+-Categories=Mixer;Audio;AudioVideo;HardwareSettings;Qt
+Categories=Mixer;Audio;AudioVideo;HardwareSettings;Qt;
--- a/libffado-dont-use-bundled-libs.patch
+++ b/libffado-dont-use-bundled-libs.patch
--- a/libffado-libconfig145.patch
+++ b/libffado-libconfig145.patch
@ -0,0 +1,12 @@
+--- 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;
--- a/libffado-no-shebang.patch
+++ b/libffado-no-shebang.patch
@ -0,0 +1,83 @@
+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
+    
--- a/libffado.spec
+++ b/libffado.spec
@ -0,0 +1,197 @@
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
+
+Summary:        Free firewire audio driver library
+Name:           libffado
+Version:        2.0.1
+Release:        3.20100706.svn1864%{?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:
+# svn export -r 1864 http://subversion.ffado.org/ffado/trunk/libffado libffado
+# tar jcf libffado-2.0.1-svn1864.tar.bz2 libffado
+Source0:        %{name}-%{version}-svn1864.tar.bz2
+# Additional README file until we have proper manpages
+Source1:        README.ffado
+# 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
+# Make the .desktop file nicer
+# http://subversion.ffado.org/ticket/291
+Patch1:         libffado-desktop.patch
+# Clean the redundant shebangs
+# http://subversion.ffado.org/ticket/292
+Patch2:         libffado-no-shebang.patch
+# Use system libraries
+# Submitted to upstream devel ML on 2010-07-12. 
+# Working together with the Debian packager Adrian Knoth. Cool guy.
+# http://subversion.ffado.org/ticket/290
+Patch3:         libffado-dont-use-bundled-libs.patch
+# Make libffado compile against libconfig-1.4.5
+# http://subversion.ffado.org/ticket/290
+Patch4:         libffado-libconfig145.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  alsa-lib-devel
+BuildRequires:  dbus-c++-devel
+BuildRequires:  dbus-devel
+BuildRequires:  dbus-python-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  doxygen
+BuildRequires:  glibmm24-devel
+BuildRequires:  graphviz
+BuildRequires:  libconfig-devel
+BuildRequires:  libiec61883-devel
+BuildRequires:  libraw1394-devel
+BuildRequires:  libxml++-devel
+BuildRequires:  pkgconfig
+BuildRequires:  PyQt4-devel
+BuildRequires:  python2-devel
+BuildRequires:  scons
+BuildRequires:  subversion
+
+%description
+The FFADO project aims to provide a generic, open-source solution for the
+support of FireWire based audio devices for the Linux platform. It is the
+successor of the FreeBoB project.
+
+%package devel
+Summary:        Free firewire audio driver library development headers
+Group:          Development/Libraries
+License:        GPLv2 or GPLv3
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+%description devel
+Development files needed to build applications against libffado.
+
+%package -n ffado
+Summary:        Free firewire audio driver library applications and utilities
+Group:          Applications/Multimedia
+# support/tools/* is GPLv3
+# Some files in support/mixer-qt4/ffado are GPLv3+
+# The rest is GPLv2 or GPLv3
+License:        GPLv3 and GPLv3+ and (GPLv2 or GPLv3)
+Requires:       %{name} = %{version}-%{release}
+Requires:       dbus
+Requires:       dbus-python
+Requires:       PyQt4
+
+%description -n ffado
+Applications and utilities for use with libffado.
+
+
+%prep
+%setup -q -n %{name}
+%patch0 -p1 -b .api.doc.only
+%patch1 -p1 -b .desktop.nicer
+%patch2 -p1
+%patch3 -p1 -b .systemlib
+%patch4 -p1 -b .libconfig145
+
+cp -a %{SOURCE1} .
+
+%build
+scons %{?_smp_mflags} \
+      COMPILE_FLAGS="%{optflags} -ffast-math" \
+      PREFIX=%{_prefix} \
+      LIBDIR=%{_libdir} \
+      BUILD_TESTS=0
+
+%install
+rm -rf %{buildroot}
+scons DESTDIR=%{buildroot} install
+
+# We need to install the xdg stuff manually
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
+   support/xdg/ffado.org-ffadomixer.desktop
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
+ln -s ../../../../libffado/icons/hi64-apps-ffado.png \
+    %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ffado.png
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n ffado
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun -n ffado
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans -n ffado
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog LICENSE.* README
+%{_libdir}/libffado.so.*
+%dir %{_datadir}/libffado/
+%{_datadir}/libffado/configuration
+
+%files devel
+%defattr(-,root,root,-)
+%doc doc/reference/html/
+%{_includedir}/libffado/
+%{_libdir}/pkgconfig/libffado.pc
+%{_libdir}/libffado.so
+
+%files -n ffado
+%defattr(-,root,root,-)
+%doc README.ffado
+%{_bindir}/*
+%{_datadir}/libffado/*.xml
+%{_datadir}/libffado/python/
+%{_datadir}/libffado/icons/
+%{_datadir}/dbus-1/services/org.ffado.Control.service
+%{_datadir}/applications/ffado.org-ffadomixer.desktop
+%{_datadir}/icons/hicolor/64x64/apps/ffado.png
+%{python_sitelib}/ffado/
+
+%changelog
+* Wed Jul 14 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.0.1-3.20100706.svn1864
+- Remove ENABLE_ALL
+- Improve the libffado-dont-use-bundled-libs.patch
+- Drop BR: expat-devel libavc1394-devel
+- Move configuration file to the library package
+- Minor enhancement in the .desktop file
+- Add links to upstream tickets for patches
+- Add -ffast-math to the compiler flags
+- Add patch to compile against libconfig-1.4.5
+
+* Tue Jul 13 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.0.1-2.20100706.svn1864
+- Add ENABLE_ALL flag to support more devices
+- Don't bundle tests
+- Include some preliminary documentation for the tools until the manpages arrive
+- Patch out bundled libraries. Also fixes some rpmlints
+- Improve the instructions how to create the tarball
+
+* Wed Jul 07 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.0.1-1.20100706.svn1864
+- Update to trunk, post 2.0.1.
+
+* Sat Jun 05 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.0.0-1.20100605.svn1845
+- Update to trunk, post 2.0.0.
+
+* Mon May 18 2009 Jarod Wilson <jarod@redhat.com> - 2.0-0.4.rc2
+- Update to 2.0.0-rc2
+
+* Thu Nov 06 2008 Jarod Wilson <jarod@redhat.com> - 2.0-0.3.beta7
+- Update to beta7
+- Put arch-dependent helper/test binaries in libexecdir instead of datadir
+
+* Sun Aug 10 2008 Jarod Wilson <jwilson@redhat.com> - 2.0-0.2.beta6
+- Review clean-ups (#456353)
+
+* Tue Jul 22 2008 Jarod Wilson <jwilson@redhat.com> - 2.0-0.1.beta6
+- Initial Fedora build of libffado
--- a/1
+++ b/1
@ -0,0 +1 @@
+6263a5e84a17afc2df16291bbd14961d  libffado-2.0.1-svn1864.tar.bz2
				`@ -0,0 +1 @@`
				`libffado-2_0_1-3_20100706_svn1864_fc13:HEAD:libffado-2.0.1-3.20100706.svn1864.fc13.src.rpm:1279487332`
				`@ -0,0 +1 @@`
				`6263a5e84a17afc2df16291bbd14961d libffado-2.0.1-svn1864.tar.bz2`