[sonic-visualiser] support raptor2 (in rdf plugin)

[Rex Dieter]

commit c6aec722d30ef702b0c21133565276b3928f11a9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jul 31 21:25:47 2011 -0500

    support raptor2 (in rdf plugin)
    
    note too, this package currently doesn't explicitly BR raptor-devel or raptor2-devel
    but relies on implicit deps from redland-devel

 sonic-visualiser-1.8-raptor2.patch |   54 ++++++++++++++++++++++++++++++++++++
 sonic-visualiser.spec              |   20 +++++++++++++
 2 files changed, 74 insertions(+), 0 deletions(-)
---
diff --git a/sonic-visualiser-1.8-raptor2.patch b/sonic-visualiser-1.8-raptor2.patch
new file mode 100644
index 0000000..da270f5
--- /dev/null
+++ b/sonic-visualiser-1.8-raptor2.patch
@@ -0,0 +1,54 @@
+* 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])
+ 
diff --git a/sonic-visualiser.spec b/sonic-visualiser.spec
index c2f43d8..f9d6471 100644
--- a/sonic-visualiser.spec
+++ b/sonic-visualiser.spec
@@ -12,6 +12,16 @@ Patch0:         %{name}-1.8-gcc46.patch
 Patch1:         %{name}-1.8-implicit-dso.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## 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
+%define 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
@@ -41,6 +51,15 @@ analysis plugin format – as well as applying standard audio effects.
 %patch0 -p1 -b .gcc46
 %patch1 -p1 -b .implicit-dso
 
+%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
@@ -95,6 +114,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Sun Jul 31 2011 Rex Dieter <rdieter at fedoraproject.org> 1.8-2
 - rebuild (rasqal/redland)
+- patch for raptor2 support
 
 * Tue Jun 21 2011 Michel Salim <salimma at fedoraproject.org> - 1.8-1
 - Update to 1.8