godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-04 06:10:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Quite some conflicts, so here goes ..

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2016-09-02 16:20:33 +02:00
parent cff53ce35b 1bd02bc230
commit 7353967690
192 changed files with 1612 additions and 1263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/ffmpeg/Config.in
View File

@@ -1,10 +1,8 @@
config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
bool
# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
# ffmpeg's configure script only supports mips64 (r1) variant
# No support for ARMv7-M in the ARM assembly logic
default y if !BR2_nios2 && !BR2_mips_64r2 && !BR2_mips_64r6 && \
!BR2_ARM_CPU_ARMV7M
default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M
menuconfig BR2_PACKAGE_FFMPEG
bool "ffmpeg"