From patchwork Tue Jun 8 06:01:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1489121 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fzfl92D9kz9sW8 for ; Tue, 8 Jun 2021 16:01:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C2C4B402FC; Tue, 8 Jun 2021 06:01:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w-wWr2KdDKHz; Tue, 8 Jun 2021 06:01:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 3914540302; Tue, 8 Jun 2021 06:01:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 938F81BF2A0 for ; Tue, 8 Jun 2021 06:01:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8FEC483B6B for ; Tue, 8 Jun 2021 06:01:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u3eXRtd7_7sM for ; Tue, 8 Jun 2021 06:01:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2D54C834DB for ; Tue, 8 Jun 2021 06:01:40 +0000 (UTC) Received: from fwd26.aul.t-online.de (fwd26.aul.t-online.de [172.20.26.131]) by mailout02.t-online.de (Postfix) with SMTP id 3B7581E7E1; Tue, 8 Jun 2021 08:01:38 +0200 (CEST) Received: from fli4l.lan.fli4l (Tt2-nMZZwhwVJBgC7cH-FUCJnBCEmqu21WTHWde-w2+ZjSGIUwcGfs2IBNk2CtMZ-4@[91.58.8.174]) by fwd26.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1lqUnv-1I08Bs0; Tue, 8 Jun 2021 08:01:35 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:46470) by fli4l.lan.fli4l with esmtp (Exim 4.94.2) (envelope-from ) id 1lqUnt-0006Vb-7v; Tue, 08 Jun 2021 08:01:34 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 8 Jun 2021 08:01:31 +0200 Message-Id: <20210608060132.8727-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210608060132.8727-1-bernd.kuhls@t-online.de> References: <20210608060132.8727-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: Tt2-nMZZwhwVJBgC7cH-FUCJnBCEmqu21WTHWde-w2+ZjSGIUwcGfs2IBNk2CtMZ-4 X-TOI-EXPURGATEID: 150726::1623132095-00011F3B-7D8C6F99/0/0 CLEAN NORMAL X-TOI-MSGID: de148d09-6de5-46f5-a5b9-d8afaba36fae Subject: [Buildroot] [PATCH v3 2/3] package/intel-mediadriver: bump version to 21.1.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Louis-Paul Cordier Errors-To: buildroot-bounces@busybox.net Sender: "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 Signed-off-by: Bernd Kuhls --- v3: rebased patch 0003, updated patch 0001 v2: no changes .../0001-Drop-hardening-related-flags.patch | 44 +++-- ...-Werror=format-overflow-under-gcc-10.patch | 162 ------------------ ...kelists.txt-respect-MEDIA_BUILD_FAT.patch} | 38 ++-- package/intel-mediadriver/Config.in | 6 - .../intel-mediadriver/intel-mediadriver.hash | 4 +- .../intel-mediadriver/intel-mediadriver.mk | 9 +- 6 files changed, 59 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} (60%) diff --git a/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch b/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch index bc29203317..b202b522a9 100644 --- a/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch +++ b/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch @@ -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 @@ -45,11 +51,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 -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 -[Retrieved from: -https://github.com/intel/media-driver/commit/da966a2ab1f5161cc0a21a4cd7e07edf732ebee9] -Signed-off-by: Fabrice Fontaine ---- - 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 60% 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..be70978b0d 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,31 @@ 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,18 +32,22 @@ + 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") + 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") + 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") + 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") + 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..56f3e8fb6d 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 219ce6b08a84bdce311160dc694d866249fd4e390391c2ac7be55f13a2fb928c intel-media-21.1.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..c8efaac294 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.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