Thu Feb 21 00:03:56 PST 2013

13 files changed, 621 insertions, 168 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index f0f9b6095..2f1412f2c 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177768 2013-02-08 09:03:22Z andrea $
+# $Id: PKGBUILD 178338 2013-02-20 11:50:07Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -17,7 +17,7 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.6.0
+pkgver=2.6.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
@@ -28,7 +28,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('df7c2816d2bbe5e2fe87ea0be3fe668c')
+md5sums=('8ba98f3ccb3c5097eb059d86b51f6139')
 
 build() {
   mkdir build
@@ -132,6 +132,9 @@ package_calligra-plan() {
 
   cd "${srcdir}"/build/plan
   make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}"/build/3rdparty/kdgantt
+  make DESTDIR="${pkgdir}" install
 }
 
 package_calligra-stage() {
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 0c4c6bd8c..81e27a414 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173222 2012-12-14 01:35:42Z eric $
+# $Id: PKGBUILD 178314 2013-02-20 01:15:54Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.3.3
+pkgver=2.3.4
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
 options=('!libtool')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('f3cd76d5b4cc637d1a82398cdb9c1ac9518ce057')
+sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 656c71e5c..a76eec767 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177790 2013-02-08 22:44:16Z dan $
+# $Id: PKGBUILD 178348 2013-02-20 15:17:58Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.1.3
+pkgver=1.8.1.4
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -25,8 +25,6 @@ backup=('etc/conf.d/git-daemon.conf')
 install=git.install
 source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
         "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
-        git-daemon
-        git-daemon.conf
         git-daemon@.service
         git-daemon.socket)
 
@@ -100,18 +98,12 @@ package() {
   # remove perllocal.pod, .packlist, and empty directories.
   rm -rf "$pkgdir"/usr/lib/perl5
 
-  # git daemon script
-  install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon
-  install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
-
-  # systemd stuff
+  # git-daemon via systemd socket activation
   install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('05fb5ea3792a51cef2becc8d06ea9b87'
-         'b8e050c3c96b0b9fa28a7b7e9413af01'
-         '8e2648910fd5dd4f1c41d3c7fa9e9156'
-         '2e42bf97779a1c6411d89043334c9e78'
+md5sums=('60f32ef4a6b3fa2143b81a28704333ed'
+         '61d19a9d386c686ee06b493a9df6e61c'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/git/git-daemon b/extra/git/git-daemon
deleted file mode 100644
index 21ba73ed5..000000000
--- a/extra/git/git-daemon
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-daemon_bin="/usr/lib/git-core/git-daemon"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      # RUN
-      $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/git/git-daemon.conf b/extra/git/git-daemon.conf
deleted file mode 100644
index 3f9a12060..000000000
--- a/extra/git/git-daemon.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# path to git repositories served
-GIT_REPO="/srv/git/"
-# see `man git-daemon` for all available options
-# $GIT_REPO will be present twice in most configs
-GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 0ff14bf1d..d2f473817 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173840 2012-12-25 00:34:21Z foutrelis $
+# $Id: PKGBUILD 178365 2013-02-20 22:51:19Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
-pkgver=2.28.0
-pkgrel=12
+pkgver=2.30.0
+pkgrel=3
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
@@ -25,7 +25,7 @@ optdepends=('mono: sharp bindings'
             'qt: gvedit')
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
         'LICENSE')
-sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d'
+sha1sums=('596c1ddf60c5428c5c4700d10f3ea86534195311'
           'e78277e502c29abb74b9587a5dc951ec392554ea')
 
 options=('!libtool')
@@ -43,7 +43,10 @@ build() {
 	export PYTHON=python2
 	export LUA=lua5.1
 
-	./configure --prefix=/usr
+	./configure \
+		--prefix=/usr \
+		--with-cgraph=false # apps need porting to that new api first
+
 	make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky
 	make
 }
@@ -52,6 +55,6 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
-	# cf. http://www.graphviz.org/License.php
+	# http://www.graphviz.org/License.php
 	install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE
 }
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index e1da18b2d..348991cd9 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177976 2013-02-12 18:43:03Z andyrtr $
+# $Id: PKGBUILD 178359 2013-02-20 19:02:07Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -8,17 +8,17 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
 pkgbase=java7-openjdk
 _java_ver=7
 _updatever=u13
-_icedtea_ver=2.3.6
+_icedtea_ver=2.3.7
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=97a8b625f6e9
-_JAXP_CHANGESET=d7feafb8427b
-_JAXWS_CHANGESET=b900024eb4ba
-_JDK_CHANGESET=6bb01322bb5a
-_LANGTOOLS_CHANGESET=e0739a8783d1
-_OPENJDK_CHANGESET=dd8d1a8f222f
+_CORBA_CHANGESET=82e58144c3fb
+_JAXP_CHANGESET=1d46a56eb51c
+_JAXWS_CHANGESET=b9590aa972b9
+_JDK_CHANGESET=6a3417030605
+_LANGTOOLS_CHANGESET=b5006c3285c6
+_OPENJDK_CHANGESET=506161df1c48
 
-_HOTSPOT_CHANGESET=bc0de5a0ece2 # see "${srcdir}/icedtea7"/hotspot.map
+_HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('f55f2f2e5cdfa8b0429eaa56b4ecba7d63c701e867dbb636883c03cd8e64f4f9'
-            'a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092'
-            '511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d'
-            '81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941'
-            '276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2'
-            'a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2'
-            '85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb'
-            '4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068'
+sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940'
+            '704bdd40bc328183384272ee282310d8fc3216f3051e504141e7660fe50185a0'
+            'c438607d04e04439ca7df3d911f3cf46ac64066a5b21da98bea8070f98abdafe'
+            'fca2c95b3e60533a937e4f8d497a2934382d9f1f95cde874d926f3b4841407ce'
+            'c6ca4f98b35acdb24a81721de0bee2686bb83917bd84b108775e586c5ae81136'
+            '2a8afd9ecb53e255e436885e6fe3e9882e8657c70482a90ef39aa33e024e79b0'
+            '44d8bc14b213b7c218465a8859bd551feb6805857077ca6aa68aaa4c1b10b676'
+            '203acf2f9737032fe4bb1096e2f81417fa8a92a7016d8220b54a70efd579711a'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
@@ -135,7 +135,6 @@ package_jre7-openjdk-headless() {
               'fontconfig: needed for Java Mauve support - libmawt.so')
   provides=('java-runtime-headless=7')
   conflicts=('openjdk6')
-  #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
   backup=(etc/profile.d/jre.sh
           etc/profile.d/jre.csh
           etc/java-7-openjdk/calendars.properties
@@ -289,7 +288,7 @@ package_jdk7-openjdk() {
   depends=('jre7-openjdk')
   provides=('java-environment=7')
   conflicts=('java-environment')
-  #  replaces=('openjdk6')
+  replaces=('openjdk6')
   backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
 
   cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
@@ -337,7 +336,8 @@ package_jdk7-openjdk() {
 
 package_openjdk7-src() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
+  replaces=('openjdk6-src')
+  
   install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
              ${pkgdir}/${_jvmdir}/src.zip
 }
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 1b9ec3fab..2b6224c7f 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178136 2013-02-16 22:48:54Z ioni $
+# $Id: PKGBUILD 178318 2013-02-20 05:19:12Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=2.5beta1
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to use"
 arch=('i686' 'x86_64')
@@ -19,9 +19,11 @@ optdepends=('speex: for using the speex plugin'
             'faad2: for using the aac plugin' 
 	    'libmodplug: for using the modplug plugin')
 options=('!libtool')
-source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig})
+source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig} \
+        moc-ffmpeg.patch)
 sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
-          '29c232c37e1f3737c3b670372732446e9c0786a8')
+          '29c232c37e1f3737c3b670372732446e9c0786a8'
+          'f3b8b327dd27d50422b1ad8c9ef89a7366529307')
 
 # source PKGBUILD && mksource
 mksource() {
@@ -41,6 +43,7 @@ mksource() {
 
 build() {
   cd "${srcdir}/${pkgname}-2.5.0-beta1"
+  patch -p0 -i "${srcdir}/moc-ffmpeg.patch"
   ./configure --prefix=/usr --without-rcc \
     --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
     --with-musepack --with-vorbis --with-flac --with-wavpack \
diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch
new file mode 100644
index 000000000..e268e5427
--- /dev/null
+++ b/extra/moc/moc-ffmpeg.patch
@@ -0,0 +1,557 @@
+Index: menu.c
+===================================================================
+--- menu.c	(revision 2516)
++++ menu.c	(working copy)
+@@ -90,9 +90,14 @@
+ 	getyx (menu->win, y, x);
+ 	if (title_width <= title_space || mi->align == MENU_ALIGN_LEFT)
+ 		xwaddnstr (menu->win, mi->title, title_space);
+-	else
+-		xwaddstr (menu->win, mi->title + title_width - title_space);
++	else {
++		char *ptr;
+ 
++		ptr = xstrtail (mi->title, title_space);
++		xwaddstr (menu->win, ptr);
++		free (ptr);
++	}
++
+ 	/* Fill the remainder of the title field with spaces. */
+ 	if (mi == menu->selected) {
+ 		getyx (menu->win, y, ix);
+Index: utf8.c
+===================================================================
+--- utf8.c	(revision 2516)
++++ utf8.c	(working copy)
+@@ -199,47 +199,50 @@
+ 
+ int xwaddnstr (WINDOW *win, const char *str, const int n)
+ {
+-	int res;
++	int res, width, inv_char;
++	wchar_t *ucs;
++	char *mstr, *lstr;
++	size_t size, num_chars;
+ 
+ 	assert (n > 0);
+ 	assert (str != NULL);
+ 
+-	if (using_utf8) {
++	mstr = iconv_str (iconv_desc, str);
+ 
+-		/* This nasty hack is because we need to count n in chars, but
+-		 * [w]addnstr() takes arguments in bytes (in UTF-8 a char can be
+-		 * longer than 1 byte).  There are also problems with [w]addnwstr()
+-		 * (screen garbled).  I have no better idea. */
++	size = xmbstowcs (NULL, mstr, -1, NULL) + 1;
++	ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
++	xmbstowcs (ucs, mstr, size, &inv_char);
++	width = wcswidth (ucs, WIDTH_MAX);
+ 
+-		wchar_t *ucs;
+-		size_t size;
+-		size_t utf_num_chars;
+-		int inv_char;
+-
+-		size = xmbstowcs (NULL, str, -1, NULL) + 1;
+-		ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
+-		xmbstowcs (ucs, str, size, &inv_char);
+-		if ((size_t)n < size - 1)
+-			ucs[n] = L'\0';
+-		utf_num_chars = wcstombs (NULL, ucs, 0);
+-		if (inv_char) {
+-			char *utf8 = (char *)xmalloc (utf_num_chars + 1);
+-
+-			wcstombs (utf8, ucs, utf_num_chars + 1);
+-			res = waddstr (win, utf8);
+-			free (utf8);
++	if (width == -1) {
++		size_t clidx;
++		for (clidx = 0; clidx < size - 1; clidx++) {
++			if (wcwidth (ucs[clidx]) == -1)
++				ucs[clidx] = L'?';
+ 		}
+-		else
+-			res = waddnstr (win, str, utf_num_chars);
+-		free (ucs);
++		width = wcswidth (ucs, WIDTH_MAX);
++		inv_char = 1;
+ 	}
+-	else {
+-		char *lstr = iconv_str (iconv_desc, str);
+ 
+-		res = waddnstr (win, lstr, n);
+-		free (lstr);
++	if (width > n) {
++		while (width > n)
++			width -= wcwidth (ucs[--size]);
++		ucs[size] = L'\0';
+ 	}
+ 
++	num_chars = wcstombs (NULL, ucs, 0);
++	lstr = (char *)xmalloc (num_chars + 1);
++
++	if (inv_char)
++		wcstombs (lstr, ucs, num_chars + 1);
++	else
++		snprintf (lstr, num_chars + 1, "%s", mstr);
++
++	res = waddstr (win, lstr);
++
++	free (ucs);
++	free (lstr);
++	free (mstr);
+ 	return res;
+ }
+ 
+Index: decoder_plugins/mp3/mp3.c
+===================================================================
+--- decoder_plugins/mp3/mp3.c	(revision 2516)
++++ decoder_plugins/mp3/mp3.c	(working copy)
+@@ -696,17 +696,19 @@
+ {
+ 	char *ext;
+ 
++	strcpy (buf, "MPx");
++
+ 	ext = ext_pos (file);
+-	if (!strcasecmp (ext, "mp3"))
+-		strcpy (buf, "MP3");
+-	else if (!strcasecmp (ext, "mp2"))
+-		strcpy (buf, "MP2");
+-	else if (!strcasecmp (ext, "mp1"))
+-		strcpy (buf, "MP1");
+-	else if (!strcasecmp (ext, "mpga"))
+-		strcpy (buf, "MPG");
+-	else
+-		strcpy (buf, "MPx");
++	if (ext) {
++		if (!strcasecmp (ext, "mp3"))
++			strcpy (buf, "MP3");
++		else if (!strcasecmp (ext, "mp2"))
++			strcpy (buf, "MP2");
++		else if (!strcasecmp (ext, "mp1"))
++			strcpy (buf, "MP1");
++		else if (!strcasecmp (ext, "mpga"))
++			strcpy (buf, "MPG");
++	}
+ }
+ 
+ static int mp3_our_format_ext (const char *ext)
+Index: decoder_plugins/ffmpeg/ffmpeg.m4
+===================================================================
+--- decoder_plugins/ffmpeg/ffmpeg.m4	(revision 2516)
++++ decoder_plugins/ffmpeg/ffmpeg.m4	(working copy)
+@@ -88,6 +88,25 @@
+ 		                 [#include <libavcodec/avcodec.h>])
+ 		AC_CHECK_DECLS([AV_CODEC_ID_OPUS], , ,
+ 		                 [#include <libavcodec/avcodec.h>])
++		AC_SEARCH_LIBS(avcodec_free_frame, avcodec,
++			[AC_DEFINE([HAVE_AVCODEC_FREE_FRAME], 1,
++				[Define to 1 if you have the `avcodec_free_frame' function.])])
++		AC_CHECK_DECLS([CODEC_ID_PCM_S8_PLANAR], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_CHECK_DECLS([AV_SAMPLE_FMT_U8P], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_CHECK_DECLS([AV_SAMPLE_FMT_S16P], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_CHECK_DECLS([AV_SAMPLE_FMT_S32P], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_CHECK_DECLS([AV_SAMPLE_FMT_FLTP], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_SEARCH_LIBS(av_get_sample_fmt_name, avutil,
++			[AC_DEFINE([HAVE_AV_GET_SAMPLE_FMT_NAME], 1,
++				[Define to 1 if you have the `av_get_sample_fmt_name' function.])])
++		AC_SEARCH_LIBS(av_lockmgr_register, avcodec,
++			[AC_DEFINE([HAVE_LOCKMGR_REGISTER], 1,
++				[Define to 1 if you have the `av_lockmgr_register' function.])])
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 		CFLAGS="$save_CFLAGS"
+ 		LIBS="$save_LIBS"
+Index: decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2516)
++++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
+@@ -99,6 +99,7 @@
+ 	bool okay; /* was this stream successfully opened? */
+ 	struct decoder_error error;
+ 	long fmt;
++	int sample_width;
+ 	int bitrate;            /* in bits per second */
+ 	int avg_bitrate;        /* in bits per second */
+ #if SEEK_IN_DECODER
+@@ -106,6 +107,7 @@
+ 	int seek_sec;           /* second to which to seek */
+ #endif
+ 	bool seek_broken;       /* FFmpeg seeking is broken */
++	bool timing_broken;     /* FFmpeg trashes duration and bit_rate */
+ #if SEEK_IN_DECODER && defined(DEBUG)
+ 	pthread_t thread_id;
+ #endif
+@@ -277,8 +279,72 @@
+ 	}
+ }
+ 
++/* Handle FFmpeg's locking requirements. */
++#ifdef HAVE_LOCKMGR_REGISTER
++static int locking_cb (void **mutex, enum AVLockOp op)
++{
++	int result;
++
++	switch (op) {
++	case AV_LOCK_CREATE:
++		*mutex = xmalloc (sizeof (pthread_mutex_t));
++		result = pthread_mutex_init (*mutex, NULL);
++		break;
++	case AV_LOCK_OBTAIN:
++		result = pthread_mutex_lock (*mutex);
++		break;
++	case AV_LOCK_RELEASE:
++		result = pthread_mutex_unlock (*mutex);
++		break;
++	case AV_LOCK_DESTROY:
++		result = pthread_mutex_destroy (*mutex);
++		free (*mutex);
++		*mutex = NULL;
++		break;
++	}
++
++	return result;
++}
++#endif
++
++/* Here we attempt to determine if FFmpeg/LibAV has trashed the 'duration'
++ * and 'bit_rate' fields in AVFormatContext for large files.  Determining
++ * whether or not they are likely to be valid is imprecise and will vary
++ * depending (at least) on:
++ *
++ * - The file's size,
++ * - The file's codec,
++ * - The number and size of tags,
++ * - The version of FFmpeg/LibAV, and
++ * - Whether it's FFmpeg or LibAV.
++ *
++ * This function represents a best guess.
++*/
++static bool is_timing_broken (AVFormatContext *ic)
++{
++	int64_t file_size;
++
++	if (ic->duration < 0 || ic->bit_rate < 0)
++		return true;
++
++#ifdef HAVE_AVIO_SIZE
++	file_size = avio_size (ic->pb);
++#else
++	file_size = ic->file_size;
++#endif
++
++	if (file_size < UINT32_MAX)
++		return false;
++
++	return true;
++}
++
+ static void ffmpeg_init ()
+ {
++#ifdef HAVE_LOCKMGR_REGISTER
++	int rc;
++#endif
++
+ #ifdef DEBUG
+ 	av_log_set_level (AV_LOG_INFO);
+ #else
+@@ -291,10 +357,20 @@
+ 	supported_extns = lists_strs_new (16);
+ 	load_audio_extns (supported_extns);
+ 	load_video_extns (supported_extns);
++
++#ifdef HAVE_LOCKMGR_REGISTER
++	rc = av_lockmgr_register (locking_cb);
++	if (rc < 0)
++		fatal ("Lock manager initialisation failed");
++#endif
+ }
+ 
+ static void ffmpeg_destroy ()
+ {
++#ifdef HAVE_LOCKMGR_REGISTER
++	av_lockmgr_register (NULL);
++#endif
++
+ 	av_log_set_level (AV_LOG_QUIET);
+ 	ffmpeg_log_repeats (NULL);
+ 
+@@ -341,9 +417,9 @@
+ 	}
+ #endif
+ 
+-	if (tags_sel & TAGS_TIME) {
++	if (!is_timing_broken (ic) && tags_sel & TAGS_TIME) {
+ 		info->time = -1;
+-		if (ic->duration >= 0)
++		if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
+ 			info->time = ic->duration / AV_TIME_BASE;
+ 	}
+ 
+@@ -426,12 +502,6 @@
+ 
+ #endif
+ 
+-	if (tags_sel & TAGS_TIME) {
+-		info->time = -1;
+-		if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
+-			info->time = ic->duration / AV_TIME_BASE;
+-	}
+-
+ end:
+ #ifdef HAVE_AVFORMAT_CLOSE_INPUT
+ 	avformat_close_input (&ic);
+@@ -450,12 +520,16 @@
+ 		if (!strcmp (data->ic->iformat->name, "wav")) {
+ 			switch (data->enc->codec_id) {
+ 			case CODEC_ID_PCM_S8:
++#if HAVE_DECL_CODEC_ID_PCM_S8_PLANAR
++			case CODEC_ID_PCM_S8_PLANAR:
++#endif
+ 				result = SFMT_S8;
+ 				break;
+ 			case CODEC_ID_PCM_U8:
+ 				result = SFMT_U8;
+ 				break;
+ 			case CODEC_ID_PCM_S16LE:
++			case CODEC_ID_PCM_S16LE_PLANAR:
+ 			case CODEC_ID_PCM_S16BE:
+ 				result = SFMT_S16;
+ 				break;
+@@ -490,15 +564,27 @@
+ 
+ 	switch (data->enc->sample_fmt) {
+ 	case AV_SAMPLE_FMT_U8:
++#if HAVE_DECL_AV_SAMPLE_FMT_U8P
++	case AV_SAMPLE_FMT_U8P:
++#endif
+ 		result = SFMT_U8;
+ 		break;
+ 	case AV_SAMPLE_FMT_S16:
++#if HAVE_DECL_AV_SAMPLE_FMT_S16P
++	case AV_SAMPLE_FMT_S16P:
++#endif
+ 		result = SFMT_S16;
+ 		break;
+ 	case AV_SAMPLE_FMT_S32:
++#if HAVE_DECL_AV_SAMPLE_FMT_S32P
++	case AV_SAMPLE_FMT_S32P:
++#endif
+ 		result = SFMT_S32;
+ 		break;
+ 	case AV_SAMPLE_FMT_FLT:
++#if HAVE_DECL_AV_SAMPLE_FMT_FLTP
++	case AV_SAMPLE_FMT_FLTP:
++#endif
+ 		result = SFMT_FLOAT;
+ 		break;
+ 	default:
+@@ -597,6 +683,7 @@
+ 	data->stream = NULL;
+ 	data->enc = NULL;
+ 	data->codec = NULL;
++	data->sample_width = 0;
+ 	data->bitrate = 0;
+ 	data->avg_bitrate = 0;
+ 
+@@ -624,6 +711,7 @@
+ 	data->seek_sec = 0;
+ #endif
+ 	data->seek_broken = false;
++	data->timing_broken = false;
+ 
+ 	decoder_error_init (&data->error);
+ 
+@@ -702,27 +790,38 @@
+ 	if (data->fmt == 0)
+ 		data->fmt = fmt_from_sample_fmt (data);
+ 	if (data->fmt == 0) {
++#ifdef HAVE_AV_GET_SAMPLE_FMT_NAME
+ 		decoder_error (&data->error, ERROR_FATAL, 0,
++		               "Cannot get sample size from unknown sample format: %s",
++		               av_get_sample_fmt_name (data->enc->sample_fmt));
++#else
++		decoder_error (&data->error, ERROR_FATAL, 0,
+ 		               "Unsupported sample size!");
++#endif
++		avcodec_close (data->enc);
+ 		goto end;
+ 	}
++	data->sample_width = sfmt_Bps (data->fmt);
+ 	if (data->codec->capabilities & CODEC_CAP_DELAY)
+ 		data->delay = true;
+ 	data->seek_broken = is_seek_broken (data);
++	data->timing_broken = is_timing_broken (data->ic);
+ 
+ 	data->okay = true;
+ 
+-	if (data->ic->duration >= AV_TIME_BASE) {
++	if (!data->timing_broken && data->ic->duration >= AV_TIME_BASE) {
+ #ifdef HAVE_AVIO_SIZE
+ 		data->avg_bitrate = (int) (avio_size (data->ic->pb) /
+-		                          (data->ic->duration / AV_TIME_BASE) * 8);
++		                           (data->ic->duration / AV_TIME_BASE) * 8);
+ #else
+ 		data->avg_bitrate = (int) (data->ic->file_size /
+-		                          (data->ic->duration / AV_TIME_BASE) * 8);
++		                           (data->ic->duration / AV_TIME_BASE) * 8);
+ #endif
+ 	}
+-	data->bitrate = data->ic->bit_rate;
+ 
++	if (!data->timing_broken && data->ic->bit_rate > 0)
++		data->bitrate = data->ic->bit_rate;
++
+ 	return data;
+ 
+ end:
+@@ -943,12 +1042,14 @@
+                           char *buf, int buf_len)
+ {
+ 	int filled = 0;
++	AVFrame *frame;
+ 
++	frame = avcodec_alloc_frame ();
++
+ 	do {
+ 		int len, got_frame, is_planar, plane_size, data_size, copied;
+-		AVFrame frame;
+ 
+-		len = avcodec_decode_audio4 (data->enc, &frame, &got_frame, pkt);
++		len = avcodec_decode_audio4 (data->enc, frame, &got_frame, pkt);
+ 
+ 		if (len < 0)  {
+ 			/* skip frame */
+@@ -968,33 +1069,46 @@
+ 
+ 		is_planar = av_sample_fmt_is_planar (data->enc->sample_fmt);
+ 		data_size = av_samples_get_buffer_size (&plane_size,
+-		                                        data->enc->channels,                                                   frame.nb_samples,
++		                                        data->enc->channels,
++		                                        frame->nb_samples,
+ 		                                        data->enc->sample_fmt, 1);
+ 
+ 		if (data_size == 0)
+ 			continue;
+ 
+-		copied = copy_or_buffer (data, (char *)frame.extended_data[0],
+-		                         plane_size, buf, buf_len);
+-		buf += copied;
+-		filled += copied;
+-		buf_len -= copied;
++		if (is_planar && data->enc->channels > 1) {
++			int offset, ch;
+ 
+-        if (is_planar && data->enc->channels > 1) {
+-			int ch;
++			for (offset = 0; offset < plane_size; offset += data->sample_width) {
++				for (ch = 0; ch < data->enc->channels; ch += 1) {
++					copied = copy_or_buffer (data,
++					                         (char *)frame->extended_data[ch]
++					                                               + offset,
++				                             data->sample_width, buf, buf_len);
++					buf += copied;
++					filled += copied;
++					buf_len -= copied;
++				}
++			}
++		}
++		else {
++			copied = copy_or_buffer (data, (char *)frame->extended_data[0],
++		                             plane_size, buf, buf_len);
++			buf += copied;
++			filled += copied;
++			buf_len -= copied;
++		}
+ 
+-            for (ch = 1; ch < data->enc->channels; ch += 1) {
+-				copied = copy_or_buffer (data, (char *)frame.extended_data[ch],
+-				                         plane_size, buf, buf_len);
+-				buf += copied;
+-				filled += copied;
+-				buf_len -= copied;
+-            }
+-        }
+-
+ 		debug ("Copying %dB (%dB filled)", data_size, filled);
+ 	} while (pkt->size > 0);
+ 
++	avcodec_get_frame_defaults (frame);
++#ifdef HAVE_AVCODEC_FREE_FRAME
++	avcodec_free_frame (&frame);
++#else
++	av_freep (&frame);
++#endif
++
+ 	return filled;
+ }
+ #endif
+@@ -1122,9 +1236,10 @@
+ 		free_packet (pkt);
+ 	} while (!bytes_produced && !data->eos);
+ 
+-	data->bitrate = compute_bitrate (sound_params, bytes_used,
+-	                                 bytes_produced + data->remain_buf_len,
+-	                                 data->bitrate);
++	if (!data->timing_broken)
++		data->bitrate = compute_bitrate (sound_params, bytes_used,
++		                                 bytes_produced + data->remain_buf_len,
++		                                 data->bitrate);
+ 
+ 	return bytes_produced;
+ }
+@@ -1185,20 +1300,23 @@
+ {
+ 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
+ 
+-	return data->bitrate / 1000;
++	return data->timing_broken ? -1 : data->bitrate / 1000;
+ }
+ 
+ static int ffmpeg_get_avg_bitrate (void *prv_data)
+ {
+ 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
+ 
+-	return data->avg_bitrate / 1000;
++	return data->timing_broken ? -1 : data->avg_bitrate / 1000;
+ }
+ 
+ static int ffmpeg_get_duration (void *prv_data)
+ {
+ 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
+ 
++	if (data->timing_broken)
++		return -1;
++
+ 	if (!data->stream)
+ 		return -1;
+ 
+
+Index: configure.in
+===================================================================
+--- configure.in	(revision 2518)
++++ configure.in	(working copy)
+@@ -293,7 +293,6 @@
+ 
+ dnl optional functions
+ AC_CHECK_FUNCS([strcasestr strerror_r syslog])
+-AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
+ AX_CHECK_UNAME_SYSCALL
+ 
+ dnl MIME magic
+@@ -322,6 +321,7 @@
+ CC="$PTHREAD_CC"
+ CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+ EXTRA_LIBS="$EXTRA_LIBS $PTHREAD_LIBS"
++AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
+ 
+ dnl __FUNCTION__
+ AC_TRY_COMPILE(,[printf(__FUNCTION__);], [AC_DEFINE([HAVE__FUNCTION__], 1,
+
+
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 67fb29697..e4d5eec23 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177967 2013-02-12 16:59:18Z andyrtr $
+# $Id: PKGBUILD 178353 2013-02-20 17:01:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
 _javaver=6
-_icedteaver=1.12.2
+_icedteaver=1.12.3
 _openjdk_version=b27
 _openjdk_date=26_oct_2012
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -33,8 +33,8 @@ noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
 	jaxp144_04.zip
 	jdk6-jaxws2_1_6-2011_06_13.zip
 	jdk6-jaf-b20.zip)
-sha256sums=('897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794'
-            '5f67865307b7ff905304da4dca1fa0511c884480da0ddff269758bada392c8f4'
+sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c'
+            'a6cbeccc4f25f72a940b9ac0c3e05ece50edc16c1c13f7a1a82ee895563930e3'
             '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
             '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
             '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 4a2c1948a..ff74c56c5 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176859 2013-02-01 18:49:56Z eric $
+# $Id: PKGBUILD 178310 2013-02-19 23:15:41Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.3.2
+pkgver=5.3.3
 pkgrel=1
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ options=('!libtool' '!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
         drracket.desktop)
-sha1sums=('bd6b1a31d3a94bc8253709f7ca1c81bcb2e23495'
+sha1sums=('96995fe20b332c4644dd51668851193b16976071'
           'a20808f6b250225704856f82a544681a962a299d')
 
 build() {
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 17ecbb6ca..1c8017608 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,30 +1,26 @@
-# $Id: PKGBUILD 176031 2013-01-26 16:24:37Z foutrelis $
+# $Id: PKGBUILD 178335 2013-02-20 10:00:55Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.76
-pkgrel=2
+pkgver=2.77
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmissiond transmissiond.conf transmission.systemd
-        transmission.tmpfiles
-        transmission-2.76-fix-regression.patch)
-md5sums=('9abbffe29ce9b5ee68a116d293c51111'
+        transmission.tmpfiles)
+md5sums=('60c0e77a1852656215f7102a437b2a3d'
          '7d6186ee2a852ae3d44980f05063e194'
          'db72b02fee139e8ab416324e6c044d76'
          '5c289c8901221a94be74665368ab5c2c'
-         '23f2320361ad54373c3a4551ef634fe8'
-         '894b1332cf651c15d593aed0b51dbdd6')
+         '23f2320361ad54373c3a4551ef634fe8')
+
 build() {
   cd $pkgbase-$pkgver
 
-  # https://trac.transmissionbt.com/ticket/5215
-  patch -Np2 -i "$srcdir/transmission-2.76-fix-regression.patch"
-
   ./configure --prefix=/usr
   make
   pushd qt
diff --git a/extra/transmission/transmission-2.76-fix-regression.patch b/extra/transmission/transmission-2.76-fix-regression.patch
deleted file mode 100644
index b3fb734ba..000000000
--- a/extra/transmission/transmission-2.76-fix-regression.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: branches/2.7x/cli/cli.c
-===================================================================
---- branches/2.7x/cli/cli.c	(revision 13784)
-+++ branches/2.7x/cli/cli.c	(revision 13794)
-@@ -268,14 +268,12 @@
-     {
-       if (!tr_fileExists (str, NULL))
--        tr_mkdirp (str, 0700);
--
--      if (tr_fileExists (str, NULL))
-         {
--          tr_bencDictAddStr (&settings, TR_PREFS_KEY_DOWNLOAD_DIR, str);
--        }
--      else
--        {
--          fprintf (stderr, "Unable to create download directory \"%s\"!\n", str);
--          return EXIT_FAILURE;
-+          tr_mkdirp (str, 0700);
-+
-+          if (!tr_fileExists (str, NULL))
-+            {
-+              fprintf (stderr, "Unable to create download directory \"%s\"!\n", str);
-+              return EXIT_FAILURE;
-+            }
-         }
-     }