Buildroot 2018-11 (#258)
* Update to buildroot 2018.11 * containerd update * runc update * runc docker engine * runc docker proxy * update rpi firmware * update network manager * update dhcpd * update wait on network * update rpi wifi * revert glibc
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FFMPEG_VERSION = 3.4.2
|
||||
FFMPEG_VERSION = 3.4.5
|
||||
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
||||
FFMPEG_SITE = http://ffmpeg.org/releases
|
||||
FFMPEG_INSTALL_STAGING = YES
|
||||
@@ -231,6 +231,13 @@ ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy)
|
||||
FFMPEG_DEPENDENCIES += libebur128
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||
FFMPEG_CONF_OPTS += --enable-libdrm
|
||||
FFMPEG_DEPENDENCIES += libdrm
|
||||
else
|
||||
FFMPEG_CONF_OPTS += --disable-libdrm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBOPENH264),y)
|
||||
FFMPEG_CONF_OPTS += --enable-libopenh264
|
||||
FFMPEG_DEPENDENCIES += libopenh264
|
||||
@@ -504,10 +511,10 @@ endif
|
||||
# warning from ffmpeg's configure script.
|
||||
ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
|
||||
FFMPEG_CONF_OPTS += --cpu=generic
|
||||
else ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
|
||||
FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_CPU)
|
||||
else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
|
||||
FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)
|
||||
else ifneq ($(GCC_TARGET_CPU),)
|
||||
FFMPEG_CONF_OPTS += --cpu="$(GCC_TARGET_CPU)"
|
||||
else ifneq ($(GCC_TARGET_ARCH),)
|
||||
FFMPEG_CONF_OPTS += --cpu="$(GCC_TARGET_ARCH)"
|
||||
endif
|
||||
|
||||
FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
|
||||
|
||||
Reference in New Issue
Block a user