package/intel-mediadriver: bump version to 21.2.3
authorBernd Kuhls <bernd.kuhls@t-online.de>
Wed, 30 Jun 2021 15:24:57 +0000 (17:24 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 3 Jul 2021 20:59:13 +0000 (22:59 +0200)
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/intel-mediadriver/0001-Drop-hardening-related-flags.patch
package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch [deleted file]
package/intel-mediadriver/0002-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch [new file with mode: 0644]
package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch [deleted file]
package/intel-mediadriver/Config.in
package/intel-mediadriver/intel-mediadriver.hash
package/intel-mediadriver/intel-mediadriver.mk

index bc29203317801bea116fa2cdf403b2a20dffd289..376308ea42eb3b23074221c2a45389ffa07f54d9 100644 (file)
@@ -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 (file)
index 46775e9..0000000
+++ /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/0002-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch b/package/intel-mediadriver/0002-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch
new file mode 100644 (file)
index 0000000..df8d39f
--- /dev/null
@@ -0,0 +1,51 @@
+From f09fddd6763aca237f19417de05a1f5de7f51d40 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sat, 5 Jun 2021 16:57:32 +0200
+Subject: [PATCH] cmrtlib/linux/CMakelists.txt: respect
+ MEDIA_BUILD_FATAL_WARNINGS
+
+Respect MEDIA_BUILD_FATAL_WARNINGS to avoid the following build failure
+when the user provides _FORTIFY_SOURCE:
+
+In file included from /home/buildroot/autobuild/instance-0/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/dlfcn.h:22,
+                 from /home/buildroot/autobuild/instance-0/output-1/build/intel-mediadriver-19.4.0r/cmrtlib/linux/../linux/share/cm_include.h:30,
+                 from /home/buildroot/autobuild/instance-0/output-1/build/intel-mediadriver-19.4.0r/cmrtlib/agnostic/share/cm_printf_host.cpp:23:
+/home/buildroot/autobuild/instance-0/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/features.h:397:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
+  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
+      |    ^~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/52638d95312e464626d1c4047b3b26d4f57a1cd2
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/intel/media-driver/pull/1203]
+---
+ cmrtlib/linux/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+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 @@
+ endif()
+ # Set up compile options that will be used for the Linux build
+-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)
+-- 
+2.30.2
+
diff --git a/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch b/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch
deleted file mode 100644 (file)
index bc7a27f..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From f09fddd6763aca237f19417de05a1f5de7f51d40 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 5 Jun 2021 16:57:32 +0200
-Subject: [PATCH] cmrtlib/linux/CMakelists.txt: respect
- MEDIA_BUILD_FATAL_WARNINGS
-
-Respect MEDIA_BUILD_FATAL_WARNINGS to avoid the following build failure
-when the user provides _FORTIFY_SOURCE:
-
-In file included from /home/buildroot/autobuild/instance-0/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/dlfcn.h:22,
-                 from /home/buildroot/autobuild/instance-0/output-1/build/intel-mediadriver-19.4.0r/cmrtlib/linux/../linux/share/cm_include.h:30,
-                 from /home/buildroot/autobuild/instance-0/output-1/build/intel-mediadriver-19.4.0r/cmrtlib/agnostic/share/cm_printf_host.cpp:23:
-/home/buildroot/autobuild/instance-0/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/features.h:397:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
-  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
-      |    ^~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/52638d95312e464626d1c4047b3b26d4f57a1cd2
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/intel/media-driver/pull/1203]
----
- cmrtlib/linux/CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-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()
- # 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(GCC_SECURE_LINK_FLAGS "-z relro -z now")
-    set(CMAKE_SKIP_RPATH ON)
--- 
-2.30.2
-
index 35117f7712a6779b399ce2bd4f64c9451e07e69c..2d5adbcf59268fedf190b913391cbf013eaaaa72 100644 (file)
@@ -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 || \
index 5d016695ae0173a3cbfb8f31526df87ee14db9f6..74dc397041d71c4c850adecd072e4c02fcdd14b4 100644 (file)
@@ -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
index 01423b9611782472509ebb3797fc6a09efcad37e..31087776e922557de93a202066cd685810cba31d 100644 (file)
@@ -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