Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b42f0370ca8d30fd0970d5bafc0a84ab76cf355
commit 4b42f0370ca8d30fd0970d5bafc0a84ab76cf355 Author: exceed <exceed.ced...@gmail.com> Date: Wed Jul 8 23:59:49 2009 +0000 sonic-visualiser-1.6-1-i686 * version bump * add gcc44 patch * changed maintainer: Devil505 -> exceed diff --git a/source/xapps-extra/sonic-visualiser/FrugalBuild b/source/xapps-extra/sonic-visualiser/FrugalBuild index 8e5e463..7e38e9d 100644 --- a/source/xapps-extra/sonic-visualiser/FrugalBuild +++ b/source/xapps-extra/sonic-visualiser/FrugalBuild @@ -1,8 +1,8 @@ # Compiling Time: 0.24 SBU -# Maintainer: Devil505 <devil505li...@gmail.com> +# Maintainer: exceed <exceed.ced...@gmail.com> pkgname=sonic-visualiser -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="Sonic Visualiser is an application for viewing and analysing the contents of music audio files" url="http://www.sonicvisualiser.org/"; @@ -11,24 +11,27 @@ options=('scriptlet') _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="sv1" Finclude sourceforge +source=("${sour...@]}" "gcc44.patch") groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('ff13a8dac50d5b5d63911c00a875e3e4a8e60d27') +sha1sums=('6a84ee27cd360db50dea62479713a353b708e14b' \ + '61d5394e317898a92ebb0249111cf862d763d61d') _F_desktop_name="Sonic Visualiser" _F_desktop_icon="sv-48x48.png" _F_desktop_categories="AudioVideo;Audio;" build() { - Fcd - qmake || Fdie - make -j1 || Fdie - Fexerel sv/$pkgname usr/bin/$pkgname - Ficonrel sv/icons/sv-48x48.png - Fdesktop2 - #Installing samples - Fmkdir usr/share/$pkgname/ - cp -r $Fsrcdir/$pkgname-$pkgver/sv/samples $Fdestdir/usr/share/$pkgname/ || Fdie + Fpatchall + Fcd + qmake || Fdie + make -j1 || Fdie + Fexerel sv/$pkgname usr/bin/$pkgname + Ficonrel sv/icons/sv-48x48.png + Fdesktop2 + #Installing samples + Fmkdir usr/share/$pkgname/ + cp -r $Fsrcdir/$pkgname-$pkgver/sv/samples $Fdestdir/usr/share/$pkgname/ || Fdie } diff --git a/source/xapps-extra/sonic-visualiser/gcc44.patch b/source/xapps-extra/sonic-visualiser/gcc44.patch new file mode 100644 index 0000000..299cd56 --- /dev/null +++ b/source/xapps-extra/sonic-visualiser/gcc44.patch @@ -0,0 +1,65 @@ +--- 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> _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
