update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,52 @@
|
||||
# HG changeset patch
|
||||
# User Bertrand Jacquin <bertrand@jacquin.bzh>
|
||||
# Date 1444431941 -3600
|
||||
# Node ID 5c6d2a6f2f9a0534933cc999b3845be4344e1af0
|
||||
# Parent b6156a08b1def3584647f26096866c1a0c11e54a
|
||||
build: Disable -march selection from CMakeLists.txt
|
||||
|
||||
x32 arch as defined on https://sites.google.com/site/x32abi is neither
|
||||
X86 nor X64, then forcing -march=i686 leads to build failure as wrong
|
||||
-march is used.
|
||||
|
||||
Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong
|
||||
|
||||
As a global sanity sake, disable all forced -march in CMakeLists
|
||||
|
||||
Backported from upstream pull request:
|
||||
https://bitbucket.org/multicoreware/x265/pull-requests/21
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -r 58dddcf01b7d source/CMakeLists.txt
|
||||
--- a/source/CMakeLists.txt Mon Jan 23 09:50:33 2017 +0530
|
||||
+++ b/source/CMakeLists.txt Mon Jan 23 21:03:10 2017 +0100
|
||||
@@ -194,28 +194,6 @@
|
||||
if(NATIVE_BUILD)
|
||||
if(INTEL_CXX)
|
||||
add_definitions(-xhost)
|
||||
- else()
|
||||
- add_definitions(-march=native)
|
||||
- endif()
|
||||
- elseif(X86 AND NOT X64)
|
||||
- string(FIND "${CMAKE_CXX_FLAGS}" "-march" marchPos)
|
||||
- if(marchPos LESS "0")
|
||||
- add_definitions(-march=i686)
|
||||
- if(WIN32 AND NOT INTEL_CXX AND NOT CLANG AND
|
||||
- CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
|
||||
- add_definitions(-mpreferred-stack-boundary=2)
|
||||
- endif()
|
||||
- endif()
|
||||
- endif()
|
||||
- if(ARM AND CROSS_COMPILE_ARM)
|
||||
- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
|
||||
- elseif(ARM)
|
||||
- find_package(Neon)
|
||||
- if(CPU_HAS_NEON)
|
||||
- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
|
||||
- add_definitions(-DHAVE_NEON)
|
||||
- else()
|
||||
- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
|
||||
endif()
|
||||
endif()
|
||||
add_definitions(${ARM_ARGS})
|
||||
28
bsp/buildroot-2017.02.11/package/x265/Config.in
Normal file
28
bsp/buildroot-2017.02.11/package/x265/Config.in
Normal file
@@ -0,0 +1,28 @@
|
||||
config BR2_PACKAGE_X265
|
||||
bool "x265"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS # dlfcn
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
help
|
||||
x265 is an open source free software and library for encoding video
|
||||
using the High Efficiency Video Coding (HEVC/H.265) standard. x265 is
|
||||
offered under either the GNU General Public License (GPL) 2 license or
|
||||
a commercial license, similar to the x264 project.
|
||||
|
||||
http://x265.org
|
||||
|
||||
if BR2_PACKAGE_X265
|
||||
|
||||
config BR2_PACKAGE_X265_CLI
|
||||
bool "CLI"
|
||||
help
|
||||
Command-line tool to encode video streams into the
|
||||
H.265/HEVC compression format.
|
||||
|
||||
endif
|
||||
|
||||
comment "x265 needs a toolchain w/ C++, threads, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
2
bsp/buildroot-2017.02.11/package/x265/x265.hash
Normal file
2
bsp/buildroot-2017.02.11/package/x265/x265.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally generated
|
||||
sha256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b x265_2.2.tar.gz
|
||||
37
bsp/buildroot-2017.02.11/package/x265/x265.mk
Normal file
37
bsp/buildroot-2017.02.11/package/x265/x265.mk
Normal file
@@ -0,0 +1,37 @@
|
||||
################################################################################
|
||||
#
|
||||
# x265
|
||||
#
|
||||
################################################################################
|
||||
|
||||
X265_VERSION = 2.2
|
||||
X265_SOURCE = x265_$(X265_VERSION).tar.gz
|
||||
X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
|
||||
X265_LICENSE = GPLv2+
|
||||
X265_LICENSE_FILES = COPYING
|
||||
X265_SUBDIR = source
|
||||
X265_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_i386)$(BR2_x86_64),y)
|
||||
X265_DEPENDENCIES += host-yasm
|
||||
endif
|
||||
|
||||
# disable altivec, it has build issues
|
||||
# https://bitbucket.org/multicoreware/x265/issues/320/
|
||||
ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y)
|
||||
X265_CONF_OPTS += -DENABLE_ALTIVEC=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
|
||||
X265_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_PIC=ON
|
||||
else
|
||||
X265_CONF_OPTS += -DENABLE_SHARED=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_X265_CLI),y)
|
||||
X265_CONF_OPTS += -DENABLE_CLI=ON
|
||||
else
|
||||
X265_CONF_OPTS += -DENABLE_CLI=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user