Tue Jul 10 00:01:37 UTC 2012

36 files changed, 882 insertions, 164 deletions

diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index fd5b54072..627fe1cce 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147731 2012-01-27 15:55:17Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 163142 2012-07-08 09:30:27Z ibiru $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel Ehlers <danielehlers@mindeye.net>
 
 pkgname=alsa-plugins
 pkgver=1.0.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Extra alsa plugins"
 arch=(i686 x86_64)
 url="http://www.alsa-project.org"
@@ -18,19 +18,25 @@ optdepends=('libpulse: PulseAudio plugin'
             'libsamplerate: libsamplerate resampling plugin'
             'speex: libspeexdsp resampling plugin')
 options=('!libtool')
-source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2")
-md5sums=('038c023eaa51171f018fbf7141255185')
+source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2"
+        alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
+        alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch)
+md5sums=('038c023eaa51171f018fbf7141255185'
+         '50d9adcda20756d063e676a563c201d9'
+         '697c6275f678d86ded2e5092d8a154c9')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
+  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  install -d "$pkgdir/usr/share/doc/$pkgname"
   install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
 }
diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
new file mode 100644
index 000000000..cce4f7e7e
--- /dev/null
+++ b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
@@ -0,0 +1,11 @@
+diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c
+--- alsa-plugins-1.0.25/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
++++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c	2012-06-09 00:42:52.177219012 +0200
+@@ -702,7 +702,6 @@
+ 	rec->channels = channels;
+ 	rec->format = format;
+ 
+-	avcodec_init();
+ 	avcodec_register_all();
+ 
+ 	rec->codec = avcodec_find_encoder_by_name("ac3_fixed");
diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
new file mode 100644
index 000000000..f4ebbf466
--- /dev/null
+++ b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
@@ -0,0 +1,29 @@
+Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for 
+the AV_CH_LAYOUT_* defines.
+
+diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c
+--- alsa-plugins-1.0.25-original/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
++++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c	2012-06-01 14:59:47.096671464 +0200
+@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t
+ #else
+   rec->avctx->sample_fmt = SAMPLE_FMT_S16;
+ #endif
+-#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
++#if (LIBAVCODEC_VERSION_MAJOR >= 54)
++	switch (io->channels) {
++	case 2:
++		rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
++		break;
++	case 4:
++		rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
++		break;
++	case 6:
++		rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
++		break;
++	default:
++		break;
++	}
++#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
+	switch (io->channels) {
+ 	case 2:
+ 		rec->avctx->channel_layout = CH_LAYOUT_STEREO;
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 6a0c3169f..63a4c1566 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162671 2012-06-27 20:00:58Z ronald $
+# $Id: PKGBUILD 163143 2012-07-08 09:30:39Z ibiru $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index 6761ba925..29999bd93 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149270 2012-02-06 17:33:22Z ibiru $
+# $Id: PKGBUILD 163145 2012-07-08 09:30:48Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index 5947712f9..2d462072e 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 161773 2012-06-13 17:38:02Z andyrtr $
+# $Id: PKGBUILD 163175 2012-07-08 10:43:05Z andyrtr $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
 pkgver=1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL' 'MIT')
 url="http://www.cinepaint.org"
 depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
-makedepends=('python2' 'gutenprint>=5.2.8')
+makedepends=('python2' 'gutenprint>=5.2.9')
 optdepends=('python2: for python plug-ins' 
             'gutenprint: for print plug-ins'
             'ghostscript: for pdf plug-ins')
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 99bb86228..aa70c9d3a 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 161969 2012-06-17 18:33:21Z ronald $
+# $Id: PKGBUILD 163197 2012-07-08 19:06:47Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.6.0
+pkgver=2.7.0
 pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
              'cmake' 'automoc4' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a7a9e4e342f118b603a11539c98a01c9970254df')
+sha1sums=('43f51c389984538025f185acf8902a923eb0268b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 40a736d38..9fd3f8808 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156738 2012-04-23 09:04:23Z ibiru $
+# $Id: PKGBUILD 163146 2012-07-08 09:30:55Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=3.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 458bfa5e4..a0285273d 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 158782 2012-05-09 17:58:43Z ibiru $
+# $Id: PKGBUILD 163147 2012-07-08 09:30:59Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20120509
+pkgver=0.11.1
 pkgrel=1
+epoch=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=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
 makedepends=('yasm' 'git' 'libvdpau')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('a35359e424608f369d380f03e4dc9966')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
+md5sums=('ff8cb914f657e164dd60ea1008b555a8')
 
 build() {
-  cd "$pkgname"
+  cd $pkgname-$pkgver
 
   ./configure \
     --prefix=/usr \
@@ -38,6 +38,7 @@ build() {
     --enable-libopenjpeg \
     --enable-librtmp \
     --enable-libpulse \
+    --enable-libv4l2 \
     --enable-gpl \
     --enable-version3 \
     --enable-runtime-cpudetect \
@@ -50,7 +51,7 @@ build() {
 }
 
 package() {
-  cd "$pkgname"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install install-man
   install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
 }
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index c611db88b..f9afaf39a 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.0.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 9519852c3..8570481bd 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158546 2012-05-04 19:12:03Z daniel $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
+# $Id: PKGBUILD 163149 2012-07-08 09:31:09Z ibiru $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gegl
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index 974e0fc4a..f27e8cc07 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153261 2012-03-12 17:04:34Z jgc $
+# $Id: PKGBUILD 163150 2012-07-08 09:31:14Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.19
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index e7016c7f4..e327af6ae 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 161772 2012-06-13 17:37:51Z andyrtr $
+# $Id: PKGBUILD 163174 2012-07-08 10:42:54Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
-pkgver=5.2.8
+pkgver=5.2.9
 pkgrel=1
 pkgdesc="Top quality printer drivers for POSIX systems"
 arch=('i686' 'x86_64')
 license=('GPL')
 install=gutenprint.install
-depends=('readline' 'gnutls>=2.12.3') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it
-makedepends=('gimp>=2.6.11' 'gtk2>=2.24.4' 'cups>=1.4.6' 'foomatic-db-engine' 'ghostscript>=9.02')
+#depends=('readline') # 'gnutls') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it
+depends=('glibc')
+makedepends=('gimp' 'gtk2' 'cups' 'foomatic-db-engine' 'ghostscript')
 optdepends=('cups:		to use cups printer spooler(recommended)'
             'foomatic-db-engine:	to use foomatic spooler'
             'ghostscript:	adds postscript support for ijsgutenprint'
@@ -18,7 +19,7 @@ source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2)
 url="http://gimp-print.sourceforge.net/"
 replaces=('gimp-print')
 options=('!libtool' '!emptydirs')
-md5sums=(5ed64c0f994245852da8e9fa6a137060'')
+md5sums=('aefbec27b96dd404d9ac9811e17d58ce')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD
index f1dce1167..c51869c8b 100644
--- a/extra/k3b/PKGBUILD
+++ b/extra/k3b/PKGBUILD
@@ -1,31 +1,34 @@
-# $Id: PKGBUILD 142626 2011-11-12 17:15:20Z ibiru $
+# $Id: PKGBUILD 163151 2012-07-08 09:31:23Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
 
 pkgname=k3b
 pkgver=2.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Feature-rich and easy to handle CD burning application"
 arch=('i686' 'x86_64')
 url="http://k3b.org/"
 license=('GPL')
-depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 
-         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft')
+depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad'
+         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' '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')
+            'emovix: for bootable multimedia cd/dvd support'
+            'cdrdao: for disk-at-once (DAO) mode support')
 options=('!libtool')
 install=k3b.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        k3b-2.0.2-ffmpeg.patch)
+        k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch)
 sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
-          '8120c0e22e6c41ea285ca6060be13723ed91c52b')
+          '8120c0e22e6c41ea285ca6060be13723ed91c52b'
+          '5b35bff3f7670686a32bd71afea2deaca4331631')
 
 build() {
-  cd "${srcdir}"
-  (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch")
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch"
+  patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch"
+  cd ..
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/k3b/k3b-2.0.2-libavformat54.patch b/extra/k3b/k3b-2.0.2-libavformat54.patch
new file mode 100644
index 000000000..174a776b8
--- /dev/null
+++ b/extra/k3b/k3b-2.0.2-libavformat54.patch
@@ -0,0 +1,22 @@
+Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
+     close();
+ 
+     // open the file
+-    int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
++    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
+     if( err < 0 ) {
+         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
+         return false;
+@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
+     }
+ 
+     // dump some debugging info
+-    ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
++    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+ 
+     return true;
+ }
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index f3f390641..3c5fb6fdb 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161219 2012-06-08 06:38:12Z andrea $
+# $Id: PKGBUILD 163152 2012-07-08 09:31:34Z 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.8.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD
index d2d14bdfe..f1bf4b731 100644
--- a/extra/kradio/PKGBUILD
+++ b/extra/kradio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150790 2012-02-22 11:29:59Z andrea $
+# $Id: PKGBUILD 163153 2012-07-08 09:31:40Z ibiru $
 # Maintainer:
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kradio
 pkgver=4.0.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 pkgdesc="A comfortable KDE internet and AM/FM radio application"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 9fa1ca3ca..539fcd30b 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163004 2012-07-05 10:52:24Z giovanni $
+# $Id: PKGBUILD 163171 2012-07-08 10:16:42Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.07.03
+pkgver=2012.07.06
 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=('c0eda380fdbec9a569a0d34fa064b21b')
+md5sums=('7b483136bf58203b4371178da1e530a7')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index a96ab6dc5..fa379bd2e 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150811 2012-02-23 01:28:04Z andrea $
+# $Id: PKGBUILD 163154 2012-07-08 09:31:45Z ibiru $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=mediastreamer
 pkgver=2.8.2
-pkgrel=1
+pkgrel=2
 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/"
@@ -14,12 +14,15 @@ license=('GPL')
 depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
 makedepends=('intltool')
 options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        mediastreamer-ffmpeg.patch)
 md5sums=('e51ea9d5fce1396b374d10473dfbadec'
-         '805da7def98f367e621363fa0c951fe8')
+         '805da7def98f367e621363fa0c951fe8'
+         'f147546489a973f148ce3dd2dba36834')
 
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
+  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch
new file mode 100644
index 000000000..944d4b833
--- /dev/null
+++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch
@@ -0,0 +1,205 @@
+diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h
+index 5ae8a63..86edf86 100644
+--- mediastreamer2/include/mediastreamer2/msvideo.h
++++ mediastreamer2/include/mediastreamer2/msvideo.h
+@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #define msvideo_h
+ 
+ #include <mediastreamer2/msfilter.h>
++#ifndef INT64_C
++#define INT64_C(c) (c ## LL)
++#define UINT64_C(c) (c ## ULL)
++#endif
++#include <libavutil/avutil.h>
++#include <libavcodec/version.h>
+ 
+ /* some global constants for video MSFilter(s) */
+ #define MS_VIDEO_SIZE_SQCIF_W 128
+@@ -206,7 +212,9 @@ extern "C"{
+ MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt);
+ MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt);
+ MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ MS2_PUBLIC void ms_ffmpeg_check_init(void);
++#endif
+ MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m);
+ MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h);
+ MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h);
+diff --git a/src/h264dec.c b/src/h264dec.c
+index 223de3d..8c40a7c 100644
+--- mediastreamer2/src/h264dec.c
++++ mediastreamer2/src/h264dec.c
+@@ -44,7 +44,9 @@ typedef struct _DecData{
+ static void ffmpeg_init(){
+ 	static bool_t done=FALSE;
+ 	if (!done){
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 		avcodec_init();
++#endif
+ 		avcodec_register_all();
+ 		done=TRUE;
+ 	}
+diff --git a/src/mscommon.c b/src/mscommon.c
+index 2cab005..bebb946 100644
+--- mediastreamer2/src/mscommon.c
++++ mediastreamer2/src/mscommon.c
+@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #include "mediastreamer2/mscodecutils.h"
+ #include "mediastreamer2/msfilter.h"
+ #include <ortp/ortp_srtp.h>
++#ifndef INT64_C
++#define INT64_C(c) (c ## LL)
++#define UINT64_C(c) (c ## ULL)
++#endif
++#include <libavutil/avutil.h>
++#include <libavcodec/version.h>
+ 
+ extern void __register_ffmpeg_encoders_if_possible(void);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ extern void ms_ffmpeg_check_init();
++#endif
+ extern bool_t libmsandroiddisplay_init(void);
+ extern void libmsandroiddisplaybad_init(void);
+ extern void libmsandroidopengldisplay_init(void);
+@@ -645,7 +653,9 @@ void ms_init(){
+ 		}
+ 	}
+ #if !defined(NO_FFMPEG)
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 	ms_ffmpeg_check_init();
++#endif
+ 	__register_ffmpeg_encoders_if_possible();
+ #endif
+ #endif
+diff --git a/src/videodec.c b/src/videodec.c
+index c04e1e9..a455075 100644
+--- mediastreamer2/src/videodec.c
++++ mediastreamer2/src/videodec.c
+@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #include "mediastreamer2/msvideo.h"
+ #include "mediastreamer2/msticker.h"
+ #include "rfc2429.h"
++#ifndef INT64_C
++#define INT64_C(c) (c ## LL)
++#define UINT64_C(c) (c ## ULL)
++#endif
++#include <libavutil/avutil.h>
++#include <libavcodec/version.h>
+ 
+-
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ extern void ms_ffmpeg_check_init();
++#endif
+ 
+ 
+ typedef struct DecState{
+@@ -50,7 +57,9 @@ typedef struct DecState{
+ 
+ static void dec_init(MSFilter *f, enum CodecID cid){
+ 	DecState *s=(DecState *)ms_new0(DecState,1);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 	ms_ffmpeg_check_init();
++#endif
+ 	
+ 	avcodec_get_context_defaults(&s->av_context);
+ 	s->av_codec=NULL;
+diff --git a/src/videoenc.c b/src/videoenc.c
+index 21d016f..520f06a 100644
+--- mediastreamer2/src/videoenc.c
++++ mediastreamer2/src/videoenc.c
+@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+ #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ static bool_t avcodec_initialized=FALSE;
++#endif
+ 
+ #ifdef ENABLE_LOG_FFMPEG
+ 
+@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+ 
+ #endif
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ void ms_ffmpeg_check_init(){
+ 	if(!avcodec_initialized){
+ 		avcodec_init();
+@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){
+ #endif
+ 	}
+ }
++#endif
+ 
+ /* the goal of this small object is to tell when to send I frames at startup:
+ at 2 and 4 seconds*/
+@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec)
+ {
+ 	EncState *s=(EncState *)ms_new(EncState,1);
+ 	f->data=s;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 	ms_ffmpeg_check_init();
++#endif
+ 	s->profile=0;/*always default to profile 0*/
+ 	s->comp_buf=NULL;
+ 	s->fps=15;
+@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){
+ 	if (s->profile==0){
+ 		s->codec=CODEC_ID_H263;
+ 	}else{
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 		c->flags|=CODEC_FLAG_H263P_UMV;
++#endif
+ 		c->flags|=CODEC_FLAG_AC_PRED;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
++#endif
+ 		/*
+ 		c->flags|=CODEC_FLAG_OBMC;
+ 		c->flags|=CODEC_FLAG_AC_PRED;
+@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){
+ 	// assume video size is CIF or QCIF
+ 	if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
+ 	else header->b_wptr[1] = 0x40;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 	if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
++#else
++	if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
++#endif
+ 	header->b_wptr += 4;
+ 	header->b_cont = *packet;
+ 	*packet = header;
+@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
+ 		s->req_vfu=TRUE;
+ 	}
+ 	if (s->req_vfu){
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 		pict.pict_type=FF_I_TYPE;
++#else
++		pict.pict_type=AV_PICTURE_TYPE_I;
++#endif
+ 		s->req_vfu=FALSE;
+ 	}
+ 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
+@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
+ 		if (s->framenum==1){
+ 			video_starter_first_frame (&s->starter,f->ticker->time);
+ 		}
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 		if (c->coded_frame->pict_type==FF_I_TYPE){
++#else
++		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
++#endif
+ 			ms_message("Emitting I-frame");
+ 		}
+ 		comp_buf->b_wptr+=error;
+@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={
+ #endif
+ 
+ void __register_ffmpeg_encoders_if_possible(void){
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
+ 	ms_ffmpeg_check_init();
++#endif
+ 	if (avcodec_find_encoder(CODEC_ID_MPEG4))
+ 		ms_filter_register(&ms_mpeg4_enc_desc);
+ 	if (avcodec_find_encoder(CODEC_ID_H263)){
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index feccf3a3a..bcf8fbb80 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161990 2012-06-18 07:02:41Z ronald $
+# $Id: PKGBUILD 163155 2012-07-08 09:31:52Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
 pkgver=5.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
@@ -16,13 +16,16 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
          'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
 makedepends=('pkg-config' 'boost')
 install=miro.install
-options=('!makeflags')
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa')
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
+        'ffmpeg.patch')
+sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa'
+          'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   cd linux
+  patch -p2 -i "${srcdir}"/ffmpeg.patch
 
   python2 setup.py install --root="${pkgdir}"
 
diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch
index edf378459..99c14107d 100644
--- a/extra/miro/ffmpeg.patch
+++ b/extra/miro/ffmpeg.patch
@@ -1,76 +1,44 @@
-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 @@
+--- miro-5.0.1/linux/miro-segmenter.c~	2012-07-06 14:33:24.618082171 +0000
++++ miro-5.0.1/linux/miro-segmenter.c	2012-07-06 15:10:19.564146117 +0000
+@@ -156,7 +156,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 @@
+-    ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
++    ret = avformat_open_input(&ic, input, ifmt, 0);
+     if (ret != 0) {
+         fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret);
          exit(1);
+@@ -215,12 +215,7 @@
+         }
      }
  
+-    if (av_set_parameters(oc, NULL) < 0) {
+-        fprintf(stderr, "Invalid output format parameters\n");
+-        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 @@
+@@ -233,12 +228,12 @@
          }
      }
  
 -    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+    if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
++    if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 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 (av_write_header(oc)) {
++    if (avformat_write_header(oc, NULL)) {
+         fprintf(stderr, "Could not write mpegts header to first output file\n");
+ 
+         exit(1);
+@@ -274,10 +269,10 @@
          }
  
          if (segment_time - prev_segment_time >= segment_duration) {
@@ -80,11 +48,11 @@ diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
 +            avio_close(oc->pb);
  
 -            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+            if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
++            if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
                  fprintf(stderr, "Could not open '%s'\n", output_filename);
                  break;
              }
-@@ -278,7 +278,7 @@
+@@ -307,7 +302,7 @@
          av_freep(&oc->streams[i]);
      }
  
@@ -92,4 +60,4 @@ diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
 +    avio_close(oc->pb);
      av_free(oc);
  
-     return 0;
+     /* End-of-transcode marker. */
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 5424c938b..3ccc032f8 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159610 2012-05-25 20:35:43Z eric $
+# $Id: PKGBUILD 163156 2012-07-08 09:31:55Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=20120224
-pkgrel=1
+pkgrel=2
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64')
 url="http://moc.daper.net/"
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 05c0dc10d..88636b960 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162847 2012-07-01 23:45:22Z bisson $
+# $Id: PKGBUILD 163157 2012-07-08 09:32:05Z ibiru $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=mpd
 pkgver=0.17
-pkgrel=1
+pkgrel=2
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
 license=('GPL')
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 369ba7820..8b5e97426 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 149282 2012-02-06 17:33:40Z ibiru $
+# $Id: PKGBUILD 163159 2012-07-08 09:32:20Z ibiru $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
-pkgver=3.10.2
-pkgrel=4
+pkgver=3.10.5
+pkgrel=1
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64)
-url="http://www.ekiga.org"
+url="http://www.opalvoip.org"
 license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex')
+depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm')
 makedepends=('ffmpeg')
 options=(!makeflags)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205')
+source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2
+        opal-ffmpeg.patch)
+md5sums=('22b0d716ed1cbc935245539e0bbab38f' '53bb06a376fb57a306522bfa6a573217')
 
 build() {
   cd "${srcdir}/opal-${pkgver}"
+  patch -Np1 -i "${srcdir}/opal-ffmpeg.patch"
   CXXFLAGS="$CXXFLAGS -fpermissive" \
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
@@ -24,4 +26,5 @@ build() {
 package() {
   cd "${srcdir}/opal-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  chmod 644 "${pkgdir}/usr/lib/libopal_s.a"
 }
diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch
new file mode 100644
index 000000000..ebfd1f037
--- /dev/null
+++ b/extra/opal/opal-ffmpeg.patch
@@ -0,0 +1,194 @@
+diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx
+--- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx	2012-04-26 06:56:01.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-06-10 16:39:35.447021150 +0200
+@@ -51,6 +51,7 @@
+ #endif
+ 
+ #include "h263-1998.h"
++#include <libavutil/opt.h>
+ #include <limits>
+ #include <iomanip>
+ #include <stdio.h>
+@@ -324,9 +325,9 @@
+     // Level 2+ 
+     // works with eyeBeam, signaled via  non-standard "D"
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_H263P_UMV; 
++      av_opt_set_int(m_context->priv_data, "umv", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
++      av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+     return;
+   }
+ 
+@@ -335,9 +336,9 @@
+     // Annex F: Advanced Prediction Mode
+     // does not work with eyeBeam
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_OBMC; 
++      av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_OBMC; 
++      av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
+     return;
+   }
+ #endif
+@@ -367,9 +368,9 @@
+     // Annex K: Slice Structure
+     // does not work with eyeBeam
+     if (atoi(value) != 0)
+-      m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; 
++      av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
++      av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
+     return;
+   }
+ 
+@@ -377,9 +378,9 @@
+     // Annex S: Alternative INTER VLC mode
+     // does not work with eyeBeam
+     if (atoi(value) == 1)
+-      m_context->flags |= CODEC_FLAG_H263P_AIV; 
++      av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
+     else
+-      m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
++      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
+     return;
+   }
+ }
+@@ -445,15 +446,6 @@
+   PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
+   PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
+ 
+-  #define CODEC_TRACER_FLAG(tracer, flag) \
+-    PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
+-  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
+-
+   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
+ }
+ 
+@@ -516,7 +508,7 @@
+ 
+     // Need to copy to local buffer to guarantee 16 byte alignment
+     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
+-    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
++    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
+ 
+     /*
+     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
+@@ -598,13 +590,13 @@
+   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
+   m_context->opaque = this; // used to separate out packets from different encode threads
+ 
+-  m_context->flags &= ~CODEC_FLAG_H263P_UMV;
++  av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+   m_context->flags &= ~CODEC_FLAG_4MV;
+ #if LIBAVCODEC_RTP_MODE
+   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
+ #endif
+-  m_context->flags &= ~CODEC_FLAG_H263P_AIV;
+-  m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
++  av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
++  av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
+ 
+   return true;
+ }
+diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx
+--- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx	2012-04-26 06:56:00.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-06-10 16:49:11.210568639 +0200
+@@ -25,6 +25,7 @@
+ #include <fstream>
+ #include <stdlib.h> 
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ 
+ #ifndef PLUGINCODEC_TRACING
+diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.5/plugins/video/H.264/h264-x264.cxx	2012-04-26 06:56:00.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx	2012-06-10 17:04:19.695646950 +0200
+@@ -1035,13 +1035,10 @@
+         return false;
+ 
+       m_context->workaround_bugs = FF_BUG_AUTODETECT;
+-      m_context->error_recognition = FF_ER_AGGRESSIVE;
+       m_context->idct_algo = FF_IDCT_H264;
+       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
+-      m_context->flags2 = CODEC_FLAG2_BRDO |
+-                          CODEC_FLAG2_MEMC_ONLY |
+-                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
++      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
+                           CODEC_FLAG2_SKIP_RD |
+                           CODEC_FLAG2_CHUNKS;
+ 
+diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx
+--- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx	2012-04-26 06:56:00.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-06-10 17:04:46.012171051 +0200
+@@ -33,6 +33,7 @@
+ 
+ #include <codec/opalplugin.hpp>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ 
+ #if defined(X264_LICENSED) || defined(GPL_HELPER_APP)
+diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+--- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-04-26 06:56:02.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-06-10 16:46:33.498089705 +0200
+@@ -101,8 +101,10 @@
+ #include <libavutil/bswap.h>
+ #include <libavcodec/mpegvideo.h>
+ 
++
+ #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
+ #include LIBAVCODEC_HEADER
++#include <libavutil/opt.h>
+ #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
+ }
+ 
+@@ -589,17 +591,17 @@
+     m_avpicture->quality = m_videoQMin;
+ 
+ #ifdef USE_ORIG
+-    m_avcontext->flags |= CODEC_FLAG_PART;   // data partitioning
++    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+     m_avcontext->flags |= CODEC_FLAG_4MV;    // 4 motion vectors
+ #else
+     m_avcontext->max_b_frames=0; /*don't use b frames*/
+     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+-    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
++    av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
+     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
+     m_avcontext->flags|=CODEC_FLAG_4MV;
+     m_avcontext->flags|=CODEC_FLAG_GMC;
+     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
+-    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
++    av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
+ #endif
+     m_avcontext->opaque = this;              // for use in RTP callback
+ }
+@@ -804,7 +806,7 @@
+         // Should the next frame be an I-Frame?
+         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
+         {
+-            m_avpicture->pict_type = FF_I_TYPE;
++            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
+         }
+         else // No IFrame requested, let avcodec decide what to do
+         {
+@@ -1325,7 +1327,7 @@
+ 
+ void MPEG4DecoderContext::SetStaticDecodingParams() {
+     m_avcontext->flags |= CODEC_FLAG_4MV; 
+-    m_avcontext->flags |= CODEC_FLAG_PART;
++    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
+ }
+ 
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 368d58db9..eedf88d60 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163131 2012-07-07 19:15:48Z schiv $
+# $Id: PKGBUILD 163187 2012-07-08 15:43:25Z ibiru $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index c628eb158..cab3e4431 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 151450 2012-02-26 11:24:29Z pierre $
+# $Id: PKGBUILD 163198 2012-07-09 00:03:09Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=ptlib
-pkgver=2.10.2
-pkgrel=2
+pkgver=2.10.5
+pkgrel=1
 pkgdesc="Portable Windows Library"
 arch=('i686' 'x86_64')
-url="http://www.ekiga.org/"
+url="http://www.opalvoip.org"
 license=('GPL')
 depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
 replaces=('pwlib')
 conflicts=('pwlib')
-source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('a0985848da2ea06a4df804a650fd800ff52a01f889c116595b9a67fc35537140')
+source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2)
+md5sums=('20e0bc3cc85affed55e1481bf96c8c6b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -31,3 +31,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('a5a571457ff3a398995b34f66d6c3cbb')
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 20b0ccc7e..322d66183 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 160646 2012-06-03 04:02:31Z eric $
+# $Id: PKGBUILD 163160 2012-07-08 09:32:27Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/"
 license=('GPL' 'LGPL')
 depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm')
 makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
+checkdepends=('time')
 optdepends=('libao: for ao plugin'
             'ffmpeg: for ffmpeg plugin'
             'libmad: for mp3 plugin'
@@ -18,19 +19,26 @@ optdepends=('libao: for ao plugin'
             'libpulse: for pulse plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        sox_default_audio_driver_fallback.patch)
+        sox_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch)
 sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
-          'ab304f1fc17269262dbc4977aa9b7e97ec805ae4')
+          'ab304f1fc17269262dbc4977aa9b7e97ec805ae4'
+          '2f92bcaebcaf300782396f106cdd27c72048a851')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch"
+  patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch"
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make bindir=. installcheck
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/sox/sox-ffmpeg0.11.patch b/extra/sox/sox-ffmpeg0.11.patch
new file mode 100644
index 000000000..901c81582
--- /dev/null
+++ b/extra/sox/sox-ffmpeg0.11.patch
@@ -0,0 +1,130 @@
+diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure
+--- sox-14.4.0-orig/configure	2012-06-12 00:35:53.462360803 -0400
++++ sox-14.4.0/configure	2012-06-12 00:36:08.572361294 -0400
+@@ -15781,9 +15781,9 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5
+-$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
+-if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5
++$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }
++if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -15797,27 +15797,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char av_open_input_file ();
++char avformat_open_input ();
+ int
+ main ()
+ {
+-return av_open_input_file ();
++return avformat_open_input ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_avformat_av_open_input_file=yes
++  ac_cv_lib_avformat_avformat_open_input=yes
+ else
+-  ac_cv_lib_avformat_av_open_input_file=no
++  ac_cv_lib_avformat_avformat_open_input=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5
+-$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }
+-if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5
++$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }
++if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :
+   for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
+--- sox-14.4.0-orig/src/ffmpeg.c	2012-06-12 00:35:53.459027469 -0400
++++ sox-14.4.0/src/ffmpeg.c	2012-06-12 00:36:26.539028545 -0400
+@@ -93,7 +93,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   enc->error_resilience = 1;
+ #else
+-  enc->error_recognition = 1;
++  enc->err_recognition = 1;
+ #endif
+ 
+   if (!codec || avcodec_open(enc, codec) < 0)
+@@ -157,7 +157,7 @@
+ static int startread(sox_format_t * ft)
+ {
+   priv_t * ffmpeg = (priv_t *)ft->priv;
+-  AVFormatParameters params;
++  AVDictionary *params;
+   int ret;
+   int i;
+ 
+@@ -172,7 +172,7 @@
+ 
+   /* Open file and get format */
+   memset(&params, 0, sizeof(params));
+-  if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, &params)) < 0) {
++  if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, &params)) < 0) {
+     lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret);
+     return SOX_EOF;
+   }
+@@ -231,7 +231,7 @@
+     /* If input buffer empty, read more data */
+     if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
+       if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
+-	  (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
++	  (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))
+ 	break;
+       ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
+       ffmpeg->audio_buf_index = 0;
+@@ -373,13 +373,6 @@
+       return SOX_EOF;
+   }
+ 
+-  /* set the output parameters (must be done even if no
+-     parameters). */
+-  if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
+-    lsx_fail("ffmpeg invalid output format parameters");
+-    return SOX_EOF;
+-  }
+-
+   /* Next line for debugging */
+   /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
+ 
+@@ -391,14 +384,14 @@
+ 
+   /* open the output file, if needed */
+   if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
+-    if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
++    if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
+       lsx_fail("ffmpeg could not open `%s'", ft->filename);
+       return SOX_EOF;
+     }
+   }
+ 
+   /* write the stream header, if any */
+-  av_write_header(ffmpeg->ctxt);
++  avformat_write_header(ffmpeg->ctxt, NULL);
+ 
+   return SOX_SUCCESS;
+ }
+@@ -478,7 +471,7 @@
+ #if (LIBAVFORMAT_VERSION_INT < 0x340000)
+     url_fclose(&ffmpeg->ctxt->pb);
+ #else
+-    url_fclose(ffmpeg->ctxt->pb);
++    avio_close(ffmpeg->ctxt->pb);
+ #endif
+   }
+ 
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index 82cb5c8de..d750d6db4 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148942 2012-02-05 11:57:05Z ibiru $
+# $Id: PKGBUILD 163161 2012-07-08 09:32:37Z ibiru $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=4
+pkgrel=5
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64')
 url="http://tcforge.berlios.de/"
@@ -18,17 +18,17 @@ options=('!libtool')
 source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
 	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
         subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
-        ffmpeg-0.10.patch)
+        ffmpeg-0.11.patch)
 sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
           'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
           'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
           '591943a33235342a66c3df0625a164a1479c09ae'
-          '3c03111cfae88db918afff3837cec7db32ace3cc')
+          '765dacce5ee463adf5c124556d68bb873ef436c6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch"
+  patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch"
   ./configure --prefix=/usr \
     --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
     --enable-lame --enable-ogg --enable-vorbis --enable-theora \
diff --git a/extra/transcode/ffmpeg-0.11.patch b/extra/transcode/ffmpeg-0.11.patch
new file mode 100644
index 000000000..24beb1069
--- /dev/null
+++ b/extra/transcode/ffmpeg-0.11.patch
@@ -0,0 +1,130 @@
+diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c
+--- transcode-1.1.7/export/export_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
++++ fixed-tc/export/export_ffmpeg.c	2012-07-05 16:22:41.095346080 -0400
+@@ -180,7 +180,7 @@
+ 
+ 
+ /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
+-#include <libavcodec/opt.h>
++#include <libavutil/opt.h>
+ #include <libavutil/avstring.h>
+ #include <libswscale/swscale.h>
+ 
+@@ -470,7 +470,6 @@
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    avcodec_init();
+     avcodec_register_all();
+     TC_UNLOCK_LIBAVCODEC;
+ 
+@@ -634,7 +633,6 @@
+         lavc_param_rc_max_rate = 2516;
+         lavc_param_rc_buffer_size = 224 * 8;
+         lavc_param_rc_buffer_aggressivity = 99;
+-        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
+ 
+         break;
+ 
+@@ -674,7 +673,6 @@
+ 
+         lavc_param_rc_buffer_size = 224 * 8;
+         lavc_param_rc_buffer_aggressivity = 99;
+-        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
+ 
+         break;
+ 
+diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c
+--- transcode-1.1.7/export/ffmpeg_cfg.c	2011-11-19 11:50:27.000000000 -0500
++++ fixed-tc/export/ffmpeg_cfg.c	2012-07-05 15:26:29.112103273 -0400
+@@ -160,9 +160,7 @@
+     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
+     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+-    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
+ //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+-    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
+     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
+@@ -211,7 +211,6 @@
+ #else
+     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
+ #endif    
+-    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
+     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+@@ -223,9 +223,6 @@
+     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
+     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+-    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
+-    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
+-    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
+     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
+     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c
+--- transcode-1.1.7/filter/filter_pp.c	2011-11-19 11:50:27.000000000 -0500
++++ fixed-tc/filter/filter_pp.c	2012-07-05 15:26:28.945436613 -0400
+@@ -38,8 +38,8 @@
+ 
+ /* FIXME: these use the filter ID as an index--the ID can grow
+  * arbitrarily large, so this needs to be fixed */
+-static pp_mode_t *mode[100];
+-static pp_context_t *context[100];
++static pp_mode *mode[100];
++static pp_context *context[100];
+ static int width[100], height[100];
+ static int pre[100];
+ 
+diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c
+--- transcode-1.1.7/import/decode_lavc.c	2011-11-19 11:50:27.000000000 -0500
++++ fixed-tc/import/decode_lavc.c	2012-07-05 15:26:28.842103278 -0400
+@@ -181,7 +181,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   lavc_dec_context->error_resilience  = 2;
+ #else
+-  lavc_dec_context->error_recognition = 2;
++  lavc_dec_context->err_recognition = 2;
+ #endif
+   lavc_dec_context->error_concealment = 3;
+   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c
+--- transcode-1.1.7/import/import_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
++++ fixed-tc/import/import_ffmpeg.c	2012-07-05 15:26:28.848769946 -0400
+@@ -314,7 +314,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+     lavc_dec_context->error_resilience  = 2;
+ #else
+-    lavc_dec_context->error_recognition = 2;
++    lavc_dec_context->err_recognition = 2;
+ #endif
+     lavc_dec_context->error_concealment = 3;
+     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c
+--- transcode-1.1.7/import/probe_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
++++ fixed-tc/import/probe_ffmpeg.c	2012-07-05 15:26:28.838769947 -0400
+@@ -99,8 +99,8 @@
+ 
+     TC_INIT_LIBAVCODEC;
+ 
+-    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
+-                             NULL, 0, NULL);
++    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
++                             NULL, NULL);
+     if (ret != 0) {
+         tc_log_error(__FILE__, "unable to open '%s'"
+                                " (libavformat failure)",
+diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h
+--- transcode-1.1.7/libtc/tcavcodec.h	2011-11-19 11:50:27.000000000 -0500
++++ fixed-tc/libtc/tcavcodec.h	2012-07-05 15:26:28.828769951 -0400
+@@ -53,7 +53,6 @@
+ 
+ #define TC_INIT_LIBAVCODEC do { \
+     TC_LOCK_LIBAVCODEC; \
+-    avcodec_init(); \
+     avcodec_register_all(); \
+     TC_UNLOCK_LIBAVCODEC; \
+ } while (0)
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 0b0ec4801..59c124285 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159387 2012-05-22 23:09:02Z ibiru $
+# $Id: PKGBUILD 163181 2012-07-08 13:55:46Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.52
+pkgver=2.60
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
@@ -11,7 +11,7 @@ license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmissiond transmissiond.conf)
-md5sums=('b50cc87b4cd77ba0cbda98b5568a4d07'
+md5sums=('2aff84c29a3c4b51ac5682a89d96bda5'
          '08875299e3fbb68fc546c1f350ac1f06'
          'be39806c35b7544856fa4070b00fc960')
 
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 9d0ae6630..df5fd2a4f 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162781 2012-06-30 12:58:20Z giovanni $
+# $Id: PKGBUILD 163162 2012-07-08 09:32:43Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index 4979b34ce..4c986ee9c 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149276 2012-02-06 17:33:31Z ibiru $
+# $Id: PKGBUILD 163164 2012-07-08 09:35:20Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=x264
-pkgver=20120204
+pkgver=20120705
 pkgrel=1
 pkgdesc="free library for encoding H264/AVC video streams"
 arch=('i686' 'x86_64')
@@ -13,17 +13,17 @@ license=('GPL')
 depends=('glibc')
 makedepends=('yasm')
 source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('4d793ecc4f9d308724ea47edf400f312')
+md5sums=('81e5bec5d5774a4a3f567f14bd94289c')
 
 build() {
-    cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable"
+    cd "$pkgname-snapshot-$pkgver-2245-stable"
 
     ./configure --enable-shared
 
     make
 }
 package() {
-    cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable"
+    cd "$pkgname-snapshot-$pkgver-2245-stable"
 
     make DESTDIR="$pkgdir" \
       bindir=/usr/bin \
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 2c8141170..3e63b912e 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150886 2012-02-23 13:48:15Z allan $
+# $Id: PKGBUILD 163163 2012-07-08 09:32:46Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64')
 url="http://www.xine-project.org"
@@ -31,7 +31,7 @@ optdepends=('imagemagick: for using the imagemagick plugin' \
             'libvdpau: for using the VDPAU plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('ebb2648456504ff4ce08c34de258d3125832bb94')
+sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"