rpms/sonic-visualiser-freeworld/F-15 sonic-visualiser-1.9-gcc47.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sonic-visualiser-freeworld.spec, 1.4, 1.5 sources, 1.5, 1.6 sonic-visualiser-1.8-gcc46.patch, 1.1, NONE

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/free/rpms/sonic-visualiser-freeworld/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25651/F-15

Modified Files:
	.cvsignore sonic-visualiser-freeworld.spec sources 
Added Files:
	sonic-visualiser-1.9-gcc47.patch 
Removed Files:
	sonic-visualiser-1.8-gcc46.patch 
Log Message:
* Fri Mar 23 2012 Michel Salim <salimma at fedoraproject.org> - 1.9-1
- Update to 1.9


sonic-visualiser-1.9-gcc47.patch:
 fileio/CodedAudioFileReader.cpp |    1 +
 model/WritableWaveFileModel.cpp |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE sonic-visualiser-1.9-gcc47.patch ---
--- sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp.gcc47	2011-10-10 22:37:09.000000000 +0700
+++ sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp	2012-03-03 11:45:00.426572588 +0700
@@ -22,6 +22,7 @@
 #include "base/Serialiser.h"
 #include "base/Resampler.h"
 
+#include <stdint.h>
 #include <iostream>
 #include <QDir>
 #include <QMutexLocker>
--- sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp.gcc47	2011-10-10 22:37:09.000000000 +0700
+++ sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp	2012-03-03 11:46:42.603157996 +0700
@@ -26,6 +26,7 @@
 
 #include <cassert>
 #include <iostream>
+#include <stdint.h>
 
 //#define DEBUG_WRITABLE_WAVE_FILE_MODEL 1
 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/F-15/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2011 21:25:19 -0000	1.5
+++ .cvsignore	23 Mar 2012 08:06:08 -0000	1.6
@@ -1 +1 @@
-sonic-visualiser-1.8.tar.gz
+sonic-visualiser-1.9.tar.gz


Index: sonic-visualiser-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/F-15/sonic-visualiser-freeworld.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sonic-visualiser-freeworld.spec	21 Jun 2011 21:25:19 -0000	1.4
+++ sonic-visualiser-freeworld.spec	23 Mar 2012 08:06:08 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           sonic-visualiser-freeworld
-Version:        1.8
+Version:        1.9
 Release:        1%{?dist}
 Summary:        A program for viewing and exploring audio data
 
@@ -8,16 +8,19 @@
 URL:            http://www.sonicvisualiser.org/
 Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.gz
 Source1:        sonic-visualiser-freeworld.desktop
-Patch0:         sonic-visualiser-1.8-gcc46.patch
-Patch1:         sonic-visualiser-1.8-implicit-dso.patch
+Patch0:         sonic-visualiser-1.8-implicit-dso.patch
+Patch1:         sonic-visualiser-1.9-gcc47.patch
+
+%if 0%{?el5}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
 BuildRequires:  libsndfile-devel libsamplerate-devel fftw-devel bzip2-devel
 BuildRequires:  alsa-lib-devel jack-audio-connection-kit-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  redland-devel rubberband-devel
-BuildRequires:	libmad-devel
+BuildRequires:  libmad-devel
 BuildRequires:  liboggz-devel libfishsound-devel liblo-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -39,13 +42,15 @@
 
 %prep
 %setup -q -n sonic-visualiser-%{version}
-%patch0 -p1 -b .gcc46
-%patch1 -p1 -b .implicit-dso
+%patch0 -p1 -b .implicit-dso
+%patch1 -p1 -b .gcc47
 
 
 %build
 %configure
 #qmake-qt4
+
+# not SMP-safe
 #make {?_smp_mflags}
 make
 
@@ -66,8 +71,10 @@
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
 
+%if 0%{?rhel}
 %clean
 rm -rf $RPM_BUILD_ROOT
+%endif
 
 
 %post
@@ -94,6 +101,9 @@
 
 
 %changelog
+* Fri Mar 23 2012 Michel Salim <salimma at fedoraproject.org> - 1.9-1
+- Update to 1.9
+
 * Tue Jun 21 2011 Michel Salim <salimma at fedoraproject.org> - 1.8-1
 - Update to 1.8
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jun 2011 21:25:19 -0000	1.5
+++ sources	23 Mar 2012 08:06:08 -0000	1.6
@@ -1 +1 @@
-ad676d0b4cf5b8561306487f52642862  sonic-visualiser-1.8.tar.gz
+a50037994d180c7b9b113fbde3131a8c  sonic-visualiser-1.9.tar.gz


--- sonic-visualiser-1.8-gcc46.patch DELETED ---