diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
commit | bc864260b40f40e8f689788c54f6138007764077 (patch) | |
tree | 9c9be0d9a53d7e3a03d76276fc4b02dd08b552bf /extra/fluidsynth | |
parent | b90f83b99150003a2022c3a4bbad90b12eb56b7e (diff) | |
parent | 453f3b8b2c568e9babcdc4852772278a39f130c0 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/drbd/PKGBUILD
community/etherape/PKGBUILD
community/ext4magic/PKGBUILD
community/fcron/PKGBUILD
community/fcron/systab.orig
community/gnome-panel/PKGBUILD
community/libident/PKGBUILD
community/libtorrent/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/usbipd.service
community/makedev/PKGBUILD
community/minbif/PKGBUILD
community/noip/PKGBUILD
community/notmuch/PKGBUILD
community/pam_pwcheck/PKGBUILD
community/pound/PKGBUILD
community/preload/PKGBUILD
community/python-cchardet/PKGBUILD
community/rtorrent/PKGBUILD
community/tor/PKGBUILD
community/ude/PKGBUILD
core/openldap/PKGBUILD
core/sysvinit/PKGBUILD
extra/cd-discid/PKGBUILD
extra/cvs/PKGBUILD
extra/epiphany-extensions/PKGBUILD
extra/fbset/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/gtkmm/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdepim/PKGBUILD
extra/libical/PKGBUILD
extra/mutt/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/ossp/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/rtkit/PKGBUILD
extra/samba/PKGBUILD
extra/totem/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/liferea-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
Diffstat (limited to 'extra/fluidsynth')
-rw-r--r-- | extra/fluidsynth/PKGBUILD | 23 | ||||
-rw-r--r-- | extra/fluidsynth/fluidsynth.conf | 2 | ||||
-rw-r--r-- | extra/fluidsynth/fluidsynth.install | 12 | ||||
-rw-r--r-- | extra/fluidsynth/fluidsynth.rc | 40 |
4 files changed, 9 insertions, 68 deletions
diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD index ae6d2337d..07b790a4d 100644 --- a/extra/fluidsynth/PKGBUILD +++ b/extra/fluidsynth/PKGBUILD @@ -1,26 +1,21 @@ -# $Id: PKGBUILD 166870 2012-09-20 10:08:01Z schiv $ +# $Id: PKGBUILD 185445 2013-05-14 10:12:02Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fluidsynth pkgver=1.1.6 -pkgrel=1.1 +pkgrel=2 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" arch=(i686 x86_64 'mips64el') url="http://www.fluidsynth.org/" -depends=('glib2' 'jack' 'dbus-core' 'libpulse') +depends=('glib2' 'jack' 'libpulse') makedepends=('cmake' 'ladspa' 'doxygen') optdepends=('pulseaudio: PulseAudio sound support') license=('LGPL') -backup=('etc/conf.d/fluidsynth') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'fluidsynth.conf' - 'fluidsynth.rc' 'fluidsynth.systemd') md5sums=('ae5aca6de824b4173667cbd3a310b263' - '7d0ab0d75d4e87652f4cb7ffeac8a82b' - 'b296dbfb524c2164f552f68bd9abe2ec' 'e0406748a154409907df62292be32e8a') build() { @@ -36,16 +31,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/fluidsynth.conf" \ - "$pkgdir/etc/conf.d/fluidsynth" - - install -Dm755 "$srcdir/fluidsynth.rc" \ - "$pkgdir/etc/rc.d/fluidsynth" - - install -Dm644 "$srcdir/fluidsynth.systemd" \ - "$pkgdir/usr/lib/systemd/system/fluidsynth.service" + install -Dm644 "$srcdir/$pkgname.systemd" \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } # vim:set ts=2 sw=2 et: diff --git a/extra/fluidsynth/fluidsynth.conf b/extra/fluidsynth/fluidsynth.conf deleted file mode 100644 index b8465fa2e..000000000 --- a/extra/fluidsynth/fluidsynth.conf +++ /dev/null @@ -1,2 +0,0 @@ -FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000" -FSYNTH_SOUNDFONT="" # path to your soundfont diff --git a/extra/fluidsynth/fluidsynth.install b/extra/fluidsynth/fluidsynth.install index 86e05f892..b100fc989 100644 --- a/extra/fluidsynth/fluidsynth.install +++ b/extra/fluidsynth/fluidsynth.install @@ -1,19 +1,13 @@ post_install() { echo - echo " > To use FluidSynth as a daemon edit /etc/conf.d/fluidsynth" - echo - echo " > Systemd users need to copy the service file from:" + 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 - echo " > PulseAudio output when running as a daemon" - echo " > is known to be problematic. See:" + echo " > PulseAudio output when running as a daemon is known to be" + echo " > problematic. See the following bulletin board post:" echo " https://bbs.archlinux.org/viewtopic.php?id=135092" echo } - -post_upgrade() { - post_install -} diff --git a/extra/fluidsynth/fluidsynth.rc b/extra/fluidsynth/fluidsynth.rc deleted file mode 100644 index ca1e8fa6e..000000000 --- a/extra/fluidsynth/fluidsynth.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth - -PID=`pidof -o %PPID /usr/bin/fluidsynth` -case "$1" in - start) - stat_busy "Starting Fluidsynth soundfont synthesizer" - [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 & - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/fluidsynth.pid - add_daemon fluidsynth - stat_done - fi - ;; - stop) - stat_busy "Stopping Fluidsynth soundfont synthesizer" - [ ! -z "$PID" ] && kill $PID &> /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/fluidsynth.pid - rm_daemon fluidsynth - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 |