Merge branch 'master' of ssh://gparabola/abslibre-mips64el

Conflicts: core/glibc/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2012-01-29 21:01:44 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2012-01-29 21:01:44 -0300
commit: 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (patch)
tree: 0dfcf0ebb742c6e359f0502d9207b3a600aa3462 /extra
parent: 7a501772e3cb37f438506df7c22a34ed9bba9d88 (diff)
parent: db0dace84403023c8d89b8801f12a5ab278dc440 (diff)
49 files changed, 471 insertions, 213 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index ad192cfb9..f2180a340 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144041 2011-12-02 20:54:07Z ibiru $
+# $Id: PKGBUILD 147227 2012-01-24 20:32:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org/akonadi'
@@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('07e2aa2e6953ac518f9306911747e264')
+md5sums=('804309dca70ede35b4a654ab764e9079')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD
index 7fe44ddc0..720073fa1 100644
--- a/extra/alsa-lib/PKGBUILD
+++ b/extra/alsa-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 110694 2011-02-21 17:46:05Z tpowa $
+# $Id: PKGBUILD 147696 2012-01-27 07:25:15Z tpowa $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-lib
-pkgver=1.0.24.1
-pkgrel=1.1
+pkgver=1.0.25
+pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsa-project.org"
@@ -24,4 +24,4 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226')
+md5sums=('06fe5819020c6684b991dcffc5471304')
diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD
index 213721546..27694c4c0 100644
--- a/extra/alsa-oss/PKGBUILD
+++ b/extra/alsa-oss/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136976 2011-09-04 11:56:05Z pierre $
+# $Id: PKGBUILD 147698 2012-01-27 07:26:45Z tpowa $
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-oss
-pkgver=1.0.17
-pkgrel=2
+pkgver=1.0.25
+pkgrel=1
 pkgdesc="OSS compatibility library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -11,7 +11,6 @@ url="http://www.alsa-project.org"
 options=('!libtool')
 depends=('alsa-lib')
 source=("ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2")
-md5sums=('1b1850c2fc91476a73d50f537cbd402f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -23,3 +22,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
+md5sums=('922ea177db15c72f1b5037181c73f934')
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index f1470b1d9..521db1b3f 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142610 2011-11-12 17:15:00Z ibiru $
+# $Id: PKGBUILD 147731 2012-01-27 15:55:17Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel Ehlers <danielehlers@mindeye.net>
 
 pkgname=alsa-plugins
-pkgver=1.0.24
-pkgrel=3
+pkgver=1.0.25
+pkgrel=1
 pkgdesc="Extra alsa plugins"
 arch=(i686 x86_64 'mips64el')
 url="http://www.alsa-project.org"
@@ -19,7 +19,7 @@ optdepends=('libpulse: PulseAudio plugin'
             'speex: libspeexdsp resampling plugin')
 options=('!libtool')
 source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2")
-md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16')
+md5sums=('038c023eaa51171f018fbf7141255185')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index b19663a19..213182d62 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 135667 2011-08-17 07:46:33Z tpowa $
+# $Id: PKGBUILD 147702 2012-01-27 07:30:51Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
-pkgver=1.0.24.2
-pkgrel=3
+pkgver=1.0.25
+pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsa-project.org"
 #can not use >=$pkgver due to use of letters in alsa-lib update versioning
-depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc')
+depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate')
 makedepends=('xmlto' 'docbook-xsl')
 license=('GPL')
 source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
@@ -35,7 +35,7 @@ package() {
   # dir where to save ALSA state
   install -d ${pkgdir}/var/lib/alsa
 }
-md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2'
+md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9'
          '2ba1a1cbf653bf1a69f8a720fd6549da'
          '7521bf20f5b3501a510ec4462ae4a934'
          '4c8ae9f976c7df5e271a4cb91ccc7767'
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index ef23d929e..a411aad44 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 146058 2012-01-04 19:41:50Z bisson $
+# $Id: PKGBUILD 147042 2012-01-21 01:22:07Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.1.2
+pkgver=3.2
 pkgrel=1
-pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
+pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
 optdepends=('unzip-libre: zipped skins support')
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ebaaefcfa291a1f97d2dae1b2d7f0cacb545dc7f')
+sha1sums=('3ebc4dcdcf5da960ba400078023e167e02105e84')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 4c901a565..d8d7050b2 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 146600 2012-01-13 22:26:31Z andrea $
+# $Id: PKGBUILD 147730 2012-01-27 15:54:11Z heftig $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
 pkgver=4.98
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,15 +26,17 @@ options=('!libtool' 'emptydirs')
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-        'bluetooth.conf.d'
-        'rc.bluetooth')
+        'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch')
 md5sums=('4aca8a0929250212e9a75fb60dd75b05'
          '7412982b440f29fa7f76a41a87fef985'
-         '8f9498707f809506928b2e480d3b6789')
+         '8f9498707f809506928b2e480d3b6789'
+         'd6a34317e56b7c2bd990791d89d6c3cb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/fix-a2dp.patch"
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
diff --git a/extra/bluez/fix-a2dp.patch b/extra/bluez/fix-a2dp.patch
new file mode 100644
index 000000000..e4bb1372a
--- /dev/null
+++ b/extra/bluez/fix-a2dp.patch
@@ -0,0 +1,68 @@
+From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Thu, 26 Jan 2012 23:39:02 +0200
+Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket
+ is disabled
+
+Local endpoints can only be used when UNIX socket API is available.
+---
+ audio/a2dp.c |   15 +++++++--------
+ 1 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/audio/a2dp.c b/audio/a2dp.c
+index 5ca105c..bbb91ce 100644
+--- a/audio/a2dp.c
++++ b/audio/a2dp.c
+@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
+ 
+ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
+ {
+-	int sbc_srcs = 1, sbc_sinks = 1;
++	int sbc_srcs = 0, sbc_sinks = 0;
+ 	int mpeg12_srcs = 0, mpeg12_sinks = 0;
+-	gboolean source = TRUE, sink = FALSE, socket = TRUE;
++	gboolean source = TRUE, sink = FALSE, socket = FALSE;
+ 	gboolean delay_reporting = FALSE;
+ 	char *str;
+ 	GError *err = NULL;
+@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
+ 			source = TRUE;
+ 		if (strstr(str, "Source"))
+ 			sink = TRUE;
++		if (strstr(str, "Socket"))
++			socket = TRUE;
+ 		g_free(str);
+ 	}
+ 
+@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
+ 	}
+ 
+ 	/* Don't register any local sep if Socket is disabled */
+-	if (socket == FALSE) {
+-		sbc_srcs = 0;
+-		sbc_sinks = 0;
+-		mpeg12_srcs = 0;
+-		mpeg12_sinks = 0;
++	if (socket == FALSE)
+ 		goto proceed;
+-	}
+ 
+ 	str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
+ 	if (err) {
+ 		DBG("audio.conf: %s", err->message);
+ 		g_clear_error(&err);
++		sbc_srcs = 1;
+ 	} else {
+ 		sbc_srcs = atoi(str);
+ 		g_free(str);
+@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
+ 	if (err) {
+ 		DBG("audio.conf: %s", err->message);
+ 		g_clear_error(&err);
++		sbc_sinks = 1;
+ 	} else {
+ 		sbc_sinks = atoi(str);
+ 		g_free(str);
+-- 
+1.7.6.5
+
diff --git a/extra/clutter-gtk2/PKGBUILD b/extra/clutter-gtk2/PKGBUILD
index 3ba9ffa2d..9ed47fd9e 100644
--- a/extra/clutter-gtk2/PKGBUILD
+++ b/extra/clutter-gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 113313 2011-03-08 12:29:48Z heftig $
+# $Id: PKGBUILD 147074 2012-01-21 15:12:46Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gtk2
 _pkgbasename=clutter-gtk
 pkgver=0.10.8
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
@@ -13,13 +13,16 @@ license=('LGPL')
 depends=('clutter' 'gtk2')
 makedepends=('gobject-introspection' 'gtk-doc')
 source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2
-        gir.patch)
+        gir.patch
+        libm.patch)
 sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
-            'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66')
+            'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66'
+            '7d5532702eb3c18fff2144f8d501f77d3d9c9c23e6904374f05634fea2d7a8ef')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
   patch -Np1 -i "$srcdir/gir.patch"
+  patch -Np1 -i "$srcdir/libm.patch"
   autoreconf -i
   ./configure --prefix=/usr
   make
diff --git a/extra/clutter-gtk2/libm.patch b/extra/clutter-gtk2/libm.patch
new file mode 100644
index 000000000..17e47ef40
--- /dev/null
+++ b/extra/clutter-gtk2/libm.patch
@@ -0,0 +1,39 @@
+diff -Nur clutter-gtk-0.10.8.orig/configure.ac clutter-gtk-0.10.8/configure.ac
+--- clutter-gtk-0.10.8.orig/configure.ac	2012-01-21 14:52:17.627228994 +0000
++++ clutter-gtk-0.10.8/configure.ac	2012-01-21 15:04:37.317308303 +0000
+@@ -57,6 +57,9 @@
+ LT_PREREQ([2.2.6])
+ LT_INIT([disable-static])
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ m4_define([clutter_req_version], [1.2.0])
+ m4_define([gtk_req_version], [2.19.5])
+ m4_define([flavour_default], [x11])
+diff -Nur clutter-gtk-0.10.8.orig/examples/Makefile.am clutter-gtk-0.10.8/examples/Makefile.am
+--- clutter-gtk-0.10.8.orig/examples/Makefile.am	2012-01-21 14:52:17.600561077 +0000
++++ clutter-gtk-0.10.8/examples/Makefile.am	2012-01-21 15:00:04.549770032 +0000
+@@ -22,18 +22,18 @@
+ 
+ gtk_clutter_test_SOURCES = gtk-clutter-test.c
+ gtk_clutter_test_DEPENDENCIES = $(common_deps)
+-gtk_clutter_test_LDADD = $(common_ldadd)
++gtk_clutter_test_LDADD = $(common_ldadd) $(LIBM)
+ 
+ gtk_clutter_events_SOURCES = gtk-clutter-events.c
+ gtk_clutter_events_DEPENDENCIES = $(common_deps)
+-gtk_clutter_events_LDADD = $(common_ldadd)
++gtk_clutter_events_LDADD = $(common_ldadd) $(LIBM)
+ 
+ gtk_clutter_multistage_SOURCES = gtk-clutter-multistage.c
+ gtk_clutter_multistage_DEPENDENCIES = $(common_deps)
+-gtk_clutter_multistage_LDADD = $(common_ldadd)
++gtk_clutter_multistage_LDADD = $(common_ldadd) $(LIBM)
+ 
+ gtk_clutter_viewport_SOURCES = gtk-clutter-viewport.c
+ gtk_clutter_viewport_DEPENDENCIES = $(common_deps)
+-gtk_clutter_viewport_LDADD = $(common_ldadd)
++gtk_clutter_viewport_LDADD = $(common_ldadd) $(LIBM)
+ 
+ EXTRA_DIST = redhand.png
diff --git a/extra/crypto++/GNUmakefile.parabola b/extra/crypto++/GNUmakefile.parabola
new file mode 100644
index 000000000..22a724961
--- /dev/null
+++ b/extra/crypto++/GNUmakefile.parabola
@@ -0,0 +1,94 @@
+# -*- makefile -*-
+
+CXXFLAGS += -DNDEBUG -fPIC
+# the following options reduce code size, but breaks link or makes link very slow on some systems
+CXXFLAGS += -ffunction-sections -fdata-sections
+LDFLAGS += -Wl,--gc-sections
+ARFLAGS = -cr	# ar needs the dash on OpenBSD
+RANLIB = ranlib
+CP = cp
+MKDIR = mkdir
+EGREP = egrep
+
+# Default prefix for make install
+PREFIX ?= /usr
+
+LDFLAGS += -pthread
+
+SRCS = $(wildcard *.cpp)
+ifeq ($(SRCS),)				# workaround wildcard function bug in GNU Make 3.77
+SRCS = $(shell echo *.cpp)
+endif
+
+OBJS = $(SRCS:.cpp=.o)
+# test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?)
+TESTOBJS = bench.o bench2.o test.o validat1.o validat2.o validat3.o adhoc.o datatest.o regtest.o fipsalgt.o dlltest.o
+LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS))
+
+DLLSRCS = algebra.cpp algparam.cpp asn.cpp basecode.cpp cbcmac.cpp channels.cpp cryptlib.cpp des.cpp dessp.cpp dh.cpp dll.cpp dsa.cpp ec2n.cpp eccrypto.cpp ecp.cpp eprecomp.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gf2n.cpp gfpcrypt.cpp hex.cpp hmac.cpp integer.cpp iterhash.cpp misc.cpp modes.cpp modexppc.cpp mqueue.cpp nbtheory.cpp oaep.cpp osrng.cpp pch.cpp pkcspad.cpp pubkey.cpp queue.cpp randpool.cpp rdtables.cpp rijndael.cpp rng.cpp rsa.cpp sha.cpp simple.cpp skipjack.cpp strciphr.cpp trdlocal.cpp
+DLLOBJS = $(DLLSRCS:.cpp=.export.o)
+LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
+TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
+DLLTESTOBJS = dlltest.dllonly.o
+
+all: cryptest.exe
+
+test: cryptest.exe
+	./cryptest.exe v
+
+clean:
+	$(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+
+install:
+	$(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin
+	$(CP) *.h $(PREFIX)/include/cryptopp
+	$(CP) *.a $(PREFIX)/lib
+	$(CP) *.so $(PREFIX)/lib
+	$(CP) *.exe $(PREFIX)/bin
+
+libcryptopp.a: $(LIBOBJS)
+	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+	$(RANLIB) $@
+
+libcryptopp.so: $(LIBOBJS)
+	$(CXX) -shared -o $@ $(LIBOBJS)
+
+cryptest.exe: libcryptopp.a $(TESTOBJS)
+	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
+
+nolib: $(OBJS)		# makes it faster to test changes
+	$(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
+
+dll: cryptest.import.exe dlltest.exe
+
+cryptopp.dll: $(DLLOBJS)
+	$(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a
+
+libcryptopp.import.a: $(LIBIMPORTOBJS)
+	$(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS)
+	$(RANLIB) $@
+
+cryptest.import.exe: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS)
+	$(CXX) -o $@ $(CXXFLAGS) $(TESTIMPORTOBJS) -L. -lcryptopp.dll -lcryptopp.import $(LDFLAGS) $(LDLIBS)
+
+dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
+	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
+
+adhoc.cpp: adhoc.cpp.proto
+ifeq ($(wildcard adhoc.cpp),)
+	cp adhoc.cpp.proto adhoc.cpp
+else
+	touch adhoc.cpp
+endif
+
+%.dllonly.o : %.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@
+
+%.import.o : %.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_IMPORTS -c $< -o $@
+
+%.export.o : %.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) -c $<
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index dac6e5f86..c18fe9cde 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -16,16 +16,17 @@ license=('custom')
 depends=('gcc-libs')
 makedepends=('unzip')
 source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
-        'libcrypto++.pc')
+        'libcrypto++.pc'
+        'GNUmakefile.parabola')
 md5sums=('96cbeba0907562b077e26bcffb483828'
-         '2337c6edbc552d9142cae8e0854715e7')
+         '2337c6edbc552d9142cae8e0854715e7'
+         'c95b2134a8c0a35b173ede32001870d2')
 
 build() {
   cd ${srcdir}
 
-  sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-  export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
-  make -f GNUmakefile  
+  cp "${srcdir}/GNUmakefile.parabola" GNUmakefile
+  make -f GNUmakefile
   make libcryptopp.so
 }
 
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index a9ffd7fae..94da7ae73 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146495 2012-01-11 22:55:38Z ibiru $
+# $Id: PKGBUILD 147716 2012-01-27 11:08:09Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20120111
+pkgver=20120127
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,9 +18,8 @@ else
     makedepends=('yasm' 'git' 'libvdpau')
 fi
 #git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz
-        revert-enabling-threads.patch
-        ffmpeg-loongson.patch)
+source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
+md5sums=('dc706cdb31801b4746f37459b0c38b7e')
 
 build() {
   cd "$srcdir/$pkgname"
@@ -33,8 +32,6 @@ build() {
       extraconf=""
   fi
 
-  patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch"
-
   ./configure \
     --prefix=/usr \
     --enable-libmp3lame \
diff --git a/extra/ffmpeg/revert-enabling-threads.patch b/extra/ffmpeg/revert-enabling-threads.patch
deleted file mode 100644
index dd50332ee..000000000
--- a/extra/ffmpeg/revert-enabling-threads.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Foptions.c;h=4ac92fd29e0a4e3bb6952b27240ac65b86671b27;hp=4ac9313f274f46eae85a144d6bb6fea30e67bea2;hb=e4e30256f87f177decf59b59e923d05ef64147df;hpb=c11b92b304334b1241ee79406dca6a03131fc921
-
-diff --git a/libavcodec/options.c b/libavcodec/options.c
-index 4ac9313..4ac92fd 100644
---- a/libavcodec/options.c
-+++ b/libavcodec/options.c
-@@ -370,7 +370,7 @@ static const AVOption options[]={
- {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"},
- #endif
- {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
--{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"},
-+{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"},
- {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
- {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
- {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD
index 92859e9f9..278a0ca3a 100644
--- a/extra/freeglut/PKGBUILD
+++ b/extra/freeglut/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 62079 2010-01-01 23:53:58Z eric $
+# $Id: PKGBUILD 147152 2012-01-23 14:30:00Z heftig $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=freeglut
-pkgver=2.6.0
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="Provides functionality for small OpenGL programs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,19 +14,18 @@ replaces=('glut')
 provides=('glut')
 conflicts=('glut')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \
-        2.6.0-GFX_radeon.patch)
-md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3')
-sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95')
+source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5db8651af306bc403fbfd36934a20e1d')
+sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-# fixes an issue with the radeon[hd] ATI opensource drivers
-# ref: http://bugs.gentoo.org/show_bug.cgi?id=295163
-  patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch" || return 1
+  ./configure --prefix=/usr --disable-static
+  make all
+}
 
-  ./configure --prefix=/usr || return 1
-  make all || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 13c0207d5..795465954 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137004 2011-09-05 05:59:05Z allan $
+# $Id: PKGBUILD 147258 2012-01-25 06:03:18Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.3.1
+pkgver=7.4
 pkgrel=1
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,9 @@ makedepends=('texinfo')
 backup=('etc/gdb/gdbinit')
 options=('!libtool')
 install=gdb.install
-source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b89a5fac359c618dda97b88645ceab47')
+source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('95a9a8305fed4d30a30a6dc28ff9d060'
+         'd5ac067e8dca336cf4586e4e2269d3b2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD
index 51a9e9ea3..6a2ebed90 100644
--- a/extra/glew/PKGBUILD
+++ b/extra/glew/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138482 2011-09-24 16:46:38Z stephane $
+# $Id: PKGBUILD 147734 2012-01-27 15:57:44Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: SleepyDog
 
 pkgname=glew
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The OpenGL Extension Wrangler Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://glew.sourceforge.net"
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 80fd90cbe..4d855ad76 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146281 2012-01-08 05:34:24Z eric $
+# $Id: PKGBUILD 147275 2012-01-25 16:46:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=1.7.0
-_fmver=1.7.0
+pkgver=1.8.0
+_fmver=1.8.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -15,14 +15,14 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}
 if [ "$CARCH" = "i686" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae'
+  sha1sums=('a70c8d3877c13af8bd8e7e319a1709c1b90eedc6'
             'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
             '197b58f40880995d6442fd42a58fa1f4594fd19d'
             '2797c326904af16a254c3e39b8c529ea14ef37e5')
 elif [ "$CARCH" = "x86_64" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae'
+  sha1sums=('a70c8d3877c13af8bd8e7e319a1709c1b90eedc6'
             'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
             '197b58f40880995d6442fd42a58fa1f4594fd19d'
             '2797c326904af16a254c3e39b8c529ea14ef37e5')
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 17fd30985..e751947bd 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146931 2012-01-19 10:12:16Z ibiru $
+# $Id: PKGBUILD 146998 2012-01-20 11:30:17Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.2.2.1
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GnomeShell"
@@ -15,16 +15,12 @@ optdepends=('network-manager-applet: shell integration for networkmanager')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        revert-notificationdaemon-group-based-on-pid-and-titles.patch)
-sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8'
-            '9e0337cd25d29d7215561d6fa30612d69c89fe7c27aa563a0c0b8a5b6f6cf12a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('209363084ef2d58777d70d8430e4659b058cf854c4b9766f3019d69ffea34d6f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np1 -R -i "$srcdir/revert-notificationdaemon-group-based-on-pid-and-titles.patch"
-
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 2ff030e69..1229e9833 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 146275 2012-01-07 21:32:08Z andyrtr $
+# $Id: PKGBUILD 147016 2012-01-20 19:27:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.11
+pkgver=3.0.12
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
-options=('!libtool' '!zipman')
+options=('!libtool' '!zipman' '!makeflags')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
 [ "$CARCH" = "mips64el" ] || makedepends=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ca3370b39f7910538a0d6c02bec7a142')
+md5sums=('685fe5c00786c04b39e9aac362fa0cac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index c5de2f9fe..c9aebc698 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139468 2011-10-02 00:35:06Z foutrelis $
+# $Id: PKGBUILD 147145 2012-01-23 07:56:33Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Hokum <hokum_at_mail_dot_ru>
 
 pkgname=gptfdisk
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=1
 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ provides=("gdisk=$pkgver")
 conflicts=('gdisk')
 replaces=('gdisk')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-sha1sums=('3285608c8c3087040d3bec9db1b287fae3cfc4c1')
+sha256sums=('b1159027ca459661f04bc3bac8e79381895933ee214c4d6dba49b7d27204e5d3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD
index a5f6db925..f9fe836bc 100644
--- a/extra/gstreamer0.10-ffmpeg/PKGBUILD
+++ b/extra/gstreamer0.10-ffmpeg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 138452 2011-09-23 18:40:52Z ibiru $
+# $Id: PKGBUILD 147131 2012-01-22 11:26:07Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10-ffmpeg
-pkgver=0.10.12
+pkgver=0.10.13
 pkgrel=1
 pkgdesc="Gstreamer FFMpeg Plugin"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.gstreamer.net"
 groups=('gstreamer0.10-plugins')
 options=('!libtool')
 source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2)
-sha256sums=('b17707102b4bfa5e0d5095be3608ee2d4388268eab822c9a0ce7a18011bdd73b')
+sha256sums=('76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62')
 
 build() {
   cd "${srcdir}/gst-ffmpeg-${pkgver}"
diff --git a/extra/gstreamer0.10-python/PKGBUILD b/extra/gstreamer0.10-python/PKGBUILD
index 610483475..efb71163c 100644
--- a/extra/gstreamer0.10-python/PKGBUILD
+++ b/extra/gstreamer0.10-python/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 109061 2011-02-05 16:24:50Z andyrtr $
+# $Id: PKGBUILD 147133 2012-01-22 11:30:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10-python
-pkgver=0.10.21
+pkgver=0.10.22
 pkgrel=1
 pkgdesc="Python bindings for GStreamer 0.10"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('pygobject>=2.20.0' 'gstreamer0.10-base>=0.10.32')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2)
-md5sums=('31340ae3e877797a10d088a226d74b16')
+md5sums=('937152fe896241f827689f4b53e79b22')
 
 build() {
   cd "${srcdir}/gst-python-${pkgver}"
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 4100b803c..f6277c090 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 145294 2011-12-21 11:46:17Z foutrelis $
+# $Id: PKGBUILD 147260 2012-01-25 08:34:39Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
-pkgname=gtk-xfce-engine
+pkgbase=gtk-xfce-engine
+pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine')
 pkgver=2.99.0
-pkgrel=1
-pkgdesc="Xfce Gtk+-2.0 and Gtk+-3.0 engines"
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
-depends=('gtk2' 'gtk3')
-makedepends=('pkgconfig')
+makedepends=('gtk2' 'gtk3')
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/$pkgname/2.99/$pkgname-$pkgver.tar.bz2)
+source=(http://archive.xfce.org/src/xfce/$pkgbase/2.99/$pkgbase-$pkgver.tar.bz2)
 sha256sums=('27bee5a68527d214cfda9b99d4ba68d39b6d341202bc728d0ddd170a73cde154')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -29,9 +28,30 @@ build() {
   make
 }
 
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
+package_gtk2-xfce-engine() {
+  pkgdesc="Xfce Gtk+-2.0 engine"
+  depends=('gtk2')
+  provides=("gtk-xfce-engine=$pkgver-$pkgrel")
+  conflicts=('gtk-xfce-engine')
+  replaces=('gtk-xfce-engine')
+
+  cd "$srcdir/$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install
+
+  # Remove gtk3 engine and themes
+  find "$pkgdir" -name gtk-3.0 -exec rm -r {} +
+}
+
+package_gtk3-xfce-engine() {
+  pkgdesc="Xfce Gtk+-3.0 engine"
+  depends=('gtk3')
+  conflicts=('gtk-xfce-engine<=2.99.0-1')
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Remove gtk2 engine and themes
+  find "$pkgdir" -name gtk-2.0 -exec rm -r {} +
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 02209a249..62edc97f7 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142844 2011-11-16 23:13:07Z ibiru $
+# $Id: PKGBUILD 147271 2012-01-25 15:45:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.8
-pkgrel=2
+pkgver=2.24.9
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,16 +12,13 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch
-        revert-iconview.patch)
-sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba')
+        xid-collision-debug.patch)
+sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
     patch -Np1 -i "$srcdir/xid-collision-debug.patch"
-    patch -Np1 -i "$srcdir/revert-iconview.patch"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 673bbdffa..481c167b4 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145717 2011-12-28 15:42:53Z stephane $
+# $Id: PKGBUILD 147724 2012-01-27 15:42:58Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.3.1
+pkgver=1.4
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('sh' 'pciutils')
 makedepends=('pkg-config')
 optdepends=('cairo: Graphical output' 'libxml2: XML export')
 options=('!libtool' '!docs')
-source=(http://www.open-mpi.org/software/hwloc/v1.3/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1051c937c3d2a4c98922903f313a1fa021bb35ba')
+source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('04326ebbf5a084164d72269f05e37ae23996c023')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD
index b47082e86..bfd0634f0 100644
--- a/extra/iptraf-ng/PKGBUILD
+++ b/extra/iptraf-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 121278 2011-04-30 08:10:51Z ibiru $
+# $Id: PKGBUILD 147066 2012-01-21 14:18:43Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: sh0 <mee@sh0.org>
 
 pkgname=iptraf-ng
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)"
 url="https://fedorahosted.org/iptraf-ng/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,20 +12,20 @@ depends=('ncurses')
 license=('GPL2')
 replaces=('iptraf')
 options=('!libtool')
-source=(https://fedorahosted.org/releases/i/p/iptraf-ng/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b2adbbbee4c269fb97a1951981c9047c')
+source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('79a3787027515f688a35173ffbee6432')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed s/ncurses5-config/ncursesw5-config/ -i configure.ac
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
+      --localstatedir=/var
   make CFLAGS="$CFLAGS"
 }
 
 package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR=$pkgdir install
-  install -dm755 "${pkgdir}/var/lib/iptraf"
+  install -dm755 "$pkgdir/var/lib/iptraf"
 }
-
-# vim: ts=2: ft=sh
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 7bf9e755a..be384b3a5 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0rc3
-_pkgver=0.8.98
+pkgver=0.9.0rc4
+_pkgver=0.8.99
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kde.org/"
+url='https://projects.kde.org/projects/extragear/base/networkmanagement'
 license=('GPL')
 depends=('kdebase-workspace' 'networkmanager')
 makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info'
@@ -18,7 +18,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2")
-sha1sums=('f46274c4cca722f37eef7418144c0c04bfe21e24')
+sha1sums=('18d625a25b90f9591a5cfdabcf77269eb3ba33e0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 2556215aa..8879cbce9 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142433 2011-11-09 18:26:23Z ibiru $
+# $Id: PKGBUILD 147137 2012-01-22 20:17:23Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.6.3
+pkgver=0.6.4
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
@@ -13,7 +13,7 @@ depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/$pkgname-$pkgver.tar.xz)
-sha256sums=('6b1ef59e26dd10feed279fdd7cc49c3391e124d31c46ac56c410ba0ce3bd1716')
+sha256sums=('55f39f3b28e676f6cbd9377d83edd031084436a4da41280a9503c94faffb1665')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index e87dc16b8..b6ffaebf5 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142481 2011-11-10 15:13:21Z dan $
+# $Id: PKGBUILD 147164 2012-01-23 19:16:26Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
-pkgver=1.4.10
+pkgver=1.4.11
 pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,7 @@ source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
         memcached.conf
 		memcached.sh)
 changelog=ChangeLog
-sha256sums=('2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf'
+sha256sums=('e3dcc4ff29d2b3f3c66f2b5b95a1bcef0163a65b588d6ba92a56cd6c8d73e83e'
             '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
             '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
 
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index d86167dda..e8edcf924 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143088 2011-11-22 17:32:55Z stephane $
+# $Id: PKGBUILD 147726 2012-01-27 15:43:19Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
 pkgver=1.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org"
diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD
index 196c93a9c..971a38206 100644
--- a/extra/perl-alien-sdl/PKGBUILD
+++ b/extra/perl-alien-sdl/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 124820 2011-05-24 15:44:07Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 147156 2012-01-23 14:30:07Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
@@ -8,17 +8,17 @@
 
 pkgname=perl-alien-sdl
 _realname=Alien-SDL
-pkgver=1.426
+pkgver=1.430
 pkgrel=1
 pkgdesc="Building, finding and using SDL binaries"
 arch=(i686 x86_64 'mips64el')
 license=(PerlArtistic GPL)
 url="http://search.cpan.org/dist/Alien-SDL/"
-depends=(sdl=1.2.14 perl-file-sharedir perl-capture-tiny)
+depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny)
 makedepends=(perl-file-which perl-text-patch)
 options=(!emptydirs)
 source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz)
-md5sums=('ab5e1167934418f4a7b3285a9d05c89b')
+md5sums=('9d7774212fb4e1c46325746c953a808b')
 
 package() {
   cd "$srcdir/$_realname-$pkgver"
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 5ee65c636..d86a432b7 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142423 2011-11-09 10:25:24Z jgc $
+# $Id: PKGBUILD 147073 2012-01-21 15:12:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman
-pkgver=0.24.0
+pkgver=0.24.2
 pkgrel=1
 pkgdesc="Pixman library"
 arch=(i686 x86_64 'mips64el')
@@ -11,10 +11,8 @@ url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
-  pixman-loongson2f.patch)
-sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177'
-          'ce4d69ea341f21fdc30f6d401ee479cd3571dab3')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index fc76c3f2f..3536a1d31 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145182 2011-12-19 11:45:17Z jgc $
+# $Id: PKGBUILD 147127 2012-01-22 11:06:04Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.2
+pkgver=0.18.3
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 license=('GPL')
@@ -14,14 +14,14 @@ _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
         git-fixes.patch)
-md5sums=('38616927823ef01937aab26872e957e4'
+md5sums=('d70d2d63d8acd29c97185f7e5f09c9b4'
          '9dc64c254a31e570507bdd4ad4ba629a'
          'af56b7b1b24a08f7498a0c7f5e862b93')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  #patch -Np1 -i "${srcdir}/git-fixes.patch"
 
   autoreconf -fi
 
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index 217a550a8..6f9ca8e29 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 140254 2011-10-11 00:44:55Z stephane $
+# $Id: PKGBUILD 147244 2012-01-25 02:07:03Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=python-egenix-mx-base
 _origname=egenix-mx-base
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="A collection of Python tools"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.egenix.com/products/python/mxBase/"
 depends=('python2')
-makedepends=('python2-distribute')
 replaces=('egenix-mx-base')
 provides=('egenix-mx-base')
 source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00')
+sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b')
 
 build() {
   cd "${srcdir}/${_origname}-${pkgver}"
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index 8b1c1c067..5d9fd6df2 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 147208 2012-01-24 18:38:05Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64" 'mips64el')
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
 depends=('qt' 'qwt' 'mesa')
 source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
-        qwtplot3d-gcc44.patch)
-sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215')
+        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
 
 build() {
     cd ${srcdir}/${pkgname}
     patch -p1 < ../qwtplot3d-gcc44.patch
+    patch -p1 < ../qwtplot3d-qt-4.8.0.patch
 
     # build qwt:
     qmake qwtplot3d.pro
diff --git a/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch
new file mode 100644
index 000000000..ae10f48f0
--- /dev/null
+++ b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch
@@ -0,0 +1,34 @@
+diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h
+--- qwtplot3d/include/qwt3d_io_gl2ps.h	2005-07-10 16:54:52.000000000 +0300
++++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h	2012-01-21 22:15:20.000000000 +0200
+@@ -2,12 +2,7 @@
+ #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+ 
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+ 
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
+diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h
+--- qwtplot3d/include/qwt3d_openglhelper.h	2005-07-19 17:40:28.000000000 +0300
++++ qwtplot3d.patched/include/qwt3d_openglhelper.h	2012-01-21 22:29:56.000000000 +0200
+@@ -2,11 +2,8 @@
+ #define __openglhelper_2003_06_06_15_49__
+ 
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+ 
+ namespace Qwt3D
+ {
diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog
index f343b86cb..ba267d49e 100644
--- a/extra/rxvt-unicode/ChangeLog
+++ b/extra/rxvt-unicode/ChangeLog
@@ -1,3 +1,6 @@
+2012-01-22  Angel Velasquez <angvp@archlinux.org>
+	* Version bump to 9.15
+
 2011-12-02  Angel Velasquez <angvp@archlinux.org>
 	* Version bump to 9.14
 
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
index 9f688a959..437bfec9d 100644
--- a/extra/rxvt-unicode/PKGBUILD
+++ b/extra/rxvt-unicode/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145618 2011-12-24 05:53:53Z angvp $
+# $Id: PKGBUILD 147102 2012-01-22 04:46:15Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.14
+pkgver=9.15
 pkgrel=1
 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,9 +15,9 @@ optdepends=('gtk2-perl: to use the urxvt-tabbed')
 changelog=ChangeLog
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
         ${pkgname}.desktop)
-md5sums=('022235a9a8b012c29e72c49177be6ce4'
+md5sums=('15595aa326167ac5eb68c28d95432faf'
          '3de6c13126a45bc3bc9f6bba077a1311')
-sha1sums=('e303b7591225b06bc04e18a875461438c635014e'
+sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7'
           '962aebc88982dbeb62a7c4a051ff567e015f61a0')
 
 build() {
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 9592c0e52..07f91ab67 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 141291 2011-10-28 08:03:24Z tpowa $
+# $Id: PKGBUILD 147668 2012-01-26 08:10:51Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('smbclient' 'samba')
-pkgver=3.6.1
+pkgver=3.6.2
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.1
+_realver=3.6.2
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
@@ -38,7 +38,6 @@ build() {
               --with-quotas \
               --with-ads \
               --with-acl-support \
-              --with-cifsmount \
               --with-libsmbclient \
               --with-syslog \
               --enable-external-libtalloc \
@@ -137,7 +136,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('5291717be0734e07dc07b6110e162e87'
+md5sums=('bd2bb63b1c90161b88262f813bd1ce8b'
          'a3da19515a234c703876cf850c44e996'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 4d9f9bf90..d5fca5122 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102618 2010-12-08 18:20:12Z dgriffiths $
+# $Id: PKGBUILD 146995 2012-01-20 06:04:00Z remy $
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scribus
-pkgver=1.3.9
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,10 +16,10 @@ depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
          'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
          'desktop-file-utils' 'shared-mime-info')
 makedepends=('cmake')
-options=(!libtool !makeflags)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a54dbf2e10cd88d683d0d34565d29378')
-sha1sums=('86bc4db2d8fbb91fe94f8535327991e9128c5862')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('ae19e62399941fb8e868d8e762caf494')
+sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
 
 build() {
 	cd "${srcdir}"
diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD
index 912a356b3..37af1d8cb 100644
--- a/extra/sdl_image/PKGBUILD
+++ b/extra/sdl_image/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146687 2012-01-16 11:34:55Z heftig $
+# $Id: PKGBUILD 147083 2012-01-21 17:53:25Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_image
-pkgver=1.2.11
+pkgver=1.2.12
 pkgrel=1
 pkgdesc="A simple library to load images of various formats as SDL surfaces"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib')
 options=('!libtool')
 url="http://www.libsdl.org/projects/SDL_image/"
 source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz)
-md5sums=('1210d7a7e87ab95abebb4f3e79a0fd31')
+md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
 
 build() {
   cd "$srcdir/SDL_image-$pkgver"
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index 55ac92d18..4045950f3 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 109019 2011-02-05 11:24:51Z andyrtr $
+#$Id: PKGBUILD 147121 2012-01-22 10:55:51Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=sg3_utils
-pkgver=1.30
-pkgrel=1.1
+pkgver=1.33
+pkgrel=1
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64 'mips64el')
 url="http://sg.danny.cz/sg/sg3_utils.html"
@@ -11,7 +11,7 @@ license=('GPL' 'custom:BSD')
 depends=('glibc')
 options=('!libtool')
 source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz)
-md5sums=('8acb9328abe17d012db8c5f95f1d7d75')
+md5sums=('261e39f7161337330ba6bd57999be801')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD
index d33fb5b2f..82706136f 100644
--- a/extra/time/PKGBUILD
+++ b/extra/time/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 131069 2011-07-10 01:00:33Z stephane $
+# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=time
 pkgver=1.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Utility for monitoring a program's use of system resources"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/directory/time.html"
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index 9faacb49b..ac5f1f722 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144420 2011-12-05 18:18:14Z jgc $
+# $Id: PKGBUILD 147746 2012-01-27 20:01:33Z ibiru $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=1
+pkgrel=3
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcforge.berlios.de/"
@@ -17,14 +17,18 @@ 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)
+        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
+        ffmpeg-0.10.patch)
 sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
           'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
           'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae')
+          '591943a33235342a66c3df0625a164a1479c09ae'
+          '3c03111cfae88db918afff3837cec7db32ace3cc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch"
   ./configure --prefix=/usr \
     --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
     --enable-lame --enable-ogg --enable-vorbis --enable-theora \
diff --git a/extra/transcode/ffmpeg-0.10.patch b/extra/transcode/ffmpeg-0.10.patch
new file mode 100644
index 000000000..5965c180c
--- /dev/null
+++ b/extra/transcode/ffmpeg-0.10.patch
@@ -0,0 +1,14 @@
+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];
+ 
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 9551054de..2c2ea6a57 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145277 2011-12-21 01:41:22Z giovanni $
+# $Id: PKGBUILD 147739 2012-01-27 19:27:41Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.13
-pkgrel=1
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 73c12fb8d..69468c86f 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146428 2012-01-10 23:37:52Z eric $
+# $Id: PKGBUILD 147743 2012-01-27 19:57:13Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
@@ -11,7 +11,7 @@ license=('LGPL' 'GPL')
 depends=('libxvmc' 'ffmpeg' 'libxinerama')
 makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
              'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
+             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau')
 optdepends=('imagemagick: for using the imagemagick plugin' \
             'jack: for using the jack plugin' \
             'vcdimager: for using the vcd plugin' \
@@ -27,7 +27,8 @@ optdepends=('imagemagick: for using the imagemagick plugin' \
             'libmpcdec: for using the musepack plugin' \
             'libcaca: for using the caca plugin' \
             'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin')
+            'gnome-vfs: for using the gnome-vfs plugin' \
+            'libvdpau: for using the VDPAU plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
 sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d')
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 504879145..4f4e269a8 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145186 2011-12-19 11:53:19Z jgc $
+# $Id: PKGBUILD 147119 2012-01-22 10:53:02Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=276
+pkgver=278
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('50ca8ee40e8a0992019f8f35042c9abb'
+md5sums=('3eeddfe35cb0a2db1924cfe0c20be443'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2012-01-29 21:01:44 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2012-01-29 21:01:44 -0300
commit	6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (patch)
tree	0dfcf0ebb742c6e359f0502d9207b3a600aa3462 /extra
parent	7a501772e3cb37f438506df7c22a34ed9bba9d88 (diff)
parent	db0dace84403023c8d89b8801f12a5ab278dc440 (diff)