Sun Nov 13 23:14:59 UTC 2011

121 files changed, 2845 insertions, 514 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 0caf35d71..c550afef0 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58055 2011-11-06 09:27:03Z giovanni $
+# $Id: PKGBUILD 58435 2011-11-12 17:24:25Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.25
-pkgrel=1
+pkgver=0.8.26
+pkgrel=3
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -21,7 +21,7 @@ install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('b7b141db18912925be08ff79fd2ead3f'
+md5sums=('269662b0af1aac2dea8add6b8d6055dc'
          '253ce4fe5d01f8ff76b63cd3825755ea'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index 8619bbbc8..28b5f9c15 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57044 2011-10-19 09:24:20Z foutrelis $
+# $Id: PKGBUILD 58385 2011-11-12 17:16:09Z ibiru $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=cherokee
 pkgver=1.2.101
-pkgrel=1
+pkgrel=2
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -27,10 +27,10 @@ source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.ta
         cherokee.rc
         cherokee.logrotate
         fix-ctk-path-handler-match.patch)
-sha1sums=('b27f149c7d7111207ac8c3cd8a4856c05490d136'
-          '85e24ccc94e6e97858226222ac62cca79c17bc80'
-          '266064ab6d3ebd206d7207e1d97b003d2021b2e4'
-          '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc')
+sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8'
+            '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86'
+            '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e'
+            '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index 8d4a63c9e..1320b04d8 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55804 2011-09-21 11:27:26Z lfleischer $
+# $Id: PKGBUILD 58389 2011-11-12 17:16:28Z ibiru $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc='An audio player for GNU/Linux based on GTK2.'
 arch=('i686' 'x86_64')
 url='http://deadbeef.sourceforge.net'
@@ -32,11 +32,11 @@ optdepends=('libsamplerate: for Resampler plugin'
             'libzip: for vfs_zip plugin')
 options=('!libtool')
 install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('be8359d1bd9cf7679cf2ca748996e726')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i $srcdir/ffmpeg.patch
 
   ./configure --prefix=/usr
   make
@@ -47,3 +47,5 @@ package () {
 
   make prefix="${pkgdir}/usr" install
 }
+md5sums=('be8359d1bd9cf7679cf2ca748996e726'
+         '6cc7623734af310095534c361c9f64e8')
diff --git a/community/deadbeef/ffmpeg.patch b/community/deadbeef/ffmpeg.patch
new file mode 100644
index 000000000..925b84408
--- /dev/null
+++ b/community/deadbeef/ffmpeg.patch
@@ -0,0 +1,45 @@
+diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c
+--- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c	2011-05-22 13:58:53.000000000 +0000
++++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c	2011-11-01 10:38:11.447669741 +0000
+@@ -140,7 +140,12 @@
+     for (i = 0; i < info->fctx->nb_streams; i++)
+     {
+         info->ctx = info->fctx->streams[i]->codec;
+-        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (info->ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++		            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             info->codec = avcodec_find_decoder (info->ctx->codec_id);
+             if (info->codec != NULL) {
+@@ -490,7 +495,12 @@
+     for (i = 0; i < fctx->nb_streams; i++)
+     {
+         ctx = fctx->streams[i]->codec;
+-        if (ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++		            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             codec = avcodec_find_decoder(ctx->codec_id);
+             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
+@@ -745,7 +755,12 @@
+     for (i = 0; i < fctx->nb_streams; i++)
+     {
+         ctx = fctx->streams[i]->codec;
+-        if (ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (ctx->codec_type == 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++			            AVMEDIA_TYPE_AUDIO)
++#else
++		            CODEC_TYPE_AUDIO)
++#endif
+         {
+             codec = avcodec_find_decoder(ctx->codec_id);
+             if (codec != NULL)
diff --git a/community/dvdstyler/PKGBUILD b/community/dvdstyler/PKGBUILD
index 7ffd429be..f797ba0f4 100644
--- a/community/dvdstyler/PKGBUILD
+++ b/community/dvdstyler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57524 2011-10-30 04:00:55Z ebelanger $
+# $Id: PKGBUILD 58391 2011-11-12 17:16:44Z ibiru $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=dvdstyler
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform DVD authoring application"
 arch=('i686' 'x86_64')
 url="http://www.dvdstyler.de/"
@@ -19,6 +19,7 @@ sha1sums=('21bb4e25c851e70cdd3ce37f3e319c71e78f74a6')
 build() {
   cd "${srcdir}/DVDStyler-${pkgver}"
   sed -i 's/rmdir "$$t"//' docs/Makefile.in
+  sed -i 's/vsink_buffer.h/buffersink.h/' src/mediatrc_ffmpeg.cpp
   ./configure --prefix=/usr
   make
 }
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index c4b934aad..da38ae549 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49560 2011-06-18 07:28:14Z andrea $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 58393 2011-11-12 17:16:52Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
 pkgver=2.7b12
-pkgrel=3
+pkgrel=4
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
 arch=('i686' 'x86_64')
 url="http://community.electricsheep.org/"
@@ -11,13 +11,14 @@ license=('GPL')
 depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
 makedepends=('xscreensaver')
 optdepends=('xscreensaver: to use electricsheep with xscreensaver')
-changelog=ChangeLog
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9c66691538941593ca9442e087b183d1')
-sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32')
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        electricsheep-ffmpeg.patch)
+sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32'
+          'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/community/electricsheep/electricsheep-ffmpeg.patch b/community/electricsheep/electricsheep-ffmpeg.patch
new file mode 100644
index 000000000..b04cf41b0
--- /dev/null
+++ b/community/electricsheep/electricsheep-ffmpeg.patch
@@ -0,0 +1,36 @@
+diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
+--- electricsheep-2.7b12.orig/electricsheep.c	2011-10-31 22:36:30.000000000 -0400
++++ electricsheep-2.7b12/electricsheep.c	2011-10-31 22:40:04.000000000 -0400
+@@ -662,7 +662,7 @@
+     input_stream_index = -1;
+     for (j = 0; j < ictx->nb_streams; j++) {
+ 	AVCodecContext *enc = ictx->streams[j]->codec;
+-	if (CODEC_TYPE_VIDEO == enc->codec_type) {
++	if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
+ 	    input_stream_index = j;
+ 	    break;
+ 	}
+@@ -730,7 +730,7 @@
+ 	av_init_packet(&opkt);
+ 	if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
+ 			     &opkt.data, &opkt.size, ipkt.data, ipkt.size,
+-			     ipkt.flags & PKT_FLAG_KEY))
++			     ipkt.flags & AV_PKT_FLAG_KEY))
+ 	    opkt.destruct= av_destruct_packet;
+ 		
+ 	if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
+diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
+--- electricsheep-2.7b12.orig/electricsheep.c	2011-11-01 00:21:51.000000000 -0400
++++ electricsheep-2.7b12/electricsheep.c	2011-11-01 00:25:10.000000000 -0400
+@@ -686,9 +686,9 @@
+ 	    }
+ 	}
+ 
+-	output_ctx = av_alloc_format_context();
++	output_ctx = avformat_alloc_context();
+ 
+-	ofmt = guess_format(NULL, fname, NULL);
++	ofmt = av_guess_format(NULL, fname, NULL);
+ 	if (!ofmt) {
+ 	    fprintf(logout, "could not determine format from %s.\n", fname);
+ 	    exit(1);
diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD
index 093fe7296..7f086d67f 100644
--- a/community/ffmpeg2theora/PKGBUILD
+++ b/community/ffmpeg2theora/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56650 2011-10-09 12:33:26Z jlichtblau $
+# $Id: PKGBUILD 58395 2011-11-12 17:16:59Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
 
 pkgname=ffmpeg2theora
 pkgver=0.28
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple converter to create Ogg Theora files"
 arch=('i686' 'x86_64')
 url="http://www.v2v.cc/~j/ffmpeg2theora/"
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index c88386caa..debefafd2 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58131 2011-11-06 19:03:02Z lcarlier $
+# $Id: PKGBUILD 58354 2011-11-12 10:52:35Z ibiru $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.23.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index df6e45db6..eb5599e8f 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57730 2011-11-01 19:01:23Z lcarlier $
+# $Id: PKGBUILD 58437 2011-11-12 17:24:37Z ibiru $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -13,14 +13,14 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
 pkgver=2.99.6
-pkgrel=1
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
 license=('GPL')
 groups=('gambas3')
 makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
-         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'qt'
+         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2'
          'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
          'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
@@ -860,7 +860,7 @@ package_gambas3-gb-qt4-opengl() {
 }
 
 package_gambas3-gb-qt4-webkit() {
-  depends=('gambas3-gb-qt4') # qt-webkit
+  depends=('gambas3-gb-qt4')
   pkgdesc="Qt4 toolkit webkit component"
 
   ## workaround for splitting
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index dbb756e2c..68f826412 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.9
-pkgrel=4
+pkgrel=5
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
@@ -14,14 +14,17 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
              gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils
              pkgconfig boost)
 options=(!libtool !emptydirs)
-source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2)
-md5sums=('5b2be6b04a1bcc5fb404cc377034499e')
+source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
+        gentoo-ffmpeg-0.8.patch)
+md5sums=('5b2be6b04a1bcc5fb404cc377034499e'
+         '98dec9a5c1b1084245a3f46b4022a6e2')
 
 build() {
   cd "$srcdir/gnash-$pkgver"
 
-  # Version is now in version.h
-  sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4
+  # Consolidated gentoo patches for ffmpeg compatibility
+  # as of 2011-10-31
+  patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch"
   ./autogen.sh
 
   ./configure \
diff --git a/community/gnash/gentoo-ffmpeg-0.8.patch b/community/gnash/gentoo-ffmpeg-0.8.patch
new file mode 100644
index 000000000..d74bcc8e0
--- /dev/null
+++ b/community/gnash/gentoo-ffmpeg-0.8.patch
@@ -0,0 +1,204 @@
+diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+--- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-10-31 17:25:56.057379760 +0100
+@@ -29,7 +29,7 @@
+ 
+ //#define GNASH_DEBUG_AUDIO_DECODING
+ 
+-#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2
++#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3
+ 
+ namespace gnash {
+ namespace media {
+@@ -549,8 +549,12 @@
+ #endif
+ 
+     // older ffmpeg versions didn't accept a const input..
++    AVPacket pkt;
++    av_init_packet(&pkt);
++    pkt.data = (uint8_t*) input;
++    pkt.size = inputSize;
+     int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize,
+-                                   input, inputSize);
++                                   &pkt);
+ 
+ #ifdef GNASH_DEBUG_AUDIO_DECODING
+     log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) "
+@@ -658,13 +662,13 @@
+ {
+     if ( _needsParsing )
+     {
+-        return av_parser_parse(_parser, _audioCodecCtx,
++        return av_parser_parse2(_parser, _audioCodecCtx,
+                     // as of 2008-10-28 SVN, ffmpeg doesn't
+                     // accept a pointer to pointer to const..
+                     const_cast<boost::uint8_t**>(outFrame),
+                     outFrameSize,
+                     input, inputSize,
+-                    0, 0); // pts & dts
++                    0, 0, AV_NOPTS_VALUE); // pts & dts
+     }
+     else
+     {
+diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
+--- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp	2011-10-31 17:25:51.210668136 +0100
+@@ -46,8 +46,10 @@
+ {
+   if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) {
+     if ( ! _context ) {
+-      _context = audio_resample_init( 
+-		2, ctx->channels, 44100, ctx->sample_rate 
++      _context = av_audio_resample_init( 
++		2, ctx->channels, 44100, ctx->sample_rate,
++		AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
++		16, 10, 0, 0.8
+ 	);
+     }
+ 
+diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+--- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp	2011-03-13 17:47:36.000000000 +0100
++++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp	2011-10-31 17:25:57.720728522 +0100
+@@ -387,7 +387,7 @@
+     
+     log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d",
+         _inputFmt->name, _formatCtx->nb_streams);
+-    
++    /*
+     if ( _formatCtx->title[0] )
+         log_debug(_("  Title:'%s'"), _formatCtx->title);
+     if ( _formatCtx->author[0] )
+@@ -398,7 +398,7 @@
+         log_debug(_("  Comment:'%s'"), _formatCtx->comment);
+     if ( _formatCtx->album[0] )
+         log_debug(_("  Album:'%s'"), _formatCtx->album);
+-    
++    */
+     // Find first audio and video stream
+     for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++)
+ 	{
+@@ -415,7 +415,7 @@
+ 	    }
+ 	    
+ 	    switch (enc->codec_type) {
+-	    case CODEC_TYPE_AUDIO:
++	    case AVMEDIA_TYPE_AUDIO:
+ 		if (_audioStreamIndex < 0) {
+ 		    _audioStreamIndex = i;
+ 		    _audioStream = _formatCtx->streams[i];
+@@ -425,7 +425,7 @@
+ 		}
+ 		break;
+ 		
+-	    case CODEC_TYPE_VIDEO:
++	    case AVMEDIA_TYPE_VIDEO:
+ 		if (_videoStreamIndex < 0) {
+ 		    _videoStreamIndex = i;
+ 		    _videoStream = _formatCtx->streams[i];
+diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
+--- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2011-03-13 17:47:36.000000000 +0100
++++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2011-10-31 17:25:54.590699488 +0100
+@@ -356,8 +356,12 @@
+ 
+     int bytes = 0;    
+     // no idea why avcodec_decode_video wants a non-const input...
+-    avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes,
+-            input, input_size);
++    AVPacket pkt;
++    av_init_packet(&pkt);
++    pkt.data = (uint8_t*) input;
++    pkt.size = input_size;
++    avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes,
++            &pkt);
+     
+     if (!bytes) {
+         log_error("Decoding of a video frame failed");
+diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4
+--- gnash-0.8.9/macros/ffmpeg.m4	2011-02-26 19:11:08.000000000 +0100
++++ gnash-0.8.9-ff/macros/ffmpeg.m4	2011-10-31 17:25:49.700654130 +0100
+@@ -22,6 +22,7 @@
+   backupLIBS="$LIBS"
+   backupCFLAGS="$CFLAGS"
+   avcodec_h=""
++  avcodec_version_h=""
+   ffmpeg_top_incl=""
+ 
+   dnl If the user specify an path to include headers from, we assume it's the full
+@@ -46,6 +47,9 @@
+       else
+         AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header])
+       fi
++      if test -f ${with_ffmpeg_incl}/version.h; then
++        avcodec_version_h=${with_ffmpeg_incl}/version.h
++      fi
+     fi
+   ])
+ 
+@@ -66,6 +70,9 @@
+           if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
+             ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`"
+             avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h"
++            if test -f ${ffmpeg_top_incl}/${i}/version.h; then
++              avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
++            fi
+             break
+           fi
+         done
+@@ -83,6 +90,9 @@
+         if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
+           ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`"
+           avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h
++          if test -f ${ffmpeg_top_incl}/${i}/version.h; then
++            avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
++          fi
+           break
+         fi
+       done
+@@ -182,14 +192,24 @@
+   dnl a modified form of grepping may be better, making sure all old kinds of
+   dnl version numbering fail gracefully.
+ 
++  versionfile=""
++
+   dnl Check avcodec version number, if it was found
+-  if test x"${avcodec_h}" != x; then
++  if test x"${avcodec_version_h}" != x; then
++    versionfile=${avcodec_version_h}
++  else
++    if test x"${avcodec_h}" != x; then
++      versionfile=${avcodec_h}
++    fi
++  fi
++
++  if test x"${versionfile}" != x; then
+ 
+     AC_MSG_CHECKING([ffmpeg version])
+ 
+-    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+-    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+-    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
+ 
+     if test x"${ffmpeg_major_version}" != x ; then
+ 
+@@ -198,15 +218,15 @@
+     else
+ 
+       dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
+-      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"`
++      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"`
+ 
+       if test x"${ffmpeg_version}" = x ; then
+ 
+         dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
+-        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
++        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
+ 
+         if test x"${ffmpeg_version}" = x ; then
+-          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'`
++          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'`
+         fi
+       fi
+ 
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index a9ea47daf..624656ee9 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 45216 2011-04-18 12:46:35Z spupykin $
+# $Id: PKGBUILD 58379 2011-11-12 16:02:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-gui
 pkgver=0.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNUstep GUI class library"
 arch=('i686' 'x86_64')
 url="http://www.gnustep.org/"
 license=('LGPL')
-depends=(gnustep-base libungif aspell gcc-libs libcups audiofile libsndfile giflib libao)
-makedepends=(gcc-objc)
+depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao')
+makedepends=('gcc-objc')
 conflicts=('gnustep-gui-svn')
 groups=('gnustep-core')
 options=('!makeflags')
@@ -22,6 +22,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   . /etc/profile.d/GNUstep.sh
   ./configure --prefix=/usr --sysconfdir=/etc/GNUstep
+  sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h
   make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index a38817828..f040dc500 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -1,47 +1,35 @@
-# Maintainer: Brad Fanella <bradfanella@archlinux.us
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: niQo
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 58399 2011-11-12 17:17:21Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpac
 pkgver=0.4.5
-pkgrel=8
+pkgrel=9
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 arch=('i686' 'x86_64')
 url="http://gpac.sourceforge.net"
-depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'libmad'
-         'faad2' 'xvidcore' 'ffmpeg' 'freeglut')
-# 'js'
+depends=('wxgtk' 'libmad' 'faad2' 'ffmpeg' 'freeglut')
 license=('LGPL')
-options=('!makeflags') # Multiple build jobs aren't handled correctly
+options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
         libpng14-infopp-null.patch openjpeg14.patch)
-md5sums=('755e8c438a48ebdb13525dd491f5b0d1'
-         '14d6483c9eb84434aea68596f243e0ca'
-         '1605fc11bd49b9c8220820bb38912021')
+sha1sums=('2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8'
+          '00ba08808ec46ef6b8301ede26e500b3449253c1'
+          '95747ca98cdf0efc33ec776764401f5a83818ab5')
 
 build() {
-	cd ${srcdir}/${pkgname}
-	chmod +x configure
-	sed -i 's|--warn-common||' configure
-	sed -i 's#osmozilla##g' applications/Makefile
-	sed -i 's#"$(prefix)#"$(DESTDIR)$(prefix)#' applications/osmo4_wx/Makefile
-	sed -i 's#ldconfig || true##g' Makefile
+  cd "${srcdir}/${pkgname}"
+  chmod +x configure
+  sed -i 's|--warn-common||' configure
+  sed -i 's#lib64#lib#g' configure
+  patch -p1 -i "${srcdir}/libpng14-infopp-null.patch"
+  patch -p1 -i "${srcdir}/openjpeg14.patch"
 	
-	#FS#14506
-	sed -i 's#lib64#lib#g' configure
-	patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch
-	patch -Np1 -i ${srcdir}/openjpeg14.patch
-	
-	# Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined
-	# symbol: XvQueryExtension" with our LDFLAGS :\
-	export LDFLAGS=${LDFLAGS/,--as-needed/}
-	
-	./configure --prefix=/usr --mandir=/usr/share/man --use-js=no
-	make
+  export LDFLAGS=${LDFLAGS/,--as-needed/}
+  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}
-	make DESTDIR=${pkgdir} install install-lib
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" install install-lib
 }
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 4de8eb067..a5d66830f 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54951 2011-08-28 19:13:33Z ttopper $
+# $Id: PKGBUILD 58366 2011-11-12 13:28:03Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
-pkgver=4.0.2
+pkgver=4.1
 pkgrel=1
 pkgdesc="An improved dynamic tiling window manager"
 arch=('i686' 'x86_64')
@@ -11,18 +11,22 @@ url="http://i3wm.org/"
 license=('BSD')
 replaces=("i3" "i3bar")
 groups=("i3")
-depends=('libxcursor' 'xcb-util' 'libev' 'yajl')
+depends=('libxcursor' 'libev' 'yajl' 'startup-notification' 'pcre')
 makedepends=('bison' 'flex')
 optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
             'dmenu: As menu.'
+            'i3lock: For locking your screen.'
+            'i3status: To display systeminformation with a bar.'
             'perl: To migrate your configuration to v4 format.')
 options=('docs' '!strip')
 source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2)
-md5sums=('8b173504824d312a954ccb32b092b068')
+md5sums=('1a05d605624506c2b4b9f1272fd84a5a')
 
 build() {
   cd "$srcdir/$_pkgsourcename-$pkgver"
   
+  # To avoid problems with bison use only a single process
+  MAKEFLAGS="-j1"
   make
 }
 
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 37ff847c7..c51383fe2 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55304 2011-09-09 16:08:23Z spupykin $
+# $Id: PKGBUILD 58466 2011-11-12 20:42:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
-pkgver=0.8svn20110722
+pkgver=0.8.2
 pkgrel=2
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64')
@@ -12,20 +12,21 @@ url="http://www.kdenlive.org/"
 license=('GPL')
 depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz'
 	 'libqzeitgeist')
-makedepends=('automoc4' 'cmake' 'gettext')
+makedepends=('automoc4' 'cmake' 'gettext' 'mesa')
 install=kdenlive.install
 options=('docs')
-#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-source=("http://arch.p5n.pp.ru/~sergej/dl/kdenlive-${pkgver}.tar.bz2")
-md5sums=('390fcbce02274ee99b2a6d6a234bef0c')
+source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz"
+	glu.patch)
+md5sums=('0836842f489f6142cee101842ac76c54'
+         'fd6c5fe46419ee505c562363d41f6e9f')
 
 build() {
   export LDFLAGS="$LDFLAGS -lX11"
-
   cd "${srcdir}"
-  mkdir build || true
+  mkdir -p build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  (cd ../kdenlive-${pkgver} && patch -p1 <$srcdir/glu.patch)
+  cmake ../kdenlive-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_INSTALL_DIR=/usr/lib \
diff --git a/community/kdenlive/glu.patch b/community/kdenlive/glu.patch
new file mode 100644
index 000000000..a4c2f21fb
--- /dev/null
+++ b/community/kdenlive/glu.patch
@@ -0,0 +1,11 @@
+diff -wbBur kdenlive-0.8.2/src/videoglwidget.cpp kdenlive-0.8.2.my/src/videoglwidget.cpp
+--- kdenlive-0.8.2/src/videoglwidget.cpp	2011-10-31 22:46:21.000000000 +0400
++++ kdenlive-0.8.2.my/src/videoglwidget.cpp	2011-11-02 14:54:10.000000000 +0400
+@@ -2,6 +2,7 @@
+ #include <QtGui>
+ #include <QtOpenGL>
+ #include "videoglwidget.h"
++#include <GL/glu.h>
+ 
+ #ifndef GL_TEXTURE_RECTANGLE_EXT
+ #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV
diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD
index e3bfb94d4..72ba96bc4 100644
--- a/community/libdlna/PKGBUILD
+++ b/community/libdlna/PKGBUILD
@@ -1,24 +1,31 @@
-# $Id: PKGBUILD 7626 2010-01-08 23:34:07Z dgriffiths $
+# $Id: PKGBUILD 58401 2011-11-12 17:17:29Z ibiru $
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> 
 # Contributor: kastor <kastor@fobos.org.ar>
 pkgname=libdlna
 pkgver=0.2.3
-pkgrel=8
+pkgrel=9
 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards "
 url="http://libdlna.geexbox.org"
 license=("LGPL")
 arch=('i686' 'x86_64')
-options=('!libtool')
+options=('!libtool' '!makeflags')  # not parallel safe, error find -ldlna  
 makedepends=('ctags')
 depends=('glibc' 'ffmpeg')
-source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2c974f95b711e5fd07f78fc4ebfcca66')
+source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "libdlna-0.2.3-libavcodec-libavformat-include-paths.patch" "ffmpeg-0.8.patch")
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c || return 1
-  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c || return 1
-  ./configure --prefix=/usr --includedir=/usr/include/libavformat || return 1
-  make || return 1
+  patch -Np1 -i $srcdir/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
+  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
+#  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c 
+#  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c 
+  ./configure --prefix=/usr --includedir=/usr/include/libavformat 
+  make -j1  # not parallel safe, error find -ldlna
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make INSTALL=/bin/install DESTDIR=${pkgdir} install
 }
+md5sums=('2c974f95b711e5fd07f78fc4ebfcca66'
+         '937f1aebf930571127856056bd1d3959'
+         'a5c9f58233fc7fc79b5fe550b297273b')
diff --git a/community/libdlna/ffmpeg-0.8.patch b/community/libdlna/ffmpeg-0.8.patch
new file mode 100644
index 000000000..63b33a451
--- /dev/null
+++ b/community/libdlna/ffmpeg-0.8.patch
@@ -0,0 +1,19 @@
+diff -aur libdlna-0.2.3/src/profiles.c libdlna-0.2.3.new/src/profiles.c
+--- libdlna-0.2.3/src/profiles.c	2007-11-26 21:47:43.000000000 +0100
++++ libdlna-0.2.3.new/src/profiles.c	2011-10-31 16:06:34.000000000 +0100
+@@ -205,13 +205,13 @@
+   for (i = 0; i < ctx->nb_streams; i++)
+   {
+     if (audio_stream == -1 &&
+-        ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
++        ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+     {
+       audio_stream = i;
+       continue;
+     }
+     else if (video_stream == -1 &&
+-             ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
++             ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+     {
+       video_stream = i;
+       continue;
diff --git a/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
new file mode 100644
index 000000000..8620ab2eb
--- /dev/null
+++ b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
@@ -0,0 +1,89 @@
+https://bugs.gentoo.org/show_bug.cgi?id=297872
+http://hg.geexbox.org/libdlna/raw-rev/4113a728a2ca
+
+From 81130b9ade274bfc53900999ccc6f963ae9ce9d7 Mon Sep 17 00:00:00 2001
+From: Jeremy Olexa <darkside@gentoo.org>
+Date: Tue, 22 Dec 2009 00:22:42 -0600
+Subject: [PATCH] Update reference to ffmpeg header files
+
+---
+ configure             |    4 ++--
+ src/av_mpeg4_part10.c |    2 +-
+ src/av_mpeg4_part2.c  |    2 +-
+ src/containers.c      |    2 +-
+ src/profiles.h        |    4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index 8acbd9d..85c1091 100755
+--- a/configure
++++ b/configure
+@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then
+ fi
+ 
+ echolog "Checking for libavformat ..."
+-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
++check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
+ echolog "Checking for libavcodec ..."
+-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
++check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
+ 
+ #################################################
+ #   version
+diff --git a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c
+index bd17022..f9c8ee5 100644
+--- a/src/av_mpeg4_part10.c
++++ b/src/av_mpeg4_part10.c
+@@ -26,7 +26,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ #include "dlna_internals.h"
+ #include "profiles.h"
+diff --git a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c
+index 0148384..823e1b6 100644
+--- a/src/av_mpeg4_part2.c
++++ b/src/av_mpeg4_part2.c
+@@ -26,7 +26,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ #include "dlna_internals.h"
+ #include "profiles.h"
+diff --git a/src/containers.c b/src/containers.c
+index 71b51f7..ca0819b 100644
+--- a/src/containers.c
++++ b/src/containers.c
+@@ -4,7 +4,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ 
+ #include "containers.h"
+ #include "profiles.h"
+diff --git a/src/profiles.h b/src/profiles.h
+index 7b86d33..a7fc0fd 100644
+--- a/src/profiles.h
++++ b/src/profiles.h
+@@ -22,8 +22,8 @@
+ #ifndef _PROFILES_H_
+ #define _PROFILES_H_
+ 
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ 
+ #include "dlna_internals.h"
+ #include "containers.h"
+-- 
+1.6.4.4
+
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index 420a82cc4..3ff564293 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56341 2011-10-05 19:08:14Z andrea $
+# $Id: PKGBUILD 58358 2011-11-12 10:52:51Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libextractor
 pkgver=0.6.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A library used to extract meta-data from files of arbitrary type"
 arch=("i686" "x86_64")
 license=('GPL')
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index 07d05193f..9641c3674 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 57461 2011-10-28 07:54:07Z lcarlier $
+# $Id: PKGBUILD 58470 2011-11-12 22:05:09Z lcarlier $
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=libraw
 _pkgbasename=LibRaw
-pkgver=0.13.8
-pkgrel=1
+pkgver=0.14.3
+pkgrel=2
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
 arch=('i686' 'x86_64')
 url="http://www.libraw.org/"
@@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom')
 depends=('lcms')
 options=('!makeflags')
 source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('62cd5fee94915add0c43a97ec6909bbb')
+md5sums=('d8f81a52b0fada9d5bf7e659e21e3a57')
 
 build() {
   	cd ${srcdir}/${_pkgbasename}-${pkgver}
@@ -28,4 +28,3 @@ package() {
 
   	make DESTDIR=${pkgdir} install
 }
-
diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD
index 517bbb7bc..cff8dd04a 100644
--- a/community/lightspark/PKGBUILD
+++ b/community/lightspark/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lightspark
 pkgver=0.5.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='An alternative Flash Player for Linux.'
 arch=('i686' 'x86_64')
 url='http://lightspark.sourceforge.net'
@@ -15,7 +15,8 @@ optdepends=('gnash-gtk: fallback support')
 install="lightspark.install"
 source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz"
         'llvm29.diff')
-md5sums=('ac2233a83e8bf0b305563bbce322cd76')
+md5sums=('ac2233a83e8bf0b305563bbce322cd76'
+         '5f717d1d9ead478184ca68f6ac068099')
 
 build() {
   cd lightspark-${pkgver}
@@ -41,5 +42,3 @@ package() {
 
   make DESTDIR=${pkgdir} install
 }
-md5sums=('ac2233a83e8bf0b305563bbce322cd76'
-         '5f717d1d9ead478184ca68f6ac068099')
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index 4d960d8e7..c2107abc2 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 56345 2011-10-05 19:08:27Z andrea $
+# $Id: PKGBUILD 58474 2011-11-12 22:05:38Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
 pkgver=2.1.0
-pkgrel=2
+pkgrel=5
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64')
 url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libraw' 'libtiff' 'openexr' 'qt')
+depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt')
 optdepends=('hugin: align image stack functionality')
 install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-hdr-${pkgver}.tar.gz)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac')
+source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz
+        luminance-hdr-2.1.0-libraw.patch)
+sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac'
+            'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c')
 
 build() {
   cd "${srcdir}/luminance-hdr-${pkgver}"
 
+  # stolen from gentoo
+  patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch
+
   if [ ${CARCH} = i686 ]; then
     sed -i 's/ -msse2//' project.pro
   fi
diff --git a/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch
new file mode 100644
index 000000000..8472a7422
--- /dev/null
+++ b/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch
@@ -0,0 +1,10 @@
+--- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig
++++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp
+@@ -94,7 +94,6 @@
+   RawProcessor.set_progress_handler(cb, callback_data);
+   int ret;
+ 
+-  OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
+   OUT.output_bps = 16;
+ 
+   //OUT.gamm[0] = 1/2.4;   //sRGB
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index fb3f6e59e..a346dceac 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54993 2011-08-29 20:53:40Z spupykin $
+# $Id: PKGBUILD 58407 2011-11-12 17:17:53Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=minidlna
 pkgver=1.0.22
-pkgrel=3
+pkgrel=4
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/minidlna/"
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 3bbe6583a..e9b0613d3 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51875 2011-07-17 19:10:00Z spupykin $
+# $Id: PKGBUILD 58409 2011-11-12 17:17:58Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -7,8 +7,8 @@
 
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.7.4
-pkgrel=1.1
+pkgver=0.7.6
+pkgrel=1
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64')
 url="http://www.mltframework.org"
@@ -16,7 +16,7 @@ license=('GPL')
 makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
 	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d5d1ff686f51131a02b0f6fca0f073da')
+md5sums=('105969a63339da2f8ce4ddce1652c9e7')
 
 build() {
   # mlt
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index dcb3828af..7114817f7 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 85176 2010-07-09 22:50:45Z eric $
+# $Id: PKGBUILD 58411 2011-11-12 17:18:08Z ibiru $
 # Maintainer:
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-depends=('ffmpeg' 'libjpeg')
+depends=('ffmpeg' 'libjpeg' 'v4l-utils')
 backup=('etc/motion/motion.conf')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion ffmpeg-0.8.patch linux-headers.patch)
 md5sums=('1ba0065ed50509aaffb171594c689f46' '24b6fbfa586857b72f90cda81410c14f')
 sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' '06f74131a9d4abc8aa05f531bd19c51a5732023f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
+  patch -Np1 -i $srcdir/linux-headers.patch
   ./configure --prefix=/usr \
     --without-pgsql \
     --without-mysql \
@@ -31,3 +33,29 @@ package(){
 
   install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
 }
+md5sums=('1ba0065ed50509aaffb171594c689f46'
+         '24b6fbfa586857b72f90cda81410c14f'
+         '2f422c268337dce583b9dac344005e93')
+sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
+          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
+          '7b41c8c273980c147694d82af7c9cb9e51302dd9')
+md5sums=('1ba0065ed50509aaffb171594c689f46'
+         '24b6fbfa586857b72f90cda81410c14f'
+         '5db295d7c2e4c38f36e861a3c4dfdd8d')
+sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
+          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
+          '2b12df6d9053d17f6ac1969e3510dd50c6fe6667')
+md5sums=('1ba0065ed50509aaffb171594c689f46'
+         '24b6fbfa586857b72f90cda81410c14f'
+         'd36687710837d69fbce4608b1345fa34')
+sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
+          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
+          '6912448db0711f85322505ee6f8052f8f98ae634')
+md5sums=('1ba0065ed50509aaffb171594c689f46'
+         '24b6fbfa586857b72f90cda81410c14f'
+         'd36687710837d69fbce4608b1345fa34'
+         'd8c3c4fdded5cfbd729710475559a21d')
+sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
+          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
+          '6912448db0711f85322505ee6f8052f8f98ae634'
+          '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e')
diff --git a/community/motion/ffmpeg-0.8.patch b/community/motion/ffmpeg-0.8.patch
new file mode 100644
index 000000000..5dcc6e686
--- /dev/null
+++ b/community/motion/ffmpeg-0.8.patch
@@ -0,0 +1,112 @@
+diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c
+--- motion-3.2.12/ffmpeg.c	2010-06-01 08:48:23.000000000 +0200
++++ motion-3.2.12.new/ffmpeg.c	2011-10-31 17:25:03.000000000 +0100
+@@ -14,7 +14,7 @@
+ 
+ #include "ffmpeg.h"
+ #include "motion.h"
+-
++#include <libavformat/avformat.h>
+ #if LIBAVCODEC_BUILD > 4680
+ /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with 
+  * non-standard framerates. Previous builds contained a broken hack 
+@@ -228,10 +228,12 @@
+     mpeg1_file_protocol.url_close = file_protocol.url_close;
+ 
+     /* Register the append file protocol. */
+-#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8)
+-    av_register_protocol(&mpeg1_file_protocol);
++#ifdef have_av_register_protocol2
++        av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol));
++#elif defined have_av_register_protocol        
++	    av_register_protocol(&mpeg1_file_protocol);
+ #else
+-    register_protocol(&mpeg1_file_protocol);
++#   warning av_register_protocolXXX missing
+ #endif
+ }
+ 
+@@ -244,7 +246,7 @@
+     const char *ext;
+     AVOutputFormat *of = NULL;
+ 
+-    /* Here, we use guess_format to automatically setup the codec information.
++    /* Here, we use av_guess_format to automatically setup the codec information.
+      * If we are using msmpeg4, manually set that codec here.
+      * We also dynamically add the file extension to the filename here. This was
+      * done to support both mpeg1 and mpeg4 codecs since they have different extensions.
+@@ -258,7 +260,7 @@
+         /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would
+          * result in a muxed output file, which isn't appropriate here.
+          */
+-        of = guess_format("mpeg1video", NULL, NULL);
++        of = av_guess_format("mpeg1video", NULL, NULL);
+         if (of) {
+             /* But we want the trailer to be correctly written. */
+             of->write_trailer = mpeg1_write_trailer;
+@@ -270,24 +272,24 @@
+ #endif
+     } else if (strcmp(codec, "mpeg4") == 0) {
+         ext = ".avi";
+-        of = guess_format("avi", NULL, NULL);
++        of = av_guess_format("avi", NULL, NULL);
+     } else if (strcmp(codec, "msmpeg4") == 0) {
+         ext = ".avi";
+-        of = guess_format("avi", NULL, NULL);
++        of = av_guess_format("avi", NULL, NULL);
+         if (of) {
+             /* Manually override the codec id. */
+             of->video_codec = CODEC_ID_MSMPEG4V2;
+         }
+     } else if (strcmp(codec, "swf") == 0) {
+         ext = ".swf";
+-        of = guess_format("swf", NULL, NULL);
++        of = av_guess_format("swf", NULL, NULL);
+     } else if (strcmp(codec, "flv") == 0) {
+         ext = ".flv";
+-        of = guess_format("flv", NULL, NULL);
++        of = av_guess_format("flv", NULL, NULL);
+         of->video_codec = CODEC_ID_FLV1;
+     } else if (strcmp(codec, "ffv1") == 0) {
+         ext = ".avi";
+-        of = guess_format("avi", NULL, NULL);
++        of = av_guess_format("avi", NULL, NULL);
+         if (of) {
+             /* Use the FFMPEG Lossless Video codec (experimental!).
+                Requires strict_std_compliance to be <= -2 */
+@@ -295,7 +297,7 @@
+         }
+     } else if (strcmp(codec, "mov") == 0) {
+         ext = ".mov";
+-        of = guess_format("mov", NULL, NULL);        
++        of = av_guess_format("mov", NULL, NULL);        
+     } else {
+         motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec);
+         return NULL;
+@@ -377,7 +379,7 @@
+ 
+     ffmpeg->c     = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st);
+     c->codec_id   = ffmpeg->oc->oformat->video_codec;
+-    c->codec_type = CODEC_TYPE_VIDEO;
++    c->codec_type = AVMEDIA_TYPE_VIDEO;
+     is_mpeg1      = c->codec_id == CODEC_ID_MPEG1VIDEO;
+ 
+     if (strcmp(ffmpeg_video_codec, "ffv1") == 0)
+@@ -646,7 +648,7 @@
+     if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) {
+         /* raw video case. The API will change slightly in the near future for that */
+ #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
+-        pkt.flags |= PKT_FLAG_KEY;
++        pkt.flags |= AV_PKT_FLAG_KEY;
+         pkt.data = (uint8_t *)pic;
+         pkt.size = sizeof(AVPicture);
+         ret = av_write_frame(ffmpeg->oc, &pkt);
+@@ -667,7 +669,7 @@
+ #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
+             pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts;
+             if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) {
+-                pkt.flags |= PKT_FLAG_KEY;
++                pkt.flags |= AV_PKT_FLAG_KEY;
+             }
+             pkt.data = ffmpeg->video_outbuf;
+             pkt.size = out_size;
diff --git a/community/motion/linux-headers.patch b/community/motion/linux-headers.patch
new file mode 100644
index 000000000..795c8aec5
--- /dev/null
+++ b/community/motion/linux-headers.patch
@@ -0,0 +1,35 @@
+diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h
+--- motion-3.2.12-OLD/motion.h	2010-05-31 23:48:23.000000000 -0700
++++ motion-3.2.12-NEW/motion.h	2011-08-30 02:11:08.000000000 -0700
+@@ -40,7 +40,7 @@
+ 
+ #define _LINUX_TIME_H 1
+ #if !defined(WITHOUT_V4L) && !defined(BSD)
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #endif
+ 
+ #include <pthread.h>
+diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c
+--- motion-3.2.12-OLD/track.c	2010-05-31 23:48:23.000000000 -0700
++++ motion-3.2.12-NEW/track.c	2011-08-30 23:05:09.000000000 -0700
+@@ -11,6 +11,7 @@
+ #include "motion.h"
+ 
+ #ifndef WITHOUT_V4L
++#include <linux/videodev2.h>
+ #include "pwc-ioctl.h"
+ #endif
+ 
+diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h
+--- motion-3.2.12-OLD/video.h	2010-05-31 23:48:23.000000000 -0700
++++ motion-3.2.12-NEW/video.h	2011-08-30 02:11:12.000000000 -0700
+@@ -12,7 +12,7 @@
+ 
+ #define _LINUX_TIME_H 1
+ #ifndef WITHOUT_V4L
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <sys/mman.h>
+ #include "pwc-ioctl.h"
+ #endif
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 7f012d00b..74f14d424 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -1,44 +1,43 @@
-# $Id: PKGBUILD 56845 2011-10-14 19:26:53Z stephane $
+# $Id: PKGBUILD 58413 2011-11-12 17:18:14Z ibiru $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Bartek Piotrowski <barthalion@gmail.com>
 
 pkgname=mplayer2
-pkgver=2.0
-pkgrel=15
+pkgver=2.0.20111101
+pkgrel=1
 pkgdesc="A movie player"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mplayer2.org/"
 depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2'
-         'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' 
+         'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad'
          'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa')
-makedepends=('live-media' 'mesa' 'unzip' 'yasm')
+makedepends=('live-media' 'mesa' 'unzip' 'yasm' 'git')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
 conflicts=('mplayer')
-source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
-        mplayer2-remove-mp3lib.patch
-        mplayer2-SAMI-subs.patch)
-sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc'
-          'c55128a99406a5e01ab077555b7b24aa7b54110c'
-          '4059d5d0564004feb55d25b5f62f7f4672e40fb1')
+#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d')
 options=('!emptydirs')
 
-build() {
-    # Custom CFLAGS break the mplayer build
-    unset CFLAGS LDFLAGS
+# source PKGBUILD && mksource
+mksource() {
+  _gitroot="git://git.mplayer2.org/mplayer2.git"
+  _gitname="${pkgname}-${pkgver}"
 
-    cd "${srcdir}/${pkgname}-${pkgver}"
+  if [[ -d "$_gitname" ]]; then
+    cd "$_gitname" && git pull origin
+  else
+    git clone "$_gitroot" "$_gitname"
+  fi
 
-    # Drop internal mp3lib (FS#24149)
-    # Default decoder for mp3 will be mpg123
-    rm -fr mp3lib
-    patch -Np1 -i ../mplayer2-remove-mp3lib.patch
+  tar -cJvf ${_gitname}.tar.xz ${_gitname}
+  rm -fr ${_gitname}
+}
 
-    # SAMI subtitle parsing buffer overflow
-    # http://mplayerhq.hu/pipermail/mplayer-cvslog/2011-May/042075.html
-    # http://labs.mwrinfosecurity.com/files/Advisories/mwri_mplayer-sami-subtitles_2011-08-12.pdf
-    patch -Np1 -i ../mplayer2-SAMI-subs.patch
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
 
     ./configure --prefix=/usr \
                 --enable-runtime-cpudetection \
@@ -49,7 +48,6 @@ build() {
                 --disable-musepack \
                 --disable-esd \
                 --disable-mga \
-                --enable-xvmc \
                 --language=all \
                 --enable-translation \
                 --confdir=/etc/mplayer
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index c53ffe04a..437f6ea1c 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('c05f2dadd4d82c0d72dbc116e82cfc0e')
+md5sums=('92b8085967110b0125c192634f127a2b')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index a8c0f7d88..731058d5d 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54658 2011-08-22 14:51:35Z spupykin $
+# $Id: PKGBUILD 58415 2011-11-12 17:18:19Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hans Janssen <janserv@gmail.com>
 # Contributor: my64 <packages@obordes.com>
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index 1daa3890a..70c6e2a87 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56949 2011-10-17 08:21:01Z ibiru $
+# $Id: PKGBUILD 58360 2011-11-12 10:52:56Z ibiru $
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgname=pdf2djvu
 pkgver=0.7.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Creates DjVu files from PDF files"
 arch=('i686' 'x86_64')
 url="http://pdf2djvu.googlecode.com"
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index ce90dd8a5..1b5652a0e 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55893 2011-09-24 16:49:07Z stephane $
+# $Id: PKGBUILD 58417 2011-11-12 17:18:28Z ibiru $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.6.1
-pkgrel=9
+pkgrel=10
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64')
 url="http://performous.org/"
@@ -13,19 +13,26 @@ depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'l
          'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo')
 makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47')
 optdepends=('performous-freesongs: free songs for performous')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2)
-md5sums=('451a759de77984b5a699e91107fe52e2')
+source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
+        boost-filesystem-v3.patch
+        ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a")
+md5sums=('451a759de77984b5a699e91107fe52e2'
+         '42a8c825d80b0de16bd5752d2a80e585'
+         'ff0ffa681dfaa09c4f42133a65309bf0')
 
 build() {
   cd ${srcdir}/Performous-${pkgver}-Source
 
+  # fix to built against boost 1.46 and later, upstream (git) now support v3
+  patch -Np1 -i ../boost-filesystem-v3.patch
+  # fix with ffmpeg-0.8
+  patch -Np1 -i ../ffmpeg-0.8.patch
+
   mkdir -p build
   cd build
 
   # fix config loading with libxml++
   export LDFLAGS=${LDFLAGS/-Wl,--as-needed/}
-  # fix to built against boost 1.46, upstream (git) now support v3
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
 
   cmake -DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_INSTALL_PREFIX=/usr ..
diff --git a/community/performous/boost-filesystem-v3.patch b/community/performous/boost-filesystem-v3.patch
new file mode 100644
index 000000000..22dd07213
--- /dev/null
+++ b/community/performous/boost-filesystem-v3.patch
@@ -0,0 +1,135 @@
+diff --git a/game/backgrounds.cc b/game/backgrounds.cc
+index 7fd3cd0..cdedefb 100644
+--- a/game/backgrounds.cc
++++ b/game/backgrounds.cc
+@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) {
+ 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
+ 			fs::path p = dirIt->path();
+ 			if (fs::is_directory(p)) { reload_internal(p); continue; }
++#if BOOST_FILESYSTEM_VERSION < 3
+ 			std::string name = p.leaf(); // File basename
+ 			std::string path = p.directory_string(); // Path without filename
++#else
++			std::string name = p.filename().string(); // File basename
++			std::string path = p.string(); // Path without filename
++#endif
+ 			path.erase(path.size() - name.size());
+ 			if (!regex_match(name.c_str(), match, expression)) continue;
+ 			{
+diff --git a/game/cache.cc b/game/cache.cc
+index 69974e2..0f1edd0 100644
+--- a/game/cache.cc
++++ b/game/cache.cc
+@@ -9,7 +9,11 @@ namespace cache {
+ 	fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){
+ 		fs::path cache_filename;
+ 		std::string const lod = (boost::format("%.2f") % factor).str();
++#if BOOST_FILESYSTEM_VERSION < 3
+ 		std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png";
++#else
++		std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png";
++#endif
+ 
+ 		if (isThemeResource(svgfilename)) {
+ 			std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s());
+diff --git a/game/filemagic.hh b/game/filemagic.hh
+index bf87ded..29e81fe 100644
+--- a/game/filemagic.hh
++++ b/game/filemagic.hh
+@@ -71,7 +71,11 @@ namespace filemagic {
+ 		// For now, just check the extension an assume it's not lying.
+ 
+ 		// Get file extension in lower case
++#if BOOST_FILESYSTEM_VERSION < 3
+ 		std::string ext = filename.extension();
++#else
++		std::string ext = filename.extension().string();
++#endif
+ 		// somehow this does not convert the extension to lower case:
+ 		//std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower));
+ 		std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower );
+diff --git a/game/fs.cc b/game/fs.cc
+index e34a784..767a7ab 100644
+--- a/game/fs.cc
++++ b/game/fs.cc
+@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) {
+ 
+ bool isThemeResource(fs::path filename){
+ 	try {
++#if BOOST_FILESYSTEM_VERSION < 3
+ 		std::string themefile = getThemePath(filename.filename());
++#else
++		std::string themefile = getThemePath(filename.filename().string());
++#endif
+ 		return themefile == filename;
+ 	} catch (...) { return false; }
+ }
+diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
+index 38e163b..db15d79 100644
+--- a/game/songparser-ini.cc
++++ b/game/songparser-ini.cc
+@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() {
+ 	// Search the dir for the music files
+ 	for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
+ 		boost::filesystem::path p = dirIt->path();
++#if BOOST_FILESYSTEM_VERSION < 3
+ 		std::string name = p.leaf(); // File basename (notes.txt)
++#else
++		std::string name = p.filename().string(); // File basename (notes.txt)
++#endif
+ 		if (regex_match(name.c_str(), match, midifile)) {
+ 			 s.midifilename = name;
+ 		} else if (regex_match(name.c_str(), match, audiofile_background)) {
+diff --git a/game/songparser.cc b/game/songparser.cc
+index 2b7b9b4..ac9f3f6 100644
+--- a/game/songparser.cc
++++ b/game/songparser.cc
+@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s):
+ 
+ 		for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
+ 			boost::filesystem::path p = dirIt->path();
++#if BOOST_FILESYSTEM_VERSION < 3
+ 			std::string name = p.leaf(); // File basename
++#else
++			std::string name = p.filename().string(); // File basename
++#endif
+ 			if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) {
+ 				m_song.cover = name;
+ 			} else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) {
+diff --git a/game/songs.cc b/game/songs.cc
+index 62ab26d..afab383 100644
+--- a/game/songs.cc
++++ b/game/songs.cc
+@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) {
+ 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
+ 			fs::path p = dirIt->path();
+ 			if (fs::is_directory(p)) { reload_internal(p); continue; }
++#if BOOST_FILESYSTEM_VERSION < 3
+ 			std::string name = p.leaf(); // File basename (notes.txt)
+ 			std::string path = p.directory_string(); // Path without filename
++#else
++			std::string name = p.filename().string(); // File basename (notes.txt)
++			std::string path = p.string(); // Path without filename
++#endif
+ 			path.erase(path.size() - name.size());
+ 			if (!regex_match(name.c_str(), match, expression)) continue;
+ 			try {
+diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh
+index 58e19dc..8895d94 100644
+--- a/tools/ss_helpers.hh
++++ b/tools/ss_helpers.hh
+@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st
+ void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); }
+ void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); }
+ 
++#if BOOST_FILESYSTEM_VERSION < 3
+ std::string filename(boost::filesystem::path const& p) { return *--p.end(); }
++#else
++std::string filename(boost::filesystem::path const& p) { return p.filename().string(); }
++#endif
+ 
+ /** Fix Singstar's b0rked XML **/
+ std::string xmlFix(std::vector<char> const& data) {
+-- 
+1.7.4.1
+
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index 6a84f1908..9937c04db 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 57200 2011-10-23 22:18:46Z bisson $
+# $Id: PKGBUILD 58419 2011-11-12 17:18:36Z ibiru $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: sysrq
 
 pkgname=picard
 pkgver=0.16
-pkgrel=1
+pkgrel=3
 pkgdesc='Official MusicBrainz tagger'
 url='http://musicbrainz.org/doc/MusicBrainz_Picard'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg')
+depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
 optdepends=('libdiscid: CD-Lookup feature')
 source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('274071410550ee29051bb0137d72602921a015f9')
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index 7dd6902ce..dedba8ceb 100755
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55279 2011-09-08 15:03:04Z ttopper $
+# $Id: PKGBUILD 58369 2011-11-12 14:16:49Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor:  JerichoKru   <jerichokru(AT)htomail.com>
 
 pkgname=pragha
-pkgver=0.99.0
+pkgver=0.99.1
 pkgrel=1
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
 arch=('i686' 'x86_64')
@@ -13,12 +13,12 @@ license=('GPL3')
 depends=('libnotify' 'libcdio' 'curl' 
          'taglib' 'gstreamer0.10' 'hicolor-icon-theme'
          'gtk2' 'dbus-glib' 'dbus-core'
-         'sqlite3' 'glib2')
+         'sqlite3' 'glib2' 'desktop-file-utils')
 optdepends=('notification-daemon: OSD notification')
 replaces=('dissonance')
 install=pragha.install
 source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('0791335c29121e6288962f4a7fbe074e4db73c9d')
+sha1sums=('bd3e965da2f602bb7d9c731eccbb4d67e8c70d6c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD
index 2b93c0bf0..45587a5d9 100644
--- a/community/python2-poppler/PKGBUILD
+++ b/community/python2-poppler/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56953 2011-10-17 08:21:15Z ibiru $
+# $Id: PKGBUILD 58362 2011-11-12 10:53:03Z ibiru $
 # Maintainer: Ray Rashif <schiv@archlinux.org
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=python2-poppler
 _realname=pypoppler
 pkgver=0.12.1
-pkgrel=5
+pkgrel=7
 pkgdesc="Python 2.x bindings for Poppler"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/poppler-python"
@@ -15,15 +15,20 @@ provides=('pypoppler' 'python-poppler')
 conflicts=('python-poppler')
 replaces=('python-poppler')
 options=(!libtool)
-source=(http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz
-        pypoppler-0.12.1-poppler-0.16.0.patch)
+source=("http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz"
+        'pypoppler-0.12.1-poppler-0.16.0.patch')
 md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a'
          '683c5b67866d56adc2494120cc329dc8')
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
 
-  patch -Np0 -i "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch"
+  # poppler 0.16 compat
+  patch -Np0 -i \
+	  "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch"
+
+  # poppler 0.18 compat
+  sed -i "/pixbuf/,/^)/d" poppler.defs
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
@@ -36,5 +41,7 @@ build() {
 package() {
   cd "$srcdir/$_realname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index cea4c5e1d..6e5964a32 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 56625 2011-10-09 08:59:56Z jlichtblau $
+#$Id: PKGBUILD 58421 2011-11-12 17:18:45Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qmmp
 pkgver=0.5.2
-pkgrel=1
+pkgrel=3
 pkgdesc="Qt4 based audio-player"
 arch=('i686' 'x86_64')
 url="http://qmmp.ylsoftware.com/"
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index 31050d69e..379f85cbe 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,7 @@
+2011-11-12 Andrea Scarpino <andrea@archlinux.org>
+    * qmmp 0.5.2-3
+    * rebuild with qt 4.7
+
 2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qmmp 0.5.2-1
 
diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD
index 75ec29542..42a0bf0fc 100644
--- a/community/qmpdclient/PKGBUILD
+++ b/community/qmpdclient/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57154 2011-10-22 15:37:23Z andrea $
+# $Id: PKGBUILD 58444 2011-11-12 18:54:25Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=qmpdclient
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A Qt4 client for MPD"
 arch=('i686' 'x86_64')
 url="http://bitcheese.net/wiki/QMPDClient"
@@ -29,6 +29,5 @@ build() {
 
 package() {
   cd ${srcdir}/build
-
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/qmpdclient/qmpdclient.changelog b/community/qmpdclient/qmpdclient.changelog
index 1e43c6a15..788ad2d68 100644
--- a/community/qmpdclient/qmpdclient.changelog
+++ b/community/qmpdclient/qmpdclient.changelog
@@ -1,3 +1,7 @@
+2011-11-12 Andrea Scarpino <andrea@archlinux.org>
+    * qmpdclient 1.2.2-2
+    * Qt 4.8 downgrade
+
 2011-10-22 Andrea Scarpino <andrea@archlinux.org>
     * qmpdclient 1.2.2-1
 
diff --git a/community/rsnapshot/PKGBUILD b/community/rsnapshot/PKGBUILD
index 21cdc3ba6..d4c727c31 100644
--- a/community/rsnapshot/PKGBUILD
+++ b/community/rsnapshot/PKGBUILD
@@ -1,23 +1,35 @@
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
+# $Id: PKGBUILD 58364 2011-11-12 11:47:00Z andrea $
+# Maintainer:
+# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Thorsten Tasch <tht@thorstentasch.de>
 # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
 pkgname=rsnapshot
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A remote filesystem snapshot utility"
 arch=('i686' 'x86_64')
 url="http://www.rsnapshot.org"
 license=('GPL')
 depends=('perl' 'rsync' 'openssh')
 backup=('etc/rsnapshot.conf')
-source=(http://www.rsnapshot.org/downloads/$pkgname-$pkgver.tar.gz rsnapshot)
+source=("http://www.rsnapshot.org/downloads/${pkgname}-${pkgver}.tar.gz"
+        'rsnapshot')
+md5sums=('588f92995dcf60a6ea6df8d94a017e7e'
+         '4cd16eaa51d58a652cffde945985e91c')
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1
-	sed -i 's:/usr/bin/pod2man:/usr/bin/perlbin/core/pod2man:' Makefile
-	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
-	mv "$pkgdir"/etc/rsnapshot.conf.default "$pkgdir"/etc/rsnapshot.conf
+	cd ${srcdir}/${pkgname}-${pkgver}
+	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
+	sed -i 's:/usr/bin/pod2man:/usr/bin/core_perl/pod2man:' Makefile
+	make
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	make DESTDIR=${pkgdir} install
+	mv ${pkgdir}/etc/rsnapshot.conf.default ${pkgdir}/etc/rsnapshot.conf
 	install -Dm644 ${srcdir}/rsnapshot ${pkgdir}/etc/logrotate.d/rsnapshot
 }
-md5sums=('588f92995dcf60a6ea6df8d94a017e7e' '4cd16eaa51d58a652cffde945985e91c')
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 06412266b..db9b90cb5 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 56880 2011-10-15 22:25:22Z spupykin $
+# $Id: PKGBUILD 58472 2011-11-12 22:05:25Z lcarlier $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
-pkgver=0.11.4
-pkgrel=2
+pkgver=0.11.6
+pkgrel=1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
 depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw'
 	 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'vala')
+makedepends=('intltool')
+# 'vala'
 install=shotwell.install
 source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2"
-	"http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2")
-md5sums=('150899574f8fd96b6a5b87173a6ef3e0'
-         'bf35262cc611de447147d01cbac33767')
+	"http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2"
+	"fix-with-libraw-0.4.patch")
+md5sums=('bbbf2843eb98b6f0ef1dfcfb934e15cf'
+         'bf35262cc611de447147d01cbac33767'
+         '488787b6d2cbc7348bc88348b78b6005')
 
 build() {
   cd "${srcdir}/vala-0.12.1"
@@ -27,11 +30,15 @@ build() {
   export PATH=$srcdir/vala/bin:$PATH
 
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../fix-with-libraw-0.4.patch
+
   ./configure --prefix=/usr \
 	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
 	--disable-schemas-install \
 	--disable-desktop-update \
 	--disable-icon-update
+
   make
 }
 
diff --git a/community/shotwell/fix-with-libraw-0.4.patch b/community/shotwell/fix-with-libraw-0.4.patch
new file mode 100644
index 000000000..f6f021b61
--- /dev/null
+++ b/community/shotwell/fix-with-libraw-0.4.patch
@@ -0,0 +1,50 @@
+Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled
+diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala
+--- shotwell-0.11.5/src/photos/GRaw.vala	2011-09-24 00:52:27.000000000 +0200
++++ shotwell-0.11.5-fixed/src/photos/GRaw.vala	2011-11-01 00:25:05.976289495 +0100
+@@ -163,9 +163,9 @@
+         proc = new LibRaw.Processor(options);
+     }
+     
+-    public void add_masked_borders_to_bitmap() {
+-        proc.add_masked_borders_to_bitmap();
+-    }
++//    public void add_masked_borders_to_bitmap() {
++//        proc.add_masked_borders_to_bitmap();
++//    }
+     
+     public void adjust_sizes_info_only() throws Exception {
+         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
+@@ -215,9 +215,9 @@
+         throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
+     }
+     
+-    public void rotate_fuji_raw() throws Exception {
+-        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
+-    }
++//    public void rotate_fuji_raw() throws Exception {
++//        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
++//    }
+     
+     public void thumb_writer(string filename) throws Exception {
+         throw_exception("thumb_writer", proc.thumb_writer(filename));
+@@ -262,7 +262,7 @@
+         // camera_profile
+         // bad_pixels
+         // dark_frame
+-        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
++        // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
+         output_params->output_bps = 8;
+         // output_tiff
+         output_params->user_flip = GRaw.Flip.FROM_SOURCE;
+@@ -303,8 +303,8 @@
+         case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
+             throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
+         
+-        case LibRaw.Result.CANNOT_ADDMASK:
+-            throw new Exception.CANNOT_ADDMASK(msg);
++//        case LibRaw.Result.CANNOT_ADDMASK:
++//            throw new Exception.CANNOT_ADDMASK(msg);
+         
+         case LibRaw.Result.UNSUFFICIENT_MEMORY:
+             throw new Exception.OUT_OF_MEMORY(msg);
diff --git a/community/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD
index 620e86ab8..db984ea91 100644
--- a/community/sqliteman/PKGBUILD
+++ b/community/sqliteman/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 44071 2011-04-01 22:02:53Z spupykin $
+# $Id: PKGBUILD 58342 2011-11-12 08:23:16Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Roman Porizka <artee@beer.cz>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=sqliteman
 pkgver=1.2.2
-pkgrel=4
+pkgrel=5
 pkgdesc="The best developer's and/or admin's GUI tool for Sqlite3 in the world"
 arch=('i686' 'x86_64')
 url="http://sqliteman.sf.net"
 license=('GPL')
-depends=('qt' 'qscintilla')
+depends=('qscintilla')
 makedepends=('cmake')
+install=sqliteman.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('5ecdf710e23606e1b924f740ea69306d')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/sqliteman/sqliteman.install b/community/sqliteman/sqliteman.install
new file mode 100644
index 000000000..ce8f7514f
--- /dev/null
+++ b/community/sqliteman/sqliteman.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+        post_install
+}
+
+post_remove() {
+        post_install
+}
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index d720c5fa5..97f4111dc 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56131 2011-10-02 08:08:49Z spupykin $
+# $Id: PKGBUILD 58423 2011-11-12 17:18:54Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
 pkgver=0.63.02
-pkgrel=1
+pkgrel=2
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64)
 url="http://synfig.org"
@@ -16,7 +16,7 @@ conflicts=('synfig-core')
 replaces=('synfig-core')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz
-	build-fix.patch)
+	build-fix.patch ffmpeg-0.8.patch)
 md5sums=('4286d5e1887275107d760d1b678aec24'
          '2de5e74159a38e4b1788c20d4c4b6f68')
 
@@ -24,7 +24,8 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
   [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
-  patch -p1 <$srcdir/build-fix.patch
+  patch -p1 -i $srcdir/build-fix.patch
+  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
   make
 }
 
@@ -32,3 +33,9 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
+md5sums=('4286d5e1887275107d760d1b678aec24'
+         '2de5e74159a38e4b1788c20d4c4b6f68'
+         'f1f22b1ce2c13e25d5eb51a664a9551f')
+md5sums=('4286d5e1887275107d760d1b678aec24'
+         '2de5e74159a38e4b1788c20d4c4b6f68'
+         'ebf41046097cfd778dee9a9854561dae')
diff --git a/community/synfig/ffmpeg-0.8.patch b/community/synfig/ffmpeg-0.8.patch
new file mode 100644
index 000000000..4ba40fff2
--- /dev/null
+++ b/community/synfig/ffmpeg-0.8.patch
@@ -0,0 +1,60 @@
+diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp
+--- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp	2011-09-29 10:51:41.000000000 +0200
++++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp	2011-10-31 16:39:03.000000000 +0100
+@@ -441,7 +441,7 @@
+ 		if( context->coded_frame )
+ 			pkt.pts = context->coded_frame->pts;
+ 		if( context->coded_frame && context->coded_frame->key_frame)
+-			pkt.flags |= PKT_FLAG_KEY;
++			pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+ 		//kluge for raw picture format (they said they'd fix)
+ 		if (formatc->oformat->flags & AVFMT_RAWPICTURE)
+@@ -463,7 +463,7 @@
+ 				if( context->coded_frame )
+ 					pkt.pts = context->coded_frame->pts;
+ 				if( context->coded_frame && context->coded_frame->key_frame)
+-					pkt.flags |= PKT_FLAG_KEY;
++					pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+ 				ret = av_write_frame(formatc, &pkt);
+ 
+@@ -567,17 +567,17 @@
+ 		if (typestring)
+ 		{
+ 			//formatptr guess_format(type, filename, MIME type)
+-			format = guess_format(typestring,NULL,NULL);
++			format = av_guess_format(typestring,NULL,NULL);
+ 		}
+ 		else
+ 		{
+-			format = guess_format(NULL, filename, NULL);
++			format = av_guess_format(NULL, filename, NULL);
+ 		}
+ 
+ 		if(!format)
+ 		{
+ 			synfig::warning("Unable to Guess the output, defaulting to mpeg");
+-			format = guess_format("mpeg", NULL, NULL);
++			format = av_guess_format("mpeg", NULL, NULL);
+ 		}
+ 
+ 		if(!format)
+@@ -753,7 +753,7 @@
+ 
+ 		context = st->codec;
+ 		context->codec_id = (CodecID)codec_id;
+-		context->codec_type = CODEC_TYPE_VIDEO;
++		context->codec_type = AVMEDIA_TYPE_VIDEO;
+ 
+ 		//PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???)
+ 
+@@ -800,7 +800,7 @@
+ 
+ 		context = stream->codec;
+ 		context->codec_id = (CodecID)codec_id;
+-		context->codec_type = CODEC_TYPE_AUDIO;
++		context->codec_type = AVMEDIA_TYPE_AUDIO;
+ 
+ 		/* put sample parameters */
+ 		context->bit_rate = 64000;
diff --git a/community/tora/PKGBUILD b/community/tora/PKGBUILD
index de4385053..49b8e64fa 100644
--- a/community/tora/PKGBUILD
+++ b/community/tora/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 44359 2011-04-06 09:51:56Z jelle $
+# $Id: PKGBUILD 58339 2011-11-12 08:18:18Z andrea $
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
+
 pkgname=tora
 pkgver=2.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Toolkit for databases with support for MySQL and PostgreSQL"
 arch=('i686' 'x86_64')
 url="http://tora.sourceforge.net"
@@ -13,15 +14,20 @@ license=('GPL')
 depends=('qscintilla')
 makedepends=('cmake')
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('ea4a75a9daeaf58492413e3f7fe40293')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/ 
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
+
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/tora/tora.install b/community/tora/tora.install
index 260f3960f..161b21e2b 100644
--- a/community/tora/tora.install
+++ b/community/tora/tora.install
@@ -1,5 +1,5 @@
 # Thanks to: Serge Gielkens (Teld) for this bugfix
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(tora.info)
 
 post_install() {
@@ -17,4 +17,3 @@ pre_remove() {
         install-info --delete $infodir/$file $infodir/dir 2> /dev/null
     done
 }
-
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index d1f035081..4dadb8d58 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
 # Contributor: leepesjee <lpeschier at xs4all dot nl>
@@ -8,7 +9,7 @@
 
 pkgname=vtk
 pkgver=5.8.0
-pkgrel=2
+pkgrel=6
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org'
@@ -22,10 +23,12 @@ optdepends=('python2: python bindings'
             'graphviz: drawing tools')
 source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
-        'fixkernelversioncheck.diff')
+        'fixkernelversioncheck.diff'
+        'ffmpeg-0.8.diff')
 md5sums=('37b7297d02d647cc6ca95b38174cb41f'
          'a05295b81930e894fc0e31866f399151'
-         '9e137af23701f76fc727222ebac23389')
+         '9e137af23701f76fc727222ebac23389'
+         'e992321c9d1def6034d0fa6607b40c5a')
 
 build() {
   cd VTK
@@ -34,6 +37,10 @@ build() {
   # remove next pkgver bump
   patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
 
+  # fix compilation error:
+  # remove next pkgver bump
+  patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
+
   cd ${srcdir}
 
   rm -rf build
diff --git a/community/vtk/ffmpeg-0.8.diff b/community/vtk/ffmpeg-0.8.diff
new file mode 100644
index 000000000..523919d6f
--- /dev/null
+++ b/community/vtk/ffmpeg-0.8.diff
@@ -0,0 +1,66 @@
+Description: Upstream changes introduced in version 5.6.1-6.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ vtk (5.6.1-6.1) unstable; urgency=low
+ .
+   [ Michael Schutte ]
+   * Non-maintainer upload.
+   * Remove absolute paths to required libraries from
+     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
+     #506992.  Due to the multiarch transition, the original behavior
+     frequently causes reverse build-deps to FTBFS.  This change should
+     probably be reverted once all required libraries are multiarched.
+ .
+   [ Steve M. Robbins ]
+   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
+   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
+     0.7.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Steve M. Robbins <smr@debian.org>
+Bug-Debian: http://bugs.debian.org/506992
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
++++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
+@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
+     }
+ 
+   //choose avi media file format
+-  this->avOutputFormat = guess_format("avi", NULL, NULL);
++  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
+   if (!this->avOutputFormat) 
+     {
+     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
+@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
+   //Set up the codec.
+   AVCodecContext *c = this->avStream->codec;
+   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
+-  c->codec_type = CODEC_TYPE_VIDEO;
++  c->codec_type = AVMEDIA_TYPE_VIDEO;
+   c->width = this->Dim[0];
+   c->height = this->Dim[1];
+   c->pix_fmt = PIX_FMT_YUVJ420P;
+@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+     pkt.stream_index = this->avStream->index;
+     if (cc->coded_frame->key_frame) //treat keyframes well
+       {
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+       }
+     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
+     pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/community/wxsvg/PKGBUILD b/community/wxsvg/PKGBUILD
index 28bcc240d..16e881116 100644
--- a/community/wxsvg/PKGBUILD
+++ b/community/wxsvg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55754 2011-09-19 05:09:05Z ebelanger $
+# $Id: PKGBUILD 58427 2011-11-12 17:19:10Z ibiru $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=wxsvg
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ library to create, manipulate and render SVG files"
 arch=('i686' 'x86_64')
 url="http://wxsvg.sourceforge.net/"
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 64af8d2a1..56fff3d7b 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57288 2011-10-25 10:02:07Z spupykin $
+# $Id: PKGBUILD 58429 2011-11-12 17:19:30Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=1
+pkgrel=2
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64')
 url="http://xmms2.org/"
diff --git a/community/xvidcap/PKGBUILD b/community/xvidcap/PKGBUILD
index 476d1d192..6d68a48a9 100644
--- a/community/xvidcap/PKGBUILD
+++ b/community/xvidcap/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=xvidcap
 pkgver=1.1.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A small tool to capture things going on on an X-Windows display to either individual frames or an MPEG video"
 arch=("i686" "x86_64")
 license=('GPL')
@@ -15,7 +15,8 @@ depends=('dbus-glib' 'lame' 'libxmu' 'libglade' 'ffmpeg' 'dbus')
 makedepends=('perlxml' 'rarian')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'xextproto-7.1.1.patch'
-	'xvidcap-ffmpeg.patch')
+	'xvidcap-ffmpeg.patch'
+        'ffmpeg-0.8.patch')
 md5sums=('b39a682d3ef9fcbf424af771936780e2'
 	'fbde2b076c5ea05723883b87f3ef2a65'
 	'f18817da1c0dada05fa791ae53193b2c')
@@ -24,14 +25,26 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   patch -Np1 -i ${srcdir}/xextproto-7.1.1.patch
-  patch -Np0 -i ${srcdir}/xvidcap-ffmpeg.patch || return 1
+  patch -Np0 -i ${srcdir}/xvidcap-ffmpeg.patch 
+  patch -Np1 -i ${srcdir}/ffmpeg-0.8.patch 
 
   ./configure --prefix=/usr \
     --with-x \
     --with-gtk2 \
     --enable-libmp3lame \
     --without-forced-embedded-ffmpeg
-  make || return 1
-  make prefix=${pkgdir}/usr install || return 1
+  make 
 }
 
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make prefix=${pkgdir}/usr install 
+}
+md5sums=('b39a682d3ef9fcbf424af771936780e2'
+         'fbde2b076c5ea05723883b87f3ef2a65'
+         'f18817da1c0dada05fa791ae53193b2c'
+         '36ead5f0345ae776601d49c1c90cb101')
+md5sums=('b39a682d3ef9fcbf424af771936780e2'
+         'fbde2b076c5ea05723883b87f3ef2a65'
+         'f18817da1c0dada05fa791ae53193b2c'
+         '6e4dfab56b877362757092f55ad6b337')
diff --git a/community/xvidcap/ffmpeg-0.8.patch b/community/xvidcap/ffmpeg-0.8.patch
new file mode 100644
index 000000000..511333a0f
--- /dev/null
+++ b/community/xvidcap/ffmpeg-0.8.patch
@@ -0,0 +1,82 @@
+diff -aur xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7.new/src/xtoffmpeg.c
+--- xvidcap-1.1.7/src/xtoffmpeg.c	2008-05-25 22:01:54.000000000 +0000
++++ xvidcap-1.1.7.new/src/xtoffmpeg.c	2011-10-31 20:41:08.259171263 +0000
+@@ -361,7 +361,7 @@
+     }
+     // put sample parameters
+     au_c->codec_id = xvc_audio_codecs[job->au_targetCodec].ffmpeg_id;
+-    au_c->codec_type = CODEC_TYPE_AUDIO;
++    au_c->codec_type = AVMEDIA_TYPE_AUDIO;
+     au_c->bit_rate = target->sndsize;
+     au_c->sample_rate = target->sndrate;
+     au_c->channels = target->sndchannels;
+@@ -567,7 +567,7 @@
+                     av_rescale_q (enc->coded_frame->pts, enc->time_base,
+                                   ost->st->time_base);
+             }
+-            pkt.flags |= PKT_FLAG_KEY;
++            pkt.flags |= AV_PKT_FLAG_KEY;
+             pkt.stream_index = ost->st->index;
+ 
+             pkt.data = audio_out;
+@@ -627,7 +627,7 @@
+             pkt.pts =
+                 av_rescale_q (enc->coded_frame->pts, enc->time_base,
+                               ost->st->time_base);
+-        pkt.flags |= PKT_FLAG_KEY;
++        pkt.flags |= AV_PKT_FLAG_KEY;
+         av_interleaved_write_frame (s, &pkt);
+     }
+ 
+@@ -681,7 +681,7 @@
+     if (ret <= 0) {
+         ret = avcodec_encode_audio (enc, bit_buffer, bit_buffer_size, NULL);
+     }
+-    pkt.flags |= PKT_FLAG_KEY;
++    pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+     if (samples) {
+         av_free (samples);
+@@ -905,7 +905,7 @@
+                               ost->time_base);
+         }
+         if (enc->coded_frame->key_frame)
+-            pkt.flags |= PKT_FLAG_KEY;
++            pkt.flags |= AV_PKT_FLAG_KEY;
+     }
+ 
+     pkt.stream_index = ost->index;
+@@ -1157,7 +1157,7 @@
+     }
+ 
+     st->codec->codec_id = codec_id;
+-    st->codec->codec_type = CODEC_TYPE_VIDEO;
++    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ 
+     // find the video encoder
+     codec = avcodec_find_encoder (st->codec->codec_id);
+@@ -1439,13 +1439,13 @@
+         // guess AVOutputFormat
+         if (job->target >= CAP_MF)
+             file_oformat =
+-                guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL);
++                av_guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL);
+         else {
+             char tmp_fn[30];
+ 
+             snprintf (tmp_fn, 29, "test-%%d.%s",
+                       xvc_formats[job->target].extensions[0]);
+-            file_oformat = guess_format (NULL, tmp_fn, NULL);
++            file_oformat = av_guess_format (NULL, tmp_fn, NULL);
+         }
+         if (!file_oformat) {
+             fprintf (stderr,
+@@ -1466,7 +1466,7 @@
+ #endif     // DEBUG
+ 
+         // prepare AVFormatContext
+-        output_file = av_alloc_format_context ();
++        output_file = avformat_alloc_context();
+         if (!output_file) {
+             fprintf (stderr,
+                      _
diff --git a/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch
new file mode 100644
index 000000000..4420d0b63
--- /dev/null
+++ b/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch
@@ -0,0 +1,33 @@
+From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
+From: Dan McGee <dan@archlinux.org>
+Date: Sun, 19 Jun 2011 16:04:25 -0500
+Subject: [PATCH] Set hostname via /proc if file is available
+
+On Linux, the hostname can be set via this file if available, precluding
+the need for a `hostname` binary.
+
+Signed-off-by: Dan McGee <dan@archlinux.org>
+---
+ dhcpcd-hooks/30-hostname |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
+index 65d1a13..af94262 100644
+--- a/dhcpcd-hooks/30-hostname
++++ b/dhcpcd-hooks/30-hostname
+@@ -21,7 +21,11 @@ need_hostname()
+ try_hostname()
+ {
+ 	if valid_domainname "$1"; then
+-		hostname "$1"
++		if [ -w /proc/sys/kernel/hostname ]; then
++			echo "$1" > /proc/sys/kernel/hostname
++		else
++			hostname "$1"
++		fi
+ 	else
+ 		syslog err "Invalid hostname: $1"
+ 	fi
+-- 
+1.7.5.4
+
diff --git a/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch
new file mode 100644
index 000000000..7e78ecd0d
--- /dev/null
+++ b/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch
@@ -0,0 +1,61 @@
+From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <d@falconindy.com>
+Date: Tue, 21 Jun 2011 09:32:47 -0400
+Subject: [PATCH] set MTU via sysfs if file is available
+
+On Linux, a network interface's MTU can be set by writing to
+/sys/class/net/$interface/mtu, which removes the dependency on ifconfig.
+
+Signed-off-by: Dave Reisner <d@falconindy.com>
+---
+ dhcpcd-hooks/10-mtu |    4 ++--
+ dhcpcd-run-hooks.in |   11 +++++++++++
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
+index 639697c..8763930 100644
+--- a/dhcpcd-hooks/10-mtu
++++ b/dhcpcd-hooks/10-mtu
+@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ 	# The smalled MTU dhcpcd can work with is 576
+ 	if [ "$new_interface_mtu" -ge 576 ]; then
+-		if ifconfig "$interface" mtu "$new_interface_mtu"; then
++		if set_mtu "$interface" "$new_interface_mtu"; then
+ 			syslog info "$interface: MTU set to $new_interface_mtu"
+ 			# Save the MTU so we can restore it later
+ 			if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then
+ 		# No MTU in this state, so restore the prior MTU
+ 		mtu=$(cat "$mtu_dir/$interface")
+ 		syslog info "$interface: MTU restored to $mtu"
+-		ifconfig "$interface" mtu "$mtu"
++		set_mtu "$interface" "$mtu"
+ 		rm "$mtu_dir/$interface"
+ 	fi
+ fi
+diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
+index 0e60338..843f3ca 100644
+--- a/dhcpcd-run-hooks.in
++++ b/dhcpcd-run-hooks.in
+@@ -215,6 +215,17 @@ service_condcommand()
+ 	service_exists $1 && service_status $1 && service_cmd $1 $2
+ }
+ 
++# Set MTU for an interface
++set_mtu() {
++	local interface=$1 mtu=$2
++
++	if [ -e /sys/class/net/$interface/mtu ]; then
++		echo "$mtu" > /sys/class/net/$interface/mtu
++	else
++		ifconfig "$interface" mtu "$mtu"
++	fi
++}
++
+ # We source each script into this one so that scripts run earlier can
+ # remove variables from the environment so later scripts don't see them.
+ # Thus, the user can create their dhcpcd.enter/exit-hook script to configure
+-- 
+1.7.5.4
+
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 1eb7dc82a..500de0241 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 118799 2011-04-07 19:53:44Z ronald $
+# $Id: PKGBUILD 142553 2011-11-12 07:19:26Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
 pkgver=5.2.12
-pkgrel=1
+pkgrel=4
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
 arch=('i686' 'x86_64')
@@ -15,13 +15,20 @@ depends=('glibc' 'sh')
 backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd.conf.d')
+        'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \
+	'0001-set-MTU-via-sysfs-if-file-is-available.patch')
 sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
-          'b67b9ce6a2faaca75fea356966a16be2283b7db0')
+          'b67b9ce6a2faaca75fea356966a16be2283b7db0'
+          'ee85adac972a8172a9d9b3a1bdd46e0430301582'
+          'afbed18dc5544f7d0b81e2266b322ca12becf9a4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # remove net-tools dep
+  patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch
+  patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch
+
   # configure variables
   ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
 
diff --git a/core/dhcpcd/remove_ifconfig.patch b/core/dhcpcd/remove_ifconfig.patch
new file mode 100644
index 000000000..5bcc4a68f
--- /dev/null
+++ b/core/dhcpcd/remove_ifconfig.patch
@@ -0,0 +1,20 @@
+--- dhcpcd-hooks/10-mtu.orig	2011-11-04 07:45:46.477712667 +0100
++++ dhcpcd-hooks/10-mtu	2011-11-04 07:46:38.964379550 +0100
+@@ -7,7 +7,7 @@
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ 	# The smalled MTU dhcpcd can work with is 576
+ 	if [ "$new_interface_mtu" -ge 576 ]; then
+-		if ifconfig "$interface" mtu "$new_interface_mtu"; then
++		if ip link set "$interface" mtu "$new_interface_mtu"; then
+ 			syslog info "$interface: MTU set to $new_interface_mtu"
+ 			# Save the MTU so we can restore it later
+ 			if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@
+ 		# No MTU in this state, so restore the prior MTU
+ 		mtu=$(cat "$mtu_dir/$interface")
+ 		syslog info "$interface: MTU restored to $mtu"
+-		ifconfig "$interface" mtu "$mtu"
++		ip link set "$interface" mtu "$new_interface_mtu"
+ 		rm "$mtu_dir/$interface"
+ 	fi
+ fi
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index b485b65db..93478640d 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 122044 2011-05-02 00:18:38Z heftig $
+# $Id: PKGBUILD 142610 2011-11-12 17:15:00Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel Ehlers <danielehlers@mindeye.net>
 
 pkgname=alsa-plugins
 pkgver=1.0.24
-pkgrel=2
+pkgrel=3
 pkgdesc="Extra alsa plugins"
 arch=(i686 x86_64)
 url="http://www.alsa-project.org"
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index a8183bd63..c3ead5dc1 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 134019 2011-08-01 10:23:47Z andrea $
+# $Id: PKGBUILD 142612 2011-11-12 17:15:02Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.4.3
-pkgrel=1
+pkgrel=3
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 8f0ae710d..a86846f68 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141482 2011-10-30 18:13:40Z giovanni $
+# $Id: PKGBUILD 142567 2011-11-12 08:25:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10648
+pkgver=10674
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('dc9d4bbe4b1b2fd263e98d32e71f6284')
+md5sums=('3557fb22e7ca7d973414d7eedfbbb79f')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index 3bf48567d..cef7b7e78 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140069 2011-10-06 07:33:44Z ibiru $
+# $Id: PKGBUILD 142664 2011-11-12 17:45:03Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.5
-pkgrel=4
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
@@ -98,7 +98,7 @@ package_avidemux-gtk() {
 
 package_avidemux-qt() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils')
+  depends=("avidemux-cli=${pkgver}" 'qt')
   install=avidemux.install
 
   cd "${srcdir}/${pkgbase}_${pkgver}"
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 334fbd7fb..4e4bb6b1c 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141279 2011-10-28 02:04:28Z eric $
+# $Id: PKGBUILD 142616 2011-11-12 17:15:07Z ibiru $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -13,7 +13,7 @@ _svn=false
 
 pkgname=blender
 pkgver=2.60a
-pkgrel=1
+pkgrel=2
 epoch=3
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
index 395192056..b3fe7427e 100644
--- a/extra/cmus/PKGBUILD
+++ b/extra/cmus/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 132775 2011-07-26 00:10:12Z eric $
+# $Id: PKGBUILD 142618 2011-11-12 17:15:10Z ibiru $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cmus
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64')
 url="http://cmus.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
-makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 
+makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug'
              'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
 optdepends=('alsa-lib: for ALSA output plugin support'
             'libao: for AO output plugin support'
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index b7d0edb29..242d7472b 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140859 2011-10-20 05:42:04Z ibiru $
+# $Id: PKGBUILD 142650 2011-11-12 17:18:26Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64')
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index b9d49ca06..14fe3d04c 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 140063 2011-10-06 07:33:35Z ibiru $
+# $Id: PKGBUILD 142620 2011-11-12 17:15:14Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20111003
+pkgver=20111108
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
 license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
+depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm')
 makedepends=('yasm' 'git')
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('38139817bee918a5664c549adb487468')
+md5sums=('bad7e47f6974cee62d98ce9de710076c')
 
 build() {
   cd "$srcdir/$pkgname"
@@ -27,6 +27,8 @@ build() {
     --enable-libx264 \
     --enable-libvpx \
     --enable-libtheora \
+    --enable-libgsm \
+    --enable-libspeex \
     --enable-postproc \
     --enable-shared \
     --enable-x11grab \
@@ -38,7 +40,8 @@ build() {
     --enable-gpl \
     --enable-version3 \
     --enable-runtime-cpudetect \
-    --disable-debug
+    --disable-debug \
+    --disable-static
 
   make
   make tools/qt-faststart
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index 82a96c06a..3fed7aae2 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -4,16 +4,16 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
-source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz
-	ffmpegthumbnailer.desktop)
-options=(!libtool)
+source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
+        'ffmpegthumbnailer.desktop')
+options=('!libtool')
 sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
           'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53')
 
@@ -30,7 +30,5 @@ package() {
 
   # FS#24105: Generate thumbnails in nautilus
   install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \
-	${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop
+    ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop
 }
-
-
diff --git a/extra/gegl/0.1.6-ffmpeg.patch b/extra/gegl/0.1.6-ffmpeg.patch
new file mode 100644
index 000000000..51fb95d28
--- /dev/null
+++ b/extra/gegl/0.1.6-ffmpeg.patch
@@ -0,0 +1,33 @@
+diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
+--- gegl-0.1.6.old//operations/external/ff-load.c   2011-01-24 19:03:30.000000000 -0300
++++ gegl-0.1.6/operations/external/ff-load.c    2011-05-04 09:59:48.910379742 -0300
+@@ -69,17 +69,17 @@
+ {
+   switch (err)
+     {
+-    case AVERROR_NUMEXPECTED:
++    case AVERROR(EDOM):
+       g_warning ("%s: Incorrect image filename syntax.\n"
+                  "Use '%%d' to specify the image number:\n"
+                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
+                  "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
+                  filename);
+       break;
+-    case AVERROR_INVALIDDATA:
++    case AVERROR(EINVAL):
+       g_warning ("%s: Error while parsing header\n", filename);
+       break;
+-    case AVERROR_NOFMT:
++    case AVERROR(EILSEQ):
+       g_warning ("%s: Unknown format\n", filename);
+       break;
+     default:
+@@ -278,7 +278,7 @@
+       for (i = 0; i< p->ic->nb_streams; i++)
+         {
+           AVCodecContext *c = p->ic->streams[i]->codec;
+-          if (c->codec_type == CODEC_TYPE_VIDEO)
++          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
+             {
+               p->video_st = p->ic->streams[i];
+               p->video_stream = i;
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 4a018da9c..64ea9e89c 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 110564 2011-02-20 03:00:42Z eric $
+# $Id: PKGBUILD 142624 2011-11-12 17:15:18Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gegl
 pkgver=0.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
 license=('GPL3' 'LGPL3')
-depends=('babl' 'libpng' 'libjpeg' 'gtk2')
+depends=('babl' 'gtk2')
 makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
 optdepends=('openexr: for using the openexr plugin' \
             'ffmpeg: for using the ffmpeg plugin' \
             'librsvg: for using the svg plugin' \
             'jasper: for using the jasper plugin')
 options=('!libtool')
-source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('af5e5a7d3c7ddfaa2b3414de2a7e9113')
-sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d')
+source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \
+        0.1.6-ffmpeg.patch)
+sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d'
+          'd62d4987f1c0fc256f5968271fc65cce0cc4c195')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch"
   ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
     --with-libavformat --with-jasper --disable-docs
   make
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index 9442d5ee0..21b6ae5eb 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -1,42 +1,39 @@
-# $Id: PKGBUILD 137743 2011-09-10 14:59:36Z pierre $
+# $Id: PKGBUILD 142675 2011-11-12 18:27:50Z ibiru $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
-pkgbase=graphite
-pkgname=('libgraphite' 'pango-graphite')
-pkgver=2.3.1
-pkgrel=2
+pkgname=graphite
+pkgver=1.0.3
+pkgrel=1
+epoch=1
 arch=('i686' 'x86_64')
 url="http://graphite.sil.org/"
-makedepends=('pango' 'gcc-libs')
+pkgdesc='reimplementation of the SIL Graphite text processing engine'
+license=('custom_SIL Dual license')
+depends=('gcc-libs')
+makedepends=('cmake' 'freetype2')
 options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz")
-md5sums=('d35724900f6a4105550293686688bbb3')
+source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz")
+md5sums=('3bf481ca95109b14435125c0dd1f2217')
 
 build() {
-  cd "${srcdir}/silgraphite-${pkgver}"
-  ./configure --prefix=/usr --disable-static
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
+	-DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
-package_libgraphite() {
-  pkgdesc='SILGraphite - a "smart font" rendering engine - the libs and headers'
-  license=('custom_SIL Dual license')
-  depends=('gcc-libs')
+check() {
+  cd "${srcdir}"/build
+  ctest
+}
 
-  cd "${srcdir}/silgraphite-${pkgver}"/engine
+package() {
+  cd "${srcdir}"/build
   make DESTDIR="$pkgdir/" install
 
   # licenses
   mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m644 license/*.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
-}
-
-package_pango-graphite() {
-  pkgdesc="SILGraphite support for pango"
-  license=('LGPL')
-  depends=('pango' 'libgraphite')
-  install=pango-graphite.install
- 
-  cd "${srcdir}/silgraphite-${pkgver}"/wrappers/pangographite
-  make DESTDIR="$pkgdir/" install
+  install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index 368c429f3..9ec05bb6d 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140071 2011-10-06 07:33:46Z ibiru $
+# $Id: PKGBUILD 142666 2011-11-12 17:45:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.18
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index a2f2c6e70..9f2dc994e 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 140925 2011-10-20 05:43:41Z ibiru $
+# $Id: PKGBUILD 142690 2011-11-12 18:51:16Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
@@ -13,13 +13,13 @@ makedepends=('gobject-introspection')
 options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3'
+sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
-    cd "${srcdir}/gtk+-${pkgver}"
+    cd "$srcdir/gtk+-$pkgver"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
@@ -31,8 +31,8 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/gtk+-${pkgver}"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/gtk+-$pkgver"
+    make DESTDIR="$pkgdir" install
 
-    install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini"
+    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
 }
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 19bb5fbef..94615493a 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 140573 2011-10-17 08:14:49Z jgc $
+# $Id: PKGBUILD 142652 2011-11-12 17:18:29Z ibiru $
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 arch=('i686' 'x86_64')
diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD
index 1b94ed8cd..f1dce1167 100644
--- a/extra/k3b/PKGBUILD
+++ b/extra/k3b/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 106655 2011-01-17 20:23:05Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: jlvsimoes
+# $Id: PKGBUILD 142626 2011-11-12 17:15:20Z ibiru $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=k3b
 pkgver=2.0.2
-pkgrel=1
-depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad'
-         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit'
-         'shared-mime-info' 'libxft')
-makedepends=('cmake' 'pkgconfig' 'automoc4' )
+pkgrel=4
 pkgdesc="Feature-rich and easy to handle CD burning application"
-url="http://k3b.sourceforge.net/"
-arch=("i686" "x86_64")
+arch=('i686' 'x86_64')
+url="http://k3b.org/"
 license=('GPL')
-install="${pkgname}.install"
+depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 
+         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft')
+makedepends=('cmake' 'automoc4' 'docbook-xml')
 optdepends=('dvd+rw-tools: for dvd burning support'
-            'vcdimager:    for vcd burning support'
-            'transcode:    for advanced mpeg conversion support'
-            'emovix:       for bootable multimedia cd/dvd support')
+            'vcdimager: for vcd burning support'
+            'transcode: for advanced mpeg conversion support'
+            'emovix: for bootable multimedia cd/dvd support')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+install=k3b.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
+        k3b-2.0.2-ffmpeg.patch)
+sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
+          '8120c0e22e6c41ea285ca6060be13723ed91c52b')
 
 build() {
   cd "${srcdir}"
+  (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch")
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -33,7 +35,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('c86113af31a2032e57fd2f302b5f637a')
diff --git a/extra/k3b/k3b-2.0.2-ffmpeg.patch b/extra/k3b/k3b-2.0.2-ffmpeg.patch
new file mode 100644
index 000000000..2878b1edc
--- /dev/null
+++ b/extra/k3b/k3b-2.0.2-ffmpeg.patch
@@ -0,0 +1,96 @@
+commit 61ca30beb978f68e72257408777c6433f33129bd
+Author: Michal Malek <michalm@jabster.pl>
+Date:   Sun Aug 28 20:18:53 2011 +0200
+
+    Fixed compilation with new FFMPEG
+    
+    BUG: 274817
+    FIXED-IN: 2.0.3
+
+diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+index 0ad59fc..0c5f366 100644
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
+ #else
+     ::AVCodecContext* codecContext =  d->formatContext->streams[0]->codec;
+ #endif
+-    if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
++    if( codecContext->codec_type != 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++        AVMEDIA_TYPE_AUDIO)
++#else
++        CODEC_TYPE_AUDIO)
++#endif
++    {
+         kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
+         return false;
+     }
+@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
+ QString K3bFFMpegFile::title() const
+ {
+     // FIXME: is this UTF8 or something??
+-    if( d->formatContext->title[0] != '\0' )
+-        return QString::fromLocal8Bit( d->formatContext->title );
++    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
++    if( ade == NULL )
++        return QString();
++    if( ade->value != '\0' )
++        return QString::fromLocal8Bit( ade->value );
+     else
+         return QString();
+ }
+@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
+ QString K3bFFMpegFile::author() const
+ {
+     // FIXME: is this UTF8 or something??
+-    if( d->formatContext->author[0] != '\0' )
+-        return QString::fromLocal8Bit( d->formatContext->author );
++    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
++    if( ade == NULL )
++        return QString();
++    if( ade->value != '\0' )
++        return QString::fromLocal8Bit( ade->value );
+     else
+         return QString();
+ }
+@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
+ QString K3bFFMpegFile::comment() const
+ {
+     // FIXME: is this UTF8 or something??
+-    if( d->formatContext->comment[0] != '\0' )
+-        return QString::fromLocal8Bit( d->formatContext->comment );
++    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
++    if( ade == NULL )
++        return QString();
++    if( ade->value != '\0' )
++        return QString::fromLocal8Bit( ade->value );
+     else
+         return QString();
+ }
+@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
+ #if LIBAVCODEC_VERSION_MAJOR < 52
+         int len = ::avcodec_decode_audio(
+ #else
++   #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++        int len = ::avcodec_decode_audio3(
++   #else
+         int len = ::avcodec_decode_audio2(
++   #endif
+ #endif
++
+ #ifdef FFMPEG_BUILD_PRE_4629
+             &d->formatContext->streams[0]->codec,
+ #else
+@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
+ #endif
+             (short*)d->alignedOutputBuffer,
+             &d->outputBufferSize,
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++            &d->packet );
++#else
+             d->packetData, d->packetSize );
++#endif
+ 
+         if( d->packetSize <= 0 || len < 0 )
+             ::av_free_packet( &d->packet );
diff --git a/extra/k3b/k3b.install b/extra/k3b/k3b.install
index a60d358ce..413ad60f7 100644
--- a/extra/k3b/k3b.install
+++ b/extra/k3b/k3b.install
@@ -1,12 +1,13 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-        update-mime-database usr/share/mime  &> /dev/null
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-mime-database usr/share/mime  &> /dev/null
+    update-desktop-database -q
 }
 
 post_upgrade() {
-	post_install
+    post_install
 }
 
 post_remove() {
-	post_install
+    post_install
 }
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 6d90df871..a35dd69a6 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141755 2011-11-02 18:12:20Z andrea $
+# $Id: PKGBUILD 142565 2011-11-12 08:14:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
 pkgver=4.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 76b4c5c98..bbb6f4d9f 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141867 2011-11-02 18:15:28Z andrea $
+# $Id: PKGBUILD 142628 2011-11-12 17:15:23Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
 pkgver=4.7.3
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index 2425f5077..f0be52a61 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $
+# $Id: PKGBUILD 142654 2011-11-12 17:18:33Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -37,25 +37,26 @@ pkgname=(
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=9
+pkgrel=11
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
              'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons')
+             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf')
 groups=('koffice')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'kde4-koffice-libwpg02.patch' 'gcc46.patch')
+        'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch')
 sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
             '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
-            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739')
-
+            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739'
+            'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa')
 build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
 	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
 	patch -p1 -i "${srcdir}"/gcc46.patch
+    patch -p1 -i "${srcdir}"/qt48fix.patch
 
 	cd "${srcdir}"
 	mkdir build
@@ -71,8 +72,8 @@ build() {
 
 package_koffice-filters(){
 	pkgdesc="Filters for the KDE office suite"
-	depends=('shared-mime-info')
-	optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
+	depends=('shared-mime-info' 'libgsf')
+	optdepends=('libwpd: WordPerfect document importer'
                    'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
                    'libkdcraw: support for raw images' 'poppler: support for pdf' 
 		   'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
diff --git a/extra/koffice/qt48fix.patch b/extra/koffice/qt48fix.patch
new file mode 100644
index 000000000..de72926d5
--- /dev/null
+++ b/extra/koffice/qt48fix.patch
@@ -0,0 +1,10 @@
+--- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-02-17 13:10:38.000000000 +0100
++++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-09-08 15:03:31.932039128 +0200
+@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
+ 	<< "visible="<<ba.isVisible()
+ 	<< "brush="<<ba.brush()
+ 	<< "pixmapmode="<<ba.pixmapMode()
+-	<< "pixmap="<<ba.pixmap()
+ 	<< ")";
+     return dbg;
+ }
diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD
index 6f776a1fc..66bea244c 100644
--- a/extra/kradio/PKGBUILD
+++ b/extra/kradio/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 105372 2011-01-08 12:01:40Z tpowa $
+# $Id: PKGBUILD 142630 2011-11-12 17:15:25Z ibiru $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kradio
 pkgver=4.0.2
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL2')
-pkgdesc="KRadio is a comfortable KDE radio application"
+pkgdesc="A comfortable KDE radio application"
 url="http://kradio.sourceforge.net/"
-depends=('lame' 'kdelibs' 'libsndfile' 'lirc-utils' 'libmms' 'ffmpeg')
-makedepends=('pkgconfig' 'automoc4')
-source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2)
+depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
+makedepends=('pkg-config' 'automoc4' 'cmake')
+install=kradio.install
+source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
 options=(!libtool)
 
 build() {
-  cd $srcdir
+  cd "$srcdir"
+  (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff")
   mkdir build
   cd build
   cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
@@ -22,7 +24,9 @@ build() {
 }
 
 package() {
-  cd $srcdir/build
-  make DESTDIR=$startdir/pkg install
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('18fea3e2bc7100882075187c6a89f7bd')
+md5sums=('18fea3e2bc7100882075187c6a89f7bd'
+         '5f407eb75536f39e79c77a70613e8704'
+         '7d31a4f54602bc109f39cc0a7a1dc50c')
diff --git a/extra/kradio/kradio-ffmpeg.diff b/extra/kradio/kradio-ffmpeg.diff
new file mode 100644
index 000000000..27d224fec
--- /dev/null
+++ b/extra/kradio/kradio-ffmpeg.diff
@@ -0,0 +1,34 @@
+X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988
+
+diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp
+index 4cd6cc0..c74d6e2 100644
+--- a/plugins/internetradio/decoder_thread.cpp
++++ b/plugins/internetradio/decoder_thread.cpp
+@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
+ 
+     //av_log_set_level(255);
+     m_av_pFormatCtx = avformat_alloc_context();
+-    memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx));
+     m_av_pFormatCtx->probesize = m_maxProbeSize;
+     m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE;
+ 
+@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
+         m_av_pFormatCtx_opened = true;
+     }
+     else {
+-
+ //         IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start");
+         if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) {
+             if (warningsNotErrors) {
+@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
+     m_av_audioStream = -1;
+     for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
+ //         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
++#if LIBAVCODEC_VERSION_MAJOR < 53
+         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
++#else
++        if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
++#endif
+             m_av_audioStream = i;
+             break;
+         }
diff --git a/extra/kradio/kradio.install b/extra/kradio/kradio.install
new file mode 100644
index 000000000..af52669f5
--- /dev/null
+++ b/extra/kradio/kradio.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
+
+post_upgrade() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
+
+post_remove() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 15b67b82a..393d6716e 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140577 2011-10-17 08:15:00Z jgc $
+# $Id: PKGBUILD 142694 2011-11-12 21:17:53Z ibiru $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -35,16 +35,16 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.3.2
-pkgver=3.4.3
-pkgrel=4
+_LOver=3.4.4.2
+pkgver=3.4.4
+pkgrel=3
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes.
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost'
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
              'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment'
@@ -52,15 +52,15 @@ makedepends=( # makedepends
              # the depends from libreoffice main pkg
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' #'libgraphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
 	     'ttf-dejavu') # to satisfy regression tests
-	     # translate-toolkit - todo move them to extra to allow --with-system-foo builds
+
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
 
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
 source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -88,10 +88,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
 	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
@@ -106,14 +103,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
 	scp2-more-reasonable-file-access-rights.diff
-	java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842
 	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe
-	pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b
-	poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b
-	build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42)
+	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -148,28 +140,26 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
 	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz)
-md5sums=('7c2e73f1197d169519f86efe422e5df9'
-         '823956297a7e0b7603c585c49bd9fd4e'
-         '465b3be0e30f88e1139c45d2e2217927'
-         'a1d5af5be5eb522c8a24feacbb0161fa'
-         '8b972e130dfe62eb41d1d71d72de4b76'
-         'a6b22494e3a65a3b242ecb896aa7ab48'
-         'b7d86f8baee5b31af210cc81785e5676'
-         'de6c062d334daab99cf0592aa3568215'
-         'df46914d540ef0126cd746d09c68ca2a'
-         '8f308250c397ddc6fdb1aae13e102927'
-         '1fd00a0fcfd4a5d1956c3f6a0990d1ce'
-         '86914ac8bc30ea721b708b2f2faa3111'
-         '1452229e57ac3c4191e798eac4c0a7e0'
-         'bb46bdb682689629d432cdbf5f3f42c2'
-         'bec7f633562762debdf810690002e688'
-         '87061613efece1c253906a90cd4dc01f'
-         '308284d7d1d1bd6860d128b26e24390b'
-         'fa8b36365a2b2fb110c44886d7069774'
-         'da8a40cac4bd9d4f6f326e0e3b1b7e2a'
+	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
+md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
+         'db423cbb1cee416b718138044a5de930'
+         '31944d2139d6d81ef1131bd513530621'
+         'f447fd4ffe54aab9561c6caa262754b3'
+         '97fe698737a35c8803712d4e08007620'
+         'acff44d97a5106d9b53c747dabeb0800'
+         '620d43a0b9f36388f423e030513864ef'
+         '4c5b1ed870363eca2602f0cb42a8415a'
+         '702c6ca31525d7d2c2ded86c77b0bd2e'
+         'ac9b3acf78f43c1395d0e2dedc860f30'
+         'd8d2c41cb86bc8ba2a07e001a5317abb'
+         '4d4af2fc06dbe33ec2307df812f7abe1'
+         '1398a566eb76598bf3005e187fc2386c'
+         'dd962d2d57f88b9e07e665adad3cabbc'
+         'fff0fc9cd16ef1eb2b2ed5d0a6e77f95'
+         'e54d41d39e63d04ac4a88ce79e37af98'
+         'dbc71403040f447683bf55d1f0be3cad'
+         '69ce5b72f44b008d0e78767c5b1dbf39'
+         '34a2e8ae6b81a042966740263c53e135'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -195,10 +185,7 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9'
          '18f577b374d60b3c760a3a3350407632'
          '0ff7d225d087793c8c2c680d77aac3e7'
          '185d60944ea767075d27247c3162b3bc'
-         'b4cae0700aa1c2aef7eb7f345365e6f1'
          '90401bca927835b6fbae4a707ed187c8'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '0625a7d661f899a8ce263fc8a9879108'
          '451ccf439a36a568653b024534669971'
          '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
          '41c9b65ad60af4b3255bbecdfef11736'
@@ -213,17 +200,13 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
          '37638431e7e40baf2e47966ebb9bc0e9'
-         'ca6032e86229ae798f3744ae244f5bfe'
          '3c6c62e77c30649a3dfe73512947cc9a'
-         '64497be966802e62ffe3282d3facf7b7'
-         '89ff871e77e10357a976fe9d1ab3a65a'
-         'c4cb0d7f2602396a3f4cac55b8a4e308'
-         'b8f1fb7f3902d22aeaa2575c6b08a62c')
+         'eb35d4c715e0dfc23bbc706996033829')
 
 build() {
 
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh
+	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
 	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
@@ -244,16 +227,12 @@ build() {
 	cd ${srcdir}/build
 
 	# buildfixes & bugfixes
-	patch -Np1 -i ${srcdir}/buildfix_boost.diff
+	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-	patch -Np1 -i ${srcdir}/java-detection.diff
 	patch -Np1 -i ${srcdir}/oracle-recognition.diff
-	patch -Np1 -i ${srcdir}/poppler-check.diff
-	patch -Np1 -i ${srcdir}/pdfimport.diff
-	patch -Np1 -i ${srcdir}/poppler-buildfix.diff
-	patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff
+	patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -282,7 +261,7 @@ build() {
 #	fi
 
 	# needed for 0003-distro-install-fix-en-US-only-installation.patch
-	autoconf -v -f
+	autoconf -f
 
 	# non-SMP test build
 #	export MAKEFLAGS="-j1"
@@ -299,7 +278,6 @@ build() {
 		--enable-crashdump \
 		--enable-dbus \
 		--enable-evolution2\
-		--enable-graphite --without-system-graphite \
 		--enable-gio\
 		--disable-gnome-vfs\
 		--disable-kde\
@@ -342,6 +320,7 @@ build() {
 		--with-external-hyph-dir=/usr/share/hyphen \
 		--with-external-thes-dir=/usr/share/mythes \
 		--with-system-cppunit\
+		--with-system-graphite\
 		--with-system-libwpg \
 		--with-system-libwps \
 		--with-system-redland\
@@ -350,7 +329,7 @@ build() {
 		--with-external-libtextcat-data \
 		--with-openldap\
 		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
+		--with-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mozilla\
@@ -393,7 +372,7 @@ package_libreoffice-common() {
  install=${pkgbase}.install
  depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
           'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
-          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite'
+          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
 	  #'java-runtime' 
           #'saxon'
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 47754d09a..1ce809241 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141480 2011-10-30 17:14:30Z giovanni $
+# $Id: PKGBUILD 142561 2011-11-12 07:58:37Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.10.27
+pkgver=2011.11.08
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('fe776efc25fbb98c6279b97cb9c48006')
+md5sums=('962ff6b036247e2abac091a6047eb822')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index 1a97bc8aa..3c3b7637a 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 129367 2011-06-27 05:48:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 142632 2011-11-12 17:15:28Z ibiru $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Adrià Arrufat <swiftscythe@gmail.com>
 
 pkgname=mediastreamer
 pkgver=2.7.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A library written in C that allows you to create and run audio and video streams"
 arch=('i686' 'x86_64')
-url="http://www.linphone.org"
+url="http://www.linphone.org/"
 license=('GPL')
 depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index 8d518a86f..e6df06f4e 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136884 2011-09-02 16:14:24Z ronald $
+# $Id: PKGBUILD 142634 2011-11-12 17:15:30Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
 pkgver=4.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
@@ -12,15 +12,20 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
          'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
          'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
          'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
-	 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' 
-	 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
+         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' 
+         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
 makedepends=('pkg-config')
 install=miro.install
-source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840')
+options=('!makeflags')
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
+        'ffmpeg.patch')
+sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840'
+          'f0c851d51318c0e0be8b91463ef901625d2587a9')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/linux"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/ffmpeg.patch"
+  cd linux
 
   python2 setup.py install --root="${pkgdir}"
 
diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch
new file mode 100644
index 000000000..edf378459
--- /dev/null
+++ b/extra/miro/ffmpeg.patch
@@ -0,0 +1,95 @@
+diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
+--- miro-4.0.old/linux/miro-segmenter.c	2011-05-25 15:58:21.000000000 +0200
++++ miro-4.0/linux/miro-segmenter.c	2011-05-25 16:09:41.000000000 +0200
+@@ -60,7 +60,7 @@
+     }
+ 
+     switch (input_codec_context->codec_type) {
+-        case CODEC_TYPE_AUDIO:
++        case AVMEDIA_TYPE_AUDIO:
+             output_codec_context->channel_layout = input_codec_context->channel_layout;
+             output_codec_context->sample_rate = input_codec_context->sample_rate;
+             output_codec_context->channels = input_codec_context->channels;
+@@ -72,7 +72,7 @@
+                 output_codec_context->block_align = input_codec_context->block_align;
+             }
+             break;
+-        case CODEC_TYPE_VIDEO:
++        case AVMEDIA_TYPE_VIDEO:
+             output_codec_context->pix_fmt = input_codec_context->pix_fmt;
+             output_codec_context->width = input_codec_context->width;
+             output_codec_context->height = input_codec_context->height;
+@@ -154,7 +154,7 @@
+         exit(1);
+     }
+ 
+-    ofmt = guess_format("mpegts", NULL, NULL);
++    ofmt = av_guess_format("mpegts", NULL, NULL);
+     if (!ofmt) {
+         fprintf(stderr, "Could not find MPEG-TS muxer\n");
+         exit(1);
+@@ -174,12 +174,12 @@
+ 
+     for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
+         switch (ic->streams[i]->codec->codec_type) {
+-            case CODEC_TYPE_VIDEO:
++            case AVMEDIA_TYPE_VIDEO:
+                 video_index = i;
+                 ic->streams[i]->discard = AVDISCARD_NONE;
+                 video_st = add_output_stream(oc, ic->streams[i]);
+                 break;
+-            case CODEC_TYPE_AUDIO:
++            case AVMEDIA_TYPE_AUDIO:
+                 audio_index = i;
+                 ic->streams[i]->discard = AVDISCARD_NONE;
+                 audio_st = add_output_stream(oc, ic->streams[i]);
+@@ -195,7 +195,7 @@
+         exit(1);
+     }
+ 
+-    dump_format(oc, 0, input, 1);
++    av_dump_format(oc, 0, input, 1);
+ 
+     if (video_st) {
+         codec = avcodec_find_decoder(video_st->codec->codec_id);
+@@ -208,7 +208,7 @@
+         }
+     }
+ 
+-    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++    if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
+         fprintf(stderr, "Could not open '%s'\n", output_filename);
+         exit(1);
+     }
+@@ -234,7 +234,7 @@
+             break;
+         }
+ 
+-        if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
++        if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
+             segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
+         }
+         else if (video_index < 0) {
+@@ -245,10 +245,10 @@
+         }
+ 
+         if (segment_time - prev_segment_time >= segment_duration) {
+-            put_flush_packet(oc->pb);
+-            url_fclose(oc->pb);
++            avio_flush(oc->pb);
++            avio_close(oc->pb);
+ 
+-            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++            if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
+                 fprintf(stderr, "Could not open '%s'\n", output_filename);
+                 break;
+             }
+@@ -278,7 +278,7 @@
+         av_freep(&oc->streams[i]);
+     }
+ 
+-    url_fclose(oc->pb);
++    avio_close(oc->pb);
+     av_free(oc);
+ 
+     return 0;
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index d782e1b0f..24465bb6e 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 127443 2011-06-15 03:16:57Z eric $
+# $Id: PKGBUILD 142636 2011-11-12 17:15:33Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=20110528
-pkgrel=3
+pkgrel=4
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64')
 url="http://moc.daper.net/"
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
 optdepends=('speex: for using the speex plugin' 
 	    'ffmpeg: for using the ffmpeg plugin'
@@ -18,15 +18,15 @@ optdepends=('speex: for using the speex plugin'
 	    'libmodplug: for using the modplug plugin')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
-        gcc-undefined-symbols.diff)
-md5sums=('003fd01af2165264eb666040e4f586cd'
-         'efacb8559e9145e15b0c25f8fa2a9d79')
+        gcc-undefined-symbols.diff moc-ffmpeg.patch)
 sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
-          'a811a4ac7e049914aab528d3f06a6be6634c2720')
+          'a811a4ac7e049914aab528d3f06a6be6634c2720'
+          'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d')
 
 build() {
   cd "${srcdir}/${pkgname}"
   patch -p0 -i ../gcc-undefined-symbols.diff
+  patch -p0 -i ../moc-ffmpeg.patch
 
 # Disabling aac to use the external ffmpeg to play them (FS#13164)
   ./autogen.sh
diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch
new file mode 100644
index 000000000..7554ea14e
--- /dev/null
+++ b/extra/moc/moc-ffmpeg.patch
@@ -0,0 +1,26 @@
+Index: decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2307)
++++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
+@@ -28,12 +28,6 @@
+ #include <ffmpeg/avformat.h>
+ #endif
+ 
+-/* libavformat's API will be changing at version 53, but at present there
+- * appears to be no guidance on what will replace the deprecated fields. */
+-#ifndef FF_API_OLD_METADATA
+-#define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
+-#endif
+-
+ /* FFmpeg also likes common names, without that, our common.h and log.h
+  * would not be included. */
+ #undef COMMON_H
+@@ -137,7 +131,7 @@
+ 	av_read_play (data->ic);
+ 	for (i = 0; i < data->ic->nb_streams; i++) {
+ 		data->enc = data->ic->streams[i]->codec;
+-		if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
++		if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
+ 			audio_index = i;
+ 			break;
+ 		}
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index a2aced8ca..77b1cecc4 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141091 2011-10-23 16:35:52Z dreisner $
+# $Id: PKGBUILD 142638 2011-11-12 17:15:35Z ibiru $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
@@ -6,7 +6,7 @@
 
 pkgname=mpd
 pkgver=0.16.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD
new file mode 100644
index 000000000..f930b1800
--- /dev/null
+++ b/extra/nawk/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 142698 2011-11-13 02:24:31Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=nawk
+pkgver=20110810
+pkgrel=2
+pkgdesc="The one, true implementation of the AWK"
+url="http://cm.bell-labs.com/who/bwk/"
+license=('MIT')
+arch=('i686' 'x86_64')
+options=('!makeflags')
+depends=('glibc')
+provides=('awk')
+source=("http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"
+        'manpage-naming.patch')
+md5sums=('a7062ecade93dc4cb39190e48db9a51d'
+         '8486d387a51fe3b3c9875c4151ad92b4')
+
+build() {
+  patch -Np1 < manpage-naming.patch
+  sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE
+
+  make "CPPFLAGS=-DHAS_ISBLANK" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS"
+}
+
+package() {
+  install -Dm755 a.out "$pkgdir/usr/bin/nawk"
+  install -Dm644 awk.1 "$pkgdir/usr/share/man/man1/nawk.1"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/nawk/LICENSE"
+}
diff --git a/extra/nawk/manpage-naming.patch b/extra/nawk/manpage-naming.patch
new file mode 100644
index 000000000..782f5e427
--- /dev/null
+++ b/extra/nawk/manpage-naming.patch
@@ -0,0 +1,46 @@
+diff -uNr ./nawk-20100523.orig/awk.1 nawk-20100523/awk.1
+--- ./nawk-20100523.orig/awk.1	2007-03-31 16:56:19.000000000 -0400
++++ nawk-20100523/awk.1	2010-09-20 21:49:16.840069318 -0400
+@@ -7,13 +7,11 @@
+ .fi
+ .ft 1
+ ..
+-awk
+-.TH AWK 1
+-.CT 1 files prog_other
++.TH NAWK 1
+ .SH NAME
+-awk \- pattern-directed scanning and processing language
++nawk \- pattern-directed scanning and processing language
+ .SH SYNOPSIS
+-.B awk
++.B nawk
+ [
+ .BI \-F
+ .I fs
+@@ -32,7 +30,7 @@
+ .I file ...
+ ]
+ .SH DESCRIPTION
+-.I Awk
++.I Nawk
+ scans each input
+ .I file
+ for lines that match any of a set of patterns specified literally in
+@@ -198,7 +196,6 @@
+ .BR atan2 
+ are built in.
+ Other built-in functions:
+-.TF length
+ .TP
+ .B length
+ the length of its argument
+@@ -407,7 +404,6 @@
+ do not combine with other patterns.
+ .PP
+ Variable names with special meanings:
+-.TF FILENAME
+ .TP
+ .B CONVFMT
+ conversion format used when converting numbers
+
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 4e45a5a34..3ae5df87d 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140067 2011-10-06 07:33:41Z ibiru $
+# $Id: PKGBUILD 142672 2011-11-12 17:47:17Z ibiru $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
 pkgver=3.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64)
 url="http://www.ekiga.org"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index f2bf421bf..505e5abb5 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136364 2011-08-27 19:56:26Z schiv $
+# $Id: PKGBUILD 142640 2011-11-12 17:15:38Z ibiru $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -6,12 +6,12 @@ pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr'
+depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030'
          'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
 makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
 optdepends=('python2-numpy: Python 2.x interface'
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index afc3662bf..1a3a0aafa 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 141011 2011-10-21 10:45:03Z ibiru $
+# $Id: PKGBUILD 142670 2011-11-12 17:46:43Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.0
-pkgrel=2
+pkgver=0.18.1
+pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
+_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
-       fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e)
-md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77'
-         '8f4a296fdd98446858d5ea74d7c496ab')
+        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
+        git-fixes.patch)
+md5sums=('d30e883a27423c936ef338ce1d967e2d'
+         '9dc64c254a31e570507bdd4ad4ba629a'
+         'a73ba6515aa73cb20c480692da52c79e')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
 
-  patch -Np1 -i "${srcdir}/fix_cairo.patch"
+  autoreconf -fi
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
@@ -32,6 +35,13 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}"
+  ln -sf test-${_testtag} test
+  cd ${pkgbase}-${pkgver}
+  make check
+}
+
 package_poppler() {
   pkgdesc="PDF rendering library based on xpdf 3.0"
   depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch
new file mode 100644
index 000000000..a18a31aec
--- /dev/null
+++ b/extra/poppler/git-fixes.patch
@@ -0,0 +1,107 @@
+From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun, 30 Oct 2011 15:02:19 +0000
+Subject: pdftocairo: Make sure beginDocument() is always called
+
+This fixes a crash when rendering only odd/even pages in a printing
+format.
+---
+diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
+index e458ee5..1b67c90 100644
+--- a/utils/pdftocairo.cc
++++ b/utils/pdftocairo.cc
+@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) {
+     lastPage = firstPage;
+   }
+ 
++  // Make sure firstPage is always used so that beginDocument() is called
++  if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1))
++    firstPage++;
++
+   cairoOut = new CairoOutputDev();
+   cairoOut->startDoc(doc->getXRef(), doc->getCatalog());
+   if (sz != 0)
+--
+cgit v0.9.0.2-2-gbebe
+From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun, 30 Oct 2011 15:08:46 +0000
+Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable
+
+This fixes an error in my previous commit.
+---
+diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
+index 1b67c90..d0d1ec6 100644
+--- a/utils/pdftocairo.cc
++++ b/utils/pdftocairo.cc
+@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) {
+   }
+ 
+   // Make sure firstPage is always used so that beginDocument() is called
+-  if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1))
++  if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1))
+     firstPage++;
+ 
+   cairoOut = new CairoOutputDev();
+--
+cgit v0.9.0.2-2-gbebe
+From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Tue, 01 Nov 2011 08:40:53 +0000
+Subject: Fix pkg-config files
+
+We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
+---
+diff --git a/configure.ac b/configure.ac
+index 3a120ca..c4f5b92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then
+   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
+ 
+   GLIB_REQUIRED=2.18
++  AC_SUBST(GLIB_REQUIRED)
+   AC_ARG_ENABLE(poppler-glib,
+ 	        AC_HELP_STRING([--disable-poppler-glib],
+ 		               [Don't compile poppler glib wrapper.]),
+diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in
+index 55a2278..5fcb6f2 100644
+--- a/poppler-glib-uninstalled.pc.in
++++ b/poppler-glib-uninstalled.pc.in
+@@ -1,7 +1,7 @@
+ Name: poppler-glib
+ Description: GLib wrapper for poppler - uninstalled
+ Version: @VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+ 
+ Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
+diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
+index 3264ed6..e15e669 100644
+--- a/poppler-glib.pc.cmake
++++ b/poppler-glib.pc.cmake
+@@ -6,7 +6,7 @@ includedir=${prefix}/include
+ Name: poppler-glib
+ Description: GLib wrapper for poppler
+ Version: @POPPLER_VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+ @PC_REQUIRES_PRIVATE@
+ 
+ Libs: -L${libdir} -lpoppler-glib
+diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in
+index 04d9bb9..9ba8978 100644
+--- a/poppler-glib.pc.in
++++ b/poppler-glib.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: poppler-glib
+ Description: GLib wrapper for poppler
+ Version: @VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+ @PC_REQUIRES_PRIVATE@
+ 
+ Libs: -L${libdir} -lpoppler-glib
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 466140ede..5572ae8fa 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 123072 2011-05-07 23:41:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 142563 2011-11-12 08:13:52Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
-pkgver=2.5.1
-pkgrel=2
+pkgver=2.6
+pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt')
+makedepends=('python2-pyqt' 'chrpath')
 source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('dd7edef5ff674d307057a3c12dbd8fce'
+md5sums=('0605a8006ea752ec2d1d7fc4791d1c75'
          '8cf9c06252e2f11ab00e62848e322fd3')
 
 
@@ -57,6 +58,9 @@ package_python-qscintilla() {
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
     install -Dm755 Qsci.so \
       "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
+
+    # Fix RPATH
+    chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so
 }
 
 package_python2-qscintilla() {
@@ -65,4 +69,7 @@ package_python2-qscintilla() {
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Fix RPATH
+    chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
 }
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index d9f3730c9..774654feb 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $
+# $Id: PKGBUILD 142642 2011-11-12 17:15:40Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/"
 license=('GPL' 'LGPL')
-depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
+depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
 makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
 optdepends=('libao: for ao plugin'
             'ffmpeg: for ffmpeg plugin'
@@ -17,12 +17,14 @@ optdepends=('libao: for ao plugin'
             'wavpack: for wavpack plugin'
             'libpulse: for pulse plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee')
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        sox-14.3.2-ffmpeg.patch)
+sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
+          '86caa6aa86a0bf7a048522114d4efd11acbbda70')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"
diff --git a/extra/sox/sox-14.3.2-ffmpeg.patch b/extra/sox/sox-14.3.2-ffmpeg.patch
new file mode 100644
index 000000000..5289b9b47
--- /dev/null
+++ b/extra/sox/sox-14.3.2-ffmpeg.patch
@@ -0,0 +1,40 @@
+Index: sox-14.3.2/src/ffmpeg.c
+===================================================================
+--- sox-14.3.2.orig/src/ffmpeg.c
++++ sox-14.3.2/src/ffmpeg.c
+@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
+ 
+   if (!codec || avcodec_open(enc, codec) < 0)
+     return -1;
+-  if (enc->codec_type != CODEC_TYPE_AUDIO) {
++  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
+     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
+     return -1;
+   }
+@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
+   /* Find audio stream (FIXME: allow different stream to be selected) */
+   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
+     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
+-    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
++    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
+       ffmpeg->audio_index = i;
+       break;
+     }
+@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
+ 
+   c = st->codec;
+   c->codec_id = codec_id;
+-  c->codec_type = CODEC_TYPE_AUDIO;
++  c->codec_type = AVMEDIA_TYPE_AUDIO;
+ 
+   /* put sample parameters */
+   c->bit_rate = 256000;  /* FIXME: allow specification */
+@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
+       av_init_packet(&pkt);
+       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
+       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+       pkt.stream_index = ffmpeg->audio_st->index;
+       pkt.data = ffmpeg->audio_buf_aligned;
+ 
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 49a3581d8..73f1461fc 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 128924 2011-06-25 14:08:35Z allan $
+# $Id: PKGBUILD 142555 2011-11-12 07:19:34Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcl
-pkgver=8.5.10
+pkgver=8.5.11
 pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64')
 url="http://tcl.sourceforge.net/"
 license=('custom')
-depends=('glibc')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('a08eaf8467c0631937067c1948dd326b')
+md5sums=('b01a9691c83990b3db0ce62d1012ca67')
 
 build() {
   cd ${srcdir}/tcl${pkgver}/unix
@@ -25,6 +24,11 @@ build() {
   make
 }
 
+#check() {
+#  cd ${srcdir}/tcl${pkgver}/unix
+#  make test
+#}
+
 package()
 {
   cd ${srcdir}/tcl${pkgver}/unix
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index cb89106d8..f1d6d4677 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128929 2011-06-25 14:10:32Z allan $
+# $Id: PKGBUILD 142557 2011-11-12 07:19:37Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tk
-pkgver=8.5.10
+pkgver=8.5.11
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('adfdaca46cc95fec8557df8ecdb0715c')
+md5sums=('b61b72f0aad230091b100746f078b8f1')
 
 build() {
   cd ${srcdir}/tk${pkgver}/unix
@@ -25,6 +25,11 @@ build() {
   make
 }
 
+#check() {
+#  cd ${srcdir}/tk${pkgver}/unix
+#  make test
+#}
+
 package() {
   cd ${srcdir}/tk${pkgver}/unix
 
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 93565f739..19ad1b223 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141260 2011-10-27 15:31:43Z heftig $
+# $Id: PKGBUILD 142660 2011-11-12 17:18:45Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,7 +7,7 @@ pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
 pkgver=0.12.7
 _tver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index a7e6a6530..9ba6c94ad 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137997 2011-09-13 21:30:20Z eric $
+# $Id: PKGBUILD 142644 2011-11-12 17:15:42Z ibiru $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -6,31 +6,29 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.5
-pkgrel=6
+pkgrel=7
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64')
 url="http://tcforge.berlios.de/"
 license=('GPL')
-depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
+depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
 	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
 makedepends=('nasm')
 options=('!libtool' '!makeflags')
 source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
 	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-	transcode-1.1.5-jpeg-7.patch  transcode-1.1.5-mpa.patch)
-md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e'
-         'c0bd49a88f667c68c4430ad25bbed510'
-         'af4056b7530a6f147594f676849e7c7b'
-         'c299cfc6c4be6a5512d1a129f04e5450')
+	transcode-1.1.5-jpeg-7.patch  transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch)
 sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
           'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
           '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977'
-          '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2')
+          '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2'
+          '2d3bb4486394ee55540e772f134e193874e5c2b4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 < ../transcode-1.1.5-jpeg-7.patch
   patch -p1 < ../transcode-1.1.5-mpa.patch
+  patch -p1 < ../transcode-1.1.5-ffmpeg.patch
 
  # building from here
   ./configure --prefix=/usr \
diff --git a/extra/transcode/transcode-1.1.5-ffmpeg.patch b/extra/transcode/transcode-1.1.5-ffmpeg.patch
new file mode 100644
index 000000000..86e8272e9
--- /dev/null
+++ b/extra/transcode/transcode-1.1.5-ffmpeg.patch
@@ -0,0 +1,124 @@
+Index: transcode-1.1.5/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.5.orig/encode/encode_lavc.c
++++ transcode-1.1.5/encode/encode_lavc.c
+@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa
+     /* 
+      * context *transcode* (not libavcodec) defaults
+      */
+-    pd->ff_vcontext.mb_qmin                 = 2;
+-    pd->ff_vcontext.mb_qmax                 = 31;
+     pd->ff_vcontext.max_qdiff               = 3;
+     pd->ff_vcontext.max_b_frames            = 0;
+     pd->ff_vcontext.me_range                = 0;
+@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri
+         //  handled by transcode core
+         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         //  handled by transcode core
+-        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+-        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+Index: transcode-1.1.5/export/aud_aux.c
+===================================================================
+--- transcode-1.1.5.orig/export/aud_aux.c
++++ transcode-1.1.5/export/aud_aux.c
+@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+     //-- set parameters (bitrate, channels and sample-rate) --
+     //--------------------------------------------------------
+     memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
+-    mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
++    mpa_ctx.codec_type  = AVMEDIA_TYPE_AUDIO;
+     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
+     mpa_ctx.channels    = vob->dm_chan;            // channels
+     mpa_ctx.sample_rate = vob->a_rate;
+Index: transcode-1.1.5/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.5.orig/export/export_ffmpeg.c
++++ transcode-1.1.5/export/export_ffmpeg.c
+@@ -643,8 +643,6 @@ MOD_init
+ 
+     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
+     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
+-    lavc_venc_context->mb_qmin            = lavc_param_mb_qmin;
+-    lavc_venc_context->mb_qmax            = lavc_param_mb_qmax;
+     lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
+     lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
+     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
+Index: transcode-1.1.5/import/decode_lavc.c
+===================================================================
+--- transcode-1.1.5.orig/import/decode_lavc.c
++++ transcode-1.1.5/import/decode_lavc.c
+@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode)
+ 
+       //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read);
+       do {
+-	  len = avcodec_decode_video(lavc_dec_context, &picture,
+-		  &got_picture, buffer+buf_len, mp4_size-buf_len);
++          AVPacket pkt;
++	  av_init_packet( &pkt );
++	  pkt.data = buffer+buf_len;
++	  pkt.size = mp4_size-buf_len;
++	  len = avcodec_decode_video2(lavc_dec_context, &picture,
++		  &got_picture, &pkt);
+ 
+ 	  if (len < 0) {
+ 	      tc_log_error(__FILE__, "frame decoding failed");
+Index: transcode-1.1.5/import/probe_ffmpeg.c
+===================================================================
+--- transcode-1.1.5.orig/import/probe_ffmpeg.c
++++ transcode-1.1.5/import/probe_ffmpeg.c
+@@ -47,7 +47,7 @@ static void translate_info(const AVForma
+     for (i = 0; i < ctx->nb_streams; i++) {
+         st = ctx->streams[i];
+ 
+-        if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
++        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+             info->bitrate = st->codec->bit_rate / 1000;
+             info->width = st->codec->width;
+             info->height = st->codec->height;
+@@ -65,7 +65,7 @@ static void translate_info(const AVForma
+     for (i = 0; i < ctx->nb_streams; i++) {
+         st = ctx->streams[i];
+ 
+-        if (st->codec->codec_type == CODEC_TYPE_AUDIO
++        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO
+          && j < TC_MAX_AUD_TRACKS) {
+             info->track[j].format = 0x1; /* known wrong */
+             info->track[j].chan = st->codec->channels;
+Index: transcode-1.1.5/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.5.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.5/export/ffmpeg_cfg.c
+@@ -34,8 +34,6 @@ int lavc_param_vme = 4;
+ //int lavc_param_vqscale = 0;
+ //int lavc_param_vqmin = 2;
+ //int lavc_param_vqmax = 31;
+-int lavc_param_mb_qmin = 2;
+-int lavc_param_mb_qmax = 31;
+ int lavc_param_lmin = 2;
+ int lavc_param_lmax = 31;
+ int lavc_param_vqdiff = 3;
+@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={
+ //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+Index: transcode-1.1.5/export/ffmpeg_cfg.h
+===================================================================
+--- transcode-1.1.5.orig/export/ffmpeg_cfg.h
++++ transcode-1.1.5/export/ffmpeg_cfg.h
+@@ -13,8 +13,6 @@ extern int lavc_param_vme;
+ //extern int lavc_param_vqscale;
+ //extern int lavc_param_vqmin;
+ //extern int lavc_param_vqmax;
+-extern int lavc_param_mb_qmin;
+-extern int lavc_param_mb_qmax;
+ extern int lavc_param_lmin;
+ extern int lavc_param_lmax;
+ extern int lavc_param_vqdiff;
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index b18e5e01d..b7d69b4be 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140583 2011-10-17 08:15:09Z jgc $
+# $Id: PKGBUILD 142662 2011-11-12 17:18:47Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
 pkgname=tumbler
 pkgver=0.1.22
-pkgrel=3
+pkgrel=4
 pkgdesc="D-Bus service for applications to request thumbnails"
 url="http://git.xfce.org/xfce/tumbler/"
 license=('GPL2' 'LGPL')
@@ -15,7 +15,7 @@ makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
 optdepends=('ffmpegthumbnailer:	for video thumbnails'
             'gstreamer0.10: for video thumbnails')
 options=('!libtool')
-source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2
+source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         fix-video-image.patch)
 md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9'
          'be9b0f1c3a4b0be102774c84d5ac29e6')
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 621ad8918..9b14f6a80 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 140130 2011-10-07 15:51:39Z giovanni $
+# $Id: PKGBUILD 142646 2011-11-12 17:15:45Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.12
-pkgrel=1
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -28,8 +28,9 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
             'kdelibs: KDE Solid hardware integration'
-            'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
-            'libpulse: PulseAudio support')
+            'libpulse: PulseAudio support'
+            'vdpau-video: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/http/.hosts'
diff --git a/extra/vlc/vlc.install b/extra/vlc/vlc.install
index 4a1091bc5..dc4961cae 100644
--- a/extra/vlc/vlc.install
+++ b/extra/vlc/vlc.install
@@ -1,6 +1,6 @@
 post_install() {
     xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins
+    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
     update-desktop-database -q
 }
 
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index 5cd10f758..d35c20c63 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -1,35 +1,38 @@
-# $Id: PKGBUILD 139491 2011-10-02 09:08:18Z ibiru $
+# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vte
 pkgver=0.28.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Virtual Terminal Emulator widget for use with GTK2"
 arch=('i686' 'x86_64')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 depends=('gtk2' 'vte-common')
-makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel' 'gtk-doc')
+makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz)
-sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae')
+source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz
+make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199)
+sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae'
+            '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   #warning: type-punning to incomplete type might break strict-aliasing rules
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
 
+  patch -Np1 -R -i "$srcdir/make_alt_work.patch"
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vte \
       --localstatedir=/var --disable-static \
-      --enable-introspection --with-gtk=2.0 \
-      --enable-gtk-doc
+      --enable-introspection --with-gtk=2.0
   make
 }
 
 package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 
-  rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
+  rm "$pkgdir/usr/lib/vte/gnome-pty-helper"
 }
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 87ae483fc..8b2f70aed 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 140961 2011-10-20 05:44:24Z ibiru $
+# $Id: PKGBUILD 142687 2011-11-12 18:46:20Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
 pkgver=0.30.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz)
-sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64')
+source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-$pkgver.tar.xz
+make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199)
+sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64'
+            '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3')
 
 build() {
-  cd "${srcdir}/vte-${pkgver}"
+  cd "$srcdir/vte-$pkgver"
   #warning: type-punning to incomplete type might break strict-aliasing rules
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
 
+  patch -Np1 -R -i "$srcdir/make_alt_work.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vte \
       --localstatedir=/var --disable-static \
@@ -28,15 +31,15 @@ build() {
 
 package_vte3(){
   depends=('gtk3' 'vte-common')
-  cd "${srcdir}/vte-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/vte-$pkgver"
+  make DESTDIR="$pkgdir" install
 
-  rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
+  rm "$pkgdir"/usr/lib/vte/gnome-pty-helper
 }
 
 package_vte-common() {
   pkgdesc="Common files used by vte and vte3"
-  cd "${srcdir}/vte-${pkgver}"
+  cd "$srcdir/vte-$pkgver"
 
-  make -C gnome-pty-helper DESTDIR="${pkgdir}" install
+  make -C gnome-pty-helper DESTDIR="$pkgdir" install
 }
diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index 0e847a587..dc8f17316 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140061 2011-10-06 07:33:34Z ibiru $
+# $Id: PKGBUILD 142608 2011-11-12 17:14:58Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=x264
-pkgver=20111001
+pkgver=20111030
 pkgrel=1
 pkgdesc="free library for encoding H264/AVC video streams"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('glibc')
 makedepends=('yasm')
 source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('dd67dca96ac79e7cb963bfcbf68e017b')
+md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc')
 
 build() {
     cd "$srcdir/$pkgname-snapshot-$pkgver-2245"
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 86dda60c1..2f7159754 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 137999 2011-09-13 21:30:22Z eric $
+# $Id: PKGBUILD 142648 2011-11-12 17:15:49Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
 pkgver=1.1.19
-pkgrel=5
+pkgrel=6
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64')
 url="http://www.xine-project.org"
 license=('LGPL' 'GPL')
-depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
+depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
 makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
              'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
 optdepends=('imagemagick: for using the imagemagick plugin' \
@@ -25,19 +25,19 @@ optdepends=('imagemagick: for using the imagemagick plugin' \
             'libmng: for using the mng plugin' \
             'aalib: for using the aalib plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
-        xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch)
-md5sums=('a410a0f0617e1d6309f0cbe907f73f8a'
-         '9776df4eb54d2f1f68d8268adbc3b5c2'
-         '8662fb124870b1dd7effe4ff5e2a2e3d')
-sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0'
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
+        xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch
+        xine-lib-1.1.19-ffmpeg.patch)
+sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d'
           '121a8358d7919b2e51067412373f52848290338a'
-          '920bf27e6e3523dfe4cc9c802ff713e9688a3f34')
+          '920bf27e6e3523dfe4cc9c802ff713e9688a3f34'
+          'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch
-  patch -p0 < ../xine-lib-1.1.19-xvmc.patch
+  patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch"
+  patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch"
+  patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch"
   sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
     configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
 
diff --git a/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch
new file mode 100644
index 000000000..6817aa989
--- /dev/null
+++ b/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch
@@ -0,0 +1,380 @@
+diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c
+--- a/src/combined/ffmpeg/ff_audio_decoder.c	Mon May 16 15:49:02 2011 +0100
++++ b/src/combined/ffmpeg/ff_audio_decoder.c	Mon May 16 19:46:49 2011 -0400
+@@ -46,6 +46,12 @@
+ 
+ #define AUDIOBUFSIZE (64 * 1024)
+ 
++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
++#  define AVAUDIO 3
++#else
++#  define AVAUDIO 2
++#endif
++
+ typedef struct {
+   audio_decoder_class_t   decoder_class;
+ } ff_audio_class_t;
+@@ -255,6 +261,9 @@
+       buf->decoder_info[2]);
+ 
+   } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
++#if AVAUDIO > 2
++    AVPacket avpkt;
++#endif
+ 
+     if( !this->decoder_ok ) {
+       if ( ! this->context || ! this->codec ) {
+@@ -286,11 +295,21 @@
+     if (!this->output_open) {
+       if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
+         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++#if AVAUDIO > 2
++	av_init_packet (&avpkt);
++	avpkt.data = (uint8_t *)&this->buf[0];
++	avpkt.size = this->size;
++	avpkt.flags = AV_PKT_FLAG_KEY;
++	avcodec_decode_audio3 (this->context,
++			       (int16_t *)this->decode_buffer,
++			       &decode_buffer_size, &avpkt);
++#else
+         avcodec_decode_audio2 (this->context,
+                               (int16_t *)this->decode_buffer,
+                               &decode_buffer_size,
+                               &this->buf[0],
+                               this->size);
++#endif
+ 	this->audio_bits = this->context->bits_per_sample;
+ 	this->audio_sample_rate = this->context->sample_rate;
+ 	this->audio_channels = this->context->channels;
+@@ -311,12 +330,21 @@
+       offset = 0;
+       while (this->size>0) {
+         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++#if AVAUDIO > 2
++	av_init_packet (&avpkt);
++	avpkt.data = (uint8_t *)&this->buf[offset];
++	avpkt.size = this->size;
++	avpkt.flags = AV_PKT_FLAG_KEY;
++	bytes_consumed = avcodec_decode_audio3 (this->context,
++						(int16_t *)this->decode_buffer,
++						&decode_buffer_size, &avpkt);
++#else
+         bytes_consumed = avcodec_decode_audio2 (this->context,
+                                                (int16_t *)this->decode_buffer,
+                                                &decode_buffer_size,
+                                                &this->buf[offset],
+                                                this->size);
+-
++#endif
+         if (bytes_consumed<0) {
+           xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+                    "ffmpeg_audio_dec: error decompressing audio frame\n");
+diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c
+--- a/src/combined/ffmpeg/ff_video_decoder.c	Mon May 16 15:49:02 2011 +0100
++++ b/src/combined/ffmpeg/ff_video_decoder.c	Mon May 16 19:46:49 2011 -0400
+@@ -58,6 +58,14 @@
+ 
+ #define ENABLE_DIRECT_RENDERING
+ 
++#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
++#  define AVVIDEO 2
++#else
++#  define AVVIDEO 1
++#  define pp_context	pp_context_t
++#  define pp_mode	pp_mode_t
++#endif
++
+ /* reordered_opaque appeared in libavcodec 51.68.0 */
+ #define AVCODEC_HAS_REORDERED_OPAQUE
+ #if LIBAVCODEC_VERSION_INT < 0x334400
+@@ -116,8 +124,8 @@
+ 
+   int               pp_quality;
+   int               pp_flags;
+-  pp_context_t     *pp_context;
+-  pp_mode_t        *pp_mode;
++  pp_context       *our_context;
++  pp_mode          *our_mode;
+ 
+   /* mpeg-es parsing */
+   mpeg_parser_t    *mpeg_parser;
+@@ -444,23 +452,23 @@
+   this->pp_quality = this->class->pp_quality;
+ 
+   if(this->pp_available && this->pp_quality) {
+-    if(!this->pp_context && this->context)
+-      this->pp_context = pp_get_context(this->context->width, this->context->height,
++    if(!this->our_context && this->context)
++      this->our_context = pp_get_context(this->context->width, this->context->height,
+                                         this->pp_flags);
+-    if(this->pp_mode)
+-      pp_free_mode(this->pp_mode);
++    if(this->our_mode)
++      pp_free_mode(this->our_mode);
+ 
+-    this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
++    this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
+                                                     this->pp_quality);
+   } else {
+-    if(this->pp_mode) {
+-      pp_free_mode(this->pp_mode);
+-      this->pp_mode = NULL;
++    if(this->our_mode) {
++      pp_free_mode(this->our_mode);
++      this->our_mode = NULL;
+     }
+ 
+-    if(this->pp_context) {
+-      pp_free_context(this->pp_context);
+-      this->pp_context = NULL;
++    if(this->our_context) {
++      pp_free_context(this->our_context);
++      this->our_context = NULL;
+     }
+   }
+ }
+@@ -1055,12 +1063,26 @@
+     }
+ 
+     /* skip decoding b frames if too late */
++#if AVVIDEO > 1
++    this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
++#else
+     this->context->hurry_up = (this->skipframes > 0);
++#endif
+ 
+     lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
++#if AVVIDEO > 1
++    AVPacket avpkt;
++    av_init_packet(&avpkt);
++    avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
++    avpkt.size = this->mpeg_parser->buffer_size;
++    avpkt.flags = AV_PKT_FLAG_KEY;
++    len = avcodec_decode_video2 (this->context, this->av_frame,
++				 &got_picture, &avpkt);
++#else
+     len = avcodec_decode_video (this->context, this->av_frame,
+                                 &got_picture, this->mpeg_parser->chunk_buffer,
+                                 this->mpeg_parser->buffer_size);
++#endif
+     lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
+             len, got_picture);
+     len = current - buf->content - offset;
+@@ -1112,7 +1134,13 @@
+ 
+     } else {
+ 
+-      if (this->context->hurry_up) {
++      if (
++#if AVVIDEO > 1
++	  this->context->skip_frame != AVDISCARD_DEFAULT
++#else
++	  this->context->hurry_up
++#endif
++	 ) {
+         /* skipped frame, output a bad frame */
+         img = this->stream->video_out->get_frame (this->stream->video_out,
+                                                   this->bih.biWidth,
+@@ -1304,13 +1332,25 @@
+         got_picture = 0;
+       } else {
+         /* skip decoding b frames if too late */
++#if AVVIDEO > 1
++	this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
++#else
+         this->context->hurry_up = (this->skipframes > 0);
+-
++#endif
+         lprintf("buffer size: %d\n", this->size);
++#if AVVIDEO > 1
++	AVPacket avpkt;
++	av_init_packet(&avpkt);
++	avpkt.data = (uint8_t *)&chunk_buf[offset];
++	avpkt.size = this->size;
++	avpkt.flags = AV_PKT_FLAG_KEY;
++	len = avcodec_decode_video2 (this->context, this->av_frame,
++				     &got_picture, &avpkt);
++#else
+         len = avcodec_decode_video (this->context, this->av_frame,
+                                     &got_picture, &chunk_buf[offset],
+                                     this->size);
+-
++#endif
+ #ifdef AVCODEC_HAS_REORDERED_OPAQUE
+         /* reset consumed pts value */
+         this->context->reordered_opaque = ff_tag_pts(this, 0);
+@@ -1432,7 +1472,7 @@
+                         img->base, img->pitches,
+                         img->width, img->height,
+                         this->av_frame->qscale_table, this->av_frame->qstride,
+-                        this->pp_mode, this->pp_context,
++                        this->our_mode, this->our_context,
+                         this->av_frame->pict_type);
+ 
+         } else if (!this->av_frame->opaque) {
+@@ -1676,11 +1716,11 @@
+     free(this->buf);
+   this->buf = NULL;
+ 
+-  if(this->pp_context)
+-    pp_free_context(this->pp_context);
++  if(this->our_context)
++    pp_free_context(this->our_context);
+ 
+-  if(this->pp_mode)
+-    pp_free_mode(this->pp_mode);
++  if(this->our_mode)
++    pp_free_mode(this->our_mode);
+ 
+   mpeg_parser_dispose(this->mpeg_parser);
+ 
+@@ -1721,8 +1761,8 @@
+   this->aspect_ratio      = 0;
+ 
+   this->pp_quality        = 0;
+-  this->pp_context        = NULL;
+-  this->pp_mode           = NULL;
++  this->our_context       = NULL;
++  this->our_mode          = NULL;
+ 
+   this->mpeg_parser       = NULL;
+ 
+diff -r 717450d734f7 src/post/planar/pp.c
+--- a/src/post/planar/pp.c	Mon May 16 15:49:02 2011 +0100
++++ b/src/post/planar/pp.c	Mon May 16 19:46:49 2011 -0400
+@@ -35,6 +35,12 @@
+ #  include <libpostproc/postprocess.h>
+ #endif
+ 
++#if LIBPOSTPROC_VERSION_MAJOR < 52
++#  define pp_context	pp_context_t
++#  define pp_mode	pp_mode_t
++#  define PP_PARAMETERS_T
++#endif
++
+ #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */
+ 
+ /* plugin class initialization function */
+@@ -76,14 +82,15 @@
+ 
+   /* libpostproc specific stuff */
+   int                pp_flags;
+-  pp_context_t      *pp_context;
+-  pp_mode_t         *pp_mode;
++  pp_context        *our_context;
++  pp_mode           *our_mode;
+ 
+   pthread_mutex_t    lock;
+ };
+ 
+ 
+ static int set_parameters (xine_post_t *this_gen, void *param_gen) {
++#ifdef PP_PARAMETERS_T
+   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
+   pp_parameters_t *param = (pp_parameters_t *)param_gen;
+ 
+@@ -92,17 +99,18 @@
+   memcpy( &this->params, param, sizeof(pp_parameters_t) );
+ 
+   pthread_mutex_unlock (&this->lock);
+-
++#endif
+   return 1;
+ }
+ 
+ static int get_parameters (xine_post_t *this_gen, void *param_gen) {
++#ifdef PP_PARAMETERS_T
+   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
+   pp_parameters_t *param = (pp_parameters_t *)param_gen;
+ 
+ 
+   memcpy( param, &this->params, sizeof(pp_parameters_t) );
+-
++#endif
+   return 1;
+ }
+ 
+@@ -202,8 +210,8 @@
+   if(cpu_caps & MM_ACCEL_X86_3DNOW)
+     this->pp_flags |= PP_CPU_CAPS_3DNOW;
+ 
+-  this->pp_mode = NULL;
+-  this->pp_context = NULL;
++  this->our_mode = NULL;
++  this->our_context = NULL;
+ 
+   pthread_mutex_init (&this->lock, NULL);
+ 
+@@ -248,13 +256,13 @@
+   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
+ 
+   if (_x_post_dispose(this_gen)) {
+-    if(this->pp_mode) {
+-      pp_free_mode(this->pp_mode);
+-      this->pp_mode = NULL;
++    if(this->our_mode) {
++      pp_free_mode(this->our_mode);
++      this->our_mode = NULL;
+     }
+-    if(this->pp_context) {
+-      pp_free_context(this->pp_context);
+-      this->pp_context = NULL;
++    if(this->our_context) {
++      pp_free_context(this->our_context);
++      this->our_context = NULL;
+     }
+     free(this);
+   }
+@@ -304,7 +312,7 @@
+ 
+     pthread_mutex_lock (&this->lock);
+ 
+-    if( !this->pp_context ||
++    if( !this->our_context ||
+         this->frame_width != yv12_frame->width ||
+         this->frame_height != yv12_frame->height ) {
+ 
+@@ -312,32 +320,32 @@
+       this->frame_height = yv12_frame->height;
+       pp_flags = this->pp_flags;
+ 
+-      if(this->pp_context)
+-        pp_free_context(this->pp_context);
++      if(this->our_context)
++        pp_free_context(this->our_context);
+ 
+-      this->pp_context = pp_get_context(frame->width, frame->height, pp_flags);
++      this->our_context = pp_get_context(frame->width, frame->height, pp_flags);
+ 
+-      if(this->pp_mode) {
+-        pp_free_mode(this->pp_mode);
+-        this->pp_mode = NULL;
++      if(this->our_mode) {
++        pp_free_mode(this->our_mode);
++        this->our_mode = NULL;
+       }
+     }
+ 
+-    if(!this->pp_mode)
+-      this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode,
++    if(!this->our_mode)
++      this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode,
+                                                       this->params.quality);
+ 
+-    if(this->pp_mode)
++    if(this->our_mode)
+       pp_postprocess(yv12_frame->base, yv12_frame->pitches,
+                      out_frame->base, out_frame->pitches,
+                      (frame->width+7)&(~7), frame->height,
+                      NULL, 0,
+-                     this->pp_mode, this->pp_context,
++                     this->our_mode, this->our_context,
+                      0 /*this->av_frame->pict_type*/);
+ 
+     pthread_mutex_unlock (&this->lock);
+ 
+-    if(this->pp_mode) {
++    if(this->our_mode) {
+       skip = out_frame->draw(out_frame, stream);
+       _x_post_frame_copy_up(frame, out_frame);
+     } else {
diff --git a/staging/kadu/PKGBUILD b/staging/kadu/PKGBUILD
new file mode 100644
index 000000000..9f3f341ab
--- /dev/null
+++ b/staging/kadu/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 57137 2011-10-22 11:15:09Z bpiotrowski $
+# Maintainer: Mateusz Herych
+# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
+
+pkgname=kadu
+pkgver=0.10.1
+pkgrel=2
+pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
+arch=('i686' 'x86_64')
+url="http://www.kadu.net/"
+license=('GPL')
+depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
+makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
+source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2)
+md5sums=('6211a9a9e02d645268cbf055892601a0')
+
+build() {
+  cd $srcdir/kadu-$pkgver
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/kadu-$pkgver
+  make DESTDIR=$pkgdir install
+  rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}
+  rm -rf $pkgdir/usr/share/kadu/{HISTORY,README}
+}
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
new file mode 100644
index 000000000..4914b1953
--- /dev/null
+++ b/testing/glib2/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 142559 2011-11-12 07:37:46Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=glib2
+pkgver=2.30.2
+pkgrel=1
+pkgdesc="Common C routines used by GTK+ and other libs"
+url="http://www.gtk.org/"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('pcre' 'libffi')
+makedepends=('pkgconfig' 'python2')
+optdepends=('python2: for gdbus-codegen')
+options=('!libtool' '!docs' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz
+        glib2.sh
+        glib2.csh)
+sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82'
+            '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
+            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
+
+build() {
+  cd "${srcdir}/glib-${pkgver}"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --sysconfdir=/etc \
+      --with-pcre=system \
+      --disable-fam
+  make
+}
+
+package() {
+  cd "${srcdir}/glib-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -d "${pkgdir}/etc/profile.d"
+  install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/"
+  install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/"
+
+  for _i in "${pkgdir}/etc/bash_completion.d/"*; do
+      chmod -x "${_i}"
+  done
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
+}
diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh
new file mode 100644
index 000000000..7aa3a2ffa
--- /dev/null
+++ b/testing/glib2/glib2.csh
@@ -0,0 +1 @@
+setenv G_BROKEN_FILENAMES 1
diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh
new file mode 100644
index 000000000..96a056e1e
--- /dev/null
+++ b/testing/glib2/glib2.sh
@@ -0,0 +1 @@
+export G_BROKEN_FILENAMES=1