Accepting request 78360 from multimedia:libs

- Updated to version 1.1.4:
  Improvements to the API for playing MIDI files, several bug fixes
  in the engine itself; for details, see:
    http://sourceforge.net/apps/trac/fluidsynth/wiki/ChangeLog1_1_4
- Use cmake for build
- Re-add a symbol dropped from 1.1.3
- Clean up spec file

OBS-URL: https://build.opensuse.org/request/show/78360
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fluidsynth?expand=0&rev=18

fluidsynth-1.1.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6c761831751ed63f1ec2b1d311af0577861778efc11d8dfe9605b9aad449611
-size 722849

fluidsynth-1.1.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56108f946f102fa08427c6ee416c842fb923576d78b4dd96abc457dffa8ec10f
+size 799903

fluidsynth-add-missing-export-for-1.1.4.diff

@@ -0,0 +1,19 @@
+---
+ src/sfloader/fluid_defsfont.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/src/sfloader/fluid_defsfont.c
++++ b/src/sfloader/fluid_defsfont.c
+@@ -109,6 +109,12 @@
+   return fluid_defsfont_get_name((fluid_defsfont_t*) sfont->data);
+ }
+ 
++fluid_sample_t* fluid_defsfont_get_sample(fluid_defsfont_t* sfont, char *s)
++{
++  /* This function is here just to avoid an ABI/SONAME bump, see ticket #98. Should never be used. */
++  return NULL;
++}
++
+ fluid_preset_t*
+ fluid_defsfont_sfont_get_preset(fluid_sfont_t* sfont, unsigned int bank, unsigned int prenum)
+ {

fluidsynth-fix-build-lash.diff

@@ -0,0 +1,14 @@
+---
+ src/CMakeLists.txt |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -296,6 +296,7 @@
+     ${WINDOWS_LIBS}
+     ${MidiShare_LIBS}
+     ${LIBFLUID_LIBS}
++    -lpthread
+ )
+ 
+ # ************ CLI program ************

fluidsynth.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Aug  8 12:57:18 CEST 2011 - tiwai@suse.de
+
+- Updated to version 1.1.4:
+  Improvements to the API for playing MIDI files, several bug fixes
+  in the engine itself; for details, see:
+    http://sourceforge.net/apps/trac/fluidsynth/wiki/ChangeLog1_1_4
+- Use cmake for build
+- Re-add a symbol dropped from 1.1.3
+- Clean up spec file
+
 -------------------------------------------------------------------
 Fri Dec 31 14:20:06 UTC 2010 - lnussel@suse.de
 

fluidsynth.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package fluidsynth (Version 1.1.3)
+# spec file for package fluidsynth (Version 1.1.4)
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,9 +20,10 @@
 Name:           fluidsynth
 BuildRequires:  alsa-devel ladspa-devel libjack-devel readline-devel
 BuildRequires:  dbus-1-devel lash-devel libsndfile-devel pulseaudio-devel
+BuildRequires:  cmake
 Summary:        A Real-Time Software Synthesizer That Uses Soundfont(tm)
-Version:        1.1.3
+Version:        1.1.4
-Release:        2
+Release:        1
 Group:          Productivity/Multimedia/Sound/Midi
 # Obsoletes:    iiwusynth
 # Provides:     iiwusynth
@@ -30,6 +31,8 @@ AutoReqProv:    on
 License:        LGPLv2.1+
 Url:            http://www.fluidsynth.org/
 Source:         %{name}-%{version}.tar.bz2
+Patch1:         fluidsynth-fix-build-lash.diff
+Patch2:         fluidsynth-add-missing-export-for-1.1.4.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -38,14 +41,6 @@ specifications. It is a real-time "software synthesizer". FluidSynth
 can read MIDI events from the MIDI input device and render them to the
 audio device. It can also play MIDI files.
 
-
-
-Authors:
---------
-    Peter Hanappe <peter@hanappe.com>
-    Samuel Bianchini
-    Johnathan Lee
-
 %package devel
 License:        LGPLv2.1+
 Summary:        Development package for the fluidsynth library
@@ -57,14 +52,6 @@ Provides:       libfluidsynth-devel = %{version}
 This package contains the files needed to compile programs that use the
 fluidsynth library.
 
-
-
-Authors:
---------
-    Peter Hanappe <peter@hanappe.com>
-    Samuel Bianchini
-    Johnathan Lee
-
 %package -n libfluidsynth1
 License:        LGPLv2.1+
 Summary:        Library for Fluidsynth
@@ -73,32 +60,20 @@ Group:          System/Libraries
 %description -n libfluidsynth1
 This package contains the shared library for Fluidsynth.
 
-
-
-Authors:
---------
-    Peter Hanappe <peter@hanappe.com>
-    Samuel Bianchini
-    Johnathan Lee
-
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
-# autoreconf --force --install
+mkdir build
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+cd build
-./configure --prefix=%{_prefix} \
+cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -Denable-ladspa=1
-  --libdir=%{_libdir} \
+%{__make} VERBOSE=1
-  --mandir=%{_mandir} \
-  --disable-static \
-  --enable-jack-support \
-  --enable-ladspa
-make
 
 %install
+cd build
 make install DESTDIR=$RPM_BUILD_ROOT
-# remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %post -n libfluidsynth1 -p /sbin/ldconfig