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

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/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])

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

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="319.32"
+PKG_VERSION="319.49"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"