initial buildroot for linux 5.15
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
From 28ca7393c08cb54b87d11c1ca92821e48f54781b Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Mon, 15 Apr 2019 23:09:33 +0200
|
||||
Subject: [PATCH] Don't force -fstack-protector
|
||||
|
||||
This allows the environment to decide whether SSP should be used or
|
||||
not, for example to support toolchains that don't have SSP support.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
[Bernd: rebased for 21.2.3]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
api/mfx_dispatch/linux/CMakeLists.txt | 2 +-
|
||||
builder/FindPackages.cmake | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/api/mfx_dispatch/linux/CMakeLists.txt b/api/mfx_dispatch/linux/CMakeLists.txt
|
||||
index 15a4bd9a..4415f840 100644
|
||||
--- a/api/mfx_dispatch/linux/CMakeLists.txt
|
||||
+++ b/api/mfx_dispatch/linux/CMakeLists.txt
|
||||
@@ -101,7 +101,7 @@ target_link_libraries(mfx dl)
|
||||
get_api_version(MFX_VERSION_MAJOR MFX_VERSION_MINOR)
|
||||
|
||||
set_target_properties( mfx PROPERTIES LINK_FLAGS
|
||||
- "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmfx.map -fstack-protector")
|
||||
+ "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmfx.map")
|
||||
set_target_properties( mfx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIB_DIR}/${CMAKE_BUILD_TYPE} FOLDER mfx )
|
||||
set_target_properties( mfx PROPERTIES VERSION ${MFX_VERSION_MAJOR}.${MFX_VERSION_MINOR})
|
||||
set_target_properties( mfx PROPERTIES SOVERSION ${MFX_VERSION_MAJOR})
|
||||
diff --git a/builder/FindPackages.cmake b/builder/FindPackages.cmake
|
||||
index 7e36ae2d..5b8b9b9d 100644
|
||||
--- a/builder/FindPackages.cmake
|
||||
+++ b/builder/FindPackages.cmake
|
||||
@@ -83,7 +83,7 @@ function( configure_build_variant_linux target variant )
|
||||
return() # should not occur; just in case
|
||||
endif()
|
||||
set( link_flags_list "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--no-as-needed -ldl")
|
||||
- append_property( ${ARGV0} LINK_FLAGS "${link_flags_list} ${MFX_LDFLAGS} -fstack-protector" )
|
||||
+ append_property( ${ARGV0} LINK_FLAGS "${link_flags_list} ${MFX_LDFLAGS}" )
|
||||
# message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" )
|
||||
|
||||
if( ARGV1 MATCHES hw AND Linux )
|
||||
@@ -445,7 +445,7 @@ function(configure_dependencies target dependencies variant)
|
||||
endforeach()
|
||||
|
||||
set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE)
|
||||
- set(SCOPE_LINKFLAGS "${SCOPE_LINKFLAGS} -Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -fstack-protector" PARENT_SCOPE)
|
||||
+ set(SCOPE_LINKFLAGS "${SCOPE_LINKFLAGS} -Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack" PARENT_SCOPE)
|
||||
set(SCOPE_LIBS ${SCOPE_LIBS} PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
config BR2_PACKAGE_INTEL_MEDIASDK
|
||||
bool "intel-mediasdk"
|
||||
depends on BR2_x86_64
|
||||
depends on !BR2_STATIC_LIBS # intel-mediadriver
|
||||
depends on BR2_INSTALL_LIBSTDCPP # intel-mediadriver
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_1 # intel-mediadriver
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # intel-mediadriver
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # intel-mediadriver
|
||||
select BR2_PACKAGE_INTEL_MEDIADRIVER
|
||||
select BR2_PACKAGE_LIBDRM_INTEL
|
||||
help
|
||||
Intel(R) Media SDK provides an API to access
|
||||
hardware-accelerated video decode, encode and filtering on
|
||||
Intel® platforms with integrated graphics.
|
||||
|
||||
Supported video encoders: HEVC, AVC, MPEG-2, JPEG
|
||||
Supported Video decoders: HEVC, AVC, VP8, MPEG-2, VC1, JPEG
|
||||
Supported video pre-processing filters: Color Conversion,
|
||||
Deinterlace, Denoise, Resize, Rotate, Composition
|
||||
|
||||
http://mediasdk.intel.com/
|
||||
|
||||
comment "intel-mediasdk needs a toolchain w/ dynamic library, C++, NPTL"
|
||||
depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1
|
||||
depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 3f13869298d3946d7d91e58846e274ef62cd5af2473f59f36b57b2c27ebfd87c intel-mediasdk-21.3.5.tar.gz
|
||||
sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE
|
||||
@@ -0,0 +1,20 @@
|
||||
################################################################################
|
||||
#
|
||||
# intel-mediasdk
|
||||
#
|
||||
################################################################################
|
||||
|
||||
INTEL_MEDIASDK_VERSION = 21.3.5
|
||||
INTEL_MEDIASDK_SITE = http://github.com/Intel-Media-SDK/MediaSDK/archive
|
||||
INTEL_MEDIASDK_LICENSE = MIT
|
||||
INTEL_MEDIASDK_LICENSE_FILES = LICENSE
|
||||
|
||||
INTEL_MEDIASDK_INSTALL_STAGING = YES
|
||||
INTEL_MEDIASDK_DEPENDENCIES = intel-mediadriver
|
||||
|
||||
INTEL_MEDIASDK_CONF_OPTS = \
|
||||
-DBUILD_SAMPLES=OFF \
|
||||
-DBUILD_TUTORIALS=OFF \
|
||||
-DMFX_INCLUDE="$(@D)/api/include"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user