diff --git a/libffado-gcc47.patch b/libffado-gcc47.patch deleted file mode 100644 index 74b6cf4..0000000 --- a/libffado-gcc47.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -rupN libffado-2.1.0.old/src/bebob/bebob_dl_mgr.cpp libffado-2.1.0/src/bebob/bebob_dl_mgr.cpp ---- libffado-2.1.0.old/src/bebob/bebob_dl_mgr.cpp 2009-12-19 11:12:53.000000000 -0500 -+++ libffado-2.1.0/src/bebob/bebob_dl_mgr.cpp 2012-01-10 23:30:49.727652689 -0500 -@@ -35,6 +35,7 @@ - - #include - #include -+#include - - namespace BeBoB { - enum { -diff -rupN libffado-2.1.0.old/src/ffadodevice.cpp libffado-2.1.0/src/ffadodevice.cpp ---- libffado-2.1.0.old/src/ffadodevice.cpp 2010-01-10 15:59:02.000000000 -0500 -+++ libffado-2.1.0/src/ffadodevice.cpp 2012-01-10 23:30:49.737652631 -0500 -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - #include - -diff -rupN libffado-2.1.0.old/src/fireworks/fireworks_device.cpp libffado-2.1.0/src/fireworks/fireworks_device.cpp ---- libffado-2.1.0.old/src/fireworks/fireworks_device.cpp 2010-10-10 13:39:07.000000000 -0400 -+++ libffado-2.1.0/src/fireworks/fireworks_device.cpp 2012-01-10 23:30:49.747652573 -0500 -@@ -45,6 +45,7 @@ - #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000 - - #include -+#include - using namespace std; - - // FireWorks is the platform used and developed by ECHO AUDIO -diff -rupN libffado-2.1.0.old/src/libieee1394/IsoHandlerManager.cpp libffado-2.1.0/src/libieee1394/IsoHandlerManager.cpp ---- libffado-2.1.0.old/src/libieee1394/IsoHandlerManager.cpp 2011-09-12 20:22:20.000000000 -0400 -+++ libffado-2.1.0/src/libieee1394/IsoHandlerManager.cpp 2012-01-10 23:30:49.758652510 -0500 -@@ -35,6 +35,7 @@ - #include "libutil/Configuration.h" - - #include -+#include - #include - - IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL ); -diff -rupN libffado-2.1.0.old/src/libutil/PosixSharedMemory.cpp libffado-2.1.0/src/libutil/PosixSharedMemory.cpp ---- libffado-2.1.0.old/src/libutil/PosixSharedMemory.cpp 2008-05-15 00:38:31.000000000 -0400 -+++ libffado-2.1.0/src/libutil/PosixSharedMemory.cpp 2012-01-10 23:30:49.767652458 -0500 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - namespace Util { -diff -rupN libffado-2.1.0.old/support/dbus/test-dbus.cpp libffado-2.1.0/support/dbus/test-dbus.cpp ---- libffado-2.1.0.old/support/dbus/test-dbus.cpp 2008-04-26 13:30:41.000000000 -0400 -+++ libffado-2.1.0/support/dbus/test-dbus.cpp 2012-01-10 23:30:49.776652406 -0500 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #include "controlclient.h" -diff -rupN libffado-2.1.0.old/tests/test-dice-eap.cpp libffado-2.1.0/tests/test-dice-eap.cpp ---- libffado-2.1.0.old/tests/test-dice-eap.cpp 2010-01-04 17:20:56.000000000 -0500 -+++ libffado-2.1.0/tests/test-dice-eap.cpp 2012-03-22 22:00:44.139732286 -0400 -@@ -45,6 +45,7 @@ using namespace Dice; - #include - #include - #include -+#include - - #include - int run; -diff -rupN libffado-2.1.0.old/tests/test-fw410.cpp libffado-2.1.0/tests/test-fw410.cpp ---- libffado-2.1.0.old/tests/test-fw410.cpp 2008-01-20 05:29:17.000000000 -0500 -+++ libffado-2.1.0/tests/test-fw410.cpp 2012-03-22 22:00:15.473867173 -0400 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - using namespace std; - -diff -rupN libffado-2.1.0.old/tests/test-ieee1394service.cpp libffado-2.1.0/tests/test-ieee1394service.cpp ---- libffado-2.1.0.old/tests/test-ieee1394service.cpp 2009-12-19 11:12:53.000000000 -0500 -+++ libffado-2.1.0/tests/test-ieee1394service.cpp 2012-03-22 22:03:36.150915502 -0400 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include - -diff -rupN libffado-2.1.0.old/tests/test-ipcringbuffer.cpp libffado-2.1.0/tests/test-ipcringbuffer.cpp ---- libffado-2.1.0.old/tests/test-ipcringbuffer.cpp 2008-05-15 00:38:31.000000000 -0400 -+++ libffado-2.1.0/tests/test-ipcringbuffer.cpp 2012-03-22 22:05:04.425493246 -0400 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - using namespace Util; - -diff -rupN libffado-2.1.0.old/tests/test-messagequeue.cpp libffado-2.1.0/tests/test-messagequeue.cpp ---- libffado-2.1.0.old/tests/test-messagequeue.cpp 2008-05-29 04:24:21.000000000 -0400 -+++ libffado-2.1.0/tests/test-messagequeue.cpp 2012-03-22 22:06:16.287149558 -0400 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -rupN libffado-2.1.0.old/tests/test-scs.cpp libffado-2.1.0/tests/test-scs.cpp ---- libffado-2.1.0.old/tests/test-scs.cpp 2009-12-23 14:10:49.000000000 -0500 -+++ libffado-2.1.0/tests/test-scs.cpp 2012-03-22 22:12:26.287380774 -0400 -@@ -477,8 +477,8 @@ main(int argc, char **argv) - } - #endif - -- BridgeMapIterator it = seqport2bridgemap.find(portNumber); -- if(it == seqport2bridgemap.end()) { -+ BridgeMapIterator it2 = seqport2bridgemap.find(portNumber); -+ if(it2 == seqport2bridgemap.end()) { - seqport2bridgemap[portNumber] = bridge; - } else { - debugError("BUG: port already present in bridge map, duplicate port.\n"); -diff -rupN libffado-2.1.0.old/tests/test-shm.cpp libffado-2.1.0/tests/test-shm.cpp ---- libffado-2.1.0.old/tests/test-shm.cpp 2008-05-15 00:38:31.000000000 -0400 -+++ libffado-2.1.0/tests/test-shm.cpp 2012-03-22 22:13:47.973990443 -0400 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - using namespace Util; - -diff -rupN libffado-2.1.0.old/tests/test-streamdump.cpp libffado-2.1.0/tests/test-streamdump.cpp ---- libffado-2.1.0.old/tests/test-streamdump.cpp 2008-05-09 08:02:40.000000000 -0400 -+++ libffado-2.1.0/tests/test-streamdump.cpp 2012-03-22 22:14:57.222659592 -0400 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - - using namespace std; diff --git a/libffado-snapshot.sh b/libffado-snapshot.sh index 4152235..0c3b37f 100644 --- a/libffado-snapshot.sh +++ b/libffado-snapshot.sh @@ -15,6 +15,7 @@ cleanup() { } unset CDPATH +unset GREP_OPTIONS pwd=$(pwd) name=libffado version=2.1.0 diff --git a/libffado.spec b/libffado.spec index 70036fd..3b1de9d 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.7.20111030.svn2000%{?dist} +Release: 0.8.20120325.svn2088%{?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 2000 -Source0: %{name}-%{version}-svn2000.tar.bz2 +# bash libffado-snapshot.sh 2088 +Source0: %{name}-%{version}-svn2088.tar.bz2 # Additional README file until we have proper manpages Source1: README.ffado # The fetch script @@ -21,9 +21,6 @@ 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 -# Fix gcc-4.7 compilation error -# http://subversion.ffado.org/ticket/344 -Patch1: libffado-gcc47.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel BuildRequires: dbus-devel @@ -77,7 +74,6 @@ Applications and utilities for use with libffado. %prep %setup -q %patch0 -p1 -b .api.doc.only -%patch1 -p1 -b .gcc47 cp -a %{SOURCE1} . @@ -148,6 +144,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{python_sitelib}/ffado/ %changelog +* Sun Mar 25 2012 Orcan Ogetbil - 2.1.0-0.8.20120325.svn2088 +- Update to svn2088. +- Drop upstreamed gcc-4.7 patch. + * Thu Mar 22 2012 Orcan Ogetbil - 2.1.0-0.7.20111030.svn2000 - Include the ffado-test executable RHBZ#805940 - Fix .desktop file warning