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

[Ray Rashif]

    Date: Monday, September 1, 2014 @ 16:04:18
  Author: schiv
Revision: 220866

upgpkg: fluidsynth 1.1.6-4

Rework service config; also solves FS#41768

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-01 13:37:33 UTC (rev 220865)
+++ PKGBUILD	2014-09-01 14:04:18 UTC (rev 220866)
@@ -4,7 +4,7 @@
 
 pkgname=fluidsynth
 pkgver=1.1.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
 arch=('i686' 'x86_64')
 url="http://www.fluidsynth.org/"
@@ -12,13 +12,14 @@
 makedepends=('cmake' 'ladspa' 'doxygen')
 optdepends=('pulseaudio: PulseAudio sound support')
 license=('LGPL')
+backup=("etc/conf.d/$pkgname")
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         'fluidsynth.systemd'
         'fluidsynth.conf')
 md5sums=('ae5aca6de824b4173667cbd3a310b263'
-         '524c616c95541dced4e9236747d4819a'
-         '28341523089ed9e15d2e7686cef2e8e8')
+         'ba5e2c71a98d593339e1460c60b0951c'
+         '2167e6a7e38ed29399d77179072548f2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"

Modified: fluidsynth.conf
===================================================================
--- fluidsynth.conf	2014-09-01 13:37:33 UTC (rev 220865)
+++ fluidsynth.conf	2014-09-01 14:04:18 UTC (rev 220866)
@@ -1,2 +1,8 @@
-SYNTHOPTS="-is -a alsa -m alsa_seq -r 48000"
-#SOUNDFONT=/path/to/a/soundfont
+# Mandatory parameters (uncomment and edit)
+#SOUND_FONT=/path/to/a/soundfont
+#AUDIO_DRIVER=alsa|jack|pulseaudio
+# see 'fluidsynth -a help'
+
+# Optional parameters (may be helpful)
+#OTHER_OPTS='-m alsa_seq -r 48000'
+# man fluidsynth, please

Modified: fluidsynth.install
===================================================================
--- fluidsynth.install	2014-09-01 13:37:33 UTC (rev 220865)
+++ fluidsynth.install	2014-09-01 14:04:18 UTC (rev 220866)
@@ -9,8 +9,3 @@
 	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-09-01 13:37:33 UTC (rev 220865)
+++ fluidsynth.systemd	2014-09-01 14:04:18 UTC (rev 220866)
@@ -3,7 +3,7 @@
 After=sound.target
 
 [Service]
-ExecStart=/usr/bin/fluidsynth $SYNTHOPTS $SOUNDFONT
+ExecStart=/usr/bin/fluidsynth -is -a $AUDIO_DRIVER $OTHER_OPTS $SOUND_FONT
 EnvironmentFile=/etc/conf.d/fluidsynth
 
 [Install]