Merge branch 'next'

My local 'next' branch was not uptodate, so the previous merge was missing
the most recent changes.

Thanks to François Perrad for noticing.

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

diff --cc package/jasper/jasper.mk
index e8b8aaa9b58554c94a1054da5641bbd66185a550,b2da07d76315deabc54667b808ff65a1682bda37..32aa618292926e348684793a8ae9440513fd73dc
--- 1/package/jasper/jasper.mk
--- 2/package/jasper/jasper.mk
+++ b/package/jasper/jasper.mk
@@@ -4,22 -4,14 +4,16 @@@
  #
  ################################################################################
  
 -JASPER_VERSION = 1.900.1
 -JASPER_SITE = http://sources.openelec.tv/devel
 -JASPER_SOURCE = jasper-$(JASPER_VERSION).tar.bz2
 +JASPER_VERSION = version-1.900.31
 +JASPER_SITE = $(call github,mdadams,jasper,$(JASPER_VERSION))
  JASPER_INSTALL_STAGING = YES
  JASPER_DEPENDENCIES = jpeg
 -JASPER_LICENSE = MIT
 +JASPER_LICENSE = JasPer License Version 2.0
  JASPER_LICENSE_FILES = LICENSE
 -# needed to fix rpath issue (http://autobuild.buildroot.net/results/307/307cac65287420252a5bb64715d9a1edd90e72fa/)
 +
 +# No configure script included. We need to generate it.
  JASPER_AUTORECONF = YES
  
- # Xtensa gcc is unable to generate correct code with -O0 enabled by
- # --enable-debug. Allow package build but disable debug.
- ifeq ($(BR2_xtensa)$(BR2_ENABLE_DEBUG),yy)
- JASPER_CONF_OPTS += --disable-debug
- endif
- 
 +JASPER_CONF_OPTS = --disable-strict
 +
  $(eval $(autotools-package))

diff --cc package/lttng-babeltrace/lttng-babeltrace.mk
Simple merge