Merge branch 'next'

Conflicts:
	Makefile
	package/flac/0001-fix-altivec-logic.patch
	package/grantlee/Config.in

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

1 files changed, 0 insertions, 30 deletions

diff --git a/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch b/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch
deleted file mode 100644
index 5ac3e74512..0000000000
--- a/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6e0a0631d97b17a82f6ce1996bcb49ee2dbe1544 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 25 Apr 2014 22:30:06 +0200
-Subject: [PATCH] make-event-names: use input.h from sysroot (instead of host
- system version)
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- src/make-event-names.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/make-event-names.py b/src/make-event-names.py
-index 2d0924d..945d473 100755
---- a/src/make-event-names.py
-+++ b/src/make-event-names.py
-@@ -10,8 +10,10 @@ from __future__ import print_function
- import argparse
- import re
- import sys
-+import os
- 
--SOURCE_FILE = "/usr/include/linux/input.h"
-+# environment variable SYSROOT set by buildroot for cross-compilation
-+SOURCE_FILE = os.environ.get('SYSROOT', '') + "/usr/include/linux/input.h"
- 
- class Bits(object):
- 	pass
--- 
-1.8.1.4
-