* [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1
@ 2021-06-30 15:24 Bernd Kuhls
2021-06-30 15:24 ` [Buildroot] [PATCH 2/3] package/intel-mediadriver: bump version to 21.2.3 Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Bernd Kuhls @ 2021-06-30 15:24 UTC (permalink / raw)
To: buildroot
Added patch to remove hardening-related flags.
Updated license hash due to upstream commit
https://github.com/intel/gmmlib/commit/9253eb8b949515d2a5030f99163a35567fe81838
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../0001-Drop-hardening-related-flags.patch | 28 +++++++++++++++++++
package/intel-gmmlib/intel-gmmlib.hash | 4 +--
package/intel-gmmlib/intel-gmmlib.mk | 2 +-
3 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 package/intel-gmmlib/0001-Drop-hardening-related-flags.patch
diff --git a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch
new file mode 100644
index 0000000000..581afd9066
--- /dev/null
+++ b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch
@@ -0,0 +1,28 @@
+From 1528980ee15e9589a7e27ec6d12a33cd8aab57b4 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Tue, 8 Jun 2021 07:51:40 +0200
+Subject: [PATCH] Drop hardening-related flags
+
+These will be set by Buildroot depending on toolchain capabilities and
+global Buildroot options.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Source/GmmLib/Linux.cmake | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake
+index 1a09bc4..b28fc1b 100644
+--- a/Source/GmmLib/Linux.cmake
++++ b/Source/GmmLib/Linux.cmake
+@@ -62,7 +62,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
+ -DUSE_SSE3
+ -DUSE_SSSE3
+ # Other common flags
+- -fstack-protector
+ -fdata-sections
+ -ffunction-sections
+ -fmessage-length=0
+--
+2.29.2
+
diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash
index 1e8baba6c7..2f50646677 100644
--- a/package/intel-gmmlib/intel-gmmlib.hash
+++ b/package/intel-gmmlib/intel-gmmlib.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 bb874b41c499abb8f6253b1834e93a02ed9744de71f2503ee9cd4100af7c1860 intel-gmmlib-19.4.1.tar.gz
-sha256 b61d639c5d84ec710ffcf5600ac92f8a4ace66670c1f9bd921f3bde671d36033 LICENSE.md
+sha256 912cd86e4cb564b6fa549d69a28b72b9cdcb5a3eab9320955ed70ac37381fc2f intel-gmmlib-21.2.1.tar.gz
+sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md
diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk
index 517fc09131..451eec7287 100644
--- a/package/intel-gmmlib/intel-gmmlib.mk
+++ b/package/intel-gmmlib/intel-gmmlib.mk
@@ -4,7 +4,7 @@
#
################################################################################
-INTEL_GMMLIB_VERSION = 19.4.1
+INTEL_GMMLIB_VERSION = 21.2.1
INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive
INTEL_GMMLIB_LICENSE = MIT
INTEL_GMMLIB_LICENSE_FILES = LICENSE.md
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/3] package/intel-mediadriver: bump version to 21.2.3
2021-06-30 15:24 [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1 Bernd Kuhls
@ 2021-06-30 15:24 ` Bernd Kuhls
2021-06-30 15:24 ` [Buildroot] [PATCH 3/3] package/intel-mediasdk: bump version to 21.2.2 Bernd Kuhls
2021-07-03 21:00 ` [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1 Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Bernd Kuhls @ 2021-06-30 15:24 UTC (permalink / raw)
To: buildroot
Rebased patch 0001 and removed another hardening flag.
Removed patch 0002 which was backported from upstream commit.
Renumbered and rebased patch 0003.
Reformatted hashes.
Reworked X11 support as it is an optional dependency:
https://github.com/intel/media-driver/pull/494
Release notes:
https://github.com/intel/media-driver/releases/tag/intel-media-21.2.3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../0001-Drop-hardening-related-flags.patch | 38 ++--
...-Werror=format-overflow-under-gcc-10.patch | 162 ------------------
...kelists.txt-respect-MEDIA_BUILD_FAT.patch} | 32 ++--
package/intel-mediadriver/Config.in | 6 -
.../intel-mediadriver/intel-mediadriver.hash | 4 +-
.../intel-mediadriver/intel-mediadriver.mk | 9 +-
6 files changed, 47 insertions(+), 204 deletions(-)
delete mode 100644 package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch
rename package/intel-mediadriver/{0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch => 0002-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch} (63%)
diff --git a/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch b/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch
index bc29203317..376308ea42 100644
--- a/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch
+++ b/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch
@@ -17,27 +17,27 @@ 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,11 +32,11 @@
+ 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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -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} ${CPP_STANDARD_OPTION} -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} ${CPP_STANDARD_OPTION} -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(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
@@ -45,11 +45,19 @@ index 9e85fdb2..c45ce11b 100755
-fdata-sections
-ffunction-sections
-Wl,--gc-sections
+@@ -119,7 +118,6 @@
+ set(MEDIA_COMPILER_FLAGS_RELEASE
+ ${MEDIA_COMPILER_FLAGS_RELEASE}
+ -O2
+- -D_FORTIFY_SOURCE=2
+ -fno-omit-frame-pointer
+ )
+ endif()
diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake
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()
diff --git a/package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch b/package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch
deleted file mode 100644
index 46775e9347..0000000000
--- a/package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From da966a2ab1f5161cc0a21a4cd7e07edf732ebee9 Mon Sep 17 00:00:00 2001
-From: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
-Date: Thu, 19 Mar 2020 20:59:12 -0700
-Subject: [PATCH] build: fix Werror=format-overflow under gcc-10
-
-Fixes: #870
-
-With upcoming gcc-10 we start to see Werror=format-overflow reporting
-that we attempt to printf %s null strings.
-
-Change-Id: I7a62bc98bf7dd6bcd61d475d7650a06aa1a70932
-Signed-off-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
-[Retrieved from:
-https://github.com/intel/media-driver/commit/da966a2ab1f5161cc0a21a4cd7e07edf732ebee9]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- media_driver/linux/common/os/i915/xf86drm.c | 57 ++++++++++---------
- .../linux/ult/libdrm_mock/xf86drm_mock.c | 57 ++++++++++---------
- 2 files changed, 58 insertions(+), 56 deletions(-)
-
-diff --git a/media_driver/linux/common/os/i915/xf86drm.c b/media_driver/linux/common/os/i915/xf86drm.c
-index 7594bde99..d0fc1b7ac 100644
---- a/media_driver/linux/common/os/i915/xf86drm.c
-+++ b/media_driver/linux/common/os/i915/xf86drm.c
-@@ -581,37 +581,38 @@ static int drmOpenByBusid(const char *busid, int type)
-
- drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid);
- for (i = base; i < base + DRM_MAX_MINOR; i++) {
-- fd = drmOpenMinor(i, 1, type);
-- drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd);
-- if (fd >= 0) {
-- /* We need to try for 1.4 first for proper PCI domain support
-- * and if that fails, we know the kernel is busted
-- */
-- sv.drm_di_major = 1;
-- sv.drm_di_minor = 4;
-- sv.drm_dd_major = -1; /* Don't care */
-- sv.drm_dd_minor = -1; /* Don't care */
-- if (drmSetInterfaceVersion(fd, &sv)) {
-+ fd = drmOpenMinor(i, 1, type);
-+ drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd);
-+ if (fd >= 0) {
-+ /* We need to try for 1.4 first for proper PCI domain support
-+ * and if that fails, we know the kernel is busted
-+ */
-+ sv.drm_di_major = 1;
-+ sv.drm_di_minor = 4;
-+ sv.drm_dd_major = -1; /* Don't care */
-+ sv.drm_dd_minor = -1; /* Don't care */
-+ if (drmSetInterfaceVersion(fd, &sv)) {
- #ifndef __alpha__
-- pci_domain_ok = 0;
-+ pci_domain_ok = 0;
- #endif
-- sv.drm_di_major = 1;
-- sv.drm_di_minor = 1;
-- sv.drm_dd_major = -1; /* Don't care */
-- sv.drm_dd_minor = -1; /* Don't care */
-- drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n");
-- drmSetInterfaceVersion(fd, &sv);
-- }
-- buf = drmGetBusid(fd);
-- drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf);
-- if (buf && drmMatchBusID(buf, busid, pci_domain_ok)) {
-- drmFreeBusid(buf);
-- return fd;
-+ sv.drm_di_major = 1;
-+ sv.drm_di_minor = 1;
-+ sv.drm_dd_major = -1; /* Don't care */
-+ sv.drm_dd_minor = -1; /* Don't care */
-+ drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n");
-+ drmSetInterfaceVersion(fd, &sv);
-+ }
-+ buf = drmGetBusid(fd);
-+ if (buf) {
-+ drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf);
-+ if (drmMatchBusID(buf, busid, pci_domain_ok)) {
-+ drmFreeBusid(buf);
-+ return fd;
-+ }
-+ drmFreeBusid(buf);
-+ }
-+ close(fd);
- }
-- if (buf)
-- drmFreeBusid(buf);
-- close(fd);
-- }
- }
- return -1;
- }
-diff --git a/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c b/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c
-index 7e5246295..2e5863798 100644
---- a/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c
-+++ b/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c
-@@ -790,37 +790,38 @@ static int drmOpenByBusid(const char *busid, int type)
-
- drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid);
- for (i = base; i < base + DRM_MAX_MINOR; i++) {
-- fd = drmOpenMinor(i, 1, type);
-- drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd);
-- if (fd >= 0) {
-- /* We need to try for 1.4 first for proper PCI domain support
-- * and if that fails, we know the kernel is busted
-- */
-- sv.drm_di_major = 1;
-- sv.drm_di_minor = 4;
-- sv.drm_dd_major = -1; /* Don't care */
-- sv.drm_dd_minor = -1; /* Don't care */
-- if (drmSetInterfaceVersion(fd, &sv)) {
-+ fd = drmOpenMinor(i, 1, type);
-+ drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd);
-+ if (fd >= 0) {
-+ /* We need to try for 1.4 first for proper PCI domain support
-+ * and if that fails, we know the kernel is busted
-+ */
-+ sv.drm_di_major = 1;
-+ sv.drm_di_minor = 4;
-+ sv.drm_dd_major = -1; /* Don't care */
-+ sv.drm_dd_minor = -1; /* Don't care */
-+ if (drmSetInterfaceVersion(fd, &sv)) {
- #ifndef __alpha__
-- pci_domain_ok = 0;
-+ pci_domain_ok = 0;
- #endif
-- sv.drm_di_major = 1;
-- sv.drm_di_minor = 1;
-- sv.drm_dd_major = -1; /* Don't care */
-- sv.drm_dd_minor = -1; /* Don't care */
-- drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n");
-- drmSetInterfaceVersion(fd, &sv);
-- }
-- buf = drmGetBusid(fd);
-- drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf);
-- if (buf && drmMatchBusID(buf, busid, pci_domain_ok)) {
-- drmFreeBusid(buf);
-- return fd;
-+ sv.drm_di_major = 1;
-+ sv.drm_di_minor = 1;
-+ sv.drm_dd_major = -1; /* Don't care */
-+ sv.drm_dd_minor = -1; /* Don't care */
-+ drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n");
-+ drmSetInterfaceVersion(fd, &sv);
-+ }
-+ buf = drmGetBusid(fd);
-+ if (buf) {
-+ drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf);
-+ if (drmMatchBusID(buf, busid, pci_domain_ok)) {
-+ drmFreeBusid(buf);
-+ return fd;
-+ }
-+ drmFreeBusid(buf);
-+ }
-+ close(fd);
- }
-- if (buf)
-- drmFreeBusid(buf);
-- close(fd);
-- }
- }
- return -1;
- }
diff --git a/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch b/package/intel-mediadriver/0002-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch
similarity index 63%
rename from package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch
rename to package/intel-mediadriver/0002-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch
index bc7a27f4d0..df8d39f777 100644
--- a/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch
+++ b/package/intel-mediadriver/0002-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch
@@ -27,25 +27,25 @@ diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt
index 7a0193a8..65f71cee 100644
--- a/cmrtlib/linux/CMakeLists.txt
+++ b/cmrtlib/linux/CMakeLists.txt
-@@ -32,12 +32,16 @@ else()
+@@ -32,12 +32,16 @@
+ 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 -Werror")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive")
- 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 -Werror")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive")
- 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")
-+ if(MEDIA_BUILD_FATAL_WARNINGS)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror")
-+ endif()
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -Werror")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive")
+ 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 -Werror")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive")
+ 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")
++if(MEDIA_BUILD_FATAL_WARNINGS)
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror")
++endif()
- set(GCC_SECURE_LINK_FLAGS "-z relro -z now")
- set(CMAKE_SKIP_RPATH ON)
+ set(GCC_SECURE_LINK_FLAGS "-z relro -z now")
+ set(CMAKE_SKIP_RPATH ON)
--
2.30.2
diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in
index 35117f7712..2d5adbcf59 100644
--- a/package/intel-mediadriver/Config.in
+++ b/package/intel-mediadriver/Config.in
@@ -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 || \
diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash
index 5d016695ae..74dc397041 100644
--- a/package/intel-mediadriver/intel-mediadriver.hash
+++ b/package/intel-mediadriver/intel-mediadriver.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 a03bd75eefe9cb0245e3aab2723b3fef555d9f180a180b2c29d7b12d483d9ec2 intel-media-19.4.0r.tar.gz
-sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md
+sha256 7b190a980447284508969da38971cfdaaf6e69d840d49e81f5969e124bf17e16 intel-media-21.2.3.tar.gz
+sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md
diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk
index 01423b9611..31087776e9 100644
--- a/package/intel-mediadriver/intel-mediadriver.mk
+++ b/package/intel-mediadriver/intel-mediadriver.mk
@@ -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.2.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
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] package/intel-mediasdk: bump version to 21.2.2
2021-06-30 15:24 [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1 Bernd Kuhls
2021-06-30 15:24 ` [Buildroot] [PATCH 2/3] package/intel-mediadriver: bump version to 21.2.3 Bernd Kuhls
@ 2021-06-30 15:24 ` Bernd Kuhls
2021-07-03 21:00 ` [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1 Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Bernd Kuhls @ 2021-06-30 15:24 UTC (permalink / raw)
To: buildroot
Removed dependency to X.org following changes in intel-mediadriver.
Reformatted hashes.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
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(-)
diff --git a/package/intel-mediasdk/Config.in b/package/intel-mediasdk/Config.in
index 05293d7604..c1f609e3f8 100644
--- a/package/intel-mediasdk/Config.in
+++ b/package/intel-mediasdk/Config.in
@@ -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 || \
diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash
index 103c8bb52d..27cfdda08d 100644
--- a/package/intel-mediasdk/intel-mediasdk.hash
+++ b/package/intel-mediasdk/intel-mediasdk.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 289a40ffe73dc291461d97edf452bdc622f76e52666483fd1eb4f131d2921cd1 intel-mediasdk-19.4.0.tar.gz
-sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE
+sha256 f7750bd3a307d796e71a3d4ebb16a730b2e9364669513e110e9ec59af159b4cd intel-mediasdk-21.2.2.tar.gz
+sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE
diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk
index 5467c96380..c3412d622d 100644
--- a/package/intel-mediasdk/intel-mediasdk.mk
+++ b/package/intel-mediasdk/intel-mediasdk.mk
@@ -4,7 +4,7 @@
#
################################################################################
-INTEL_MEDIASDK_VERSION = 19.4.0
+INTEL_MEDIASDK_VERSION = 21.2.2
INTEL_MEDIASDK_SITE = http://github.com/Intel-Media-SDK/MediaSDK/archive
INTEL_MEDIASDK_LICENSE = MIT
INTEL_MEDIASDK_LICENSE_FILES = LICENSE
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1
2021-06-30 15:24 [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1 Bernd Kuhls
2021-06-30 15:24 ` [Buildroot] [PATCH 2/3] package/intel-mediadriver: bump version to 21.2.3 Bernd Kuhls
2021-06-30 15:24 ` [Buildroot] [PATCH 3/3] package/intel-mediasdk: bump version to 21.2.2 Bernd Kuhls
@ 2021-07-03 21:00 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2021-07-03 21:00 UTC (permalink / raw)
To: buildroot
On Wed, 30 Jun 2021 17:24:56 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Added patch to remove hardening-related flags.
>
> Updated license hash due to upstream commit
> https://github.com/intel/gmmlib/commit/9253eb8b949515d2a5030f99163a35567fe81838
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> .../0001-Drop-hardening-related-flags.patch | 28 +++++++++++++++++++
> package/intel-gmmlib/intel-gmmlib.hash | 4 +--
> package/intel-gmmlib/intel-gmmlib.mk | 2 +-
> 3 files changed, 31 insertions(+), 3 deletions(-)
> create mode 100644 package/intel-gmmlib/0001-Drop-hardening-related-flags.patch
Series applied, thanks. It will be useful to watch for build failures
on these packages in the next days, I'm fearing that the removal of
X.org as a mandatory dependency might exhibit some new build failures.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-03 21:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-30 15:24 [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1 Bernd Kuhls
2021-06-30 15:24 ` [Buildroot] [PATCH 2/3] package/intel-mediadriver: bump version to 21.2.3 Bernd Kuhls
2021-06-30 15:24 ` [Buildroot] [PATCH 3/3] package/intel-mediasdk: bump version to 21.2.2 Bernd Kuhls
2021-07-03 21:00 ` [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 21.2.1 Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.