12 files changed, 58 insertions, 98 deletions
diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD
index a234ff615..bc2f55d47 100644
--- a/community/esmtp/PKGBUILD
+++ b/community/esmtp/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=esmtp
 pkgver=1.2
-pkgrel=5
+pkgrel=6
 pkgdesc="An easy SMTP forwarder."
 arch=('i686' 'x86_64')
 url='http://esmtp.sourceforge.net'
@@ -14,6 +14,7 @@ depends=('libesmtp' 'openssl')
 optdepends=('liblockfile: for esmtp-wrapper script'
             'procmail: for local mail delivery')
 provides=('smtp-forwarder')
+conflicts=('smtp-forwarder')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('79a9c1f9023d53f35bb82bf446150a72')
 
diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD
index 660dafc40..e74dbcb09 100644
--- a/community/mednafen/PKGBUILD
+++ b/community/mednafen/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 83342 2013-01-29 21:58:18Z jsteel $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
+# $Id: PKGBUILD 97157 2013-09-14 14:43:41Z jsteel $
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: megadriver <megadriver at gmx dot com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
@@ -7,8 +7,8 @@
 # Contributor: Hans-Kristian Arntzen <maister@archlinux.us>
 
 pkgname=mednafen
-pkgver=0.9.28
-_pkgver=0.9.28-wip
+pkgver=0.9.32
+_pkgver=$pkgver-wip
 pkgrel=1
 pkgdesc="A command-line multi-system gaming emulator"
 url="http://mednafen.sourceforge.net"
@@ -19,7 +19,7 @@ makedepends=('mesa' 'glu')
 replaces=('mednafen-wip')
 install="$pkgname.install"
 source=(http://downloads.sourceforge.net/mednafen/$pkgname-$_pkgver.tar.bz2)
-md5sums=('2b9f0be9f77a6e1b5d26093e30b24e77')
+md5sums=('ffdf4f4bb4498df38e6aaaf316be40f5')
 
 build() {
   cd "$srcdir"/$pkgname
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index b5466cc93..45b14470c 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96909 2013-09-07 21:16:35Z eric $
+# $Id: PKGBUILD 97143 2013-09-14 07:10:59Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
 
 pkgname=mpv
-pkgver=0.1.5
+pkgver=0.1.6
 pkgrel=1
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('portaudio' 'ffmpeg' 'lcms2' 'libxinerama' 'libquvi' 'mpg123' 'libxv' '
 makedepends=('mesa' 'python-docutils')
 options=(!emptydirs)
 source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz")
-md5sums=('693d2b3854b86081382b71465b5cdb3e')
+md5sums=('4c9ee855f8beedb2508baa392704a45d')
 
 build() {
   unset CFLAGS
diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD
deleted file mode 100644
index eac151149..000000000
--- a/community/musepack-tools/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 67972 2012-03-16 13:24:52Z giovanni $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
-
-pkgname=musepack-tools
-pkgver=475
-pkgrel=2
-pkgdesc="Musepack decoder/encoder"
-arch=('i686' 'x86_64')
-url="http://www.musepack.net/"
-license=('LGPL')
-depends=('libcuefile' 'libreplaygain')
-makedepends=('cmake')
-source=("http://files.musepack.net/source/musepack_src_r$pkgver.tar.gz"
-        'math.patch')
-md5sums=('754d67be67f713e54baf70fcfdb2817e'
-         '9de31f07a3492c7b1db1248b055fbdc8')
-
-build() {
-  cd "$srcdir/musepack_src_r$pkgver"
-
-  #export LDFLAGS+="-lm"
-
-  patch -Np1 -i "$srcdir/math.patch"
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_SKIP_RPATH=ON
-}
-
-package() {
-  cd "$srcdir/musepack_src_r$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  for bin in chap cut dec enc gain 2sv8; do
-    install -Dm755 mpc$bin/mpc$bin "$pkgdir/usr/bin/mpc$bin"
-  done
-
-  find ${pkgdir} -depth -type d -name .svn -exec rm -rf {} \;
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/musepack-tools/math.patch b/community/musepack-tools/math.patch
deleted file mode 100644
index 61b3d07ec..000000000
--- a/community/musepack-tools/math.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur musepack_src_r475.old/CMakeLists.txt musepack_src_r475/CMakeLists.txt
---- musepack_src_r475.old/CMakeLists.txt	2011-10-14 16:31:05.536450109 +0800
-+++ musepack_src_r475/CMakeLists.txt	2011-10-14 16:31:34.022962450 +0800
-@@ -16,7 +16,7 @@
- add_definitions(-DFAST_MATH -DCVD_FASTLOG)
- 
- if(NOT MSVC)
--  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
-+  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe -lm")
- endif(NOT MSVC)
- 
- add_subdirectory(libmpcdec)
diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD
index f19f62ea1..d22a145d8 100644
--- a/community/recorditnow/PKGBUILD
+++ b/community/recorditnow/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97050 2013-09-11 14:06:02Z fyan $
+# $Id: PKGBUILD 97147 2013-09-14 07:29:00Z bpiotrowski $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yichao Yu <yyc1992@gmail.com>
 # Contributor: Weng Xuetian <wengxt@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=recorditnow
 pkgver=0.8.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A plugin based desktop recorder for KDE SC 4"
 arch=('i686' 'x86_64')
 url="http://kde-apps.org/content/show.php/RecordItNow?content=114610"
@@ -17,16 +17,22 @@ makedepends=('cmake' 'automoc4' 'recordmydesktop' 'mencoder')
 optdepends=('mencoder: for mencoder encoder plugin'
             'recordmydesktop')
 provides=('joschy')
-conflicts=('joschy-git')
 install=recorditnow.install
 source=("http://downloads.sourceforge.net/project/recorditnow/${pkgname}-${pkgver}.tar.bz2"
-        "cmake.patch")
+        "cmake.patch"
+        "ffmpeg.patch")
 md5sums=('6619b4048545adbab1d13a790189e80f'
-         '74ea0ababc2291e2a62e5d045c62616a')
+         '74ea0ababc2291e2a62e5d045c62616a'
+         '867f30a0cba692c7dad56195fd64b092')
+
+prepare() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -p0 -i "${srcdir}/cmake.patch"
+  patch -p0 -i "${srcdir}/ffmpeg.patch"
+}
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-  patch -i "${srcdir}/cmake.patch" -p0
 
   mkdir -p build
   cd build
diff --git a/community/recorditnow/ffmpeg.patch b/community/recorditnow/ffmpeg.patch
new file mode 100644
index 000000000..6247cbafe
--- /dev/null
+++ b/community/recorditnow/ffmpeg.patch
@@ -0,0 +1,16 @@
+--- src/plugins/recorder/ffmpegrecorder/ffmpegrecorder.cpp.orig	2010-03-04 17:39:20.000000000 +0100
++++ src/plugins/recorder/ffmpegrecorder/ffmpegrecorder.cpp	2013-09-10 18:17:26.193834681 +0200
+@@ -120,11 +120,10 @@
+             videoQuality = 2;
+         }
+ 
+-        args << "-f" << "x11grab" << "-qscale" << QString::number(videoQuality) << "-r" << QString::number(d.fps);
++        args << "-f" << "x11grab" << "-r" << QString::number(d.fps);
+         args << "-s" << QString("%1x%2").arg(geometry.width()).arg(geometry.height());
+         args << "-i" << DisplayString(QX11Info::display())+QString("+%1,%2").arg(geometry.x()).arg(geometry.y());
+-        args << "-s" << QString("%1x%2").arg(geometry.width()).arg(geometry.height());
+-        args << m_tmpFile;
++        args << "-qscale" << QString::number(videoQuality) << m_tmpFile;
+         //ffmpeg -f x11grab -qscale 2 -r 20 -s 1440x900 -i :0.0 -s 1440x900 x11grab.avi
+     } else {
+ 
diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD
index 551c6846a..95b1c7d41 100644
--- a/community/siege/PKGBUILD
+++ b/community/siege/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 95093 2013-08-05 14:00:41Z bluewind $
+# $Id: PKGBUILD 97153 2013-09-14 10:52:19Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Sven Kauber <celeon@gmail.com>
 
 pkgname=siege
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -29,4 +29,4 @@ package() {
   sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc"
 }
 
-md5sums=('116bcedf8a6663c1d42ce958e2cdd3ca')
+md5sums=('6ac0a828c02fbbe51cc437ba1addf2f0')
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 60fa909b4..0d3439b71 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94931 2013-08-01 07:01:27Z bpiotrowski $
+# $Id: PKGBUILD 97145 2013-09-14 07:15:14Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
@@ -14,10 +14,8 @@ install=sxiv.install
 url='https://github.com/muennich/sxiv'
 depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils')
 source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz
-        sxiv.desktop
         config.h)
 sha256sums=('30569b7cb1568a7f60d102f6eb21f25c93de42243a1c8ac3c1a521d58b08281f'
-            'bd14b9b6bc6d78f18cdff8535b4d1c13b3c76e35091dd6bc675011d42a01bb47'
             '61515a87692849c942bfc3cce8b4c0f19139b4a1e9b6375a994cc541c64aab5c')
 
 build() {
@@ -30,6 +28,6 @@ package() {
   cd sxiv-$pkgver
 
   make PREFIX="$pkgdir"/usr install
-  install -D -m644 "$srcdir"/sxiv.desktop \
-                   "$pkgdir"/usr/share/applications/sxiv.desktop
+  install -D -m644 sxiv.desktop \
+    "$pkgdir"/usr/share/applications/sxiv.desktop
 }
diff --git a/community/sxiv/sxiv.desktop b/community/sxiv/sxiv.desktop
deleted file mode 100644
index a981171c5..000000000
--- a/community/sxiv/sxiv.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=sxiv
-GenericName=Image Viewer
-Exec=sxiv %F
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;
-NoDisplay=true
diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index 726da372b..9829db0f7 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96937 2013-09-09 01:52:45Z dwallace $
+# $Id: PKGBUILD 97172 2013-09-14 20:33:55Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
@@ -9,6 +9,7 @@ pkgbase=uwsgi
 pkgname=(uwsgi
         uwsgi-plugin-common
         uwsgi-plugin-rack
+        uwsgi-plugin-psgi
         uwsgi-plugin-python2
         uwsgi-plugin-python
         uwsgi-plugin-nagios
@@ -22,7 +23,7 @@ pkgname=(uwsgi
         uwsgi-plugin-pam
         uwsgi-plugin-zergpool
         )
-pkgver=1.9.15
+pkgver=1.9.16
 pkgrel=1
 arch=(i686 x86_64)
 url="http://projects.unbit.it/$pkgbase"
@@ -39,8 +40,8 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
         uwsgi_fix_rpath.patch
         uwsgi_ruby20_compatibility.patch
         uwsgi_trick_chroot.patch)
-md5sums=('e2a1c245e0b8b7e3c8dff8dbbfca52f3'
-         '4741a0cb14a55aca640a99ad30c951af'
+md5sums=('71fdc369d595ec40776ad954c6ea346b'
+         'fcd57c37372e6afe5b1fae151dd43bc9'
          'b05ba1d796e1ea608a40635bc4f3ec67'
          '740a7718bd341b03d916a13ddbbbe694'
          'db70315bbc8cb886a278ba59d5fd8d57'
@@ -103,6 +104,14 @@ package_uwsgi-plugin-rack(){
     install -Dm755 $pkgbase-$pkgver/rbthreads_plugin.so $pkgdir/usr/lib/uwsgi/rbthreads_plugin.so
 }
 
+package_uwsgi-plugin-psgi(){
+    depends=(perl uwsgi-plugin-common)
+    pkgdesc="Perl psgi plugin"
+    install -dm755 $pkgdir/usr/bin
+    install -Dm755 $pkgbase-$pkgver/psgi_plugin.so $pkgdir/usr/lib/uwsgi/psgi_plugin.so
+    ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
+}
+
 package_uwsgi-plugin-python2(){
     depends=(uwsgi-plugin-common python2-gevent python2-gevent)
     pkgdesc="Plugin for Python2 support"
@@ -227,11 +236,3 @@ package_uwsgi-plugin-gevent() {
     install -Dm755 $pkgbase-$pkgver/gevent_plugin.so $pkgdir/usr/lib/uwsgi/gevent_plugin.so
     ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
 }
-md5sums=('e2a1c245e0b8b7e3c8dff8dbbfca52f3'
-         '18ef00843b3eeb537bd9456402d11a4b'
-         'b05ba1d796e1ea608a40635bc4f3ec67'
-         '740a7718bd341b03d916a13ddbbbe694'
-         'db70315bbc8cb886a278ba59d5fd8d57'
-         '1a4516d5cdcf5b95b036f4eae2d0c152'
-         '4d09535ce379c8acd76160f35d5d6b55'
-         '0c09a52fdb88f08c36a8b380f451ce6d')
diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini
index 3b0cd4d78..e3770bf5b 100644
--- a/community/uwsgi/archlinux.ini
+++ b/community/uwsgi/archlinux.ini
@@ -14,4 +14,4 @@ yaml_implementation = auto
 malloc_implementation = libc
 embedded_plugins = echo, ping, http, corerouter
 plugin_dir = /usr/lib/uwsgi
-plugins = echo, ping, http, rack, corerouter, rbthreads, fiber, python, nagios,  admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter
+plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios,  admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter