Thu May 23 01:28:33 PDT 2013

20 files changed, 63 insertions, 567 deletions

diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD
index 99a6ba213..c3995f60b 100644
--- a/extra/alsa-lib/PKGBUILD
+++ b/extra/alsa-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184466 2013-05-07 10:49:12Z tpowa $
+# $Id: PKGBUILD 186216 2013-05-22 06:35:12Z tpowa $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-lib
-pkgver=1.0.27
-pkgrel=2
+pkgver=1.0.27.1
+pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
@@ -12,20 +12,7 @@ optdepends=('python2: for python smixer plugin')
 makedepends=('python2')
 license=('GPL')
 options=(!libtool)
-source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2
-        alsa-lib-1.0.27-segfault.patch
-        alsa-lib-1.0.27-kernel.patch
-        alsa-lib-1.0.27-inline.patch
-        alsa-lib-1.0.27-inline2.patch)
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # add upstream patches
-  patch -Np1 -i "$srcdir/alsa-lib-1.0.27-segfault.patch"
-  patch -Np1 -i "$srcdir/alsa-lib-1.0.27-kernel.patch"
-  patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline.patch"
-  patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline2.patch"
-}
+source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -37,8 +24,4 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('f090c7dbd0fe57d786d82e411eac2d08'
-         '755cfcd116c28feac437eb6b5bdc51bb'
-         '277e2bc587de25e3294a0f597ae9246e'
-         'db14deccb57d8dbcfc6f6d22bed45c1e'
-         '92ca1fec0cb99bfc302896cf9393a936')
+md5sums=('17102aaab10e9d4b19f6b02937bab015')
diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline.patch
deleted file mode 100644
index cc5cb8d75..000000000
--- a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 25 Apr 2013 09:52:33 +0200
-Subject: [PATCH] Use __inline__ for exported headers
-
-Some programs are still using C90.
-
-Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- include/control.h     |  4 ++--
- include/iatomic.h     | 14 +++++++-------
- include/pcm.h         |  2 +-
- include/pcm_extplug.h |  4 ++--
- include/use-case.h    |  4 ++--
- 5 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/include/control.h b/include/control.h
-index 27fe2ac..5fdf379 100644
---- a/include/control.h
-+++ b/include/control.h
-@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t
- int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode);
- int snd_ctl_close(snd_ctl_t *ctl);
- int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock);
--static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); }
-+static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); }
- int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, 
- 			      snd_async_callback_t callback, void *private_data);
- snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler);
-@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode);
- int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl);
- int snd_hctl_close(snd_hctl_t *hctl);
- int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock);
--static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); }
-+static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); }
- int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl);
- int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space);
- int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents);
-diff --git a/include/iatomic.h b/include/iatomic.h
-index e92dbfd..5711fe8 100644
---- a/include/iatomic.h
-+++ b/include/iatomic.h
-@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v)
- 	return result;
- }
- 
--static inline int atomic_add_negative(int i, volatile atomic_t *v)
-+static __inline__ int atomic_add_negative(int i, volatile atomic_t *v)
- {
- 	unsigned long flags;
- 	int result;
-@@ -1160,36 +1160,36 @@ typedef struct {
- 
- void snd_atomic_read_wait(snd_atomic_read_t *t);
- 
--static inline void snd_atomic_write_init(snd_atomic_write_t *w)
-+static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w)
- {
- 	w->begin = 0;
- 	w->end = 0;
- }
- 
--static inline void snd_atomic_write_begin(snd_atomic_write_t *w)
-+static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w)
- {
- 	w->begin++;
- 	wmb();
- }
- 
--static inline void snd_atomic_write_end(snd_atomic_write_t *w)
-+static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w)
- {
- 	wmb();
- 	w->end++;
- }
- 
--static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w)
-+static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w)
- {
- 	r->write = w;
- }
- 
--static inline void snd_atomic_read_begin(snd_atomic_read_t *r)
-+static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r)
- {
- 	r->end = r->write->end;
- 	rmb();
- }
- 
--static inline int snd_atomic_read_ok(snd_atomic_read_t *r)
-+static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r)
- {
- 	rmb();
- 	return r->end == r->write->begin;
-diff --git a/include/pcm.h b/include/pcm.h
-index e440030..95b8aed 100644
---- a/include/pcm.h
-+++ b/include/pcm.h
-@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm);
- int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space);
- int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents);
- int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock);
--static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); }
-+static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); }
- int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm, 
- 			      snd_async_callback_t callback, void *private_data);
- snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler);
-diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h
-index 884f322..e3b71bc 100644
---- a/include/pcm_extplug.h
-+++ b/include/pcm_extplug.h
-@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type,
- /**
-  * set the parameter constraint with a single value
-  */
--static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
-+static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
- {
- 	return snd_pcm_extplug_set_param_list(extplug, type, 1, &val);
- }
-@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type
- /**
-  * set the parameter constraint for slave PCM with a single value
-  */
--static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
-+static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
- {
- 	return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val);
- }
-diff --git a/include/use-case.h b/include/use-case.h
-index defd4ea..93b3456 100644
---- a/include/use-case.h
-+++ b/include/use-case.h
-@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr);
-  * \param list Returned allocated list
-  * \return Number of list entries if success, otherwise a negative error code
-  */
--static inline int snd_use_case_card_list(const char **list[])
-+static __inline__ int snd_use_case_card_list(const char **list[])
- {
- 	return snd_use_case_get_list(NULL, NULL, list);
- }
-@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[])
-  * \param list Returned list of verbs
-  * \return Number of list entries if success, otherwise a negative error code
-  */
--static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr,
-+static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr,
- 					 const char **list[])
- {
- 	return snd_use_case_get_list(uc_mgr, "_verbs", list);
--- 
-1.7.11.7
-
diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch
deleted file mode 100644
index e99bae864..000000000
--- a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a8f405b8f90d752c3609b9e918dc949c4efadf87 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 25 Apr 2013 09:55:49 +0200
-Subject: [PATCH] Add definition of __inline__ for non-GCC
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- include/asoundlib-head.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h
-index 6edbab0..71b5c29 100644
---- a/include/asoundlib-head.h
-+++ b/include/asoundlib-head.h
-@@ -40,6 +40,10 @@
- #include <errno.h>
- #include <stdarg.h>
- 
-+#ifndef __GNUC__
-+#define __inline__ inline
-+#endif
-+
- #include <alsa/asoundef.h>
- #include <alsa/version.h>
- #include <alsa/global.h>
--- 
-1.7.11.7
-
diff --git a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch b/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch
deleted file mode 100644
index 3d4eaf3cb..000000000
--- a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 886f0cc3c274643de464e646535afb4ceee1d816 Mon Sep 17 00:00:00 2001
-From: Daniel Mack <zonque@gmail.com>
-Date: Thu, 18 Apr 2013 10:37:50 +0200
-Subject: [PATCH] bring pcm.h and pcm.c in sync with the kernel list
-
-In particular, this adds definitions and descriptions for G.723 and
-DSD types.
-
-Signed-off-by: Daniel Mack <zonque@gmail.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- include/pcm.h | 14 +++++++++++++-
- src/pcm/pcm.c | 12 ++++++++++++
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/include/pcm.h b/include/pcm.h
-index d94ba90..e440030 100644
---- a/include/pcm.h
-+++ b/include/pcm.h
-@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format {
- 	SND_PCM_FORMAT_U18_3LE,
- 	/** Unsigned 18bit Big Endian in 3bytes format */
- 	SND_PCM_FORMAT_U18_3BE,
--	SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE,
-+	/* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */
-+	SND_PCM_FORMAT_G723_24,
-+	/* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */
-+	SND_PCM_FORMAT_G723_24_1B,
-+	/* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */
-+	SND_PCM_FORMAT_G723_40,
-+	/* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */
-+	SND_PCM_FORMAT_G723_40_1B,
-+	/* Direct Stream Digital (DSD) in 1-byte samples (x8) */
-+	SND_PCM_FORMAT_DSD_U8,
-+	/* Direct Stream Digital (DSD) in 2-byte samples (x16) */
-+	SND_PCM_FORMAT_DSD_U16_LE,
-+	SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE,
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- 	/** Signed 16 bit CPU endian */
-diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
-index 2a87a7b..438fb3f 100644
---- a/src/pcm/pcm.c
-+++ b/src/pcm/pcm.c
-@@ -1558,6 +1558,12 @@ static const char *const snd_pcm_format_names[] = {
- 	FORMAT(S18_3BE),
- 	FORMAT(U18_3LE),
- 	FORMAT(U18_3BE),
-+	FORMAT(G723_24),
-+	FORMAT(G723_24_1B),
-+	FORMAT(G723_40),
-+	FORMAT(G723_40_1B),
-+	FORMAT(DSD_U8),
-+	FORMAT(DSD_U16_LE),
- };
- 
- static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = {
-@@ -1611,6 +1617,12 @@ static const char *const snd_pcm_format_descriptions[] = {
- 	FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"),
- 	FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"),
- 	FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"),
-+	FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"),
-+	FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"),
-+	FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"),
-+	FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"),
-+	FORMATD(DSD_U8,  "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"),
-+	FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"),
- };
- 
- static const char *const snd_pcm_type_names[] = {
--- 
-1.7.11.7
-
diff --git a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch b/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch
deleted file mode 100644
index 72df46185..000000000
--- a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 15 Apr 2013 18:12:17 +0200
-Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code
-
-When multiple dlobj_cache items point to the same dlobj, dlclose() may
-be called wrongly multiple times when these items are cleared, because
-we manage the dlobj_cache list as a flat list.  This results in a bad
-segfault we've seen in openal-soft, for example.
-
-For fixing this, we need the refcounting of dlobj itself.  But, in
-this case, we don't have to manage yet another list,  since dlopen()
-does a proper refcounting by itself.  That is, we can just call always
-dlopen() at each time a new function is assigned, and also call
-dlclose() for each released dlobj_cache item at cleanup.
-
-Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- src/dlmisc.c | 31 +++++++++++--------------------
- 1 file changed, 11 insertions(+), 20 deletions(-)
-
-diff --git a/src/dlmisc.c b/src/dlmisc.c
-index 3788382..2de0234 100644
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
- {
- 	struct list_head *p;
- 	struct dlobj_cache *c;
--	void *func, *dlobj = NULL;
--	int dlobj_close = 0;
-+	void *func, *dlobj;
- 
- 	snd_dlobj_lock();
- 	list_for_each(p, &pcm_dlobj_list) {
-@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
- 			continue;
- 		if (!lib && c->lib)
- 			continue;
--		dlobj = c->dlobj;
- 		if (strcmp(c->name, name) == 0) {
- 			c->refcnt++;
- 			func = c->func;
-@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
- 			return func;
- 		}
- 	}
-+
-+	dlobj = snd_dlopen(lib, RTLD_NOW);
- 	if (dlobj == NULL) {
--		dlobj = snd_dlopen(lib, RTLD_NOW);
--		if (dlobj == NULL) {
--			if (verbose)
--				SNDERR("Cannot open shared library %s",
-+		if (verbose)
-+			SNDERR("Cannot open shared library %s",
- 						lib ? lib : "[builtin]");
--			snd_dlobj_unlock();
--			return NULL;
--		}
--		dlobj_close = 1;
-+		snd_dlobj_unlock();
-+		return NULL;
- 	}
-+
- 	func = snd_dlsym(dlobj, name, version);
- 	if (func == NULL) {
- 		if (verbose)
-@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
- 		free((void *)c->lib);
- 		free(c);
- 	      __err:
--		if (dlobj_close)
--			snd_dlclose(dlobj);
-+		snd_dlclose(dlobj);
- 		snd_dlobj_unlock();
- 		return NULL;
- 	}
-@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void)
- 	struct list_head *p, *npos;
- 	struct dlobj_cache *c;
- 
--	/* clean up caches only when really no user is present */
- 	snd_dlobj_lock();
--	list_for_each(p, &pcm_dlobj_list) {
--		c = list_entry(p, struct dlobj_cache, list);
--		if (c->refcnt)
--			goto unlock;
--	}
--
- 	list_for_each_safe(p, npos, &pcm_dlobj_list) {
- 		c = list_entry(p, struct dlobj_cache, list);
-+		if (c->refcnt)
-+			continue;
- 		list_del(p);
- 		snd_dlclose(c->dlobj);
- 		free((void *)c->name); /* shut up gcc warning */
--- 
-1.7.11.7
-
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index f48a7dbd4..da828c0e1 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185745 2013-05-18 09:51:58Z tpowa $
+# $Id: PKGBUILD 186218 2013-05-22 06:35:50Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
-pkgver=1.0.27
-pkgrel=5
+pkgver=1.0.27.1
+pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
@@ -13,21 +13,9 @@ 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
-        90alsa
-        alsa-restore-1.0.27.service.patch
-        alsactl-fix-buffer-overflow-1.0.27.patch
-        arecord-1.0.27.patch)
+        90alsa)
 backup=(etc/conf.d/alsa)
 
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch
-  patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch
-  patch -Np1 -i ${srcdir}/arecord-1.0.27.patch
-  # remove wrong udev file from sources
-  rm alsactl/90-alsa-restore.rules
-}
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-alsaconf --sbindir=/usr/bin \
@@ -44,8 +32,5 @@ package() {
   # dir where to save ALSA state
   install -d ${pkgdir}/var/lib/alsa
 }
-md5sums=('cbfb21a24f63fb052b3392195639ce48'
-         '529216f6a46e61a546640e08ea7a0879'
-         '0a27f7b80351d6baa274c32d859bf037'
-         'cd577445636542f9f60b420e4ffe3f0f'
-         'cecb38f03bd245d0584bfd63370e9a05')
+md5sums=('3d81357b997744a139881ef72bc6921a'
+         '529216f6a46e61a546640e08ea7a0879')
diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch
deleted file mode 100644
index b3a9d48fd..000000000
--- a/extra/alsa-utils/alsa-restore-1.0.27.service.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old	2013-04-15 14:37:57.326541394 +0200
-+++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in	2013-04-15 14:38:10.179673494 +0200
-@@ -12,6 +12,6 @@
- Conflicts=shutdown.target
- 
- [Service]
--Type=oneshop
-+Type=oneshot
- ExecStart=-@sbindir@/alsactl restore
- StandardOutput=syslog
diff --git a/extra/alsa-utils/alsa.conf.d b/extra/alsa-utils/alsa.conf.d
deleted file mode 100644
index bd50dcca2..000000000
--- a/extra/alsa-utils/alsa.conf.d
+++ /dev/null
@@ -1,15 +0,0 @@
-# Arguments for alsactl
-# example: ALSA_ARGS="--file /var/lib/alsa/asound.state"
-ALSA_ARGS="--file /var/lib/alsa/asound.state"
-
-# Enables powersaving mode for AC97 and hda_intel audio chips.
-# Set to 1 to enable powersaving.
-# Set to 0 to disable powersaving (default).
-POWERSAVE=0
-
-# Whether to save volume levels when stopped ("yes" or "no").
-SAVE_VOLUME="yes"
-
-# Whether to mute the master volume when stopped ("yes" or "no").
-# Useful for bad audio cards which make a noise on system poweroff.
-MUTE_VOLUME="no"
diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch
deleted file mode 100644
index d4b526614..000000000
--- a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200)
-Subject: alsactl: Fix the string size for the lock file contents
-X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b
-
-alsactl: Fix the string size for the lock file contents
-
-The string length is 10 characters + LF + '\0' = 12 characters.
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
-
-diff --git a/alsactl/lock.c b/alsactl/lock.c
-index d34d013..fce208b 100644
---- a/alsactl/lock.c
-+++ b/alsactl/lock.c
-@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout)
- 	int fd = -1, err = 0;
- 	struct flock lck;
- 	struct stat st;
--	char lcktxt[11];
-+	char lcktxt[12];
- 	char *nfile;
- 
- 	if (!do_lock)
diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch
deleted file mode 100644
index f9edb2d21..000000000
--- a/extra/alsa-utils/arecord-1.0.27.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200)
-Subject: arecord: add a missing break to the capture loop
-X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977
-
-arecord: add a missing break to the capture loop
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
-
-diff --git a/aplay/aplay.c b/aplay/aplay.c
-index 5bdc39c..000d25b 100644
---- a/aplay/aplay.c
-+++ b/aplay/aplay.c
-@@ -3021,6 +3021,9 @@ static void capture(char *orig_name)
- 			fd = -1;
- 		}
- 
-+		if (in_aborting)
-+			break;
-+
- 		/* repeat the loop when format is raw without timelimit or
- 		 * requested counts of data are recorded
- 		 */
diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD
index ab46c237b..23396fe7b 100644
--- a/extra/capi4hylafax/PKGBUILD
+++ b/extra/capi4hylafax/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159422 2012-05-24 06:11:44Z tpowa $
+# $Id: PKGBUILD 186226 2013-05-22 09:28:57Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capi4hylafax
 pkgver=010300
-pkgrel=8
+pkgrel=9
 pkgdesc="capi plugin for hylafax to enable isdn faxing"
 arch=(i686 x86_64)
 url="ftp://ftp.avm.de/tools"
@@ -11,18 +11,24 @@ license=('GPL')
 depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
 source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
 	config.faxCAPI 
-	capi4hylafax.rc
 	c2faxrecv.service
-	capi4hylafax.conf)
+	capi4hylafax.conf
+        capi4hylafax-compile-gcc48-fix.patch)
 
 install=capi4hylafax.install
 backup=(var/spool/hylafax/etc/config.faxCAPI)
 
-build() {
+prepare() {
   cd "$srcdir"/$pkgname-01.03.00
-# fix config file
+  # fix compiling with gcc48
+  patch -Np1 -i $srcdir/capi4hylafax-compile-gcc48-fix.patch
+  # fix config file
   sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
   autoreconf --force --install
+}
+
+build() {
+  cd "$srcdir"/$pkgname-01.03.00
   ./configure
   make
 }
@@ -33,7 +39,6 @@ package() {
   install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
   install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
   install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
-  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
 # adding FIFO
   mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
   chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
@@ -59,6 +64,10 @@ EOF
 }
 md5sums=('d37dc652ac80d1525ef8693be55ee67f'
          '653b60695d21c128f020a86274ca9192'
-         '1fe40c58289fa3ba625ce6fe2fdb3d07'
          'e2c085a00189ded0a659642c689a1be2'
          '7c41d4fa5c5ef7b1372813341fd0d02b')
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+         '653b60695d21c128f020a86274ca9192'
+         'e2c085a00189ded0a659642c689a1be2'
+         '7c41d4fa5c5ef7b1372813341fd0d02b'
+         'fa01597396c5493f90243a8d9e2841c0')
diff --git a/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch b/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch
new file mode 100644
index 000000000..88d948366
--- /dev/null
+++ b/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch
@@ -0,0 +1,11 @@
+--- capi4hylafax-01.03.00/src/standard/aStdLib.cpp.old	2013-05-21 16:55:37.031658830 +0200
++++ capi4hylafax-01.03.00/src/standard/aStdLib.cpp	2013-05-21 16:55:42.314905957 +0200
+@@ -233,7 +233,7 @@
+ 
+ tUInt a_pointer2string (void *pointer, tWiChar *string) {
+     tULong    p   = (tULong) pointer;
+-    tWiChar  *fmt = (sizeof (p) > 4) ? L"    .    :    .    " : L"    :    "; // must be symmetric!
++    const tWiChar  *fmt = (sizeof (p) > 4) ? L"    .    :    .    " : L"    :    "; // must be symmetric!
+     unsigned i  = s_strlen (fmt);
+ 
+     string[i] = '\0';
diff --git a/extra/capi4hylafax/capi4hylafax.rc b/extra/capi4hylafax/capi4hylafax.rc
deleted file mode 100755
index 51025b020..000000000
--- a/extra/capi4hylafax/capi4hylafax.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/c2faxrecv`
-case "$1" in
-  start)
-    stat_busy "Starting capi4hylafax"
-    if [ -z "$PID" ]; then
-    /usr/bin/c2faxrecv > /dev/null &
-       faxmodem faxCAPI
-    fi
-    if [ ! -f /var/run/faxq.pid ]; then
-       stat_fail
-       echo "ERROR: hylafax is not running"
-       exit 1
-    fi
-    if [ ! -f /var/run/hfaxd.pid ]; then
-    stat_fail
-    echo "ERROR: hylafax is not running"
-    exit 1
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon capi4hylafax
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping capi4hylafax"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon capi4hylafax
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 420dc3a0e..9364a1f45 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,33 +1,24 @@
-# $Id: PKGBUILD 179599 2013-03-07 17:46:37Z andrea $
+# $Id: PKGBUILD 186227 2013-05-22 10:21:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.10.2
-pkgrel=5
+pkgver=2.8.11
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
 license=('custom')
 depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt5-base' 'emacs')
-optdepends=('qt5-base: cmake-gui')
+makedepends=('qt4' 'emacs')
+optdepends=('qt4: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
-        'qt4.patch')
-md5sums=('097278785da7182ec0aea8769d06860c'
-         '4933fbe934d3989923f0a60a78dac44e')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
+md5sums=('be6008f2299613d23fe82ab53ef7472e')
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  # qmake refers to Qt5
-  patch -p1 -i "${srcdir}"/qt4.patch
-
-  # Qt is built with reduce-relocations
-  export CFLAGS="${CFLAGS} -fPIC"
-  export CXXFLAGS="${CXXFLAGS} -fPIC"
-
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
     --docdir=/share/doc/cmake \
diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD
index a1641db1c..ef6e457d2 100644
--- a/extra/dosfstools/PKGBUILD
+++ b/extra/dosfstools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185832 2013-05-19 14:15:45Z tpowa $
+# $Id: PKGBUILD 186197 2013-05-22 00:02:48Z eric $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=dosfstools
@@ -7,9 +7,7 @@ pkgrel=2
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc')
-#source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz)
-# using debian source, main page is down since quite some time
-source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.orig.tar.xz{,.sig})
+source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
 url="http://www.daniel-baumann.ch/software/dosfstools/"
 license=('GPL2')
 
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 19bb8e718..5de8d1a22 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184851 2013-05-09 09:42:22Z andrea $
+# $Id: PKGBUILD 186222 2013-05-22 07:16:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
 pkgver=4.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Extends the functionality of kdepim'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdepim-runtime'
diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD
index acbcf2f6e..90088d2f4 100644
--- a/extra/kdevelop-python/PKGBUILD
+++ b/extra/kdevelop-python/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184199 2013-05-03 13:03:50Z andrea $
+# $Id: PKGBUILD 186211 2013-05-22 06:00:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-python
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="Python language and documentation plugin for KDevelop"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('kdevelop')
 makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
 source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2")
-sha1sums=('fb9af112910c5655ce52bf9cfef19bacbab4f62f')
+sha1sums=('accc8950a380e663bcfe3f51e4e5a6653ff8c146')
 
 build() {
   mkdir build
diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD
index 66dc724ad..5b2339402 100644
--- a/extra/libkgapi/PKGBUILD
+++ b/extra/libkgapi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 173820 2012-12-24 04:23:51Z andrea $
+# $Id: PKGBUILD 186220 2013-05-22 07:15:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkgapi
-pkgver=0.4.4
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="A KDE-based library for accessing various Google services via their public API"
 url='https://projects.kde.org/projects/extragear/libs/libkgapi'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'qjson')
+depends=('kdepimlibs')
 makedepends=('cmake' 'automoc4' 'boost')
 replaces=('akonadi-google' 'libkgoogle')
 conflicts=('akonadi-google' 'libkgoogle')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a26ddd6da675075f7529652f36f5c9f5')
+md5sums=('e7938dcec05b0f73e6a0b24c1674378d')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 65b5ecf6f..1c9f1fcc1 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186194 2013-05-21 22:02:40Z andrea $
+# $Id: PKGBUILD 186213 2013-05-22 06:19:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/kde-telepathy/0.6.2/src/${_pkgname}-${pkgver}.tar.bz2")
 sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15')
 
 build() {
diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD
index 39382479e..afe4ebc98 100644
--- a/extra/telepathy-logger-qt/PKGBUILD
+++ b/extra/telepathy-logger-qt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182024 2013-04-05 09:11:10Z andrea $
+# $Id: PKGBUILD 186224 2013-05-22 07:20:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: George Brooke <george+arch.aur@george-brooke.co.uk>
 
 pkgname=telepathy-logger-qt
-pkgver=0.6.0
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Qt bindings for telepathy logger"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-log
 license=('GPL')
 depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer')
 makedepends=('automoc4' 'cmake' 'python2' 'doxygen' 'boost')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('3e58f7a25ad192d9a62b52784492b317b77a5ffa')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('a61650a06e5b8f6d452d6120ee402567439ef687')
 
 build() {
   mkdir build