From 9dc80e5af0a163894695642784112d8af009c7b0 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: May 30 2009 04:15:10 +0000 Subject: - Update to 1.0.0 --- diff --git a/.cvsignore b/.cvsignore index f56f42b..ece5cc9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dssi-0.9.1.tar.gz +dssi-1.0.0.tar.gz diff --git a/dssi-0.9-cstdlib.patch b/dssi-0.9-cstdlib.patch deleted file mode 100644 index 7a86976..0000000 --- a/dssi-0.9-cstdlib.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up examples/trivial_sampler_qt_gui.cpp.orig examples/trivial_sampler_qt_gui.cpp ---- examples/trivial_sampler_qt_gui.cpp.orig 2005-05-05 13:56:31.000000000 -0400 -+++ examples/trivial_sampler_qt_gui.cpp 2008-07-16 17:54:47.000000000 -0400 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #include "dssi.h" diff --git a/dssi-0.9-math.patch b/dssi-0.9-math.patch deleted file mode 100644 index 7c78df8..0000000 --- a/dssi-0.9-math.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dssi-0.9/examples/trivial_sampler_qt_gui.cpp~ 2004-10-28 04:46:08.000000000 -0700 -+++ dssi-0.9/examples/trivial_sampler_qt_gui.cpp 2004-12-23 22:18:42.000000000 -0800 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include "dssi.h" - diff --git a/dssi-lib64.patch b/dssi-lib64.patch index 9fce738..644431e 100644 --- a/dssi-lib64.patch +++ b/dssi-lib64.patch @@ -1,14 +1,27 @@ ---- jack-dssi-host/jack-dssi-host.c~ 2005-10-11 09:44:56.000000000 -0700 -+++ jack-dssi-host/jack-dssi-host.c 2006-05-30 14:26:37.000000000 -0700 -@@ -494,9 +494,9 @@ +diff -rupN dssi-1.0.0.old/doc/jack-dssi-host.1 dssi-1.0.0/doc/jack-dssi-host.1 +--- dssi-1.0.0.old/doc/jack-dssi-host.1 2009-01-05 15:43:48.000000000 -0500 ++++ dssi-1.0.0/doc/jack-dssi-host.1 2009-05-30 00:03:04.000000000 -0400 +@@ -91,7 +91,7 @@ by the environment variable + .B DSSI_PATH, + which is a colon-separated list of directories. If + .B DSSI_PATH +-is not set, a default search path of /usr/lib/dssi, ++is not set, a default search path of /usr/lib64/dssi, /usr/local/lib64/dssi, /usr/lib/dssi, + /usr/local/lib/dssi, and (assuming the environment variable HOME is + set,) $HOME/.dssi is used. + .br +diff -rupN dssi-1.0.0.old/jack-dssi-host/jack-dssi-host.c dssi-1.0.0/jack-dssi-host/jack-dssi-host.c +--- dssi-1.0.0.old/jack-dssi-host/jack-dssi-host.c 2009-01-04 16:48:26.000000000 -0500 ++++ dssi-1.0.0/jack-dssi-host/jack-dssi-host.c 2009-05-30 00:02:28.000000000 -0400 +@@ -493,9 +493,9 @@ load(const char *dllName, void **dll, in const char *home = getenv("HOME"); if (home) { defaultDssiPath = malloc(strlen(home) + 60); - sprintf(defaultDssiPath, "/usr/local/lib/dssi:/usr/lib/dssi:%s/.dssi", home); -+ sprintf(defaultDssiPath, "/usr/local/lib64/dssi:/usr/lib64/dssi:%s/.dssi", home); ++ sprintf(defaultDssiPath, "/usr/local/lib64/dssi:/usr/lib64/dssi:/usr/local/lib/dssi:/usr/lib/dssi:%s/.dssi", home); } else { - defaultDssiPath = strdup("/usr/local/lib/dssi:/usr/lib/dssi"); -+ defaultDssiPath = strdup("/usr/local/lib64/dssi:/usr/lib64/dssi"); ++ defaultDssiPath = strdup("/usr/local/lib64/dssi:/usr/lib64/dssi:/usr/local/lib/dssi:/usr/lib/dssi"); } } dssiPath = defaultDssiPath; diff --git a/dssi.spec b/dssi.spec index 9a0129e..8f63aa2 100644 --- a/dssi.spec +++ b/dssi.spec @@ -1,31 +1,33 @@ Summary: Disposable Soft Synth Interface Name: dssi -Version: 0.9.1 -Release: 16%{?dist} +Version: 1.0.0 +Release: 1%{?dist} License: MIT Group: Applications/Multimedia URL: http://dssi.sourceforge.net/ -Source0: http://download.sf.net/sourceforge/dssi/dssi-0.9.1.tar.gz +Source0: http://download.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Patch1: dssi-lib64.patch -Patch2: dssi-0.9-cstdlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ladspa-devel, alsa-lib-devel +BuildRequires: alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel -BuildRequires: liblo-devel, libsndfile-devel, libsamplerate-devel +BuildRequires: ladspa-devel +BuildRequires: liblo-devel +BuildRequires: libsamplerate-devel +BuildRequires: libsndfile-devel # for the examples -BuildRequires: qt-devel +BuildRequires: qt3-devel %description -Disposable Soft Synth Interface (DSSI, pronounced "dizzy") is a -proposal for a plugin API for software instruments (soft synths) with -user interfaces, permitting them to be hosted in-process by Linux -audio applications. Think of it as LADSPA-for-instruments, or -something comparable to a simpler version of VSTi. +Disposable Soft Synth Interface (DSSI, pronounced "dizzy") is a proposal for a +plugin API for software instruments (soft synths) with user interfaces, +permitting them to be hosted in-process by Linux audio applications. Think of +it as LADSPA-for-instruments, or something comparable to a simpler version of +VSTi. %package examples Summary: DSSI plugin examples -Group: Applications/Multimedia +Group: Applications/Multimedia License: Public Domain Requires: %{name} = %{version} @@ -36,42 +38,42 @@ Example plugins for the Disposable Soft Synth Interface. Summary: Libraries, includes, etc to develop DSSI applications Group: Development/Libraries License: LGPLv2+ -Requires: ladspa-devel, alsa-lib-devel, liblo-devel +Requires: alsa-lib-devel +Requires: ladspa-devel Requires: pkgconfig %description devel -Libraries, include files, etc you can use to develop DSSI -based applications. +Libraries, include files, etc you can use to develop DSSI based applications. %prep %setup -q - -# Conditionally apply patch to read DSSI plugins from lib64 dir. -%ifarch x86_64 -%patch1 -p0 -%endif - -%patch2 -p0 +%patch1 -p1 %build %configure -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/dssi/*.la %clean rm -rf $RPM_BUILD_ROOT +%check +# Build and run the tests +make -C tests controller +tests/controller + %files %defattr(-,root,root,-) -%doc README ChangeLog doc +%doc README ChangeLog doc/TODO %{_bindir}/dssi_osc_send %{_bindir}/dssi_osc_update %{_bindir}/jack-dssi-host %dir %{_libdir}/dssi +%{_mandir}/man1/* %files examples %defattr(-,root,root,-) @@ -80,17 +82,22 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/dssi/trivial_sampler.so %{_libdir}/dssi/trivial_sampler %{_libdir}/dssi/trivial_synth.so +%{_libdir}/dssi/karplong.so %{_bindir}/trivial_sampler %{_bindir}/trivial_synth %{_bindir}/less_trivial_synth +%{_bindir}/karplong %files devel %defattr(-,root,root,-) -%doc COPYING +%doc doc/*.txt doc/*.html COPYING %{_includedir}/dssi.h %{_libdir}/pkgconfig/dssi.pc %changelog +* Fri May 29 2009 Orcan Ogetbil - 1.0.0-1 +- Update to 1.0.0 + * Tue Feb 24 2009 Fedora Release Engineering - 0.9.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -134,23 +141,23 @@ rm -rf $RPM_BUILD_ROOT * Sun May 21 2006 Anthony Green 0.9.1-3 - Move .pc file from examples to devel. -- Delete the .la files instead of %exclude-ing them. +- Delete the .la files instead of %%exclude-ing them. - Add some dependencies to the -devel package. - dssi-devel package no longer depends on dssi. - Move COPYING to devel package. * Thu May 18 2006 Anthony Green 0.9.1-2 - Clean up BuildRequires. -- Add "%dir" to dssi lib dir in $files. +- Add "%%dir" to dssi lib dir in $files. - Move plugin examples to a new -examples package. * Sat May 13 2006 Anthony Green 0.9.1-1 - Upgrade to 0.9.1 sources. - Remove fluidsynth-dssi bits. -- Own %{_libdir}/dssi. +- Own %%{_libdir}/dssi. * Tue Apr 25 2006 Anthony Green 0.9-3 -- Own %{_libdir}/dssi/* directories. +- Own %%{_libdir}/dssi/* directories. * Tue Apr 18 2006 Anthony Green 0.9-2 - Build for Fedora Extras. diff --git a/sources b/sources index 87b2a2a..497914c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a353c3ae80328cded838853ddf52164 dssi-0.9.1.tar.gz +bc4c50f9f9b3cd13019718266f8f15af dssi-1.0.0.tar.gz