From: Peter Korsgaard Date: Sun, 2 Jun 2013 14:33:05 +0000 (+0200) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ba51d2fbddd5650f8caea0a327b9031238ad843;p=buildroot.git Merge branch 'next' --- 1ba51d2fbddd5650f8caea0a327b9031238ad843 diff --cc package/libsigsegv/libsigsegv.mk index ac72c6dd2a,a4be0b6da1..b71e572e73 --- a/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 4be3aee5f7,d918f80ce3..3292ef5fd0 --- a/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/pixman/pixman.mk index c2ee035ff6,8b35ef190a..a59568173e --- a/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