Author: salimma
Update of /cvs/free/rpms/sonic-visualiser-freeworld/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25651/F-16
Modified Files:
.cvsignore sonic-visualiser-freeworld.spec sources
Added Files:
sonic-visualiser-1.9-gcc47.patch
Removed Files:
sonic-visualiser-1.8-gcc46.patch
sonic-visualiser-1.8-no_virt_QObject.patch
sonic-visualiser-1.8-raptor2.patch
Log Message:
* Fri Mar 23 2012 Michel Salim <salimma(a)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-16/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 21 Jun 2011 20:42:44 -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-16/sonic-visualiser-freeworld.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sonic-visualiser-freeworld.spec 3 Oct 2011 19:59:12 -0000 1.7
+++ sonic-visualiser-freeworld.spec 23 Mar 2012 08:06:08 -0000 1.8
@@ -1,6 +1,6 @@
Name: sonic-visualiser-freeworld
-Version: 1.8
-Release: 3%{?dist}
+Version: 1.9
+Release: 1%{?dist}
Summary: A program for viewing and exploring audio data
Group: Applications/Multimedia
@@ -8,24 +8,13 @@
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
-Patch2: sonic-visualiser-1.8-no_virt_QObject.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
-## upstreamable patches
-# support raptor2
-# note too, this package currently doesn't explicitly BR raptor-devel or
raptor2-devel
-# but relies on implicit deps from redland-devel
-Patch50: sonic-visualiser-1.8-raptor2.patch
-%if 0%{?fedora} > 15
-%global raptor2 1
-BuildRequires: automake autoconf
-%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
@@ -53,18 +42,8 @@
%prep
%setup -q -n sonic-visualiser-%{version}
-%patch0 -p1 -b .gcc46
-%patch1 -p1 -b .implicit-dso
-%patch2 -p1 -b .no_virt_QObject
-
-%if 0%{?raptor2}
-%patch50 -p1 -b .raptor2
-for dir in sonic-visualiser svapp svcore svgui ; do
-pushd $dir
-sh ./bootstrap.sh
-popd
-done
-%endif
+%patch0 -p1 -b .implicit-dso
+%patch1 -p1 -b .gcc47
%build
@@ -122,6 +101,9 @@
%changelog
+* Fri Mar 23 2012 Michel Salim <salimma(a)fedoraproject.org> - 1.9-1
+- Update to 1.9
+
* Mon Oct 3 2011 Michel Salim <salimma(a)fedoraproject.org> - 1.8-3
- Fix for Qt 4.8 disallowing virtual inheritance of QObject (Radek Novacek)
- patch for raptor2 support (Rex Dieter)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/F-16/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 21 Jun 2011 20:42:45 -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 ---
--- sonic-visualiser-1.8-no_virt_QObject.patch DELETED ---
--- sonic-visualiser-1.8-raptor2.patch DELETED ---