rpms/sonic-visualiser/devel sonic-visualiser-1.5-alsa.patch, NONE, 1.1 sonic-visualiser-1.5-gcc44.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sonic-visualiser.spec, 1.14, 1.15 sources, 1.5, 1.6 sonic-visualiser-1.4-gcc44.patch, 1.1, NONE sonic-visualiser-1.4-specfix.patch, 1.1, NONE

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/sonic-visualiser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10988/devel

Modified Files:
	.cvsignore sonic-visualiser.spec sources 
Added Files:
	sonic-visualiser-1.5-alsa.patch 
	sonic-visualiser-1.5-gcc44.patch 
Removed Files:
	sonic-visualiser-1.4-gcc44.patch 
	sonic-visualiser-1.4-specfix.patch 
Log Message:
* Thu Mar 26 2009 Michel Salim <salimma at fedoraproject.org> - 1.5-1
- Update to 1.5


sonic-visualiser-1.5-alsa.patch:

--- NEW FILE sonic-visualiser-1.5-alsa.patch ---
--- sonic-visualiser-1.5/sv/sv.pro.alsa	2009-03-16 13:03:50.000000000 -0400
+++ sonic-visualiser-1.5/sv/sv.pro	2009-03-26 15:56:29.122333007 -0400
@@ -20,7 +20,7 @@
 
 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
 
-LIBS = -lsvframework -lsvaudioio -lsvview -lsvlayer -lsvrdf -lsvtransform -lsvrdf -lsvtransform -lsvwidgets -lsvdata -lsvplugin -lsvbase -lsvsystem $$LIBS
+LIBS = -lsvframework -lsvaudioio -lsvview -lsvlayer -lsvrdf -lsvtransform -lsvrdf -lsvtransform -lsvwidgets -lsvdata -lsvplugin -lsvbase -lsvsystem -lasound $$LIBS
 
 PRE_TARGETDEPS += ../view/libsvview.a \
                   ../layer/libsvlayer.a \

sonic-visualiser-1.5-gcc44.patch:

--- NEW FILE sonic-visualiser-1.5-gcc44.patch ---
--- sonic-visualiser-1.5/data/fft/FFTMemoryCache.cpp.gcc44	2009-03-16 13:04:09.000000000 -0400
+++ sonic-visualiser-1.5/data/fft/FFTMemoryCache.cpp	2009-03-26 13:30:33.124732276 -0400
@@ -17,6 +17,7 @@
 #include "system/System.h"
 
 #include <iostream>
+#include <cstdio> // perror
 #include <cstdlib>
 
 //#define DEBUG_FFT_MEMORY_CACHE 1
--- sonic-visualiser-1.5/data/fileio/FileReadThread.cpp.gcc44	2009-03-16 13:04:26.000000000 -0400
+++ sonic-visualiser-1.5/data/fileio/FileReadThread.cpp	2009-03-26 13:31:51.140732496 -0400
@@ -20,6 +20,7 @@
 
 #include <iostream>
 #include <unistd.h>
+#include <cstdio> // perror
 
 //#define DEBUG_FILE_READ_THREAD 1
 
--- sonic-visualiser-1.5/base/Thread.cpp.gcc44	2009-03-16 13:04:33.000000000 -0400
+++ sonic-visualiser-1.5/base/Thread.cpp	2009-03-26 13:28:35.802982120 -0400
@@ -22,6 +22,7 @@
 //#define DEBUG_MUTEX_LOCKER 1
 
 #include <iostream>
+#include <cstdio> // perror
 
 Thread::Thread(Type type, QObject *parent) :
     QThread(parent),
--- sonic-visualiser-1.5/base/RingBuffer.h.gcc44	2009-03-16 13:04:33.000000000 -0400
+++ sonic-visualiser-1.5/base/RingBuffer.h	2009-03-26 13:26:04.569982992 -0400
@@ -26,6 +26,7 @@
 #include "system/System.h"
 #include "Scavenger.h"
 
+#include <cstdio>  // perror
 #include <cstring> // memcpy, memset &c
 
 //#define DEBUG_RINGBUFFER 1
--- sonic-visualiser-1.5/rdf/RDFFeatureWriter.h.gcc44	2009-03-16 13:04:39.000000000 -0400
+++ sonic-visualiser-1.5/rdf/RDFFeatureWriter.h	2009-03-26 13:38:33.891742875 -0400
@@ -20,6 +20,12 @@
 #ifndef _RDF_FEATURE_WRITER_H_
 #define _RDF_FEATURE_WRITER_H_
 
+// GCC 4.4.x: cstdint provides uint64_t, but it is still experimental
+//#include <cstdint>
+// while <stdint.h> defines it as long long long, which the C++ compiler
+// does not like. ugh for C <-> C++ impedance mismatch!
+#define uint64_t unsigned long long
+// GCC 4.4x END
 #include <string>
 #include <map>
 #include <set>
--- sonic-visualiser-1.5/system/System.cpp.gcc44	2009-03-16 13:03:42.000000000 -0400
+++ sonic-visualiser-1.5/system/System.cpp	2009-03-26 13:42:34.443747793 -0400
@@ -19,6 +19,7 @@
 #include <QString>
 
 #include <stdint.h>
+#include <cstdio> // file functions, perror
 
 #ifndef _WIN32
 #include <signal.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Dec 2008 23:23:33 -0000	1.5
+++ .cvsignore	26 Mar 2009 20:45:42 -0000	1.6
@@ -1 +1 @@
-sonic-visualiser-1.4.tar.bz2
+sonic-visualiser-1.5.tar.bz2


Index: sonic-visualiser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sonic-visualiser.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sonic-visualiser.spec	26 Feb 2009 02:02:14 -0000	1.14
+++ sonic-visualiser.spec	26 Mar 2009 20:45:42 -0000	1.15
@@ -1,7 +1,7 @@
 # rebuild with --with libmad to enable support for MP3 files
 Name:           sonic-visualiser
-Version:        1.4
-Release:        4%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
@@ -9,13 +9,14 @@
 URL:            http://www.sonicvisualiser.org/
 Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2
 Source1:        %{name}.desktop
-Patch0:         %{name}-1.4-specfix.patch
-Patch1:         %{name}-1.4-gcc44.patch
+Patch0:         %{name}-1.5-gcc44.patch
+Patch1:         %{name}-1.5-alsa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
 BuildRequires:  libsndfile-devel libsamplerate-devel fftw-devel bzip2-devel
-BuildRequires:  jack-audio-connection-kit-devel pulseaudio-libs-devel
+BuildRequires:  alsa-lib-devel jack-audio-connection-kit-devel
+BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  redland-devel rubberband-devel
 %{?_with_libmad:BuildRequires:  libmad-devel}
 BuildRequires:  liboggz-devel libfishsound-devel liblo-devel
@@ -39,8 +40,10 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .specfix
-%patch1 -p1 -b .gcc44
+# https://sourceforge.net/tracker/?func=detail&aid=2715387&group_id=162924&atid=825705
+%patch0 -p1 -b .gcc44
+# https://sourceforge.net/tracker/?func=detail&aid=2715381&group_id=162924&atid=825705
+%patch1 -p1 -b .alsa
 
 
 %build
@@ -93,6 +96,9 @@
 
 
 %changelog
+* Thu Mar 26 2009 Michel Salim <salimma at fedoraproject.org> - 1.5-1
+- Update to 1.5
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Dec 2008 23:23:33 -0000	1.5
+++ sources	26 Mar 2009 20:45:42 -0000	1.6
@@ -1 +1 @@
-5b420e047895771acfb756c5b7270dce  sonic-visualiser-1.4.tar.bz2
+6a4c29abbadce83dc8b55ac84c34c0d4  sonic-visualiser-1.5.tar.bz2


--- sonic-visualiser-1.4-gcc44.patch DELETED ---


--- sonic-visualiser-1.4-specfix.patch DELETED ---