Merge branch 'next'

diff --cc linux/linux.mk
Simple merge

diff --cc package/gutenprint/gutenprint.mk
Simple merge

diff --cc package/libsigsegv/libsigsegv.mk
index ac72c6dd2ab9091640dcb0a63aded21b02366d82,a4be0b6da1a9f1e653390f5ae8eb345166ebbbfc..b71e572e735c7ef3ce5941a5599ec9449dc3692b
--- 1/package/libsigsegv/libsigsegv.mk
--- 2/package/libsigsegv/libsigsegv.mk
+++ b/package/libsigsegv/libsigsegv.mk
@@@ -4,10 -4,9 +4,10 @@@
  #
  #############################################################
  
- LIBSIGSEGV_VERSION = 2.6
+ LIBSIGSEGV_VERSION = 2.10
  LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv
  LIBSIGSEGV_INSTALL_STAGING = YES
 +LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes
  LIBSIGSEGV_LICENSE = GPLv2+
  LIBSIGSEGV_LICENSE_FILES = COPYING
  

diff --cc package/multimedia/bellagio/Config.in
index 4be3aee5f74d7364fe33fa72e908b499bce56e7d,d918f80ce3052a4b21b86d16c0083715f17803d1..3292ef5fd045b2c605f5bb09c4a111cd2a3090c5
--- 1/package/multimedia/bellagio/Config.in
--- 2/package/multimedia/bellagio/Config.in
+++ b/package/multimedia/bellagio/Config.in
@@@ -1,7 -1,7 +1,8 @@@
  config BR2_PACKAGE_BELLAGIO
        bool "bellagio"
        depends on BR2_INSTALL_LIBSTDCPP
 +      depends on BR2_TOOLCHAIN_HAS_THREADS
+       select BR2_PACKAGE_HAS_OPENMAX
        help
          Bellagio is an opensource implementation of the
          OpenMAX IL API.

diff --cc package/multimedia/pulseaudio/pulseaudio.mk
Simple merge

diff --cc package/pixman/pixman.mk
index c2ee035ff62db391f61670fd754e84662b519742,8b35ef190a66752ff74c10dfe30660f76f5c9332..a59568173ec2f09d6e699bcfaa1c0f462d1d1e7d
--- 1/package/pixman/pixman.mk
--- 2/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@@ -3,13 -3,12 +3,15 @@@
  # pixman
  #
  ################################################################################
- PIXMAN_VERSION = 0.28.2
+ PIXMAN_VERSION = 0.30.0
  PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
 +PIXMAN_LICENSE = MIT
 +PIXMAN_LICENSE_FILES = COPYING
 +
  PIXMAN_INSTALL_STAGING = YES
  PIXMAN_DEPENDENCIES = host-pkgconf
+ PIXMAN_AUTORECONF = YES
+ 
  # don't build gtk based demos
  PIXMAN_CONF_OPT = --disable-gtk
  

diff --cc package/x11r7/xlib_libX11/xlib_libX11.mk
Simple merge

diff --cc support/scripts/graph-depends
Simple merge

diff --cc toolchain/toolchain-external/Config.in
Simple merge

diff --cc toolchain/toolchain-external/ext-tool.mk
Simple merge