[arch-commits] Commit in fluidsynth/trunk (4 files)

[Ray Rashif]

    Date: Thursday, July 10, 2014 @ 19:15:49
  Author: schiv
Revision: 216765

upgpkg: fluidsynth 1.1.6-3

rework systemd configuration; closes FS#41156

Added:
  fluidsynth/trunk/fluidsynth.conf
Modified:
  fluidsynth/trunk/PKGBUILD
  fluidsynth/trunk/fluidsynth.install
  fluidsynth/trunk/fluidsynth.systemd

--------------------+
 PKGBUILD           |   13 +++++++++----
 fluidsynth.conf    |    2 ++
 fluidsynth.install |   13 ++++++++-----
 fluidsynth.systemd |    3 ++-
 4 files changed, 21 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-10 16:20:56 UTC (rev 216764)
+++ PKGBUILD	2014-07-10 17:15:49 UTC (rev 216765)
@@ -4,19 +4,21 @@
 
 pkgname=fluidsynth
 pkgver=1.1.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
 arch=('i686' 'x86_64')
 url="http://www.fluidsynth.org/"
-depends=('glib2' 'jack' 'libpulse')
+depends=('jack' 'libpulse')
 makedepends=('cmake' 'ladspa' 'doxygen')
 optdepends=('pulseaudio: PulseAudio sound support')
 license=('LGPL')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'fluidsynth.systemd')
+        'fluidsynth.systemd'
+        'fluidsynth.conf')
 md5sums=('ae5aca6de824b4173667cbd3a310b263'
-         'e0406748a154409907df62292be32e8a')
+         '524c616c95541dced4e9236747d4819a'
+         '28341523089ed9e15d2e7686cef2e8e8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -35,6 +37,9 @@
 
   install -Dm644 "$srcdir/$pkgname.systemd" \
     "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+
+  install -Dm644 "$srcdir/$pkgname.conf" \
+    "$pkgdir/etc/conf.d/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:

Added: fluidsynth.conf
===================================================================
--- fluidsynth.conf	                        (rev 0)
+++ fluidsynth.conf	2014-07-10 17:15:49 UTC (rev 216765)
@@ -0,0 +1,2 @@
+SYNTHOPTS="-is -a alsa -m alsa_seq -r 48000"
+#SOUNDFONT=/path/to/a/soundfont

Modified: fluidsynth.install
===================================================================
--- fluidsynth.install	2014-07-10 16:20:56 UTC (rev 216764)
+++ fluidsynth.install	2014-07-10 17:15:49 UTC (rev 216765)
@@ -1,10 +1,8 @@
 post_install() {
 	echo
-	echo "  > To use FluidSynth as a daemon copy the service file from:"
-	echo "      /usr/lib/systemd/system/fluidsynth.service"
-	echo "  > to:"
-	echo "      /etc/systemd/system/multi-user.target.wants/"
-	echo "  > and then edit accordingly."
+	echo "  > FluidSynth comes with a daemon. Start/enable it with systemd."
+	echo "  > Before that, you need a soundfont and some preconfiguration:"
+	echo "      /etc/conf.d/fluidsynth"
 	echo
 	echo "  > PulseAudio output when running as a daemon is known to be"
 	echo "  > problematic. See the following bulletin board post:"
@@ -11,3 +9,8 @@
 	echo "      https://bbs.archlinux.org/viewtopic.php?id=135092"
 	echo
 }
+
+post_upgrade() {
+	echo "  > Configuration is once again done via /etc/conf.d/fluidsynth"
+	echo "  > Remove any and all other configuration files."
+}

Modified: fluidsynth.systemd
===================================================================
--- fluidsynth.systemd	2014-07-10 16:20:56 UTC (rev 216764)
+++ fluidsynth.systemd	2014-07-10 17:15:49 UTC (rev 216765)
@@ -3,7 +3,8 @@
 After=sound.target
 
 [Service]
-ExecStart=/usr/bin/fluidsynth -is -a alsa -m alsa_seq -r 48000 # append soundfont path here
+ExecStart=/usr/bin/fluidsynth $SYNTHOPTS $SOUNDFONT
+EnvironmentFile=/etc/conf.d/fluidsynth
 
 [Install]
 WantedBy=multi-user.target