From 846cd36c2c8e3e42a228775bb7f8ed8eb9ca061b Mon Sep 17 00:00:00 2001
From: Ypnose <linuxien@legtux.org>
Date: Sun, 28 Sep 2014 08:40:39 +0000
Subject: [PATCH 01/21] s-nail: update to 14.7.7

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index c49814c1c0d..282c8f9edd7 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,6 +1,6 @@
 # Template file for 's-nail'
 pkgname=s-nail
-version=14.7.6
+version=14.7.7
 revision=1
 makedepends="libressl-devel libidn-devel"
 conf_files="/etc/mail.rc"
@@ -9,7 +9,7 @@ maintainer="Ypnose <linuxienATlegtuxDOTorg>"
 license="BSD"
 homepage="http://s-nail.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version//./_}.tar.gz"
-checksum=9abcc8e913b0a48d1b33fd9c83e95183a01dc65be4c52901737a81b641078669
+checksum=28370171ce0aa0d80dabf3c4711e0344050d68a798d225c6f55328f08e6b1b1e
 provides="mail-${version}_${revision}"
 replaces="mail>=0"
 

From d6b12eaebe22832b5c505fc57494968fea57f6e4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 28 Sep 2014 11:25:48 +0200
Subject: [PATCH 02/21] radare2-git: bump as requested by pancake.

---
 srcpkgs/radare2-git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/radare2-git/template b/srcpkgs/radare2-git/template
index cee6d4706a4..8906aec4667 100644
--- a/srcpkgs/radare2-git/template
+++ b/srcpkgs/radare2-git/template
@@ -2,7 +2,7 @@
 #
 # Do not create a -devel pkg; it's a full pkg explicitly.
 pkgname=radare2-git
-version=20140924
+version=20140928
 revision=1
 build_style=gnu-configure
 hostmakedepends="git"

From 874491640be46536350b5b93eb41fc9ad1fab463 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 28 Sep 2014 11:56:49 +0200
Subject: [PATCH 03/21] bash: update to 4.3 patchlevel 027 (CVE-2014-7186).

---
 srcpkgs/bash/template        | 4 ++--
 srcpkgs/chroot-bash/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index dc7571f7457..f83ce79804e 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,9 +1,9 @@
 # Template build file for 'bash'.
 pkgname=bash
 _bash_distver=4.3
-_bash_patchlevel=026
+_bash_patchlevel=027
 version=${_bash_distver}.${_bash_patchlevel}
-revision=2
+revision=1
 wrksrc=${pkgname}-${_bash_distver}
 build_style=gnu-configure
 configure_args="--without-bash-malloc --with-curses --with-installed-readline"
diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index ecc4c1dae7d..5d1b974ba15 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -1,9 +1,9 @@
 # Template build file for 'chroot-bash'.
 pkgname=chroot-bash
 _bash_distver=4.3
-_bash_patchlevel=026
+_bash_patchlevel=027
 version=${_bash_distver}.${_bash_patchlevel}
-revision=2
+revision=1
 wrksrc="bash-${_bash_distver}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --without-curses --without-installed-readline --disable-nls"

From 53418864fb336b04f9ef68f36093dd8878a9b468 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 28 Sep 2014 11:59:00 +0200
Subject: [PATCH 04/21] bash: drop NetBSD patches now that CVE-2014-7186 has a
 patch.

---
 srcpkgs/bash/patches/patch-shell.c     | 22 ----------------------
 srcpkgs/bash/patches/patch-variables.c | 23 -----------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 srcpkgs/bash/patches/patch-shell.c
 delete mode 100644 srcpkgs/bash/patches/patch-variables.c

diff --git a/srcpkgs/bash/patches/patch-shell.c b/srcpkgs/bash/patches/patch-shell.c
deleted file mode 100644
index 7f37c86d4fe..00000000000
--- a/srcpkgs/bash/patches/patch-shell.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-shell.c,v 1.1 2014/09/25 20:28:32 christos Exp $
-
-Add flag to disable importing of function unless explicitly enabled
-
---- shell.c.christos	2014-01-14 08:04:32.000000000 -0500
-+++ shell.c	2014-09-25 16:11:51.000000000 -0400
-@@ -229,6 +229,7 @@
- #else
- int posixly_correct = 0;	/* Non-zero means posix.2 superset. */
- #endif
-+int import_functions = 0;	/* Import functions from environment */
- 
- /* Some long-winded argument names.  These are obviously new. */
- #define Int 1
-@@ -248,6 +249,7 @@
-   { "help", Int, &want_initial_help, (char **)0x0 },
-   { "init-file", Charp, (int *)0x0, &bashrc_file },
-   { "login", Int, &make_login_shell, (char **)0x0 },
-+  { "import-functions", Int, &import_functions, (char **)0x0 },
-   { "noediting", Int, &no_line_editing, (char **)0x0 },
-   { "noprofile", Int, &no_profile, (char **)0x0 },
-   { "norc", Int, &no_rc, (char **)0x0 },
diff --git a/srcpkgs/bash/patches/patch-variables.c b/srcpkgs/bash/patches/patch-variables.c
deleted file mode 100644
index bb93ba5b9dd..00000000000
--- a/srcpkgs/bash/patches/patch-variables.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-variables.c,v 1.1 2014/09/25 20:28:32 christos Exp $
-
-Only read functions from environment if flag is set.
-
---- variables.c.christos	2014-09-25 16:09:41.000000000 -0400
-+++ variables.c	2014-09-25 16:12:10.000000000 -0400
-@@ -105,6 +105,7 @@
- extern int assigning_in_environment;
- extern int executing_builtin;
- extern int funcnest_max;
-+extern int import_functions;
- 
- #if defined (READLINE)
- extern int no_line_editing;
-@@ -349,7 +350,7 @@
- 
-       /* If exported function, define it now.  Don't import functions from
- 	 the environment in privileged mode. */
--      if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
-+      if (import_functions && privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
- 	{
- 	  string_length = strlen (string);
- 	  temp_string = (char *)xmalloc (3 + string_length + char_index);

From 3098184499b8afd21cb51418207a87fdc30c266d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 28 Sep 2014 12:07:34 +0200
Subject: [PATCH 05/21] bash: apply 3rd patch for CVE-2014-7169 from Fedora
 too.

---
 .../patches/bash-4.2-cve-2014-7169-2.patch    | 83 +++++++++++++++++++
 srcpkgs/bash/template                         |  2 +-
 srcpkgs/chroot-bash/template                  |  2 +-
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bash/patches/bash-4.2-cve-2014-7169-2.patch

diff --git a/srcpkgs/bash/patches/bash-4.2-cve-2014-7169-2.patch b/srcpkgs/bash/patches/bash-4.2-cve-2014-7169-2.patch
new file mode 100644
index 00000000000..9036fbb8f69
--- /dev/null
+++ b/srcpkgs/bash/patches/bash-4.2-cve-2014-7169-2.patch
@@ -0,0 +1,83 @@
+--- parse.y	2014-09-25 13:07:59.218209276 +0200
++++ parse.y	2014-09-25 15:26:52.813159810 +0200
+@@ -264,9 +264,21 @@
+ 
+ /* Variables to manage the task of reading here documents, because we need to
+    defer the reading until after a complete command has been collected. */
+-static REDIRECT *redir_stack[10];
++static REDIRECT **redir_stack;
+ int need_here_doc;
+ 
++/* Pushes REDIR onto redir_stack, resizing it as needed. */
++static void
++push_redir_stack (REDIRECT *redir)
++{
++  /* Guard against oveflow. */
++  if (need_here_doc + 1 > INT_MAX / sizeof (*redir_stack))
++    abort ();
++  redir_stack = xrealloc (redir_stack,
++			  (need_here_doc + 1) * sizeof (*redir_stack));
++  redir_stack[need_here_doc++] = redir;
++}
++
+ /* Where shell input comes from.  History expansion is performed on each
+    line when the shell is interactive. */
+ static char *shell_input_line = (char *)NULL;
+@@ -519,42 +531,42 @@
+ 			  source.dest = 0;
+ 			  redir.filename = $2;
+ 			  $$ = make_redirection (source, r_reading_until, redir, 0);
+-			  redir_stack[need_here_doc++] = $$;
++			  push_redir_stack ($$);
+ 			}
+ 	|	NUMBER LESS_LESS WORD
+ 			{
+ 			  source.dest = $1;
+ 			  redir.filename = $3;
+ 			  $$ = make_redirection (source, r_reading_until, redir, 0);
+-			  redir_stack[need_here_doc++] = $$;
++			  push_redir_stack ($$);
+ 			}
+ 	|	REDIR_WORD LESS_LESS WORD
+ 			{
+ 			  source.filename = $1;
+ 			  redir.filename = $3;
+ 			  $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
+-			  redir_stack[need_here_doc++] = $$;
++			  push_redir_stack ($$);
+ 			}
+ 	|	LESS_LESS_MINUS WORD
+ 			{
+ 			  source.dest = 0;
+ 			  redir.filename = $2;
+ 			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
+-			  redir_stack[need_here_doc++] = $$;
++			  push_redir_stack ($$);
+ 			}
+ 	|	NUMBER LESS_LESS_MINUS WORD
+ 			{
+ 			  source.dest = $1;
+ 			  redir.filename = $3;
+ 			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
+-			  redir_stack[need_here_doc++] = $$;
++			  push_redir_stack ($$);
+ 			}
+ 	|	REDIR_WORD  LESS_LESS_MINUS WORD
+ 			{
+ 			  source.filename = $1;
+ 			  redir.filename = $3;
+ 			  $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
+-			  redir_stack[need_here_doc++] = $$;
++			  push_redir_stack ($$);
+ 			}
+ 	|	LESS_LESS_LESS WORD
+ 			{
+@@ -4757,7 +4769,7 @@
+     case CASE:
+     case SELECT:
+     case FOR:
+-      if (word_top < MAX_CASE_NEST)
++      if (word_top + 1 < MAX_CASE_NEST)
+ 	word_top++;
+       word_lineno[word_top] = line_number;
+       break;
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index f83ce79804e..d53629fe0b8 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -3,7 +3,7 @@ pkgname=bash
 _bash_distver=4.3
 _bash_patchlevel=027
 version=${_bash_distver}.${_bash_patchlevel}
-revision=1
+revision=2
 wrksrc=${pkgname}-${_bash_distver}
 build_style=gnu-configure
 configure_args="--without-bash-malloc --with-curses --with-installed-readline"
diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 5d1b974ba15..32b92e48f6e 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -3,7 +3,7 @@ pkgname=chroot-bash
 _bash_distver=4.3
 _bash_patchlevel=027
 version=${_bash_distver}.${_bash_patchlevel}
-revision=1
+revision=2
 wrksrc="bash-${_bash_distver}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --without-curses --without-installed-readline --disable-nls"

From 15c4449b3284d4b71756448cd352834b551904d5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 28 Sep 2014 12:20:57 +0200
Subject: [PATCH 06/21] tzdata: update to 2014h.

---
 srcpkgs/tzdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index d04a1039859..f65623560eb 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -2,7 +2,7 @@
 pkgname=tzdata
 wrksrc=${pkgname}
 create_wrksrc=yes
-version=2014g
+version=2014h
 revision=1
 noarch=yes
 homepage="http://www.iana.org/time-zones"
@@ -10,7 +10,7 @@ short_desc="Time zone and daylight-saving time data"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=5547d5b7a982f7f53fffe68cb2a13692553f591a17d58c8ef15b20679d82a270
+checksum=e78152f616fb07c1dea124215ffca57d0de66d8897e00896086542e3de30f69e
 
 do_install() {
 	local timezones="africa antarctica asia australasia europe northamerica \

From 14f2b27363de5d41286f4eb3ca77a55c918ff511 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 28 Sep 2014 13:35:08 +0200
Subject: [PATCH 07/21] xbps-git: revbump (new bugfix/testcase).

---
 srcpkgs/xbps-git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index 48572a5db57..9dea405acb9 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
 version=20140928
-revision=1
+revision=2
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.voidlinux.eu/xbps"

From eac0b74c17bade9af28dae633fdbce65e34c789b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 28 Sep 2014 18:43:20 +0200
Subject: [PATCH 08/21] wpa_supplicant: enable syslog for debug messages; make
 dbus services less verbose.

---
 srcpkgs/wpa_supplicant/files/config | 4 ++--
 srcpkgs/wpa_supplicant/template     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/files/config b/srcpkgs/wpa_supplicant/files/config
index 59da1e27e80..961de5425e4 100644
--- a/srcpkgs/wpa_supplicant/files/config
+++ b/srcpkgs/wpa_supplicant/files/config
@@ -396,9 +396,9 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y
 CONFIG_DEBUG_FILE=y
 
 # Send debug messages to syslog instead of stdout
-#CONFIG_DEBUG_SYSLOG=y
+CONFIG_DEBUG_SYSLOG=y
 # Set syslog facility for debug messages
-#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
 
 # Enable privilege separation (see README 'Privilege separation' for details)
 #CONFIG_PRIVSEP=y
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 4b82b77cdd5..ec1d2c3b398 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.2
-revision=3
+revision=4
 build_wrksrc=$pkgname
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,12 +13,12 @@ checksum=e0d8b8fd68a659636eaba246bb2caacbf53d22d53b2b6b90eb4b4fef0993c8ed
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel libressl-devel dbus-devel readline-devel>=6.3"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
-
 build_options="systemd"
 
 pre_build() {
 	sed -i 's|/usr/local|$(PREFIX)|g' Makefile
 	cp -f ${FILESDIR}/config .config
+	sed -i 's, -u, -uq,' dbus/*.service.in
 }
 
 do_build() {
@@ -52,5 +52,5 @@ do_install() {
 		sed -e 's|-i%I|& -Dnl80211,wext|' -i ${DESTDIR}/usr/lib/systemd/system/wpa_supplicant@.service
 	fi
 
-	vinstall README 644 usr/share/licenses/$pkgname LICENSE
+	vlicense README
 }

From cc4aa31c01015eb87f535470d5f6b709a79b16a9 Mon Sep 17 00:00:00 2001
From: John Galt <johngaltfirstrun@gmail.com>
Date: Sun, 28 Sep 2014 13:00:06 -0700
Subject: [PATCH 09/21] libdrm: update to 2.5.58

---
 srcpkgs/libdrm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 3cb6b0e3602..dd73f8cc718 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
 # Template build file for 'libdrm'.
 pkgname=libdrm
-version=2.4.56
+version=2.4.58
 revision=1
 build_style=gnu-configure
 configure_args="--enable-udev"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://dri.freedesktop.org/"
 license="MIT"
 distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
-checksum=e20fbbe092177a8422913d8884a1255477456ab5b10b07389fa891a4dce54030
+checksum=b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd
 
 pre_configure() {
 	sed -e '/pthread-stubs/d' -i configure.ac

From 7dae1a9ca672371f6655d199653850bd478e5115 Mon Sep 17 00:00:00 2001
From: John Galt <johngaltfirstrun@gmail.com>
Date: Sun, 28 Sep 2014 13:02:12 -0700
Subject: [PATCH 10/21] MesaLib: revbump for new libdrm

---
 srcpkgs/MesaLib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index d9b51096879..d333fe6e59a 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.3.0
-revision=1
+revision=2
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm

From 29f232640572887bb54916575bbecb5b28d46d9d Mon Sep 17 00:00:00 2001
From: John Galt <johngaltfirstrun@gmail.com>
Date: Sun, 28 Sep 2014 13:09:54 -0700
Subject: [PATCH 11/21] MesaLib-git: update to current master

---
 srcpkgs/MesaLib-git/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/MesaLib-git/template b/srcpkgs/MesaLib-git/template
index 468c35b2567..9b97bfad57a 100644
--- a/srcpkgs/MesaLib-git/template
+++ b/srcpkgs/MesaLib-git/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib-git'.
 pkgname=MesaLib-git
-version=20140920
-revision=3
+version=20140928
+revision=1
 wrksrc="Mesa-git-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@@ -55,7 +55,7 @@ conf_files="/etc/drirc"
 
 do_fetch() {
 	local url="git://anongit.freedesktop.org/mesa/mesa"
-	local sha=4eb2bbefd2bf0359aff7ebbb8e931a1c7833606f
+	local sha=40aabc0e809fa7523606f15c053e0d6ac01d9b9e
 	msg_normal "Fetching source from $url ...\n"
 	git clone ${url} ${wrksrc}
 	cd ${wrksrc}

From 56303fe31c8bb3a0fea3907a5625566f096c6ac6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Sep 2014 03:04:49 +0200
Subject: [PATCH 12/21] dash: update to 0.5.8.

---
 srcpkgs/dash/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index b3600a30f7f..5c44fd9189a 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -1,7 +1,7 @@
 # Template file for 'dash'
 pkgname=dash
-version=0.5.7
-revision=9
+version=0.5.8
+revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
 register_shell="/bin/sh"
@@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gondor.apana.org.au/~herbert/dash/"
 license="BSD"
 distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
-checksum=ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39
+checksum=c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f
 
 post_install() {
 	ln -s dash ${DESTDIR}/usr/bin/sh

From cf3f5bfd048f9f24fc085442a2fa12abdea7f0d0 Mon Sep 17 00:00:00 2001
From: John Galt <johngaltfirstrun@gmail.com>
Date: Sun, 28 Sep 2014 21:10:18 -0700
Subject: [PATCH 13/21] linux3.17: update to rc7

---
 srcpkgs/linux3.17/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux3.17/template b/srcpkgs/linux3.17/template
index 871e25c6b32..48d57b8ddd9 100644
--- a/srcpkgs/linux3.17/template
+++ b/srcpkgs/linux3.17/template
@@ -2,7 +2,7 @@
 #
 pkgname=linux3.17
 _distver=3.17.0
-_patchver=rc6
+_patchver=rc7
 version=${_distver}${_patchver}
 revision=1
 wrksrc="linux-${_distver%%??}-${_patchver}"
@@ -11,7 +11,7 @@ homepage="http://www.kernel.org"
 license="GPL-2"
 short_desc="The Linux kernel and modules (${version%.*} series)"
 distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-${_distver%%??}-${_patchver}.tar.xz"
-checksum=7c537d2fe094a305a0c08dc67bb8ea66920658be1f44c366ed3d9c4d70b3a34f
+checksum=c6a7c665f37b720c35a599efdd44eda6d2463f4cb69bc8ee940d0071fada806b
 
 _kernver="${version}_${revision}"
 

From e2eade16eccdde3e766c539e7923d77a4e67545a Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 29 Sep 2014 09:22:26 +0200
Subject: [PATCH 14/21] ffmpeg: update to 2.4.1 (soname bump)

---
 common/shlibs           | 16 ++++++++--------
 srcpkgs/ffmpeg/template | 27 ++++++++++++---------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61e41a1062a..eee7889711f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -382,14 +382,14 @@ libid3tag.so.0 libid3tag-0.15.1b_1
 libgif.so.6 giflib-5.0.1_1
 libImlib2.so.1 imlib2-1.4.2_1
 libmp3lame.so.0 lame-3.98.2_1
-libavdevice.so.55 libavdevice-2.1_1
-libavformat.so.55 libavformat-2.1_1
-libswscale.so.2 libswscale-0.8.6_1
-libswresample.so.0 libswresample-0.8.6_1
-libpostproc.so.52 libpostproc-0.8.6_1
-libavcodec.so.55 libavcodec-2.1_1
-libavutil.so.52 libavutil-1.2.1_1
-libavfilter.so.4 libavfilter-2.3_1
+libavdevice.so.56 libavdevice-2.4.1_1
+libavformat.so.56 libavformat-2.4.1_1
+libswscale.so.3 libswscale-2.4.1_1
+libswresample.so.1 libswresample-2.4.1_1
+libpostproc.so.53 libpostproc-2.4.1_1
+libavcodec.so.56 libavcodec-2.4.1_1
+libavutil.so.54 libavutil-2.4.1_1
+libavfilter.so.5 libavfilter-2.4.1_1
 libSDL-1.2.so.0 SDL-1.2.14_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.136 x264-20131007_1
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 8c2894d60ca..0df3af0f65d 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,13 +1,13 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
-version=2.3.3
+version=2.4.1
 revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.ffmpeg.org"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
-checksum=bb4c0d10a24e08fe67292690a1b4d4ded04f5c4c388f0656c98940ab0c606446
+checksum=b4aecfce2c41ea4a21320dad818aa9a365b09a9cafe0b7173359cba86683c7f3
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -24,20 +24,17 @@ do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*) _args="--enable-vdpau --enable-vaapi";;
 	esac
-        if [ "$CROSS_BUILD" ]; then
-                case "$XBPS_TARGET_MACHINE" in
-                        arm*) _arch="arm";;
-                        mips*) _arch="mips";;
-                        *) _arch="$XBPS_TARGET_MACHINE";;
-                esac
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _arch="arm";;
+			mips*) _arch="mips";;
+			*) _arch="$XBPS_TARGET_MACHINE";;
+		esac
 
-                _args+=" --enable-cross-compile
-                        --sysroot=$XBPS_CROSS_BASE
-                        --cross-prefix=${XBPS_CROSS_TRIPLET}-
-                        --target-os=linux --arch=${_arch}"
-
-		# Remove this pkg_config kludge, breaks cross build.
-		sed -e 's,$pkg_config --,pkg-config --,g' -i configure
+		_args+=" --enable-cross-compile
+			--sysroot=$XBPS_CROSS_BASE
+			--cross-prefix=${XBPS_CROSS_TRIPLET}-
+			--target-os=linux --arch=${_arch}"
 	fi
 
 	./configure --prefix=/usr --disable-debug --enable-gpl \

From 25f3995210735101d7fe84c8ea323d82c466dff4 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 29 Sep 2014 09:23:39 +0200
Subject: [PATCH 15/21] Revbump pkgs that link against ffmpeg

---
 srcpkgs/alsa-plugins/template                 |  2 +-
 srcpkgs/audacious-plugins/template            |  4 +-
 srcpkgs/blender/template                      | 13 +++--
 srcpkgs/cherokee/patches/ffmpeg.patch         | 14 -----
 ...fix-ctk-path-handler-match_from_arch.patch | 16 ------
 srcpkgs/cherokee/template                     | 40 +++++++++-----
 srcpkgs/chromaprint/template                  | 17 +++---
 srcpkgs/cmus/template                         |  2 +-
 srcpkgs/deadbeef/template                     |  4 +-
 srcpkgs/dolphin-emu/template                  |  4 +-
 srcpkgs/freerdp/template                      |  6 +-
 srcpkgs/guvcview/template                     |  4 +-
 srcpkgs/idjc/template                         | 18 +++---
 srcpkgs/kfilemetadata/template                |  4 +-
 .../patches/AVCodec_compiler_error.patch      | 20 -------
 srcpkgs/libextractor/template                 | 21 ++++---
 srcpkgs/libopenal/template                    | 13 +++--
 srcpkgs/mpd/template                          |  9 +--
 srcpkgs/mpv/template                          |  2 +-
 .../vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch    | 15 +++++
 srcpkgs/vlc/template                          | 55 ++++---------------
 srcpkgs/xine-lib/template                     |  4 +-
 22 files changed, 121 insertions(+), 166 deletions(-)
 delete mode 100644 srcpkgs/cherokee/patches/ffmpeg.patch
 delete mode 100644 srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch
 delete mode 100644 srcpkgs/libextractor/patches/AVCodec_compiler_error.patch
 create mode 100644 srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch

diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 07022792788..5883e8aca5f 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,7 +1,7 @@
 # Template build file for 'alsa-plugins'.
 pkgname=alsa-plugins
 version=1.0.28
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-maemo-plugin --with-speex=lib"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index 6f470445e51..f6fac29e40b 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'.
 pkgname=audacious-plugins
 version=3.5.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="
@@ -11,7 +11,7 @@ makedepends="
  libcurl-devel libmtp-devel neon-devel libmms-devel gtk+3-devel libxml2-devel"
 short_desc="Plugins for the Audacious media player"
 maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL-3"
+license="BSD"
 homepage="http://audacious-media-player.org/"
 distfiles="http://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
 checksum=e6da3346df520f3c6cee3c3706eb09290840ea12dfff28d6bec32e5842dc9e26
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index b2c97aa216a..82c3f49326f 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,17 +1,18 @@
 # Template file for 'blender'
 pkgname=blender
 version=2.71
-revision=2
+revision=3
 hostmakedepends="cmake"
 # XXX missing deps: openimageio, opencolorio
-makedepends="libgomp-devel libpng-devel tiff-devel python3.4-devel glu-devel
-	glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
-	libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
-	desktop-file-utils hicolor-icon-theme libopenexr-devel"
+makedepends="
+ libgomp-devel libpng-devel tiff-devel python3.4-devel glu-devel
+ glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
+ libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
+ libopenexr-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 build_style="cmake"
 maintainer="Enno Boland <eb@s01.de>"
-license="GPL"
+license="GPL-2"
 homepage="http://blender.org"
 distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.gz"
 checksum=1d7d5a67a8ce5d258534fc0d426c30dbff56995b5648deba98b21b446f6e5889
diff --git a/srcpkgs/cherokee/patches/ffmpeg.patch b/srcpkgs/cherokee/patches/ffmpeg.patch
deleted file mode 100644
index 03e8badf1cc..00000000000
--- a/srcpkgs/cherokee/patches/ffmpeg.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- cherokee/handler_streaming.c.ffmpeg	2012-06-04 12:56:16.000000000 +0800
-+++ cherokee/handler_streaming.c	2012-06-04 12:56:40.000000000 +0800
-@@ -380,7 +380,7 @@
- 	if (likely (secs > 0)) {
- 		long tmp;
- 
--		tmp = (hdl->avformat->file_size / secs);
-+		tmp = (avio_size(hdl->avformat) / secs);
- 		if (tmp > rate) {
- 			rate = tmp;
- 			TRACE(ENTRIES, "New rate: %d bytes/s\n", rate);
-
-
-
diff --git a/srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch b/srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch
deleted file mode 100644
index b496f2e5e5e..00000000000
--- a/srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py
---- admin/CTK/CTK/Server.py	2011-06-06 14:17:35.000000000 +0300
-+++ admin/CTK/CTK/Server.py	2011-09-16 03:31:06.000000000 +0300
-@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler)
-         my_thread.scgi_conn   = self
-         my_thread.request_url = url
-
-+        # Drop the query string before matching against the handlers
-+        path = url.split('?', 1)[0]
-+
-         for published in server._web_paths:
--            if re.match (published._regex, url):
-+            if re.match (published._regex, path):
-                 # POST
-                 if published._method == 'POST':
-                     post = self._process_post()
diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template
index c051bdf7093..82326931b05 100644
--- a/srcpkgs/cherokee/template
+++ b/srcpkgs/cherokee/template
@@ -1,7 +1,8 @@
 # Template file for 'cherokee'
 pkgname=cherokee
-version=1.2.101
-revision=11
+version=1.2.104
+revision=1
+wrksrc="webserver-${version}"
 build_style=gnu-configure
 configure_args="
  --prefix=/usr --sysconfdir=/etc --localstatedir=/var
@@ -10,15 +11,14 @@ configure_args="
 hostmakedepends="automake libtool python"
 makedepends="libressl-devel pcre-devel>=8.30 python-devel libldap-devel pam-devel
  libmysqlclient-devel ffmpeg-devel>=2.1 geoip-devel"
-short_desc="An innovative, feature rich, and yet easy to configure open source Web Server"
+short_desc="Innovative, feature rich and easy to configure web server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.cherokee-project.com/"
 license="GPL-2"
-distfiles="http://pkgs.fedoraproject.org/repo/pkgs/$pkgname/${pkgname}-${version}.tar.gz/ef47003355a2e368e4d9596cd070ef23/${pkgname}-${version}.tar.gz"
-checksum=ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8
+distfiles="https://github.com/${pkgname}/webserver/archive/v${version}.tar.gz"
+checksum=5cbd00ff48503eaf90356b2975e311c02977f9166927e57fc23f541a109efd98
 
 conf_files="/etc/${pkgname}/${pkgname}.conf"
-systemd_services="cherokee.service on"
 system_accounts="httpd"
 httpd_descr="Cherokee HTTP server"
 httpd_homedir="/srv/httpd"
@@ -27,8 +27,16 @@ make_dirs="
 	/var/log/cherokee               0755    httpd   httpd
 	/var/lib/cherokee/graphs/images 0755    httpd   httpd"
 
+build_options="systemd"
+if [ "$build_option_systemd" ]; then
+	systemd_services="cherokee.service on"
+fi
+
 pre_configure() {
-	autoreconf -fi
+	if [ "$CROSS_BUILD" ]; then
+		_args="--host=${XBPS_CROSS_TRIPLET}"
+	fi
+	NOCONFIGURE=1 ./autogen.sh ${_args}
 	# use /var/log/cherokee instead of /var/log
 	sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
 }
@@ -36,25 +44,29 @@ pre_configure() {
 post_install() {
 	# Setup logrotate thing
 	vinstall ${FILESDIR}/${pkgname}.logrotate 644 etc/logrotate.d ${pkgname}
-	
-	# Install systemd service
-	vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
+
+	# Install PAM configuration file
+	vinstall pam.d_cherokee 644 etc/pam.d ${pkgname}
+
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
+	fi
 }
 
 cherokee-devel_package() {
-	depends="libcherokee>=${version}_${revision}"
+	depends="lib${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/cherokee-config
-        	vmove usr/include
-        	vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/share/aclocal
 		vmove "usr/lib/*.so"
 	}
 }
 
 libcherokee_package() {
-	short_desc+=" - Runtime library"
+	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 		vmove usr/lib/cherokee
diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template
index 4b0aad02fee..8f0eb14abc0 100644
--- a/srcpkgs/chromaprint/template
+++ b/srcpkgs/chromaprint/template
@@ -1,18 +1,17 @@
 # Template file for 'chromaprint'
 pkgname=chromaprint
-version=1.1
-revision=3
-distfiles="https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-${version}.tar.gz"
-checksum="6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12"
-build_style="cmake"
-configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON"
+version=1.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_EXAMPLES=ON"
 hostmakedepends="cmake"
 makedepends="ffmpeg-devel"
 maintainer="Steven R <dev@styez.com>"
 homepage="http://acoustid.org/chromaprint/"
-license="LGPL-2"
-short_desc="Library that implements a custom algorithm for extracting fingerprints from any audio source"
-
+license="LGPL-2.1"
+short_desc="Library that extracts fingerprints from any audio source"
+distfiles="https://bitbucket.org/acoustid/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
+checksum=822b8949a322ac04c6f8a3ed78f5e689bcc493c6ca0972bf627c913c8430031a
 
 chromaprint-devel_package() {
     short_desc+=" - development files"
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 99190b4987b..6a3926cf872 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
 # Template file for 'cmus'
 pkgname=cmus
 version=2.6.0
-revision=1
+revision=2
 short_desc="Small, fast and powerful console music player"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index 98062b7d825..3f2c5921896 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,7 +1,7 @@
 # Template file for 'deadbeef'.
 pkgname=deadbeef
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-gtk3 --disable-gtk2"
 hostmakedepends="pkg-config intltool yasm"
@@ -13,7 +13,7 @@ makedepends="
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player For GNU/Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL-2,LGPL-2.1"
+license="GPL-2, LGPL-2.1"
 homepage="http://deadbeef.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=3433b966683286c03ffbcc79b2201cd517f8dbf6b41da8600778dfa93cd64e1a
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 4fe0969d007..9575c23d16e 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -8,14 +8,14 @@ CXXFLAGS="-mssse3"
 
 pkgname=dolphin-emu
 version=4.0.2
-revision=2
+revision=3
 wrksrc="dolphin-${version}"
 build_style=cmake
 hostmakedepends="cmake pkg-config"
 makedepends="
  zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel>=1.9
  SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel>=2.1 libgomp-devel
- portaudio-devel libopenal-devel soundtouch-devel lzo-devel desktop-file-utils"
+ portaudio-devel libopenal-devel soundtouch-devel lzo-devel"
 depends="desktop-file-utils"
 short_desc="A Gamecube / Wii / Triforce emulator"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index e35a30fb9ce..6af02359628 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=1.0.2
-revision=3
+revision=4
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON
@@ -16,7 +16,7 @@ makedepends="
 short_desc="A Free RDP (Remote Desktop Protocol) client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Apache-2.0"
-homepage="http://freerdp.sourceforge.net"
+homepage="http://www.freerdp.com/"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
 checksum=c0f137df7ab6fb76d7e7d316ae4e0ca6caf356e5bc0b5dadbdfadea5db992df1
 
@@ -29,7 +29,7 @@ pre_configure() {
 }
 
 libfreerdp_package() {
-	replaces="freerdp<1.0.2_2"
+	replaces="${sourcepkg}<1.0.2_2"
 	short_desc+=" - runtime libraries"
 	pkg_install() {
 		vmove usr/lib/*.so.*
diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template
index 4abce2e0d84..1e03f0da8f2 100644
--- a/srcpkgs/guvcview/template
+++ b/srcpkgs/guvcview/template
@@ -1,13 +1,13 @@
 # Template file for 'guvcview'
 pkgname=guvcview
 version=1.7.3
-revision=2
+revision=3
 wrksrc="${pkgname}-src-${version}"
 build_style=gnu-configure
 configure_args="--disable-debian-menu"
 hostmakedepends="pkg-config intltool"
 makedepends="libudev-devel gtk+3-devel SDL-devel ffmpeg-devel libusb-devel
- pulseaudio-devel v4l-utils-devel portaudio-devel desktop-file-utils"
+ pulseaudio-devel v4l-utils-devel portaudio-devel"
 depends="desktop-file-utils"
 short_desc="Simple GTK interface for capturing and viewing video from UVC devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index 88083ae749c..6a3c678dfb7 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -1,23 +1,19 @@
 # Template file for 'idjc'
 pkgname=idjc
-version=0.8.9
-revision=3
+version=0.8.14
+revision=1
 build_style=gnu-configure
-hostmakedepends="which pkg-config"
+hostmakedepends="pkg-config python-devel"
 makedepends="
  libvorbis-devel libogg-devel jack-devel libsamplerate-devel
  libflac-devel libsndfile-devel libmad-devel ffmpeg-devel>=2.1
  speex-devel glib-devel pixman-devel lame-devel pygtk-devel>=2.24.0_8
- libshout-idjc-devel opus-devel mutagen desktop-file-utils shared-mime-info"
+ libshout-idjc-devel opus-devel mutagen"
 depends="pygtk mutagen desktop-file-utils shared-mime-info"
-pycompile_module="idjc"
+pycompile_module="idjcmonitor.py idjc"
 short_desc="Internet DJ Console"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-homepage="http://${pkgname}.sourceforge.net"
+homepage="http://idjc.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b74e9a8378b951492c35ea9c2e3e665c5dd79f94958168d4ca872592ab326e71
-
-pre_configure() {
-	sed -e 's|AVCODEC_MAX_AUDIO_FRAME_SIZE|192000|g' -i c/avcodecdecode.c
-}
+checksum=2cc6932f2029dd6d59780b76b29d9d7d63fdb5338ce07d99b3878f9aae7de1bc
diff --git a/srcpkgs/kfilemetadata/template b/srcpkgs/kfilemetadata/template
index 175ba481158..cb48cf25591 100644
--- a/srcpkgs/kfilemetadata/template
+++ b/srcpkgs/kfilemetadata/template
@@ -1,7 +1,7 @@
 # Template file for 'kfilemetadata'
 pkgname=kfilemetadata
 version=4.13.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF"
 hostmakedepends="cmake automoc4 pkg-config"
@@ -9,7 +9,7 @@ makedepends="zlib-devel libressl-devel qt-devel phonon-devel kdelibs-devel>=${ve
  poppler-qt4-devel ffmpeg-devel taglib-devel exiv2-devel"
 short_desc="A library for extracting file metadata"
 maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL, LGPL, FDL"
+license="LGPL-2.1, LGPL-3"
 homepage="https://projects.kde.org/projects/kde/kdelibs/kfilemetadata"
 distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
 checksum=0777d591dd4328f83bdede9764fe7d70923baed0ccad779d9cc3aaddaefef4cf
diff --git a/srcpkgs/libextractor/patches/AVCodec_compiler_error.patch b/srcpkgs/libextractor/patches/AVCodec_compiler_error.patch
deleted file mode 100644
index 58570e6a684..00000000000
--- a/srcpkgs/libextractor/patches/AVCodec_compiler_error.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/plugins/thumbnailffmpeg_extractor.c.orig	2014-05-08 21:07:41.546845538 +0200
-+++ src/plugins/thumbnailffmpeg_extractor.c	2014-05-08 21:08:30.389842241 +0200
-@@ -335,7 +335,7 @@
-  * @param ec extraction context to use
-  */
- static void
--extract_image (enum CodecID image_codec_id,
-+extract_image (enum AVCodecID image_codec_id,
-                struct EXTRACTOR_ExtractContext *ec)
- {
-   AVDictionary *opts;
-@@ -631,7 +631,7 @@
-   /**
-    * Corresponding ffmpeg decoder ID.
-    */
--  enum CodecID codec_id;
-+  enum AVCodecID codec_id;
- };
- 
- 
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index c2d36340ea0..1a87bc0cf82 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,17 +1,24 @@
 # Template file for 'libextractor'
 pkgname=libextractor
-version=1.1
-revision=3
+version=1.3
+revision=1
 short_desc="Library used to extract meta data from files"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="MIT"
+license="GPL-3"
 homepage="http://www.gnu.org/software/libextractor/"
-distfiles="http://ftpmirror.gnu.org/libextractor/libextractor-${version}.tar.gz"
-checksum="cbb7c2f7f92654dc09b8e5c5e353a49609a22b222ba23c944fcc14f2223172ff"
+distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=868ad64c9a056d6b923d451d746935bffb1ddf5d89c3eb4f67d786001a3f7b7f
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config"
-makedepends="zlib-devel bzip2-devel exiv2-devel tiff-devel libpng-devel libjpeg-turbo-devel libvorbis-devel libflac-devel giflib-devel libmpeg2-devel ffmpeg-devel libgsf-devel gtk+3-devel libltdl-devel"
+hostmakedepends="automake gettext-devel libtool pkg-config"
+makedepends="
+ zlib-devel bzip2-devel exiv2-devel tiff-devel libpng-devel libjpeg-turbo-devel
+ libvorbis-devel libflac-devel giflib-devel libmpeg2-devel ffmpeg-devel
+ libgsf-devel gtk+3-devel libltdl-devel libarchive-devel file-devel"
+
+pre_configure() {
+	autoreconf -fi
+}
 
 libextractor-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template
index 534fd391f98..14a19899081 100644
--- a/srcpkgs/libopenal/template
+++ b/srcpkgs/libopenal/template
@@ -1,21 +1,26 @@
 # Template file for 'libopenal'
 pkgname=libopenal
-version=1.15
-revision=6
+version=1.16.0
+revision=1
 build_style=cmake
 wrksrc="openal-soft-${version}"
 short_desc="A cross-platform 3D audio library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
-homepage="http://connect.creativelabs.com/openal/default.aspx"
+homepage="http://kcat.strangesoft.net/openal.html"
 distfiles="http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2"
-checksum=bf58ecaf178339e86db00403b6d5c6408c9a3dfd3a077b43ac5432c52b63702d
+checksum=2f3dcd313fe26391284fbf8596863723f99c65d6c6846dccb48e79cadaf40d5f
 
 hostmakedepends="pkg-config cmake"
 makedepends="alsa-lib-devel pulseaudio-devel SDL-devel ffmpeg-devel>=2.1"
 # dlopen(3)d dependencies
 depends="alsa-lib libpulseaudio SDL"
 
+post_install() {
+	rm -f ${DESTDIR}/usr/share/openal/alsoftrc.sample
+	vsconf alsoftrc.sample
+}
+
 libopenal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 5cfaaa4b877..f88da3e72d2 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.18.14
+version=0.18.16
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -26,7 +26,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.musicpd.org/"
 distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=8a33225f8abeb312f794ded01aaaa14e61ddcaf3723d298e266892343dae285d
+checksum=7524c7a7695acfc6a5ce4117b30c74b172cef681a4bb9032db20c3671ad5765a
 
 # Package build options
 build_options="jack lame mpcdec pulseaudio systemd wavpack"
@@ -57,7 +57,8 @@ post_install() {
 
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/tmpfiles.d 644 usr/lib/tmpfiles.d mpd.conf
-		vmkdir usr/lib/systemd/user
-		ln -s ../system/mpd.service ${DESTDIR}/usr/lib/systemd/user/mpd.service
+		install -Dm644 ${DESTDIR}/usr/lib/systemd/{system,user}/mpd.service
+		sed '/\[Service\]/a User=mpd' -i ${DESTDIR}/usr/lib/systemd/system/mpd.service
+		sed '/WantedBy=/c WantedBy=default.target' -i ${DESTDIR}/usr/lib/systemd/{system,user}/mpd.service
 	fi
 }
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index c8fa386e320..19391a97ca6 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
 # Template file for 'mpv'
 pkgname=mpv
 version=0.5.4
-revision=1
+revision=2
 short_desc="Video player based on MPlayer/mplayer2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
diff --git a/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch b/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch
new file mode 100644
index 00000000000..3dd93c91d97
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch
@@ -0,0 +1,15 @@
+diff --git configure.ac.orig configure.ac
+index a684338..053713a 100644
+--- configure.ac.orig
++++ configure.ac
+@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec,
+ [  --enable-avcodec        libavcodec codec (default enabled)])
+ AS_IF([test "${enable_avcodec}" != "no"], [
+   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
+-    PKG_CHECK_EXISTS([libavcodec < 56],, [
+-      AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
++    PKG_CHECK_EXISTS([libavcodec < 57],, [
++      AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
+     ])
+     VLC_SAVE_FLAGS
+     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index c0cf802df3d..b8fc8a628ef 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,15 +1,17 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --disable-lua --disable-live555 --disable-fluidsynth
- --enable-dvdread --enable-flac --disable-gnomevfs"
-short_desc="VideoLan Client - A highly portable multimedia player"
+ --enable-dvdread --enable-flac --disable-gnomevfs
+ $(vopt_enable notify) $(vopt_enable opengl glx) $(vopt_enable qt)
+ $(vopt_enable svg) $(vopt_enable v4l v4l2)"
+short_desc="A cross-platform multimedia player"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/vlc/"
-license="GPL-2"
+license="GPL-2, LGPL-2.1"
 distfiles="http://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
 checksum=6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72
 
@@ -17,7 +19,7 @@ lib32disabled=yes
 
 # XXX Add missing deps: gme, telepathy, lua, live555, libtar (for skins2).
 hostmakedepends="automake libtool pkg-config libgcrypt-devel"
-makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 libupnp-devel
+makedepends="videoproto libudev-devel libpng-devel>=1.6 libupnp-devel
  ncurses-devel libvorbis-devel x264-devel>=20131007.2245_2 ffmpeg-devel>=2.1
  xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 libsamplerate-devel
  libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel
@@ -27,7 +29,9 @@ makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 libupnp-devel
  gnutls-devel>=3.1.5 taglib-devel libmatroska-devel>=1.4.1 libmpcdec-devel
  libcdio-devel libdvdnav-devel libsysfs-devel libmtp-devel>=1.1.4
  sqlite-devel libtheora-devel speex-devel pulseaudio-devel libxml2-devel
- opus-devel libbluray-devel faad2-devel jack-devel libSM-devel freefont-ttf"
+ opus-devel libbluray-devel faad2-devel jack-devel libSM-devel freefont-ttf
+ $(vopt_if notify libnotify-devel) $(vopt_if opengl MesaLib-devel)
+ $(vopt_if qt qt-devel) $(vopt_if svg librsvg-devel) $(vopt_if v4l v4l-utils-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" ] || [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@@ -58,41 +62,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" libnotify qt"
 fi
 
-if [ "$build_option_notify" ]; then
-	configure_args+=" --enable-notify"
-	makedepends+=" libnotify-devel"
-else
-	configure_args+=" --disable-notify"
-fi
-
-if [ "$build_option_opengl" ]; then
-	configure_args+=" --enable-glx"
-	makedepends+=" MesaLib-devel"
-else
-	configure_args+=" --disable-glx"
-fi
-
-if [ "$build_option_qt" ]; then
-	configure_args+=" --enable-qt"
-	makedepends+=" qt-devel"
-else
-	configure_args+=" --disable-qt"
-fi
-
-if [ "$build_option_svg" ]; then
-	configure_args+=" --enable-svg"
-	makedepends+=" librsvg-devel"
-else
-	configure_args+=" --disable-svg"
-fi
-
-if [ "$build_option_v4l" ]; then
-	configure_args+=" --enable-v4l2"
-	makedepends+=" v4l-utils-devel"
-else
-	configure_args+=" --disable-v4l2"
-fi
-
 pre_configure() {
 	NOCONFIGURE=1 ./bootstrap
 
@@ -114,7 +83,7 @@ post_install() {
 }
 
 libvlc_package() {
-	replaces="vlc<2.1.1_2"
+	replaces="${sourcepkg}<2.1.1_2"
 	short_desc+=" - runtime libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
@@ -128,7 +97,7 @@ libvlc_package() {
 
 vlc-devel_package() {
 	short_desc+=" - development files"
-	depends+=" libvlc>=${version}_${revision}"
+	depends+=" lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index cd8c4f841b3..438e6beff8d 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'xine-lib'
 pkgname=xine-lib
 version=1.2.6
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 --disable-oss"
@@ -15,7 +15,7 @@ makedepends="
  libjpeg-turbo-devel libmng-devel"
 short_desc="A multimedia playback engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL, LGPL"
+license="GPL-2, LGPL-2.1"
 homepage="http://www.xine-project.org"
 distfiles="${SOURCEFORGE_SITE}/xine/$pkgname-$version.tar.xz"
 checksum=bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005

From 9af034aee808f5beed0f9e2367a228e09f358daa Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Sep 2014 09:53:35 +0200
Subject: [PATCH 16/21] omxplayer: update to upstream commit 6ee9a0a548 and
 rebuild against ffmpeg>=2.4.

---
 srcpkgs/omxplayer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template
index 8cd0474058b..f366bd7cf57 100644
--- a/srcpkgs/omxplayer/template
+++ b/srcpkgs/omxplayer/template
@@ -1,8 +1,8 @@
 # Template file for 'omxplayer'
-_githash=ed4d3d50b4
+_githash=6ee9a0a548
 
 pkgname=omxplayer
-version=20140713
+version=20140929
 revision=1
 short_desc="Commandline OMX player for the Raspberry Pi (git ${_githash})"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,7 +13,7 @@ homepage="https://github.com/popcornmix/omxplayer"
 only_for_archs="armv6l"
 build_style=gnu-makefile
 hostmakedepends="pkg-config git"
-makedepends="rpi-firmware>=20130913 pcre-devel boost-devel freetype-devel ffmpeg-devel>=2.1 dbus-devel"
+makedepends="rpi-firmware>=20130913 pcre-devel boost-devel freetype-devel ffmpeg-devel>=2.4 dbus-devel"
 depends="rpi-firmware>=20130913 freefont-ttf"
 
 do_fetch() {

From 9c7228112a0672b47216ae7aff6af2ef875ec508 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Sep 2014 11:10:52 +0200
Subject: [PATCH 17/21] xbps-git: bump (new tests for reverts).

---
 srcpkgs/xbps-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index 9dea405acb9..a61384474dd 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
-version=20140928
-revision=2
+version=20140929
+revision=1
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.voidlinux.eu/xbps"

From 25a3b53765e9c8b3a894c4b6384ff6b207f40b66 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Sep 2014 14:13:08 +0200
Subject: [PATCH 18/21] omxplayer: make this build with ffmpeg-2.4 and simplify
 build (based on alarm).

---
 srcpkgs/omxplayer/files/Makefile           |  66 -------------
 srcpkgs/omxplayer/files/Makefile.include   |  29 ------
 srcpkgs/omxplayer/patches/build.patch      | 105 +++++++++++++++++++++
 srcpkgs/omxplayer/patches/ffmpeg-2.4.patch |  11 +++
 srcpkgs/omxplayer/template                 |   3 +-
 5 files changed, 117 insertions(+), 97 deletions(-)
 delete mode 100644 srcpkgs/omxplayer/files/Makefile
 delete mode 100644 srcpkgs/omxplayer/files/Makefile.include
 create mode 100644 srcpkgs/omxplayer/patches/build.patch
 create mode 100644 srcpkgs/omxplayer/patches/ffmpeg-2.4.patch

diff --git a/srcpkgs/omxplayer/files/Makefile b/srcpkgs/omxplayer/files/Makefile
deleted file mode 100644
index 6d5469f56e7..00000000000
--- a/srcpkgs/omxplayer/files/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-include Makefile.include
-
-CFLAGS+= -std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
-
-LDFLAGS+=-L./ -ldbus-1 -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
-INCLUDES+=-I./ -Ilinux
-
-SRC=linux/XMemUtils.cpp \
-    utils/log.cpp \
-    DynamicDll.cpp \
-    utils/PCMRemap.cpp \
-    utils/RegExp.cpp \
-    OMXSubtitleTagSami.cpp \
-    OMXOverlayCodecText.cpp \
-    BitstreamConverter.cpp \
-    linux/RBP.cpp \
-    OMXThread.cpp \
-    OMXReader.cpp \
-    OMXStreamInfo.cpp \
-    OMXAudioCodecOMX.cpp \
-    OMXCore.cpp \
-    OMXVideo.cpp \
-    OMXAudio.cpp \
-    OMXClock.cpp \
-    File.cpp \
-    OMXPlayerVideo.cpp \
-    OMXPlayerAudio.cpp \
-    OMXPlayerSubtitles.cpp \
-    SubtitleRenderer.cpp \
-    Unicode.cpp \
-    Srt.cpp \
-    KeyConfig.cpp \
-    OMXControl.cpp \
-    Keyboard.cpp \
-    omxplayer.cpp \
-
-OBJS+=$(filter %.o,$(SRC:.cpp=.o))
-
-all: omxplayer.bin
-
-%.o: %.cpp
-	@rm -f $@ 
-	$(CXX) $(CFLAGS) $(INCLUDES) -c $< -o $@ -Wno-deprecated-declarations
-
-list_test:
-	$(CXX) -O3 -o list_test list_test.cpp
-
-version:
-	bash gen_version.sh > version.h
-
-omxplayer.bin: version $(OBJS)
-	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
-
-clean:
-	for i in $(OBJS); do (if test -e "$$i"; then ( rm $$i ); fi ); done
-	@rm -f omxplayer.old.log omxplayer.log
-	@rm -f omxplayer.bin
-	@rm -rf omxplayer-dist
-	@rm -f omxplayer-dist.tar.gz
-
-install:
-	install -d $(DESTDIR)/usr/bin
-	install -Dm755 omxplayer $(DESTDIR)/usr/bin/omxplayer
-	install -Dm755 omxplayer.bin $(DESTDIR)/usr/bin
-
-	
diff --git a/srcpkgs/omxplayer/files/Makefile.include b/srcpkgs/omxplayer/files/Makefile.include
deleted file mode 100644
index 72d1d4d5501..00000000000
--- a/srcpkgs/omxplayer/files/Makefile.include
+++ /dev/null
@@ -1,29 +0,0 @@
-USE_BUILDROOT=0
-
-JOBS=1
-
-CFLAGS		:= 
-CXXFLAGS	:= $(CFLAGS)
-CPPFLAGS	:= $(CFLAGS)
-LDFLAGS		:= 
-LD		:= ld
-CC		:= gcc
-CXX         	:= g++
-OBJDUMP		:= objdump
-RANLIB		:= ranlib
-STRIP		:= strip
-AR 		:= ar
-CXXCP 		:= $(CXX) -E
-
-CFLAGS		+= -pipe -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux \
-		   -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check \
-		   -O3 -mstructure-size-boundary=32 -mno-sched-prolog
-
-LDFLAGS		+= -L@CROSSBASE@/opt/vc/lib/ -Wl,-rpath /opt/vc/lib -L@CROSSBASE@/usr/lib
-
-INCLUDES	+= -I@CROSSBASE@/opt/vc/include -I@CROSSBASE@/opt/vc/include/interface/vcos/ \
-		    -I@CROSSBASE@/opt/vc/include/interface/vcos/pthreads \
-		    -I@CROSSBASE@/opt/vc/include/interface/vmcs_host/linux \
-		    -I@CROSSBASE@/usr/include -I@CROSSBASE@/usr/include/dbus-1.0 \
-		    -I@CROSSBASE@/usr/lib/dbus-1.0/include -I@CROSSBASE@/usr/include/freetype2
-
diff --git a/srcpkgs/omxplayer/patches/build.patch b/srcpkgs/omxplayer/patches/build.patch
new file mode 100644
index 00000000000..58a5b06b738
--- /dev/null
+++ b/srcpkgs/omxplayer/patches/build.patch
@@ -0,0 +1,105 @@
+--- Makefile
++++ Makefile
+@@ -2,9 +2,9 @@ include Makefile.include
+ 
+ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
+ 
+-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
++LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
+ 
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
++INCLUDES+=-I./ -Ilinux
+ 
+ DIST ?= omxplayer-dist
+ 
+@@ -39,7 +39,7 @@ SRC=linux/XMemUtils.cpp \
+ 
+ OBJS+=$(filter %.o,$(SRC:.cpp=.o))
+ 
+-all: dist
++all: omxplayer.bin
+ 
+ %.o: %.cpp
+ 	@rm -f $@ 
+@@ -51,7 +51,7 @@ version:
+ 	bash gen_version.sh > version.h 
+ 
+ omxplayer.bin: version $(OBJS)
+-	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
++	$(CXX) -o omxplayer.bin $(OBJS) $(LDFLAGS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
+ 	$(STRIP) omxplayer.bin
+ 
+ help.h: README.md Makefile
+@@ -74,19 +74,9 @@ clean:
+ 	@rm -rf $(DIST)
+ 	@rm -f omxplayer-dist.tar.gz
+ 
+-ffmpeg:
+-	@rm -rf ffmpeg
+-	make -f Makefile.ffmpeg
+-	make -f Makefile.ffmpeg install
+-
+-dist: omxplayer.bin omxplayer.1
+-	mkdir -p $(DIST)/usr/lib/omxplayer
+-	mkdir -p $(DIST)/usr/bin
+-	mkdir -p $(DIST)/usr/share/doc/omxplayer
+-	mkdir -p $(DIST)/usr/share/man/man1
+-	cp omxplayer omxplayer.bin $(DIST)/usr/bin
+-	cp COPYING $(DIST)/usr/share/doc/omxplayer
+-	cp README.md $(DIST)/usr/share/doc/omxplayer/README
+-	cp omxplayer.1 $(DIST)/usr/share/man/man1
+-	cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
+-	cd $(DIST); tar -czf ../$(DIST).tgz *
++install:
++	install -d $(DESTDIR)/usr/bin
++	install -d $(DESTDIR)/usr/share/doc/omxplayer
++	install omxplayer $(DESTDIR)/usr/bin/
++	install omxplayer.bin $(DESTDIR)/usr/bin/
++	install README.md $(DESTDIR)/usr/share/doc/omxplayer/
+--- Makefile.include
++++ Makefile.include
+@@ -1,40 +1,4 @@
+-USE_BUILDROOT=0
+-FLOAT=hard
+-
+-ifeq ($(USE_BUILDROOT), 1)
+-BUILDROOT	:=/opt/xbmc-bcm/buildroot
+-SDKSTAGE	:=$(BUILDROOT)/output/staging
+-TARGETFS	:=$(BUILDROOT)/output/target
+-TOOLCHAIN	:=$(BUILDROOT)/output/host/usr/
+-HOST			:=arm-unknown-linux-gnueabi
+-SYSROOT		:=$(BUILDROOT)/output/host/usr/arm-unknown-linux-gnueabi/sysroot
+-else
+-BUILDROOT	:=/opt/bcm-rootfs
+-SDKSTAGE	:=/opt/bcm-rootfs
+-TARGETFS	:=/opt/bcm-rootfs
+-TOOLCHAIN	:=/home/dc4/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/
+-HOST		:=arm-linux-gnueabihf
+-#SYSROOT		:=$(TOOLCHAIN)/arm-bcm2708hardfp-linux-gnueabi/sysroot
+-SYSROOT		:=/opt/bcm-rootfs
+-endif
+-
+-JOBS=7
+-
+-CFLAGS			:= -isystem$(PREFIX)/include
+-CXXFLAGS		:= $(CFLAGS)
+-CPPFLAGS		:= $(CFLAGS)
+-LDFLAGS			:= -L$(BUILDROOT)/lib
+-LD					:= $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT)
+-CC					:= $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT)
+-CXX         := $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT)
+-OBJDUMP			:= $(TOOLCHAIN)/bin/$(HOST)-objdump
+-RANLIB			:= $(TOOLCHAIN)/bin/$(HOST)-ranlib
+-STRIP				:= $(TOOLCHAIN)/bin/$(HOST)-strip
+-AR 					:= $(TOOLCHAIN)/bin/$(HOST)-ar
+-CXXCP 			:= $(CXX) -E
+-PATH 				:= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
+-
+-CFLAGS			+= -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
+-LDFLAGS			+= -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
+-#INCLUDES		+= -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
+-INCLUDES		+= -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
++#STRIP			:= strip
++CFLAGS			+= -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
++LDFLAGS		+= -L$(XBPS_CROSS_BASE)/opt/vc/lib/
++INCLUDES		+= -I$(XBPS_CROSS_BASE)/opt/vc/include -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vmcs_host/linux -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vcos/pthreads -I$(XBPS_CROSS_BASE)/usr/include/freetype2 -I$(XBPS_CROSS_BASE)/usr/include/dbus-1.0 -I$(XBPS_CROSS_BASE)/usr/lib/dbus-1.0/include
diff --git a/srcpkgs/omxplayer/patches/ffmpeg-2.4.patch b/srcpkgs/omxplayer/patches/ffmpeg-2.4.patch
new file mode 100644
index 00000000000..5f554cea6d1
--- /dev/null
+++ b/srcpkgs/omxplayer/patches/ffmpeg-2.4.patch
@@ -0,0 +1,11 @@
+--- DllAvFilter.h
++++ DllAvFilter.h
+@@ -124,7 +124,7 @@ public:
+   }
+   virtual int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, AVFilterInOut **inputs, AVFilterInOut **outputs, void *log_ctx)
+   {
+-    return ::avfilter_graph_parse(graph, filters, inputs, outputs, log_ctx);
++    return ::avfilter_graph_parse(graph, filters, *inputs, *outputs, log_ctx);
+   }
+   virtual int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx)
+   {
diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template
index f366bd7cf57..57550ec2519 100644
--- a/srcpkgs/omxplayer/template
+++ b/srcpkgs/omxplayer/template
@@ -12,6 +12,7 @@ homepage="https://github.com/popcornmix/omxplayer"
 # XXX only rpi
 only_for_archs="armv6l"
 build_style=gnu-makefile
+make_build_args="XBPS_CROSS_BASE=$XBPS_CROSS_BASE"
 hostmakedepends="pkg-config git"
 makedepends="rpi-firmware>=20130913 pcre-devel boost-devel freetype-devel ffmpeg-devel>=2.4 dbus-devel"
 depends="rpi-firmware>=20130913 freefont-ttf"
@@ -24,8 +25,6 @@ do_fetch() {
 }
 
 pre_build() {
-	cp -f ${FILESDIR}/* .
 	sed -e 's,/usr/share/fonts/truetype/freefont,/usr/share/fonts/TTF,g' -i omxplayer.cpp
 	mkdir -p /opt/vc/lib
-	sed -e "s|@CROSSBASE@|${XBPS_CROSS_BASE}|g" -i Makefile.include
 }

From 616e6bd2b91e13fc90839e7b3ab8512a199df8e5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Sep 2014 15:28:09 +0200
Subject: [PATCH 19/21] xbps-git: revbump (another bugfix, another test case).

---
 srcpkgs/xbps-git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index a61384474dd..ac9b0131b8a 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
 version=20140929
-revision=1
+revision=2
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.voidlinux.eu/xbps"

From 1253876925bb39b611b4578a8e70844df10ce868 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Sep 2014 15:56:20 +0200
Subject: [PATCH 20/21] xbps: update to 0.41.

---
 srcpkgs/xbps-static/template | 2 +-
 srcpkgs/xbps/template        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index 74fb4122765..7d2fcb7ac20 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -2,7 +2,7 @@
 #
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
-version=0.40
+version=0.41
 revision=1
 bootstrap=yes
 short_desc="The XBPS package system utilities - static binaries"
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index a66ae3d7a45..4d3ec756956 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps'
 pkgname=xbps
-version=0.40
+version=0.41
 revision=1
 bootstrap=yes
 short_desc="The XBPS package system utilities"

From 2b37d03fb7279a899003f3c86e5ddcf3cf9cc606 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 29 Sep 2014 16:00:03 +0200
Subject: [PATCH 21/21] xbps-git: revbump (0.42).

---
 srcpkgs/xbps-git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index ac9b0131b8a..5de83b4f75d 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
 version=20140929
-revision=2
+revision=3
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.voidlinux.eu/xbps"