9 files changed, 37 insertions, 34 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index d344c30e3..8ce773463 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 216131 2014-07-01 17:22:49Z bpiotrowski $
+# $Id: PKGBUILD 216776 2014-07-10 20:34:58Z bpiotrowski $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=ffmpeg
 pkgver=2.2.4
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD
index a1e133765..669529f19 100644
--- a/extra/fluidsynth/PKGBUILD
+++ b/extra/fluidsynth/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 185445 2013-05-14 10:12:02Z schiv $
+# $Id: PKGBUILD 216766 2014-07-10 17:16:24Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 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 @@ package() {
 
   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:
diff --git a/extra/fluidsynth/fluidsynth.conf b/extra/fluidsynth/fluidsynth.conf
new file mode 100644
index 000000000..08c5460f5
--- /dev/null
+++ b/extra/fluidsynth/fluidsynth.conf
@@ -0,0 +1,2 @@
+SYNTHOPTS="-is -a alsa -m alsa_seq -r 48000"
+#SOUNDFONT=/path/to/a/soundfont
diff --git a/extra/fluidsynth/fluidsynth.install b/extra/fluidsynth/fluidsynth.install
index b100fc989..f289a80ed 100644
--- a/extra/fluidsynth/fluidsynth.install
+++ b/extra/fluidsynth/fluidsynth.install
@@ -1,13 +1,16 @@
 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:"
 	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."
+}
diff --git a/extra/fluidsynth/fluidsynth.systemd b/extra/fluidsynth/fluidsynth.systemd
index 06784fe05..ce37ab4d0 100644
--- a/extra/fluidsynth/fluidsynth.systemd
+++ b/extra/fluidsynth/fluidsynth.systemd
@@ -3,7 +3,8 @@ Description=FluidSynth Daemon
 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
diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD
index edcd83e2f..0af09f347 100644
--- a/extra/ncmpc/PKGBUILD
+++ b/extra/ncmpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 215504 2014-06-27 12:04:47Z bisson $
+# $Id: PKGBUILD 216764 2014-07-10 16:20:56Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Daniel Bainton <dpb [at] backarrow.org>
 
 pkgname=ncmpc
-pkgver=0.22
+pkgver=0.23
 pkgrel=1
 pkgdesc='Fully featured MPD client using ncurses'
 url='http://www.musicpd.org/clients/ncmpc/'
@@ -15,16 +15,8 @@ license=('GPL')
 depends=('ncurses' 'glib2' 'libmpdclient')
 optdepends=('python2: to enable lyrics plugin'
             'ruby: to enable lyrics plugin')
-source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-        "po::git://git.musicpd.org/master/ncmpc.git#commit=a0dcef5c1685813aa7f70bf7b7fd5f95f441d1b1")
-makedepends=('git')
-sha1sums=('addb9ae527a1a2fe3dffe0ef2b6b4db79aeaeee4'
-          'SKIP')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	cp -a ../po/po/*.po po
-}
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('571ba50a252d9a7c69ae089b576560ef9de2f423')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD
index 2c8d0960f..8d34a6fc8 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 215099 2014-06-14 03:49:47Z fyan $
+# $Id: PKGBUILD 216769 2014-07-10 17:52:48Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=perl-net-dns
-pkgver=0.77
+pkgver=0.78
 pkgrel=1
 pkgdesc="Perl Module: Interface to the DNS resolver"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('perl-io-socket-inet6: IPv6 support'
             'perl-socket6: IPv6 support')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz)
-sha1sums=('e2264580ba9fa1d13104d41239c317570de9807e')
+sha1sums=('a50fdf4786fadd7ece6958393f9b81e1eae749ac')
 
 build() {
   cd Net-DNS-${pkgver}
diff --git a/extra/python-cryptography/PKGBUILD b/extra/python-cryptography/PKGBUILD
index 18e334002..1dd4838e4 100644
--- a/extra/python-cryptography/PKGBUILD
+++ b/extra/python-cryptography/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212992 2014-05-17 05:33:24Z fyan $
+# $Id: PKGBUILD 216771 2014-07-10 18:27:12Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgbase=python-cryptography
 pkgname=('python-cryptography' 'python2-cryptography')
-pkgver=0.4
+pkgver=0.5.2
 pkgrel=1
 pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six'
 checkdepends=('python-pytest' 'python2-pytest' 'python-cryptography-vectors' 'python2-cryptography-vectors'
               'python-iso8601' 'python2-iso8601' 'python-pretend' 'python2-pretend' 'python-pyasn1' 'python2-pyasn1')
 source=("http://pypi.python.org/packages/source/c/cryptography/cryptography-${pkgver}.tar.gz")
-md5sums=('d1bb13648a12eda2a54653ba113d2e84')
+md5sums=('8c2d381ef263653b640a7a5d14618e4c')
 
 prepare() {
    cp -a cryptography-${pkgver}{,-python2}
diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD
index 33c66a926..3ba60457c 100644
--- a/extra/x265/PKGBUILD
+++ b/extra/x265/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 214741 2014-06-09 07:59:31Z bpiotrowski $
+# $Id: PKGBUILD 216774 2014-07-10 20:23:11Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: kfgz <kfgz at interia pl>
 
 pkgname=x265
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
 pkgdesc='Open Source H265/HEVC video encoder'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('gcc-libs')
 makedepends=('yasm' 'cmake')
 url='https://bitbucket.org/multicoreware/x265'
 source=($url/get/$pkgver.tar.bz2)
-md5sums=('e6d33d31abdab1f7bd9c240641933472')
+md5sums=('57a4b8300918c5412ceaa26bb8e0a0bb')
 
 build() {
   cd multicoreware-x265-*/build/linux