package/intel-gmmlib: bump version to 21.1.3
PATCH v2 1/4 package/intel-gmmlib: bump version to 21.1.3
Reformatted hashes.
---
v2: no changes
package/intel-gmmlib/intel-gmmlib.hash | 4 ++-- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/intel-gmmlib/intel-gmmlib.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed -sha256 bb874b41c499abb8f6253b1834e93a02ed9744de71f2503ee9cd4100af7c1860 intel-gmmlib-19.4.1.tar.gz -sha256 b61d639c5d84ec710ffcf5600ac92f8a4ace66670c1f9bd921f3bde671d36033 LICENSE.md +sha256 c459a95243075296c72a40674c449ffcc314ed6d21ad0291c1603dbc11f4a74e intel-gmmlib-21.1.3.tar.gz +sha256 b61d639c5d84ec710ffcf5600ac92f8a4ace66670c1f9bd921f3bde671d36033 LICENSE.md
package/intel-gmmlib/intel-gmmlib.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 19.4.1 +INTEL_GMMLIB_VERSION = 21.1.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md
Signature · 1 line
2.29.2
PATCH v2 2/4 package/intel-mediadriver: bump version to 21.1.3
Rebased patch 0001.
Removed patch 0002 which was backported from upstream commit. Reformatted hashes.
Reworked X11 support as it is an optional dependency:
https://github.com/intel/media-driver/pull/494
---
v2: no changes
.../0001-Drop-hardening-related-flags.patch | 36 ++-- ...-Werror=format-overflow-under-gcc-10.patch | 162 ------------------ package/intel-mediadriver/Config.in | 6 - .../intel-mediadriver/intel-mediadriver.hash | 4 +- .../intel-mediadriver/intel-mediadriver.mk | 9 +- 5 files changed, 29 insertions(+), 188 deletions(-) delete mode 100644 package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch
package/intel-mediadriver/0001-Drop-hardening-related-flags.patch +21 -15
@@ -17,27 +17,33 @@ diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt index 44ce4f08..b462fbea 100644 --- a/cmrtlib/linux/CMakeLists.txt +++ b/cmrtlib/linux/CMakeLists.txt -@@ -26,11 +26,11 @@ set(LIBRARY_OUTPUT_PATH ${MDF_OPTION__OUTPUT_DIR}) +@@ -32,17 +32,17 @@ + endif() # Set up compile options that will be used for the Linux build - if(CMAKE_COMPILER_IS_GNUCC) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -fstack-protector-all -Werror") -- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -fstack-protector-all -Werror") -- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -Werror") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") + endif() +-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") ++set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -Werror") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1") + endif() +-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") ++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") - set(GCC_SECURE_LINK_FLAGS "-z relro -z now") + set(GCC_SECURE_LINK_FLAGS "-z relro -z now") diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake index 9e85fdb2..c45ce11b 100755 --- a/media_driver/cmake/linux/media_compile_flags_linux.cmake +++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake -@@ -64,7 +64,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON +@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON # Other common flags -fmessage-length=0 -fvisibility=hidden
@@ -49,7 +55,7 @@ diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.c index 3491db1e..b30fa04a 100755 --- a/media_driver/media_top_cmake.cmake +++ b/media_driver/media_top_cmake.cmake -@@ -88,7 +88,7 @@ if(MEDIA_BUILD_FATAL_WARNINGS) +@@ -105,7 +105,7 @@ if(MEDIA_BUILD_FATAL_WARNINGS) set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") endif()
package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch deleted +0 -162
162 lines not on this page · raw message
package/intel-mediadriver/Config.in +0 -6
@@ -6,12 +6,10 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d depends on BR2_TOOLCHAIN_HAS_THREADS # libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d - depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_INTEL_GMMLIB select BR2_PACKAGE_LIBPCIACCESS select BR2_PACKAGE_LIBVA select BR2_PACKAGE_MESA3D - select BR2_PACKAGE_XLIB_LIBX11 help The Intel(R) Media Driver for VAAPI is a new VA-API (Video Acceleration API) user mode driver supporting hardware
@@ -20,10 +18,6 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER https://github.com/intel/media-driver -comment "intel-mediadriver needs X.org" - depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 - depends on !BR2_PACKAGE_XORG7 - comment "intel-mediadriver 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 || \
package/intel-mediadriver/intel-mediadriver.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed -sha256 a03bd75eefe9cb0245e3aab2723b3fef555d9f180a180b2c29d7b12d483d9ec2 intel-media-19.4.0r.tar.gz -sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md +sha256 219ce6b08a84bdce311160dc694d866249fd4e390391c2ac7be55f13a2fb928c intel-media-21.1.3.tar.gz +sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md
package/intel-mediadriver/intel-mediadriver.mk +6 -3
@@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 19.4.0r +INTEL_MEDIADRIVER_VERSION = 21.1.3 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause
@@ -16,8 +16,11 @@ INTEL_MEDIADRIVER_DEPENDENCIES = \ intel-gmmlib \ libpciaccess \ libva \ - mesa3d \ - xlib_libX11 + mesa3d + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +INTEL_MEDIADRIVER_DEPENDENCIES += xlib_libX11 +endif INTEL_MEDIADRIVER_SUPPORTS_IN_SOURCE_BUILD = NO
Signature · 1 line
2.29.2
PATCH v2 3/4 package/intel-mediasdk: bump version to 21.1.3
In reply to Bernd KuhlsRemoved dependency to X.org following changes in intel-mediadriver. Reformatted hashes.
---
v2: initial version
package/intel-mediasdk/Config.in | 5 ----- package/intel-mediasdk/intel-mediasdk.hash | 4 ++-- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-)
package/intel-mediasdk/Config.in +0 -5
@@ -6,7 +6,6 @@ config BR2_PACKAGE_INTEL_MEDIASDK 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 - depends on BR2_PACKAGE_XORG7 # intel-mediadriver select BR2_PACKAGE_INTEL_MEDIADRIVER select BR2_PACKAGE_LIBDRM_INTEL help
@@ -21,10 +20,6 @@ config BR2_PACKAGE_INTEL_MEDIASDK http://mediasdk.intel.com/ -comment "intel-mediasdk needs X.org" - depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 - depends on !BR2_PACKAGE_XORG7 - 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 || \
package/intel-mediasdk/intel-mediasdk.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed -sha256 289a40ffe73dc291461d97edf452bdc622f76e52666483fd1eb4f131d2921cd1 intel-mediasdk-19.4.0.tar.gz -sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE +sha256 718e68e3be78fcdc2dea0e3cd4714c38df2d451d7c8afef840c9c07e82bd4cb9 intel-mediasdk-21.1.3.tar.gz +sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE
package/intel-mediasdk/intel-mediasdk.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 19.4.0 +INTEL_MEDIASDK_VERSION = 21.1.3 INTEL_MEDIASDK_SITE = http://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE
Signature · 1 line
2.29.2
PATCH v2 4/4 DEVELOPERS: add myself for intel-mediasdk & deps
In reply to Bernd Kuhls---
v2: initial version
DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+)
DEVELOPERS +3 -0
@@ -337,6 +337,9 @@ F: package/glmark2/ F: package/gpsd/ F: package/hdparm/ F: package/inih/ +F: package/intel-gmmlib/ +F: package/intel-mediadriver/ +F: package/intel-mediasdk/ F: package/jsoncpp/ F: package/kodi* F: package/lame/
Signature · 1 line
2.29.2
Arnout Vandecappelle
AppliedPATCH v2 4/4 DEVELOPERS: add myself for intel-mediasdk & deps
Quoted 1 line · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
This one is actually for master!
Applied to master, thanks.
I've replaced "myself" with "Bernd Kuhls" though since all the "myself"s look a
bit ridiculous in the oneline log.
Regards,
Arnout
Quoted 21 lines
---
v2: initial versionDEVELOPERS | 3 +++ 1 file changed, 3 insertions(+)DEVELOPERS +3
-0@@ -337,6 +337,9 @@ F: package/glmark2/ F: package/gpsd/ F: package/hdparm/ F: package/inih/ +F: package/intel-gmmlib/ +F: package/intel-mediadriver/ +F: package/intel-mediasdk/ F: package/jsoncpp/ F: package/kodi* F: package/lame/
PATCH v2 4/4 DEVELOPERS: add myself for intel-mediasdk & deps
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 1 line · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>This one is actually for master!
Applied to master, thanks.
I've replaced "myself" with "Bernd Kuhls" though since all the "myself"s look a
bit ridiculous in the oneline log.
Committed to 2021.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard