Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

2025-02-05 03:57:15 +08:00 · 2012-08-29 23:20:49 +00:00 · 2012-08-29 23:20:49 +00:00 · 1e691c7bd3
commit 1e691c7bd3
parent 0809e7447f 923ead1a03
91 changed files with 584 additions and 896 deletions
--- a/alsa-firmware/PKGBUILD
+++ b/alsa-firmware/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=alsa-firmware
 pkgver=1.0.25
-pkgrel=4
+pkgrel=6
 pkgdesc="ALSA firmware package"
 arch=('i686' 'x86_64')
 url="http://alsa-project.org/"
--- a/alsa-lib/PKGBUILD
+++ b/alsa-lib/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=alsa-lib
 pkgver=1.0.25
-pkgrel=3
+pkgrel=5
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
--- a/alsa-oss/PKGBUILD
+++ b/alsa-oss/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=alsa-oss
 pkgver=1.0.25
-pkgrel=3
+pkgrel=5
 pkgdesc="OSS compatibility library"
 arch=(i686 x86_64)
 license=('GPL')
--- a/alsa-plugins/PKGBUILD
+++ b/alsa-plugins/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=alsa-plugins
 pkgver=1.0.25
-pkgrel=3
+pkgrel=5
 pkgdesc="Extra alsa plugins"
 arch=(i686 x86_64)
 url="http://www.alsa-project.org"
@ -18,11 +18,12 @@ 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=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-#md5sums=('01d00251cbe4f510e131eeee69c8361a')
+source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2"
+        "alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch"
+        "alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch")
+md5sums=('038c023eaa51171f018fbf7141255185'
+         '9c52cbe8f1bc8c823d70a92b171c1055'
+         '07d382f969d0514297e9dbc5f642bbdf')

 # create tarball: source PKGBUILD && mksource

@ -38,6 +39,9 @@ mksource() {

 build() {
  cd "$srcdir/$pkgname-$pkgver"
+  
+  patch -Np1 -i "${srcdir}/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch"
+  patch -Np1 -i "${srcdir}/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch"
  ./configure --prefix=/usr
  make
 }
@ -46,6 +50,6 @@ package() {
  cd "$srcdir/$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/"
-}
+}
--- a/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
+++ b/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");
--- a/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
+++ b/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;
--- a/alsa-utils/PKGBUILD
+++ b/alsa-utils/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=alsa-utils
 pkgver=1.0.25
-pkgrel=4
+pkgrel=6
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
--- a/cdemu-client/PKGBUILD
+++ b/cdemu-client/PKGBUILD
@ -4,8 +4,8 @@
 # maintainer abveritas@chakra-project.org

 pkgname=cdemu-client
-pkgver=1.4.0
-pkgrel=4
+pkgver=1.5.0
+pkgrel=2
 pkgdesc="Simple command-line client for controlling cdemu-daemon"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
@ -13,11 +13,11 @@ license=('GPL')
 depends=('python2' 'dbus-python' 'cdemu-daemon')
 makedepends=('intltool')
 conflicts=('cdemu')
-source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz)
-md5sums=('ce469f0660dfa4a9306faed00b3e6d6c')
+source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2")
+md5sums=('11141138f2b91a7100445d9c32b31181')

 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"

  # python2 fix
  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/cdemu
@ -27,6 +27,7 @@ build() {
 }

 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
--- a/cdemu-daemon/PKGBUILD
+++ b/cdemu-daemon/PKGBUILD
@ -4,30 +4,31 @@
 # maintainer abveritas@chakra-project.org

 pkgname=cdemu-daemon
-pkgver=1.4.0
-pkgrel=7
+pkgver=1.5.0
+pkgrel=2
 pkgdesc="CD/DVD-ROM device emulator daemon"
 arch=('i686' 'x86_64')
 backup=('etc/conf.d/cdemud'
 	'etc/dbus-1/system.d/cdemud-dbus.conf')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage=$pkgver" 'libao')
+depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage=$pkgver" 'libao' 'systemd-units')
 optdepends=('alsa-lib: to enable the ALSA audio driver'
            'pulseaudio: to enable the PA audio driver')
-install=cdemud.install
-source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
        'cdemud.conf'
        'cdemud.rc'
        'cdemu-daemon.service')
-md5sums=('f7ccc0abc33057d552ec7b0925fce63a'
-         'c3097a01d9e79093485181ff47a81542'
-         '29b9bc0023ff17e14091f3fb8438ccb4'
+md5sums=('5ba780caa26d855942512b5b3c22405a'
+         '914b3577284e9ae1ebe442aa837eea2d'
+         '6d32f6a4b7465adaf7b92a3537279e7b'
         'be9a8f50da3f42129c0a0e3dea8cd56c')

 build() {
  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --libexecdir=/usr/lib/$pkgname
  make
 }

@ -46,3 +47,4 @@ package() {
    "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEMUD_Daemon.service"

 }
+
--- a/cdemu-daemon/cdemu-daemon.install
+++ b/cdemu-daemon/cdemu-daemon.install
@ -0,0 +1,28 @@
+post_install () {
+  cat <<MSG
+  > The daemon is automatically started, but can be manually
+    started via /etc/rc.d/cdemud or cdemu-daemon.service.
+  > See /etc/conf.d/cdemud for further configuration.
+
+  > Only users at the console or in the 'cdemu' group can
+    communicate with the system daemon or use a session
+    daemon.
+
+  > If you want to output CD-Audio, write AUDIO_DRIVER=pulse or
+    AUDIO_DRIVER=alsa to ~/.cdemud and use "cdemu -b session"
+    to control a session daemon.
+MSG
+
+  return 0
+}
+
+post_upgrade () {
+  # Repeat install message due to policy changes
+  # Added on 2012-06-19, remove after a grace period
+  post_install
+
+  return 0
+}
+
+# vim:set ts=2 sw=2 et:
+
--- a/cdemu-daemon/cdemud-dbus.conf
+++ b/cdemu-daemon/cdemud-dbus.conf
@ -0,0 +1,23 @@
+<!DOCTYPE busconfig PUBLIC 
+    "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+    <!-- Only root can own the CDEMUD_Daemon service on bus -->
+    <policy user="root">
+        <allow own="net.sf.cdemu.CDEMUD_Daemon"/>
+    </policy>
+    <policy group="root">
+        <allow own="net.sf.cdemu.CDEMUD_Daemon"/>
+    </policy>
+    
+    <!-- Allow users at the console to invoke methods on the interface -->
+    <policy at_console="true">
+        <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/>
+    </policy>
+
+    <!-- Allow users in the 'cdemu' group to invoke methods on the interface -->
+    <policy group="cdemu">
+        <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/>
+    </policy>
+</busconfig>
--- a/cdemu-daemon/cdemud.conf
+++ b/cdemu-daemon/cdemud.conf
@ -1,12 +1,9 @@
 # how many optical drives to emulate
-NUM_DRIVES=2
+NUM_DEVICES=2

-# control device
-CTL_DEVICE=/dev/vhba_ctl
+# audio backend (null, alsa or pulse)
+AUDIO_DRIVER=pulse

-# audio backend (null, alsa or pulseaudio)
-AUDIO_BACKEND=null
+# log file
+LOG_FILE=/var/log/cdemud.log

-DAEMON="/usr/bin/cdemud"
-BUS="system"
-LOG_FILE="/var/log/cdemu.log"
--- a/cdemu-daemon/cdemud.install
+++ b/cdemu-daemon/cdemud.install
@ -7,3 +7,4 @@ post_install () {
 post_remove() {
  groupdel cdemu
 }
+
--- a/cdemu-daemon/cdemud.rc
+++ b/cdemu-daemon/cdemud.rc
@ -2,33 +2,11 @@

 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/conf.d/cdemud

 case "$1" in
  start)
-    stat_busy "Loading vhba and loop modules"
-    modprobe loop
-    modprobe vhba
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-
-    stat_busy "Waiting for $CTL_DEVICE"
-    i=0
-    until [ -c $CTL_DEVICE -o $i -ge 10 ]; do
-      i=`expr $i + 1`
-      sleep 1
-    done
-    if [ -c $CTL_DEVICE ]; then
-      stat_done
-    else
-      stat_fail
-    fi
-
    stat_busy "Starting cdemud"
-    cdemud -n $NUM_DRIVES -c $CTL_DEVICE -a $AUDIO_BACKEND -b $BUS -l $LOG_FILE &
+    /usr/lib/cdemu-daemon/cdemu-daemon-system.sh &
    if [ $? -ne 0 ]; then
      stat_fail
    else
@ -38,7 +16,7 @@ case "$1" in
    ;;
  stop)
    stat_busy "Stopping cdemud"
-    kill -9 `pidof cdemud` &>/dev/null && sleep 1 && rmmod vhba
+    kill `pidof cdemud` &>/dev/null
    if [ $? -ne 0 ]; then
      stat_fail
    else
@ -54,3 +32,4 @@ case "$1" in
  *)
    echo "usage: $0 {start|stop|restart}"
 esac
+
--- a/cdrdao/PKGBUILD
+++ b/cdrdao/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=('cdrdao')
 pkgver=1.2.3
-pkgrel=6
+pkgrel=8
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://cdrdao.sourceforge.net/"
--- a/celt/PKGBUILD
+++ b/celt/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=celt
 pkgver=0.11.1
-pkgrel=7
+pkgrel=9
 pkgdesc="Low-latency audio communication codec"
 arch=('i686' 'x86_64')
 url="http://www.celt-codec.org"
--- a/dssi/PKGBUILD
+++ b/dssi/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=dssi
 pkgver=1.1.1
-pkgrel=4
+pkgrel=6
 pkgdesc="An API for audio plugins, with particular application for software synthesis plugins with native user interfaces."
 arch=("i686" "x86_64")
 url="http://dssi.sourceforge.net/"
--- a/ffmpeg/PKGBUILD
+++ b/ffmpeg/PKGBUILD
@ -4,16 +4,17 @@
 # maintainer abveritas@chakra-project.org

 pkgname=ffmpeg
-pkgver=0.10.3
-pkgrel=2
+pkgver=0.11.1
+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' 'speex' 'gsm' 'libpulse')
+depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx>=1.1.0' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm' 
+'libpulse')
 makedepends=('yasm')
 source=("http://${pkgname}.org/releases/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('775d184933f71ff44a2fff4968e78b2b')
+md5sums=('ff8cb914f657e164dd60ea1008b555a8')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
--- a/ffmpeg/fix_metadata_mapping_for_author_artist.patch
+++ b/ffmpeg/fix_metadata_mapping_for_author_artist.patch
@ -1,122 +0,0 @@
-Index: ffserver.c
-===================================================================
--- ffserver.c	(revision 23065)
-+++ ffserver.c	(working copy)
-@@ -2232,7 +2232,7 @@
-     switch(c->state) {
-     case HTTPSTATE_SEND_DATA_HEADER:
-         memset(&c->fmt_ctx, 0, sizeof(c->fmt_ctx));
-        av_metadata_set2(&c->fmt_ctx.metadata, "author"   , c->stream->author   , 0);
-+        av_metadata_set2(&c->fmt_ctx.metadata, "artist"   , c->stream->author   , 0);
-         av_metadata_set2(&c->fmt_ctx.metadata, "comment"  , c->stream->comment  , 0);
-         av_metadata_set2(&c->fmt_ctx.metadata, "copyright", c->stream->copyright, 0);
-         av_metadata_set2(&c->fmt_ctx.metadata, "title"    , c->stream->title    , 0);
-Index: libavformat/rm.c
-===================================================================
--- libavformat/rm.c	(revision 23065)
-+++ libavformat/rm.c	(working copy)
-@@ -23,7 +23,7 @@
- 
- const char * const ff_rm_metadata[4] = {
-     "title",
-    "author",
-+    "artist",
-     "copyright",
-     "comment"
- };
-Index: libavformat/mov.c
-===================================================================
--- libavformat/mov.c	(revision 23065)
-+++ libavformat/mov.c	(working copy)
-@@ -144,7 +144,7 @@
-     switch (atom.type) {
-     case MKTAG(0xa9,'n','a','m'): key = "title";     break;
-     case MKTAG(0xa9,'a','u','t'):
-    case MKTAG(0xa9,'A','R','T'): key = "author";    break;
-+    case MKTAG(0xa9,'A','R','T'): key = "artist";    break;
-     case MKTAG(0xa9,'w','r','t'): key = "composer";  break;
-     case MKTAG( 'c','p','r','t'):
-     case MKTAG(0xa9,'c','p','y'): key = "copyright"; break;
-Index: libavformat/vqf.c
-===================================================================
--- libavformat/vqf.c	(revision 23065)
-+++ libavformat/vqf.c	(working copy)
-@@ -113,7 +113,7 @@
-             add_metadata(s, "copyright", len, header_size);
-             break;
-         case MKTAG('A','U','T','H'):
-            add_metadata(s, "author"   , len, header_size);
-+            add_metadata(s, "artist"   , len, header_size);
-             break;
-         case MKTAG('A','L','B','M'):
-             add_metadata(s, "album"    , len, header_size);
-Index: libavformat/rpl.c
-===================================================================
--- libavformat/rpl.c	(revision 23065)
-+++ libavformat/rpl.c	(working copy)
-@@ -135,7 +135,7 @@
-     error |= read_line(pb, line, sizeof(line));      // date/copyright
-     av_metadata_set2(&s->metadata, "copyright", line, 0);
-     error |= read_line(pb, line, sizeof(line));      // author and other
-    av_metadata_set2(&s->metadata, "author"   , line, 0);
-+    av_metadata_set2(&s->metadata, "artist"   , line, 0);
- 
-     // video headers
-     vst = av_new_stream(s, 0);
-Index: libavformat/mp3.c
-===================================================================
--- libavformat/mp3.c	(revision 23065)
-+++ libavformat/mp3.c	(working copy)
-@@ -215,7 +215,7 @@
-     buf[1] = 'A';
-     buf[2] = 'G';
-     count += id3v1_set_string(s, "title",   buf +  3, 30);
-    count += id3v1_set_string(s, "author",  buf + 33, 30);
-+    count += id3v1_set_string(s, "artist",  buf + 33, 30);
-     count += id3v1_set_string(s, "album",   buf + 63, 30);
-     count += id3v1_set_string(s, "date",    buf + 93,  4);
-     count += id3v1_set_string(s, "comment", buf + 97, 30);
-Index: libavformat/movenc.c
-===================================================================
--- libavformat/movenc.c	(revision 23065)
-+++ libavformat/movenc.c	(working copy)
-@@ -1444,7 +1444,7 @@
-     put_be32(pb, 0); /* size */
-     put_tag(pb, "ilst");
-     mov_write_string_metadata(s, pb, "\251nam", "title"    , 1);
-    mov_write_string_metadata(s, pb, "\251ART", "author"   , 1);
-+    mov_write_string_metadata(s, pb, "\251ART", "artist"   , 1);
-     mov_write_string_metadata(s, pb, "aART", "album_artist", 1);
-     mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1);
-     mov_write_string_metadata(s, pb, "\251alb", "album"    , 1);
-@@ -1572,7 +1572,7 @@
- 
-         if (mov->mode & MODE_3GP) {
-             mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");
-            mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");
-+            mov_write_3gp_udta_tag(pb_buf, s, "auth", "artist");
-             mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");
-             mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");
-             mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
-@@ -1580,7 +1580,7 @@
-             mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");
-         } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
-             mov_write_string_metadata(s, pb_buf, "\251nam", "title"      , 0);
-            mov_write_string_metadata(s, pb_buf, "\251aut", "author"     , 0);
-+            mov_write_string_metadata(s, pb_buf, "\251aut", "artist"     , 0);
-             mov_write_string_metadata(s, pb_buf, "\251alb", "album"      , 0);
-             mov_write_string_metadata(s, pb_buf, "\251day", "date"       , 0);
-             mov_write_string_tag(pb_buf, "\251enc", LIBAVFORMAT_IDENT, 0, 0);
-Index: libavformat/aiffdec.c
-===================================================================
--- libavformat/aiffdec.c	(revision 23065)
-+++ libavformat/aiffdec.c	(working copy)
-@@ -223,7 +223,7 @@
-             get_meta(s, "title"    , size);
-             break;
-         case MKTAG('A', 'U', 'T', 'H'):     /* Author chunk */
-            get_meta(s, "author"   , size);
-+            get_meta(s, "artist"   , size);
-             break;
-         case MKTAG('(', 'c', ')', ' '):     /* Copyright chunk */
-             get_meta(s, "copyright", size);
--- a/ffmpegthumbnailer/PKGBUILD
+++ b/ffmpegthumbnailer/PKGBUILD
@ -4,8 +4,8 @@
 # maintainer abveritas@chakra-project.org

 pkgname=ffmpegthumbnailer
-pkgver=2.0.7
-pkgrel=4
+pkgver=2.0.8
+pkgrel=2
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
@ -13,7 +13,7 @@ arch=('i686' 'x86_64')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz)
 options=(!libtool)
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73')
+sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533')

 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
--- a/flac/PKGBUILD
+++ b/flac/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=flac
 pkgver=1.2.1
-pkgrel=8
+pkgrel=10
 pkgdesc="Free Lossless Audio Codec"
 arch=('i686' 'x86_64')
 url="http://flac.sourceforge.net/"
--- a/fluidsynth/PKGBUILD
+++ b/fluidsynth/PKGBUILD
@ -5,8 +5,8 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=fluidsynth
-pkgver=1.1.4
-pkgrel=2
+pkgver=1.1.6
+pkgrel=1
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
 arch=("i686" "x86_64")
 url="http://www.fluidsynth.org/"
@ -18,7 +18,7 @@ license=('LGPL')
 backup=('etc/conf.d/fluidsynth')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 	'fluidsynth.conf' 'fluidsynthd')
-md5sums=('71f297a90d00a253f0f12ceb5d3d661d'
+md5sums=('ae5aca6de824b4173667cbd3a310b263'
         '16c5f4d4cbdddc6c5fcbd4fd4cc142f1'
         'b296dbfb524c2164f552f68bd9abe2ec')

--- a/gnash/PKGBUILD
+++ b/gnash/PKGBUILD
@ -6,7 +6,7 @@
 
 pkgname=gnash
 pkgver=0.8.10
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Flash player and kpath plugin for KDE 4."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gnash/"
@ -34,7 +34,7 @@ build() {

 	./configure \
 		--enable-renderer=agg \
-		--enable-media=gst \
+		--enable-media=gst,ffmpeg \
 		--enable-gui=kde4 \
 		--enable-sound=sdl \
 		--enable-hwaccel=vaapi \
--- a/gstreamer0.10-bad/PKGBUILD
+++ b/gstreamer0.10-bad/PKGBUILD
@ -6,7 +6,7 @@
 pkgbase=gstreamer0.10-bad
 pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
 pkgver=0.10.23
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 
--- a/gstreamer0.10-base/PKGBUILD
+++ b/gstreamer0.10-base/PKGBUILD
@ -6,7 +6,7 @@
 pkgbase=('gstreamer0.10-base')
 pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
 pkgver=0.10.36
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('pkgconfig' "gstreamer0.10>=${pkgver}" 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
--- a/gstreamer0.10-good/PKGBUILD
+++ b/gstreamer0.10-good/PKGBUILD
@ -6,7 +6,7 @@
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.31
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.36' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 
--- a/gstreamer0.10-python/PKGBUILD
+++ b/gstreamer0.10-python/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=gstreamer0.10-python
 pkgver=0.10.22
-pkgrel=4
+pkgrel=6
 pkgdesc="Python bindings for GStreamer 0.10"
 arch=('i686' 'x86_64')
 license=('LGPL')
--- a/gstreamer0.10-ugly/PKGBUILD
+++ b/gstreamer0.10-ugly/PKGBUILD
@ -6,7 +6,7 @@
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.19
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 
--- a/gstreamer0.10/PKGBUILD
+++ b/gstreamer0.10/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=gstreamer0.10
 pkgver=0.10.36
-pkgrel=1
+pkgrel=3
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64')
 license=('LGPL')
--- a/imlib2/PKGBUILD
+++ b/imlib2/PKGBUILD
@ -4,19 +4,19 @@
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>

 pkgname=imlib2
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64')
 license=('BSD')
-depends=('libtiff>=3.9.2-2' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.4.0' 'libid3tag' 'libjpeg>=8')
+depends=('libtiff>=3.9.2-2' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.4.0' 'libid3tag' 'libjpeg-turbo')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2")
-sha1sums=('aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b')
+sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')

 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"

  # disable optimizations, they cause problems (e.g. FS#12268)
  [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx"
@ -25,10 +25,15 @@ build() {
  # Configure and Build
  ./configure --prefix=/usr \
              --sysconfdir=/etc/imlib2 \
-              --x-libraries=/usr/lib $EXTRAOPTS || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+              --x-libraries=/usr/lib $EXTRAOPTS
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  make DESTDIR="$pkgdir" install

  # Install License
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
--- a/imlib2/bufferoverflow.patch
+++ b/imlib2/bufferoverflow.patch
@ -1,13 +0,0 @@
--- src/modules/loaders/loader_xpm.c
-+++ src/modules/loaders/loader_xpm.c.new
-@@ -246,8 +246,8 @@
-                                  return 0;
-                               }
-                             ptr = im->data;
-                            end = ptr + (sizeof(DATA32) * w * h);
-                             pixels = w * h;
-+                            end = ptr + pixels;
-                          }
-                        else
-                          {
-
--- a/imlib2/libpng14.patch
+++ b/imlib2/libpng14.patch
@ -1,12 +0,0 @@
-diff -Naur imlib2-1.4.2-orig/src/modules/loaders/loader_png.c imlib2-1.4.2/src/modules/loaders/loader_png.c
--- imlib2-1.4.2-orig/src/modules/loaders/loader_png.c	2010-01-19 03:37:21.000000000 -0500
-+++ imlib2-1.4.2/src/modules/loaders/loader_png.c	2010-01-19 03:38:51.000000000 -0500
-@@ -38,7 +38,7 @@
- 
-         /* if we haven't read the header before, set the header data */
-         fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-        if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+        if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-           {
-              fclose(f);
-              return 0;
--- a/jack/PKGBUILD
+++ b/jack/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=jack
 pkgver=0.121.3
-pkgrel=7
+pkgrel=9
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64')
 license=('GPL2' 'custom:LGPL2')
--- a/ladspa/PKGBUILD
+++ b/ladspa/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=ladspa
 pkgver=1.13
-pkgrel=6
+pkgrel=8
 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
 arch=("i686" "x86_64")
 license=('LGPL')
--- a/lame/03_lame-ffmpeg.diff
+++ b/lame/03_lame-ffmpeg.diff
@ -1,72 +0,0 @@
--- lame-3.98.2.orig/libmp3lame/lame.c	2009-07-07 10:52:01.000000000 +0200
-+++ lame-3.98.2/libmp3lame/lame.c	2009-07-07 10:52:03.000000000 +0200
-@@ -1602,6 +1602,13 @@
-         /* update mfbuf[] counters */
-         gfc->mf_size += n_out;
-         assert(gfc->mf_size <= MFSIZE);
-+
-+        /* lame_encode_flush may have set gfc->mf_sample_to_encode to 0
-+         * so we have to reinitialize it here when that happened.
-+         */
-+        if (gfc->mf_samples_to_encode < 1) {
-+            gfc->mf_samples_to_encode = ENCDELAY + POSTDELAY;
-+        }
-         gfc->mf_samples_to_encode += n_out;
- 
- 
-@@ -1931,6 +1938,10 @@
-     int     frames_left;
-     int     samples_to_encode = gfc->mf_samples_to_encode;
- 
-+    /* Was flush already called? */
-+    if (gfc->mf_samples_to_encode < 1) {
-+        return 0;
-+    }
-     memset(buffer, 0, sizeof(buffer));
-     mp3count = 0;
-     
-@@ -1942,7 +1953,9 @@
-     end_padding += pad_out_samples;
- 
-     frames_left = (samples_to_encode + pad_out_samples) / gfp->framesize;
-    while (frames_left > 0) {
-+
-+    /* send in a frame of 0 padding until all internal sample buffers are flushed */
-+    while (frames_left > 0 && imp3 >= 0) {
-         int frame_num = gfp->frameNum;
- 
-         mp3buffer_size_remaining = mp3buffer_size - mp3count;
-@@ -1951,22 +1964,23 @@
-         if (mp3buffer_size == 0)
-             mp3buffer_size_remaining = 0;
- 
-        /* send in a frame of 0 padding until all internal sample buffers
-         * are flushed
-         */
-         imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], 32,
-                                   mp3buffer, mp3buffer_size_remaining);
-         
-        if (frame_num != gfp->frameNum) {
-            --frames_left;
-        }
-        if (imp3 < 0) {
-            /* some type of fatal error */
-            return imp3;
-        }
-         mp3buffer += imp3;
-         mp3count += imp3;
-+        frames_left -= (frame_num != gfp->frameNum) ? 1 : 0;
-     }
-+    /* Set gfc->mf_samples_to_encode to 0, so we may detect
-+     * and break loops calling it more than once in a row.
-+     */
-+    gfc->mf_samples_to_encode = 0;
-+
-+    if (imp3 < 0) {
-+        /* some type of fatal error */
-+        return imp3;
-+    }
-+
-     mp3buffer_size_remaining = mp3buffer_size - mp3count;
-     /* if user specifed buffer size = 0, dont check size */
-     if (mp3buffer_size == 0)
--- a/lame/PKGBUILD
+++ b/lame/PKGBUILD
@ -3,7 +3,7 @@
 # NOTE might break. restart the build

 pkgname=lame
-pkgver=3.98.4
+pkgver=3.99.5
 pkgrel=1
 pkgdesc="An MP3 encoder and graphical frame analyzer"
 arch=('i686' 'x86_64')
@ -12,8 +12,8 @@ depends=('ncurses')
 makedepends=('nasm')
 license=('LGPL')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8e9866ad6b570c6c95c8cba48060473f')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('84835b313d4a8b68f5349816d33e07ce')

 build() {
  export MAKEFLAGS="-j1"
@ -23,6 +23,11 @@ build() {
  ./configure --prefix=/usr \
              --enable-nasm \
              --enable-shared
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
--- a/lame/shared-frontend.patch
+++ b/lame/shared-frontend.patch
@ -1,23 +0,0 @@
--- lame-3.96.1.orig/frontend/Makefile.am	2004-01-21 01:41:36.000000000 -0800
-+++ lame-3.96.1/frontend/Makefile.am	2004-10-03 16:39:12.415901779 -0700
-@@ -50,7 +50,7 @@
- endif
- 
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- 
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
- 
-diff -Naur lame-3.96.1.orig/frontend/Makefile.in lame-3.96.1/frontend/Makefile.in
--- lame-3.96.1.orig/frontend/Makefile.in	2004-01-21 05:50:29.000000000 -0800
-+++ lame-3.96.1/frontend/Makefile.in	2004-10-03 16:39:19.711701553 -0700
-@@ -91,7 +91,7 @@
- 	$(top_builddir)/libmp3lame/libmp3lame.la \
- 	@FRONTEND_LDADD@
- 
-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
--- a/libao/PKGBUILD
+++ b/libao/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=libao
 pkgver=1.1.0
-pkgrel=5
+pkgrel=7
 pkgdesc="A cross-platform audio output library and plugins"
 url="http://www.xiph.org/ao"
 arch=('i686' 'x86_64')
--- a/libcdio/PKGBUILD
+++ b/libcdio/PKGBUILD
@ -3,7 +3,7 @@
 # Contributor: damir <damir@archlinux.org>

 pkgname=libcdio
-pkgver=0.82
+pkgver=0.83
 pkgrel=1
 pkgdesc="GNU Compact Disc Input and Control Library"
 arch=("i686" "x86_64")
@ -13,13 +13,28 @@ depends=('gcc-libs>=4.4.2' 'libcddb' 'ncurses')
 options=('!libtool')
 install=libcdio.install
 source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz)
-md5sums=('1c29b18e01ab2b966162bc727bf3c360')
+source=("http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz"
+        "libcdio-0.83-linking.patch")
+md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb'
+         '8ff23299effd635725fd070d03aac9cf')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs || return 1
-  make || return 1
-  make -j1 DESTDIR="${pkgdir}" install || return 1
-  #install -m644 libcdio_paranoia.pc libcdio_cdda.pc \
-  #  "${pkgdir}/usr/lib/pkgconfig/" || return 1
+  
+  patch -Np1 -i "${srcdir}/libcdio-0.83-linking.patch"
+  
+  ./configure --prefix=/usr \
+              --disable-vcd-info \
+              --enable-cpp-progs \
+              --disable-static
+              
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  make -j1 DESTDIR="${pkgdir}" install
+  sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
+    "${pkgdir}/usr/include/cdio/cdio_config.h"
 }
--- a/libcdio/libcdio-0.83-linking.patch
+++ b/libcdio/libcdio-0.83-linking.patch
@ -0,0 +1,22 @@
+diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
+--- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
+++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
+@@ -315,15 +315,15 @@
+
+ isofile2_SOURCES = isofile2.cpp
+ isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+
+ isolist_SOURCES = isolist.cpp
+ isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+
+ iso4_SOURCES = iso4.cpp
+ iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+
+ mmc1_SOURCES = mmc1.cpp
+ mmc1_DEPENDENCIES = $(LIBCDIO_DEPS) 
--- a/liblastfm/PKGBUILD
+++ b/liblastfm/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=liblastfm
 pkgver=1.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc='A Qt C++ library for the Last.fm webservices'
 url="https://github.com/eartle/liblastfm/"
 license=('GPL3')
--- a/liblrdf/PKGBUILD
+++ b/liblrdf/PKGBUILD
@ -5,10 +5,10 @@

 pkgname=liblrdf
 pkgver=0.5.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
 arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf"
+url="https://github.com/swh/LRDF"
 depends=('raptor' 'ladspa')
 makedepends=('pkgconfig')
 license=('GPL')
@ -21,7 +21,8 @@ build() {
  cd "${srcdir}/swh-LRDF-7ebc032"

  autoreconf -vfi
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+              --disable-static
  make
 }

--- a/liblrdf/md5.patch
+++ b/liblrdf/md5.patch
@ -1,18 +0,0 @@
--- liblrdf-0.4.0.orig/src/lrdf_md5.h
-+++ liblrdf-0.4.0/src/lrdf_md5.h
-@@ -32,6 +32,15 @@
- #ifndef __MD5_H__
- #define __MD5_H__
-
-+/* Change function names to prevent symbol conflicts */
-+#define md5_init _lrdf_md5_init
-+#define md5_buffer _lrdf_md5_buffer
-+#define md5_sig_from_string _lrdf_md5_sig_from_string
-+#define md5_finish _lrdf_md5_finish
-+#define md5_process _lrdf_md5_process
-+#define md5_sig_to_string _lrdf_md5_sig_to_string
-+#define md5_get_result _lrdf_md5_get_result
-+
- /*
-  * Size of a standard MD5 signature in bytes.  This definition is for
-  * external programs only.  The MD5 routines themselves reference the
--- a/liblrdf/raptor2.diff
+++ b/liblrdf/raptor2.diff
@ -1,193 +0,0 @@
--- src/Makefile.am
-+++ src/Makefile.am
-@@ -4,5 +4,5 @@ lib_LTLIBRARIES = liblrdf.la
- noinst_HEADERS = lrdf_md5.h md5_loc.h ladspa.h
- 
- liblrdf_la_SOURCES = lrdf.c lrdf_multi.c md5.c
-liblrdf_la_LIBADD = -lraptor
-+liblrdf_la_LIBADD = -lraptor2
- liblrdf_la_LDFLAGS = -version-info @LRDF_LIBTOOL_VERSION@
--- src/lrdf.c
-+++ src/lrdf.c
-@@ -18,6 +18,7 @@
- static unsigned int lrdf_uid = 0;	/* A unique(ish) id to append to genid's to
- 					 * avoid clashses */
- 
-+static raptor_world *world = NULL;
- static lrdf_statement *triples = NULL;
- static lrdf_statement *free_triples;
- static lrdf_string_hash *resources_hash[LRDF_HASH_SIZE];
-@@ -43,8 +44,7 @@ static void lrdf_remove_triple_hash(lrdf_triple_hash ** tbl,
- 				    lrdf_hash hash, lrdf_statement * s);
- static void lrdf_add_closure_hash(lrdf_closure_hash ** tbl,
- 				  lrdf_hash subject, lrdf_hash object);
-static void lrdf_store(void *user_data,
-		       const raptor_statement * statement);
-+static void lrdf_store(void *user_data, raptor_statement * statement);
- void lrdf_free_statements(lrdf_statement * s);
- void lrdf_copy_statement(lrdf_statement * from, lrdf_statement * to);
- void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
-@@ -71,7 +71,7 @@ void lrdf_init()
-     unsigned int i;
-     struct timeval tv;
- 
-    raptor_init();
-+    world = raptor_new_world();
-     lrdf_more_triples(256);
- 
-     /* A UID to add to genids to make them safer */
-@@ -112,7 +112,8 @@ void lrdf_more_triples(int count)
- 
- void lrdf_cleanup()
- {
-    raptor_finish();
-+    raptor_free_world(world);
-+    world = NULL;
- 
-     lrdf_free_string_hash(resources_hash);
-     lrdf_free_string_hash(literals_hash);
-@@ -232,26 +233,29 @@ void lrdf_remove_matches(lrdf_statement *pattern)
-     }
- }
- 
-static void lrdf_store(void *user_data, const raptor_statement * statement)
-+static const char *lrdf_term_as_string(char *tmp, int tmp_len,
-+				       const raptor_term *term)
-+{
-+    switch (term->type) {
-+    case RAPTOR_TERM_TYPE_URI:
-+	return (const char *) raptor_uri_as_string(term->value.uri);
-+    case RAPTOR_TERM_TYPE_LITERAL:
-+	return (const char *) term->value.literal.string;
-+    case RAPTOR_TERM_TYPE_BLANK:
-+	snprintf(tmp, tmp_len, "_:%s.%x", term->value.blank.string, lrdf_uid);
-+	return tmp;
-+    default:
-+	return "(?)";
-+    }
-+}
-+
-+static void lrdf_store(void *user_data, raptor_statement * statement)
- {
-     lrdf_statement *s = lrdf_alloc_statement();
-     char tmps[128], tmpp[128], tmpo[128];
-    char *subj = (char *) statement->subject,
-	 *pred = (char *) statement->predicate,
-	 *obj = (char *) statement->object;
-
-    if (statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
-	snprintf(tmps, 127, "_:%s.%x", subj, lrdf_uid);
-	subj = tmps;
-    }
-    if (statement->predicate_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
-	snprintf(tmpp, 127, "_:%s.%x", pred, lrdf_uid);
-	pred = tmpp;
-    }
-    if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
-	snprintf(tmpo, 127, "_:%s.%x", obj, lrdf_uid);
-	obj = tmpo;
-    }
-+    const char *subj = lrdf_term_as_string(tmps, 128, statement->subject),
-+	       *pred = lrdf_term_as_string(tmpp, 128, statement->predicate),
-+	       *obj = lrdf_term_as_string(tmpo, 128, statement->object);
- 
-     s->shash = lrdf_gen_hash(subj);
-     s->phash = lrdf_gen_hash(pred);
-@@ -261,7 +265,7 @@ static void lrdf_store(void *user_data, const raptor_statement * statement)
- 
-     s->subject = lrdf_check_hash(resources_hash, s->shash, subj);
-     s->predicate = lrdf_check_hash(resources_hash, s->phash, pred);
-    if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_LITERAL) {
-+    if (statement->object->type == RAPTOR_TERM_TYPE_LITERAL) {
- 	s->object = lrdf_check_hash(literals_hash, s->ohash, obj);
- 	s->object_type = lrdf_literal;
-     } else {
-@@ -537,28 +541,22 @@ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
-     free(pathto);
- }
- 
-static void lrdf_error_handler(void *data, raptor_locator * locator,
-			       const char *message);
-+static void lrdf_log_handler(void *data, raptor_log_message *message);
- 
-static void lrdf_error_handler(void *data, raptor_locator * locator,
-			       const char *message)
-+static void lrdf_log_handler(void *data, raptor_log_message *message)
- {
-    fprintf(stderr, "liblrdf: error - ");
-    raptor_print_locator(stderr, locator);
-    fprintf(stderr, " - %s\n", message);
-
-    raptor_parse_abort((raptor_parser*)data);
-}
-+    const char *severity = "error";
-+    if (message->level == RAPTOR_LOG_LEVEL_WARN) {
-+	severity = "warning";
-+    }
- 
-static void lrdf_warning_handler(void *data, raptor_locator * locator,
-				 const char *message);
-+    fprintf(stderr, "liblrdf: %s - ", severity);
-+    raptor_locator_print(message->locator, stderr);
-+    fprintf(stderr, " - %s\n", message->text);
- 
-static void lrdf_warning_handler(void *data, raptor_locator * locator,
-				 const char *message)
-{
-    fprintf(stderr, "liblrdf: warning - ");
-    raptor_print_locator(stderr, locator);
-    fprintf(stderr, " - %s\n", message);
-+    if (message->level != RAPTOR_LOG_LEVEL_WARN) {
-+	raptor_parser_parse_abort((raptor_parser*)data);
-+    }
- }
- 
- 
-@@ -593,15 +591,15 @@ int lrdf_read_file_intl(const char *uri)
-     lrdf_hash source;
- 
-     //printf("lrdf: reading %s\n", uri);
-    ruri = raptor_new_uri(uri);
-    furi = raptor_new_uri(uri);
-+    ruri = raptor_new_uri(world, (const unsigned char *) uri);
-+    furi = raptor_new_uri(world, (const unsigned char *) uri);
-     source = lrdf_gen_hash(uri);
-     lrdf_check_hash(resources_hash, source, uri);
- 
-     if (strstr(uri, ".rdf")) {
-	parser = raptor_new_parser("rdfxml");
-+	parser = raptor_new_parser(world, "rdfxml");
-     } else {
-	parser = raptor_new_parser("ntriples");
-+	parser = raptor_new_parser(world, "ntriples");
-     }
-     if (!parser) {
- 	fprintf(stderr, "liblrdf: failed to create parser\n");
-@@ -609,12 +607,11 @@ int lrdf_read_file_intl(const char *uri)
- 	return 1;
-     }
- 
-    raptor_set_error_handler(parser, parser, lrdf_error_handler);
-    raptor_set_warning_handler(parser, NULL, lrdf_warning_handler);
-    raptor_set_statement_handler(parser, &source, lrdf_store);
-    raptor_set_default_generate_id_parameters(parser, NULL, ++lrdf_uid);
-+    raptor_world_set_log_handler(world, parser, lrdf_log_handler);
-+    raptor_parser_set_statement_handler(parser, &source, lrdf_store);
-+    raptor_world_set_generate_bnodeid_parameters(world, NULL, ++lrdf_uid);
- 
-    if (raptor_parse_file(parser, furi, ruri)) {
-+    if (raptor_parser_parse_file(parser, furi, ruri)) {
- 	raptor_free_uri(furi);
- 	raptor_free_uri(ruri);
- 	raptor_free_parser(parser);
--- configure.ac
-+++ configure.ac
-@@ -18,7 +18,7 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS([errno.h limits.h stdlib.h string.h unistd.h])
- 
-PKG_CHECK_MODULES(RAPTOR, raptor >= 0.9.11)
-+PKG_CHECK_MODULES(RAPTOR, raptor2 >= 0.9.11)
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
--- a/libmatroska/PKGBUILD
+++ b/libmatroska/PKGBUILD
@ -7,19 +7,19 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=libmatroska
-pkgver=1.0.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="Matroska library"
 arch=('i686' 'x86_64')
 url="http://dl.matroska.org/downloads/libmatroska/"
 license=('LGPL')
-depends=('libebml>=0.7.6')
-source=(http://dl.matroska.org/downloads/libmatroska/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4efcf3945b17a6f0320cf1aaa326a4de')
+depends=('libebml')
+source=("http://dl.matroska.org/downloads/libmatroska/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('f4a8c411f09d39c754eb726efd616043')

 build() {
 cd "${srcdir}/${pkgname}-${pkgver}/make/linux"

- make sharedlib || return 1
- make prefix="${pkgdir}/usr" install || return 1
+ make sharedlib
+ make prefix="${pkgdir}/usr" install
 }
--- a/libmirage/PKGBUILD
+++ b/libmirage/PKGBUILD
@ -4,21 +4,27 @@
 # maintainer abveritas@chakra-project.org

 pkgname=libmirage
-pkgver=1.4.0
-pkgrel=4
+pkgver=1.5.0
+pkgrel=2
 pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('glib2' 'libsndfile')
+depends=('glib2' 'libsndfile' 'zlib')
 makedepends=('bison' 'flex')
-source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2)
 options=(!libtool)
-md5sums=('cd6cc75e1b76a0ef72821b30168c94d9')
+md5sums=('b60d9baa754efee6e0f6a584ec033fff')

 build() {
  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  sed -i "63,65d" configure.ac
+  autoconf
+  ./configure --prefix=/usr \
+      --disable-static \
+      --disable-gtk-doc \
+      --disable-gtk-doc-html \
+      --disable-gtk-doc-pdf
  make
 }

@ -26,3 +32,4 @@ package() {
  cd $srcdir/$pkgname-$pkgver
  make DESTDIR=$pkgdir install
 }
+
--- a/libmp4v2/PKGBUILD
+++ b/libmp4v2/PKGBUILD
@ -4,25 +4,25 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>

 pkgname=libmp4v2
-pkgver=1.9.1
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="MPEG-4 library"
 arch=('i686' 'x86_64')
 license=('MPL')
 url="http://code.google.com/p/mp4v2/"
 options=('!libtool')
-source=(http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2)
-md5sums=('986701929ef15b03155ac4fb16444797')
+source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
+md5sums=('c91f06711225b34b4c192c9114887b14')

 build() {
-  cd ${srcdir}/mp4v2-${pkgver}
+  cd "${srcdir}/mp4v2-${pkgver}"

-  ./configure --prefix=/usr || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
 }

 package() {
-  cd ${srcdir}/mp4v2-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-  make DESTDIR=${pkgdir} install-man || return 1
-}
+  cd "${srcdir}/mp4v2-${pkgver}"
+  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install-man
+}
--- a/libogg/PKGBUILD
+++ b/libogg/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=libogg
 pkgver=1.3.0
-pkgrel=4
+pkgrel=6
 pkgdesc="Ogg bitstream and framing library"
 arch=('i686' 'x86_64')
 url="http://www.xiph.org/ogg/"
--- a/libsamplerate/PKGBUILD
+++ b/libsamplerate/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=libsamplerate
 pkgver=0.1.8
-pkgrel=4
+pkgrel=6
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
 arch=('i686' 'x86_64')
 url="http://www.mega-nerd.com/SRC/index.html"
--- a/libshout/PKGBUILD
+++ b/libshout/PKGBUILD
@ -4,16 +4,16 @@
 # maintainer abveritas@chakra-project.org

 pkgname=libshout
-pkgver=2.3.0
-pkgrel=3
+pkgver=2.3.1
+pkgrel=2
 pkgdesc="Library for accessing a shoutcast/icecast server"
 arch=('i686' 'x86_64')
 depends=('libvorbis' 'libtheora' 'speex')
 url="http://www.icecast.org/"
-options=('!libtool' 'force')
+options=('!libtool')
 license=('LGPL')
-source=(http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('976a5979505f3de4026ae7fffb10754b')
+source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('11765b2592e7ea623ccd93d3f8df172c')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
--- a/libsndfile/PKGBUILD
+++ b/libsndfile/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=libsndfile
 pkgver=1.0.25
-pkgrel=4
+pkgrel=6
 pkgdesc="A C library for reading and writing files containing sampled sound"
 arch=('i686' 'x86_64')
 url="http://www.mega-nerd.com/libsndfile"
--- a/libtheora/PKGBUILD
+++ b/libtheora/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=libtheora
 pkgver=1.1.1
-pkgrel=7
+pkgrel=9
 pkgdesc="An open video codec developed by the Xiph.org"
 arch=('i686' 'x86_64')
 url="http://www.xiph.org"
--- a/libvorbis/PKGBUILD
+++ b/libvorbis/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=libvorbis
 pkgver=1.3.3
-pkgrel=3
+pkgrel=5
 pkgdesc="Vorbis codec library"
 arch=('i686' 'x86_64')
 license=('custom')
--- a/libvpx/PKGBUILD
+++ b/libvpx/PKGBUILD
@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=libvpx
-pkgver=0.9.6
+pkgver=1.1.0
 pkgrel=2
 pkgdesc="The VP8 Codec SDK"
 arch=('i686' 'x86_64')
@ -13,12 +13,13 @@ url="http://www.webmproject.org/"
 license=('BSD')
 depends=('glibc')
 makedepends=('yasm')
-source=(http://webm.googlecode.com/files/${pkgname}-v${pkgver}.tar.bz2)
-sha1sums=('a3522bd2b73d52381ba767ded1cbf4760e9cc6f8')
+source=("http://webm.googlecode.com/files/${pkgname}-v${pkgver}.tar.bz2")
+sha1sums=('356af5f770c50cd021c60863203d8f30164f6021')

 build() {
    cd "${srcdir}/${pkgname}-v${pkgver}"
-    ./configure --enable-vp8 \
+    ./configure --prefix=/usr \
+        --enable-vp8 \
        --enable-runtime-cpu-detect \
        --enable-shared \
        --enable-postproc \
@ -33,5 +34,5 @@ package() {

    make DIST_DIR="$pkgdir/usr" install
    chmod -R o+r "${pkgdir}/usr/include/vpx"
-    install -D -m 0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+    install -D -m 0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
--- a/mesa-demos/PKGBUILD
+++ b/mesa-demos/PKGBUILD
@ -7,17 +7,17 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

-pkgname=('mesa-demos')
+pkgname='mesa-demos'
 pkgver=8.0.1
-pkgrel=2.1
+pkgrel=1
 arch=(i686 x86_64)
 pkgdesc="Mesa demos and tools"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-depends=('glew>=1.5.6')
+depends=('glew')
 conflicts=('mesa<7.9')
-source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2
-        LICENSE)
+source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
+        'LICENSE')
 md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
         '5c65a0fe315dd347e09b1f2826a1df5a')

@ -30,8 +30,8 @@ build() {
 package() {
  cd "${srcdir}/mesa-demos-${pkgver}"
  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
-  rm -v ${pkgdir}/usr/bin/line
-  rm -v ${pkgdir}/usr/bin/clear
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
+  rm -v "${pkgdir}/usr/bin/line"
+  rm -v "${pkgdir}/usr/bin/clear"
 }
--- a/mlt/PKGBUILD
+++ b/mlt/PKGBUILD
@ -7,36 +7,40 @@

 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.7.8
-pkgrel=3
+pkgver=0.8.2
+pkgrel=1
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64')
 url="http://www.mltframework.org"
 license=('GPL')
-depends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'ffmpeg>=0.8.9' 'frei0r-plugins' 'swig' 'python2')
+depends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'ffmpeg>=0.11' 'frei0r-plugins' 'swig' 'python2')
 optdepends=('jack')
 makedepends=('subversion')
 conflicts=('mlt++<=0.3.8')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('4bdce45d832e065ac4c8c8ca56765e1d')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('c7a8c4ca7485bb615cbcf851d8742a1c')

 build() {
  # mlt
-  cd $srcdir/mlt-$pkgver
+  cd "${srcdir}/mlt-${pkgver}"

 #  [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
  SSE2=--disable-sse2
+  SSE=--disable-sse

  msg "SSE2=$SSE2"
-  ./configure --prefix=/usr --enable-gpl \
-	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \
-	--avformat-vdpau \
-        --disable-gtk2 \
-	--avformat-swscale $SSE2
+  msg "SSE=$SSE"
+  ./configure --prefix=/usr \
+              --enable-gpl \
+              --qimage-libdir=/usr/lib/ \
+              --qimage-includedir=/usr/include/Qt \
+              --avformat-vdpau \
+              --disable-gtk2 \
+              --avformat-swscale $SSE2 $SSE
  make

  # mlt python bindings
-  cd $srcdir/mlt-$pkgver/src/swig/python
+  cd "$srcdir/mlt-$pkgver/src/swig/python"
  sed -i 's_path=`which python_path=`which python2_' build
  sed -i 's_`python -c_`python2 -c_' build
  sed -i 's#python-config#python2-config#' build
@ -44,20 +48,20 @@ build() {
 }

 package_mlt() {
-  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
+  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg>=0.11' 'frei0r-plugins')
  optdepends=('jack' 'libexif' 'qt' "ladspa")
  conflicts=('mlt++<=0.3.8')

-  cd $srcdir/mlt-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/mlt-$pkgver"
+  make DESTDIR="$pkgdir" install
 }

 package_mlt-python-bindings() {
-  depends=('python2' 'mlt')
+  depends=('python2' 'mlt>=0.8')

-  cd $srcdir/mlt-$pkgver/src/swig/python
-  mkdir -p $pkgdir/usr/lib/python2.7/
-  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
-  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
-  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
+  cd "$srcdir/mlt-$pkgver/src/swig/python"
+  mkdir -p "$pkgdir/usr/lib/python2.7/"
+  install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
+  install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
+  install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
 }
--- a/mpg123/PKGBUILD
+++ b/mpg123/PKGBUILD
@ -4,8 +4,8 @@
 # maintainer abveritas@chakra-project.org

 pkgname=mpg123
-pkgver=1.14.2
-pkgrel=1
+pkgver=1.14.4
+pkgrel=2
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/mpg123"
@ -20,12 +20,15 @@ provides=('mpg321')
 replaces=('mpg321')
 options=('libtool')
 categories=('multimedia')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('70ccfc51fc9f7f1c776ae8cf611f6be3')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('9f53e27bb40b8df3d3b6df25f5f9a8a83b1fccfe')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-int-quality --with-audio="alsa oss sdl jack pulse"
+  ./configure --prefix=/usr \
+              --enable-int-quality \
+              --with-audio="alsa oss sdl jack pulse" \
+              --with-module-suffix=.so
  make
 }

--- a/mplayer/PKGBUILD
+++ b/mplayer/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=mplayer
 pkgver=34923
-pkgrel=3
+pkgrel=5
 pkgdesc="Multimedia player."
 arch=('i686' 'x86_64')
 depends=('a52dec' 'aalib' 'alsa-lib' 'bzip2' 'cdparanoia' 'directfb' 'enca' 'faac' 'faad2'
--- a/mplayer2/PKGBUILD
+++ b/mplayer2/PKGBUILD
@ -5,7 +5,7 @@
 
 pkgname=mplayer2
 pkgver=2.0.4
-pkgrel=2
+pkgrel=4
 pkgdesc="A movie player"
 arch=('i686' 'x86_64')
 license=('GPL')
--- a/normalize/PKGBUILD
+++ b/normalize/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=normalize
 pkgver=0.7.7
-pkgrel=6
+pkgrel=8
 pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
 arch=('i686' 'x86_64')
 url="http://normalize.nongnu.org"
--- a/opencv/PKGBUILD
+++ b/opencv/PKGBUILD
@ -6,8 +6,8 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.0
-pkgrel=4
+pkgver=2.4.2
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
@ -19,7 +19,7 @@ optdepends=('python-numpy: Python 2.x interface'
            'eigen')
 options=('!libtool')
 source=("http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/$pkgver/$_realname-$pkgver.tar.bz2")
-md5sums=('1fcda4ed3d0655f033ac30be8bad4882')
+md5sums=('059ef86fc1724d69b75832a0d2929ff5')

 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
            '-D CMAKE_INSTALL_PREFIX=/usr'
@ -73,17 +73,17 @@ package_opencv() {
  cd "$pkgdir/usr/share"

  # prepare FSH-friendly dirs
-  if [ -d OpenCV ]; then
-    mv opencv/samples OpenCV/
-    rm -r opencv
-    mv OpenCV opencv
-  fi
+  #if [ -d OpenCV ]; then
+  #  mv opencv/samples OpenCV/
+  #  rm -r opencv
+  #  mv OpenCV opencv
+  #fi

  # separate docs package; also be -R friendly
-  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
+  [ -d OpenCV/doc ] && mv OpenCV/doc "$srcdir/opencv-doc"

  # separate samples package
-  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
+  [ -d OpenCV/samples ] && mv OpenCV/samples "$srcdir/opencv-samples"
 }

 package_opencv-docs() {
--- a/orc/PKGBUILD
+++ b/orc/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=orc
 pkgver=0.4.16
-pkgrel=3
+pkgrel=5
 pkgdesc="The Oild Runtime Compiler"
 arch=('i686' 'x86_64')
 license=('custom')
--- a/perl-sdl/PKGBUILD
+++ b/perl-sdl/PKGBUILD
@ -2,7 +2,7 @@

 pkgname=perl-sdl
 pkgver=2.536
-pkgrel=4
+pkgrel=6
 pkgdesc="Simple DirectMedia Layer for Perl."
 arch=(i686 x86_64)
 license=(LGPL)
--- a/phonon-backend-gstreamer/PKGBUILD
+++ b/phonon-backend-gstreamer/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=('phonon-backend-gstreamer')
 pkgver=4.6.2
-pkgrel=1
+pkgrel=3
 pkgdesc="Phonon GStreamer backend"
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org'
--- a/phonon-backend-mplayer/PKGBUILD
+++ b/phonon-backend-mplayer/PKGBUILD
@ -6,7 +6,7 @@
 pkgname=('phonon-backend-mplayer')
 _pkgname=('phonon-mplayer')
 pkgver=20120212
-pkgrel=5
+pkgrel=7
 pkgdesc='Phonon MPlayer backend'
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org'
--- a/phonon-backend-vlc/PKGBUILD
+++ b/phonon-backend-vlc/PKGBUILD
@ -4,8 +4,8 @@
 # maintainer abveritas@chakra-project.org

 pkgname=('phonon-backend-vlc')
-pkgver=0.5.0
-pkgrel=5
+pkgver=0.6.0
+pkgrel=2
 pkgdesc='Phonon VLC backend'
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org'
@ -16,7 +16,7 @@ groups=("kde-complete" "kde-uninstall")
 replaces=('phonon-vlc-svn' 'phonon-vlc')
 conflicts=('phonon-vlc-svn' 'phonon-vlc')
 source=("http://download.kde.org/stable/phonon/${pkgname}/$pkgver/src/${pkgname}-$pkgver.tar.xz")
-md5sums=('fc5dc2b353fa0d9e428ecfc3c485eb66')
+md5sums=('13c7adb90f62cb568d17bc9ced9406e9')

 # create tarball: source PKGBUILD && mksource

@ -29,16 +29,16 @@ mksource() {
 }

 build() {
-	cd ${srcdir}
+	cd "${srcdir}"
 	mkdir -p build
 	cd build
-	cmake ../${pkgname}-$pkgver \
+	cmake "../${pkgname}-$pkgver" \
 		 -DCMAKE_BUILD_TYPE=Release \
 		 -DCMAKE_INSTALL_PREFIX=/usr
 	make
 }

 package() {
-	cd ${srcdir}/build
-	make DESTDIR=${pkgdir} install
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}" install
 } 
--- a/phonon/PKGBUILD
+++ b/phonon/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=phonon
 pkgver=4.6.0
-pkgrel=4
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://phonon.kde.org"
 license=('LGPL')
--- a/pulseaudio/PKGBUILD
+++ b/pulseaudio/PKGBUILD
@ -6,7 +6,7 @@
 pkgbase=pulseaudio
 pkgname=('pulseaudio' 'libpulse')
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=2.0
+pkgver=2.1
 pkgrel=2
 arch=('i686' 'x86_64')
 url="http://pulseaudio.org/"
@ -18,7 +18,7 @@ makedepends=('libasyncns' 'libcap' 'attr' 'libxtst' 'libsm' 'libsamplerate'
 options=(!emptydirs !libtool !makeflags)
 source=("http://freedesktop.org/software/${pkgbase}/releases/${pkgbase}-${pkgver}.tar.xz"
        "${pkgbase}.xinit")
-sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061'
+sha256sums=('ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f'
            '4beae1ce931ae4bde3d2faca25735cc62a6eac182323f257dd9e703d499f7aa8')

 build() {
@ -39,27 +39,27 @@ build() {
 }

 package_libpulse() {
-pkgdesc="${pkgdesc} (client library)"
-depends=('dbus-core' 'xcb-util' 'libasyncns' 'libcap' 'libxtst' 'libsm'
-         'libsamplerate' 'json-c')
-optdepends=('alsa-plugins: ALSA support'
-            'avahi: zeroconf support')
-backup=(etc/pulse/client.conf)
+  pkgdesc="${pkgdesc} (client library)"
+  depends=('dbus-core' 'xcb-util' 'libasyncns' 'libcap' 'libxtst' 'libsm'
+           'libsamplerate' 'json-c')
+  optdepends=('alsa-plugins: ALSA support'
+              'avahi: zeroconf support')
+  backup=(etc/pulse/client.conf)

  mv "${srcdir}/libpulse"/* "${pkgdir}"
 }

 package_pulseaudio() {
-depends=("libpulse=${pkgver}-${pkgrel}" 'rtkit' 'libltdl' 'speex' 'tdb'
-         'udev' 'fftw' 'orc' 'webrtc-audio-processing' 'systemd')
-optdepends=('avahi: zeroconf support'
-            'bluez: bluetooth support'
-            'gconf: configuration through gconf (paprefs)'
-            'jack: jack support'
-            'lirc-utils: infra-red support'
-            'openssl: RAOP support')
-backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
-install="pulseaudio.install"
+  depends=("libpulse=${pkgver}-${pkgrel}" 'rtkit' 'libltdl' 'speex' 'tdb'
+           'udev' 'fftw' 'orc' 'webrtc-audio-processing' 'systemd')
+  optdepends=('avahi: zeroconf support'
+              'bluez: bluetooth support'
+              'gconf: configuration through gconf (paprefs)'
+              'jack: jack support'
+              'lirc-utils: infra-red support'
+              'openssl: RAOP support')
+  backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
+  install="pulseaudio.install"

  cd "${srcdir}/${pkgbase}-${pkgver}"
  make DESTDIR="${pkgdir}" install
@ -85,7 +85,7 @@ install="pulseaudio.install"

  rm "${pkgdir}/etc/dbus-1/system.d/pulseaudio-system.conf"

-### Split libpulse
+  ### Split libpulse

  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib/pulseaudio,share/man/man5}}

--- a/pyogg/PKGBUILD
+++ b/pyogg/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=pyogg
 pkgver=1.3
-pkgrel=11
+pkgrel=13
 pkgdesc="Python ogg wrapper library"
 arch=('i686' 'x86_64')
 url="http://ekyo.nerim.net/software/pyogg/index.html"
--- a/pyvorbis/PKGBUILD
+++ b/pyvorbis/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=pyvorbis
 pkgver=1.4
-pkgrel=10
+pkgrel=12
 pkgdesc="Python vorbis wrapper library"
 arch=(i686 x86_64)
 license=('LGPL')
--- a/rdesktop/PKGBUILD
+++ b/rdesktop/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=rdesktop
 pkgver=1.7.1
-pkgrel=3
+pkgrel=5
 depends=('libx11' 'openssl' 'libao' 'libsamplerate')
 pkgdesc="Is used to connect to windows terminal servers"
 url="http://www.rdesktop.org/"
--- a/sdl_mixer/PKGBUILD
+++ b/sdl_mixer/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=sdl_mixer
 pkgver=1.2.12
-pkgrel=3
+pkgrel=5
 pkgdesc="A simple multi-channel audio mixer"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org/projects/SDL_mixer/"
--- a/sdl_sound/PKGBUILD
+++ b/sdl_sound/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=sdl_sound
 pkgver=1.0.3
-pkgrel=8
+pkgrel=10
 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3"
 arch=('i686' 'x86_64')
 url="http://icculus.org/SDL_sound/"
--- a/smpeg/PKGBUILD
+++ b/smpeg/PKGBUILD
@ -3,27 +3,47 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>

 pkgname=smpeg
-pkgver=0.4.4
-pkgrel=5
+pkgver=0.4.5
+_pkgver=395
+pkgrel=1
 pkgdesc="SDL MPEG Player Library"
 arch=('i686' 'x86_64')
 url="http://icculus.org/smpeg/"
 license=('LGPL')
 depends=('sdl')
-makedepends=('mesa')
+makedepends=('mesa' 'subversion')
 optdepends=('mesa: to use glmovie')
 options=('!libtool' '!makeflags')
-source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz smpeg-0.4.4-gcc41.patch)
-md5sums=('59c76ac704088ef5539210190c4e1fe3' '8b979a58307d7196655758bd3d2466c4')
-sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e')
+source=("smpeg-0.4.4-gcc41.patch")
+sha1sums=('7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e')

 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../smpeg-0.4.4-gcc41.patch || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make LDFLAGS+=-lstdc++ || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}"
+
+  if [ -d "${pkgname}/.svn" ] ; then
+    cd "${pkgname}" && svn up -r ${_pkgver}
+  else
+    svn co svn://svn.icculus.org/${pkgname}/trunk --config-dir ./ -r ${_pkgver} ${pkgname}
+  fi
+
+  msg "SVN checkout done or server timeout"
+  msg "Starting make..."
+ 
+  rm -rf "${srcdir}/${pkgname}-build"
+  cp -r "${srcdir}/${pkgname}" "${srcdir}/${pkgname}-build"
+  cd "${srcdir}/${pkgname}-build"
+
+  ./autogen.sh
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man
+  make LDFLAGS+=-lstdc++
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-build"
+
+  make DESTDIR="${pkgdir}" install
  
  #fix aclocal warnings
-  sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 || return 1
+  sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" "${pkgdir}/usr/share/aclocal/smpeg.m4"
 }
--- a/soundtouch/PKGBUILD
+++ b/soundtouch/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=soundtouch
 pkgver=1.6.0
-pkgrel=2
+pkgrel=4
 pkgdesc="SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files."
 arch=('i686' 'x86_64')
 url="http://www.surina.net/soundtouch/"
--- a/sox/PKGBUILD
+++ b/sox/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=sox
 pkgver=14.4.0
-pkgrel=1
+pkgrel=3
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/"
--- a/speex/PKGBUILD
+++ b/speex/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=speex
 pkgver=1.2rc1
-pkgrel=6
+pkgrel=8
 pkgdesc="A free codec for free speech"
 arch=('i686' 'x86_64')
 license=('BSD')
--- a/timidity++/PKGBUILD
+++ b/timidity++/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=timidity++
 pkgver=2.13.2
-pkgrel=15
+pkgrel=17
 pkgdesc="A MIDI to WAVE converter and player"
 arch=('i686' 'x86_64')
 url="http://timidity.sourceforge.net"
--- a/transcode/PKGBUILD
+++ b/transcode/PKGBUILD
@ -6,29 +6,29 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=4
+pkgrel=6
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64')
 url="http://tcforge.berlios.de/"
 license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
+depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg>0.11' 'mjpegtools'
 	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
 makedepends=('nasm')
 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')
+          '54d4be67de3d6d9436357be76d9620af553ee30d')

 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 \
--- a/transcode/ffmpeg-0.10.patch
+++ b/transcode/ffmpeg-0.10.patch
@ -1,14 +0,0 @@
-diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c
--- transcode-1.1.7.orig/filter/filter_pp.c	2012-01-27 19:55:13.706613234 +0000
-+++ transcode-1.1.7/filter/filter_pp.c	2012-01-27 19:56:04.719541629 +0000
-@@ -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];
- 
--- a/transcode/ffmpeg-0.11.patch
+++ b/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 16:50:27.000000000 +0000
+++ fixed-tc/export/export_ffmpeg.c	2012-08-29 09:17:18.796437760 +0000
+@@ -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 +672,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 16:50:27.000000000 +0000
+++ fixed-tc/export/ffmpeg_cfg.c	2012-08-29 09:17:49.133561320 +0000
+@@ -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 +209,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 +220,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 16:50:27.000000000 +0000
+++ fixed-tc/filter/filter_pp.c	2012-08-29 09:18:21.497382078 +0000
+@@ -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 16:50:27.000000000 +0000
+++ fixed-tc/import/decode_lavc.c	2012-08-29 09:19:38.008534454 +0000
+@@ -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 16:50:27.000000000 +0000
+++ fixed-tc/import/import_ffmpeg.c	2012-08-29 09:20:21.839194652 +0000
+@@ -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 16:50:27.000000000 +0000
+++ fixed-tc/import/probe_ffmpeg.c	2012-08-29 09:21:40.853718199 +0000
+@@ -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 16:50:27.000000000 +0000
+++ fixed-tc/libtc/tcavcodec.h	2012-08-29 09:22:17.480936619 +0000
+@@ -53,7 +53,6 @@
+ 
+ #define TC_INIT_LIBAVCODEC do { \
+     TC_LOCK_LIBAVCODEC; \
+-    avcodec_init(); \
+     avcodec_register_all(); \
+     TC_UNLOCK_LIBAVCODEC; \
+ } while (0)
--- a/transcode/transcode-1.1.5-ffmpeg.patch
+++ b/transcode/transcode-1.1.5-ffmpeg.patch
@ -1,124 +0,0 @@
-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;
--- a/transcode/transcode-1.1.5-jpeg-7.patch
+++ b/transcode/transcode-1.1.5-jpeg-7.patch
@ -1,16 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=294488
-
-Patch by: Salah Coronya
-
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
--- export/export_jpg.c
-+++ export/export_jpg.c
-@@ -91,6 +91,7 @@
- 
-   jpeg_set_quality(&encinfo, quality, TRUE);
-   encinfo.raw_data_in = TRUE;
-+  encinfo.do_fancy_downsampling = FALSE;
-   encinfo.in_color_space = JCS_YCbCr;
- 
-   encinfo.comp_info[0].h_samp_factor = 2;
--- a/transcode/transcode-1.1.5-mpa.patch
+++ b/transcode/transcode-1.1.5-mpa.patch
@ -1,10 +0,0 @@
--- transcode-1.1.5-old/export/aud_aux.c	2010-07-04 12:44:31.867550180 -0500
-+++ transcode-1.1.5/export/aud_aux.c	2010-07-04 13:41:01.253292529 -0500
-@@ -347,6 +347,7 @@
-     //-- 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.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
-     mpa_ctx.channels    = vob->dm_chan;            // channels
-     mpa_ctx.sample_rate = vob->a_rate;
--- a/vcdimager/PKGBUILD
+++ b/vcdimager/PKGBUILD
@ -3,8 +3,8 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>

 pkgname=vcdimager
-pkgver=0.7.23
-pkgrel=7
+pkgver=0.7.24
+pkgrel=1
 pkgdesc="GNU VCDImager is a full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's"
 arch=(i686 x86_64)
 license=('GPL')
@ -12,13 +12,20 @@ url="http://www.vcdimager.org/"
 depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt')
 options=('!libtool')
 install=vcdimager.install
-source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5e7d80fdbf0037ad20e438f2a9573253')
+source=("ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz")
+md5sums=('3af22978fd79c79d5fda6513b6811145')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
  ./configure --prefix=/usr \
-    --mandir=/usr/share/man --infodir=/usr/share/info  || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+              --mandir=/usr/share/man \
+              --infodir=/usr/share/info \
+              --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
--- a/vlc/PKGBUILD
+++ b/vlc/PKGBUILD
@ -5,7 +5,7 @@

 pkgname='vlc'
 pkgver=2.0.3
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
--- a/vorbis-tools/PKGBUILD
+++ b/vorbis-tools/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=vorbis-tools
 pkgver=1.4.0
-pkgrel=6
+pkgrel=8
 pkgdesc="Extra tools for Ogg-Vorbis"
 arch=('i686' 'x86_64')
 url='http://www.xiph.org/vorbis/'
--- a/webrtc-audio-processing/PKGBUILD
+++ b/webrtc-audio-processing/PKGBUILD
@ -5,7 +5,7 @@

 pkgname=webrtc-audio-processing
 pkgver=0.1
-pkgrel=1
+pkgrel=3
 pkgdesc="AudioProcessing library based on Google's implementation of WebRTC"
 arch=(i686 x86_64)
 url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing"
--- a/x264/PKGBUILD
+++ b/x264/PKGBUILD
@ -5,13 +5,13 @@

 pkgname=x264
 pkgver=20120518
-pkgrel=2
+pkgrel=4
 pkgdesc="free library for encoding H264/AVC video streams"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/developers/x264.html"
 license=('GPL')
 depends=('glibc')
-makedepends=('yasm')
+makedepends=('yasm' 'libvpx>=1.1.0')
 source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
 md5sums=('a328a0976780857a3d8bcafe57cb6e1f')

@ -30,4 +30,4 @@ package() {
      libdir=/usr/lib \
      includedir=/usr/include \
      install
-}
+}
--- a/xine-lib/PKGBUILD
+++ b/xine-lib/PKGBUILD
@ -4,8 +4,8 @@
 # maintainer abveritas@chakra-project.org

 pkgname=xine-lib
-pkgver=1.2.1
-pkgrel=6
+pkgver=1.2.2
+pkgrel=2
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64')
 url="http://www.xine-project.org"
@ -32,12 +32,16 @@ optdepends=('imagemagick: for using the imagemagick plugin' \
            'libvdpau: for using the VDPAU plugin'
            'libpulse: for using the pulse plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('ebb2648456504ff4ce08c34de258d3125832bb94')
+source=("http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations --disable-gnomevfs
+  ./configure --prefix=/usr \
+              --with-wavpack \
+              --enable-vdpau \
+              --disable-optimizations \
+              --disable-gnomevfs
  make
 }

--- a/xvidcore/PKGBUILD
+++ b/xvidcore/PKGBUILD
@ -3,7 +3,7 @@
 # Contributor: Sarah Hay <sarah@archlinux.org>

 pkgname=xvidcore
-pkgver=1.2.2
+pkgver=1.3.2
 pkgrel=1
 pkgdesc="XviD is an open source MPEG-4 video codec"
 arch=('i686' 'x86_64')
@ -11,18 +11,23 @@ license=('GPL')
 url="http://www.xvid.org/"
 depends=('glibc')
 makedepends=('nasm')
-source=(http://downloads.xvid.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6a3473a12c8a1fa7bdc2b5cb829fab58')
+source=("http://downloads.xvid.org/downloads/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('34389e980d4f849688f8b1e168f4e2f9')

 build() {
-  cd ${srcdir}/${pkgname}/build/generic
+  cd "${srcdir}/${pkgname}/build/generic"
  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}/build/generic"
+
+  make DESTDIR=${pkgdir} install

  #Fix dynamic libraries
-  cd ${pkgdir}/usr/lib
-  mylib=$(basename libxvidcore.so.*)
-  ln -sf ${mylib} libxvidcore.so.4
-  ln -sf ${mylib} libxvidcore.so
+  cd "${pkgdir}/usr/lib"
+  _mylib=$(basename libxvidcore.so.*)
+  ln -sf ${_mylib} libxvidcore.so.4
+  ln -sf ${_mylib} libxvidcore.so
 }