rpms/sonic-visualiser-freeworld/devel
sonic-visualiser-1.8-no_virt_QObject.patch, NONE,
1.1 sonic-visualiser-1.8-raptor2.patch, NONE,
1.1 sonic-visualiser-freeworld.spec, 1.6, 1.7
Michel Alexandre Salim
salimma at rpmfusion.org
Mon Oct 3 21:59:12 CEST 2011
Author: salimma
Update of /cvs/free/rpms/sonic-visualiser-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24893
Modified Files:
sonic-visualiser-freeworld.spec
Added Files:
sonic-visualiser-1.8-no_virt_QObject.patch
sonic-visualiser-1.8-raptor2.patch
Log Message:
backport changes from Fedora package, for Qt 4.8 / raptor2 support
sonic-visualiser-1.8-no_virt_QObject.patch:
AudioCallbackPlaySource.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE sonic-visualiser-1.8-no_virt_QObject.patch ---
--- sonic-visualiser-1.8/svapp/audioio/AudioCallbackPlaySource.h.no_virt_QObject 2011-04-08 17:56:48.000000000 +0200
+++ sonic-visualiser-1.8/svapp/audioio/AudioCallbackPlaySource.h 2011-08-09 23:27:18.856064127 +0200
@@ -51,7 +51,7 @@
* provides a method for a realtime thread to pick up the latest
* available sample data from these buffers.
*/
-class AudioCallbackPlaySource : public virtual QObject,
+class AudioCallbackPlaySource : public QObject,
public AudioPlaySource
{
Q_OBJECT
sonic-visualiser-1.8-raptor2.patch:
sonic-visualiser/configure.ac | 2 +-
svapp/configure.ac | 2 +-
svcore/configure.ac | 2 +-
svgui/configure.ac | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE sonic-visualiser-1.8-raptor2.patch ---
* Add support for raptor2
* remove raptor references from configure.ac's that don't need/use it anywhere in
it's corresponding source code.
TODO: maintain compatibility with raptor(1) too?
diff -up sonic-visualiser-1.8/sonic-visualiser/configure.ac.raptor2 sonic-visualiser-1.8/sonic-visualiser/configure.ac
--- sonic-visualiser-1.8/sonic-visualiser/configure.ac.raptor2 2011-04-08 10:56:20.000000000 -0500
+++ sonic-visualiser-1.8/sonic-visualiser/configure.ac 2011-07-31 20:32:32.494052584 -0500
@@ -82,7 +82,7 @@ SV_MODULE_REQUIRED([samplerate],[sampler
SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.0],[vamp-hostsdk/PluginLoader.h],[],[])
SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
-SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
+#SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
SV_MODULE_REQUIRED([rasqal],[rasqal >= 0.9.19],[rasqal/rasqal.h],[rasqal],[rasqal_new_world])
SV_MODULE_REQUIRED([redland],[redland >= 1.0.10],[librdf.h],[rdf],[librdf_new_world])
diff -up sonic-visualiser-1.8/svapp/configure.ac.raptor2 sonic-visualiser-1.8/svapp/configure.ac
--- sonic-visualiser-1.8/svapp/configure.ac.raptor2 2011-04-08 10:56:48.000000000 -0500
+++ sonic-visualiser-1.8/svapp/configure.ac 2011-07-31 20:32:57.720737209 -0500
@@ -82,7 +82,7 @@ SV_MODULE_REQUIRED([samplerate],[sampler
SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.0],[vamp-hostsdk/PluginLoader.h],[],[])
SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
-SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
+#SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
SV_MODULE_REQUIRED([rasqal],[rasqal >= 0.9.19],[rasqal/rasqal.h],[rasqal],[rasqal_new_world])
SV_MODULE_REQUIRED([redland],[redland >= 1.0.10],[librdf.h],[rdf],[librdf_new_world])
diff -up sonic-visualiser-1.8/svcore/configure.ac.raptor2 sonic-visualiser-1.8/svcore/configure.ac
--- sonic-visualiser-1.8/svcore/configure.ac.raptor2 2011-04-08 10:56:35.000000000 -0500
+++ sonic-visualiser-1.8/svcore/configure.ac 2011-07-31 20:33:31.846310577 -0500
@@ -82,7 +82,7 @@ SV_MODULE_REQUIRED([samplerate],[sampler
SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.0],[vamp-hostsdk/PluginLoader.h],[],[])
SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
-SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
+SV_MODULE_REQUIRED([raptor2],[raptor2 >= 2.0.0],[raptor.h],[raptor],[raptor_start_parse])
SV_MODULE_REQUIRED([rasqal],[rasqal >= 0.9.19],[rasqal/rasqal.h],[rasqal],[rasqal_new_world])
SV_MODULE_REQUIRED([redland],[redland >= 1.0.10],[librdf.h],[rdf],[librdf_new_world])
diff -up sonic-visualiser-1.8/svgui/configure.ac.raptor2 sonic-visualiser-1.8/svgui/configure.ac
--- sonic-visualiser-1.8/svgui/configure.ac.raptor2 2011-04-08 10:56:44.000000000 -0500
+++ sonic-visualiser-1.8/svgui/configure.ac 2011-07-31 20:33:13.936534473 -0500
@@ -82,7 +82,7 @@ SV_MODULE_REQUIRED([samplerate],[sampler
SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.0],[vamp-hostsdk/PluginLoader.h],[],[])
SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
-SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
+#SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
SV_MODULE_REQUIRED([rasqal],[rasqal >= 0.9.19],[rasqal/rasqal.h],[rasqal],[rasqal_new_world])
SV_MODULE_REQUIRED([redland],[redland >= 1.0.10],[librdf.h],[rdf],[librdf_new_world])
Index: sonic-visualiser-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/devel/sonic-visualiser-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sonic-visualiser-freeworld.spec 3 Oct 2011 19:21:28 -0000 1.6
+++ sonic-visualiser-freeworld.spec 3 Oct 2011 19:59:12 -0000 1.7
@@ -1,6 +1,6 @@
Name: sonic-visualiser-freeworld
Version: 1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A program for viewing and exploring audio data
Group: Applications/Multimedia
@@ -10,14 +10,28 @@
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
+
+%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
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
@@ -41,11 +55,23 @@
%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
%build
%configure
#qmake-qt4
+
+# not SMP-safe
#make {?_smp_mflags}
make
@@ -66,8 +92,10 @@
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+%if 0%{?rhel}
%clean
rm -rf $RPM_BUILD_ROOT
+%endif
%post
@@ -94,6 +122,10 @@
%changelog
+* Mon Oct 3 2011 Michel Salim <salimma at fedoraproject.org> - 1.8-3
+- Fix for Qt 4.8 disallowing virtual inheritance of QObject (Radek Novacek)
+- patch for raptor2 support (Rex Dieter)
+
* Mon Oct 03 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.8-2
- Rebuild for librasqal
More information about the rpmfusion-commits
mailing list