Merge remote-tracking branch 'upstream/master' into openelec-3.2

Conflicts:
	packages/x11/driver/xf86-video-nvidia/meta

packages/debug/strace/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="strace"
-PKG_VERSION="4.7"
+PKG_VERSION="4.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/debug/strace/patches/strace-4.7-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur strace-4.7-old/configure.ac strace-4.7-new/configure.ac
---- strace-4.7-old/configure.ac	2012-05-02 05:34:56.000000000 -0700
-+++ strace-4.7-new/configure.ac	2013-01-03 21:01:04.000000000 -0800
-@@ -3,7 +3,7 @@
- AC_INIT([strace],[4.7])
- AC_CONFIG_SRCDIR([strace.c])
- AC_CONFIG_AUX_DIR([.])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([foreign check-news dist-xz no-dist-gzip silent-rules])
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST

packages/debug/strace/patches/strace-4.8-autoreconf.patch

@@ -0,0 +1,13 @@
+diff -Naur strace-4.8/configure.ac strace-4.8.patch/configure.ac
+--- strace-4.8/configure.ac	2013-05-04 21:51:57.000000000 +0200
++++ strace-4.8.patch/configure.ac	2013-09-04 03:30:12.478057723 +0200
+@@ -1,8 +1,6 @@
+ dnl Process this file with autoconf to create configure.  Use autoreconf.
+ AC_PREREQ(2.57)
+-AC_INIT([strace],
+-	m4_esyscmd([./git-version-gen .tarball-version]),
+-	[strace-devel@lists.sourceforge.net])
++AC_INIT([strace],[4.8])
+ AC_CONFIG_SRCDIR([strace.c])
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_HEADERS([config.h])

packages/linux/meta

@@ -53,7 +53,7 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-if [ "$DEVTOOLS" = "yes" ]; then
+if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then
   PKG_DEPENDS="$PKG_DEPENDS Python"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS elfutils Python"
 fi

packages/mediacenter/xbmc/package.mk

@@ -387,6 +387,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \
                            $XBMC_NFS \
                            $XBMC_AFP \
                            $XBMC_VORBISENC \
+                           --disable-libcap \
                            --enable-ffmpeg-libvorbis \
                            $XBMC_LAMEENC \
                            $XBMC_DVDCSS \

packages/mediacenter/xbmc/patches/xbmc-311-fix_rsxs_build-0.1.patch

@@ -1,12 +0,0 @@
-diff -Naur xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h
---- xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h	2011-09-27 15:56:19.000000000 +0200
-+++ xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h	2011-10-16 02:13:13.805433847 +0200
-@@ -17,7 +17,7 @@
-    with this program; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
- 
--#if !_LIBC
-+#if 0
- /* This code is written for inclusion in gnu-libc, and uses names in the
-    namespace reserved for libc.  If we're not compiling in libc, define those
-    names to be the normal ones instead.  */

packages/network/ntp/build

@@ -33,6 +33,7 @@ cd $PKG_BUILD
             --enable-ipv6 \
             --without-rpath \
             --with-gnu-ld \
+            --disable-linuxcaps \
             --without-crypto
 
 make -C sntp/libopts

packages/network/ntp/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.ntp.org/"
 PKG_URL="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libcap"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="ntp: Network Time Protocol utilities"

packages/x11/data/xkeyboard-config/patches/xkeyboard-config-01_autoconf-macrodir.patch

@@ -0,0 +1,9 @@
+diff --git a/configure.ac b/configure.ac
+index fb31994..42f9eee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,3 +1,4 @@
++AC_CONFIG_MACRO_DIR([m4])
+ AC_INIT(xkeyboard-config, 2.9)
+ AC_CONFIG_SRCDIR(rules/base.xml.in)
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])