[Buildroot] [PATCH/next 1/3] package/libdrm: bump version to 2.4.114

[Buildroot] [PATCH/next 1/3] package/libdrm: bump version to 2.4.114

[Bernd Kuhls]

Release notes:
https://lists.x.org/archives/xorg-announce/2022-November/003250.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libdrm/libdrm.hash | 6 +++---
 package/libdrm/libdrm.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash
index a47e169bed..387beadc3f 100644
--- a/package/libdrm/libdrm.hash
+++ b/package/libdrm/libdrm.hash
@@ -1,6 +1,6 @@
-# From https://lists.freedesktop.org/archives/dri-devel/2022-August/369983.html
-sha256  7fd7eb2967f63beb4606f22d50e277d993480d05ef75dd88a9bd8e677323e5e1  libdrm-2.4.113.tar.xz
-sha512  fca9834ce090f63ce6dc6d04491a2c5e86162fdddfc8ea70d55a6cdeb401be656388aae1577e58f463a78d8dc502be0a641908784819874e20bbec9a39a057e0  libdrm-2.4.113.tar.xz
+# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html
+sha256  3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026  libdrm-2.4.114.tar.xz
+sha512  8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644  libdrm-2.4.114.tar.xz
 
 # Hash for license file
 sha256  d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83  data/meson.build
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index 34bd678c5a..56366b6c48 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBDRM_VERSION = 2.4.113
+LIBDRM_VERSION = 2.4.114
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz
 LIBDRM_SITE = https://dri.freedesktop.org/libdrm
 LIBDRM_LICENSE = MIT
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH/next 2/3] package/intel-mediasdk: bump version to 22.6.2

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/intel-mediasdk/intel-mediasdk.hash | 2 +-
 package/intel-mediasdk/intel-mediasdk.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash
index da4286ae23..0807d6de7e 100644
--- a/package/intel-mediasdk/intel-mediasdk.hash
+++ b/package/intel-mediasdk/intel-mediasdk.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  21a54b752c6b84f032b53a3e328d29f05a448b39f4c18f75fe4e79bb219dc40e  intel-mediasdk-22.6.0.tar.gz
+sha256  8b9bbe1631c9df8cb670d9e1cc66ae79b21520d26519d929e0a264da9f4c0924  intel-mediasdk-22.6.2.tar.gz
 sha256  dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6  LICENSE
diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk
index 30fddfbcfd..67c6683ec0 100644
--- a/package/intel-mediasdk/intel-mediasdk.mk
+++ b/package/intel-mediasdk/intel-mediasdk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-INTEL_MEDIASDK_VERSION = 22.6.0
+INTEL_MEDIASDK_VERSION = 22.6.2
 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive
 INTEL_MEDIASDK_LICENSE = MIT
 INTEL_MEDIASDK_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH/next 3/3] package/intel-mediadriver: bump version to 22.6.2

[Bernd Kuhls]

Replaced patches with upstream patch which fixes both problems.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../0001-Fix-uClibc-build.patch               |  65 --------
 ...ck-for-backtrace-3-via-FindBacktrace.patch | 150 ++++++++++++++++++
 .../0002-Fix-build-with-libexecinfo.patch     |  43 -----
 .../intel-mediadriver/intel-mediadriver.hash  |   2 +-
 .../intel-mediadriver/intel-mediadriver.mk    |   2 +-
 5 files changed, 152 insertions(+), 110 deletions(-)
 delete mode 100644 package/intel-mediadriver/0001-Fix-uClibc-build.patch
 create mode 100644 package/intel-mediadriver/0001-build-check-for-backtrace-3-via-FindBacktrace.patch
 delete mode 100644 package/intel-mediadriver/0002-Fix-build-with-libexecinfo.patch

diff --git a/package/intel-mediadriver/0001-Fix-uClibc-build.patch b/package/intel-mediadriver/0001-Fix-uClibc-build.patch
deleted file mode 100644
index 97919d0632..0000000000
--- a/package/intel-mediadriver/0001-Fix-uClibc-build.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 2007edc683499d2e82772f84241b453bdf319372 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Fri, 29 Jul 2022 19:51:39 +0200
-Subject: [PATCH] Fix uClibc build
-
-uClibc does not provide execinfo.h
-
-Patch sent upstream: https://github.com/intel/media-driver/pull/1437
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- CMakeLists.txt                                              | 6 ++++++
- .../linux/common/os/osservice/mos_utilities_specific.cpp    | 4 ++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 053904748..4a3f0869e 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
- 
- option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
- 
-+include(CheckIncludeFileCXX)
-+check_include_file_cxx("execinfo.h" HAVE_EXECINFO)
-+if (HAVE_EXECINFO)
-+    add_definitions(-DHAVE_EXECINFO)
-+endif()
-+
- include(GNUInstallDirs)
- 
- if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX)
-diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-index bde216b83..120b02d55 100644
---- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-@@ -34,7 +34,9 @@
- #include <signal.h>
- #include <unistd.h>  // fork
- #include <algorithm>
-+#ifdef HAVE_EXECINFO
- #include <execinfo.h> // backtrace
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>  // fstat
- #include <sys/ipc.h>  // System V IPC
-@@ -2473,6 +2475,7 @@ void MosUtilities::MosTraceEvent(
-                 MOS_FreeMemory(pTraceBuf);
-             }
-         }
-+#ifdef HAVE_EXECINFO
-         if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK))
-         {
-             // reserve space for header and stack size field.
-@@ -2492,6 +2495,7 @@ void MosUtilities::MosTraceEvent(
-                 size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
-             }
-         }
-+#endif
-     }
-     return;
- }
--- 
-2.30.2
-
diff --git a/package/intel-mediadriver/0001-build-check-for-backtrace-3-via-FindBacktrace.patch b/package/intel-mediadriver/0001-build-check-for-backtrace-3-via-FindBacktrace.patch
new file mode 100644
index 0000000000..46d843924e
--- /dev/null
+++ b/package/intel-mediadriver/0001-build-check-for-backtrace-3-via-FindBacktrace.patch
@@ -0,0 +1,150 @@
+From 08ad0e3da9f9ab48e423d0aea2af9605190aafe7 Mon Sep 17 00:00:00 2001
+From: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
+Date: Mon, 31 Oct 2022 16:41:43 -0700
+Subject: [PATCH] build: check for backtrace(3) via FindBacktrace
+
+Fixes: #1533
+
+Change-Id: I81bcdb5e65c26f94b174af9b5e6218c14601c50f
+Signed-off-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
+
+Downloaded from upstream PR:
+https://github.com/intel/media-driver/pull/1536
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ media_driver/media_top_cmake.cmake            | 11 +++++-
+ .../common/os/osservice/media_srcs.cmake      |  3 ++
+ .../linux/common/os/osservice/mos_compat.h.in | 35 +++++++++++++++++++
+ .../os/osservice/mos_utilities_specific.cpp   |  4 ++-
+ 4 files changed, 51 insertions(+), 2 deletions(-)
+ create mode 100644 media_softlet/linux/common/os/osservice/mos_compat.h.in
+
+diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake
+index 1a8b3b242..e71c8630d 100755
+--- a/media_driver/media_top_cmake.cmake
++++ b/media_driver/media_top_cmake.cmake
+@@ -22,6 +22,10 @@ project( media )
+ 
+ find_package(PkgConfig)
+ find_package(X11)
++find_package(Backtrace)
++
++# to get access to generated header files
++include_directories(${CMAKE_BINARY_DIR})
+ 
+ bs_set_if_undefined(LIB_NAME iHD_drv_video)
+ 
+@@ -381,10 +385,15 @@ set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS})
+ set_target_properties(${LIB_NAME}        PROPERTIES PREFIX "")
+ set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "")
+ 
++set(MEDIA_LINK_EXTERNAL_LIBS "${PKG_PCIACCESS_LIBRARIES} m pthread dl")
++if(Backtrace_FOUND)
++    set(MEDIA_LINK_EXTERNAL_LIBS "${MEDIA_LINK_EXTERNAL_LIBS} ${Backtrace_LIBRARY}")
++endif()
++
+ bs_ufo_link_libraries_noBsymbolic(
+     ${LIB_NAME}
+     "${INCLUDED_LIBS}"
+-    "${PKG_PCIACCESS_LIBRARIES} m pthread dl"
++    "${MEDIA_LINK_EXTERNAL_LIBS}"
+ )
+ 
+ if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" STREQUAL "")
+diff --git a/media_softlet/linux/common/os/osservice/media_srcs.cmake b/media_softlet/linux/common/os/osservice/media_srcs.cmake
+index e90c502f3..4e8aad1d8 100644
+--- a/media_softlet/linux/common/os/osservice/media_srcs.cmake
++++ b/media_softlet/linux/common/os/osservice/media_srcs.cmake
+@@ -18,12 +18,15 @@
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+ 
++configure_file(${CMAKE_CURRENT_LIST_DIR}/mos_compat.h.in ${CMAKE_BINARY_DIR}/mos_compat.h)
++
+ set(TMP_SOURCES_
+     ${CMAKE_CURRENT_LIST_DIR}/mos_util_debug_specific.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/mos_utilities_specific.cpp
+ )
+ 
+ set(TMP_HEADERS_
++    ${CMAKE_BINARY_DIR}/mos_compat.h
+     ${CMAKE_CURRENT_LIST_DIR}/mos_utilities_specific.h
+     ${CMAKE_CURRENT_LIST_DIR}/mos_util_debug_specific.h
+ )
+diff --git a/media_softlet/linux/common/os/osservice/mos_compat.h.in b/media_softlet/linux/common/os/osservice/mos_compat.h.in
+new file mode 100644
+index 000000000..4a04febe5
+--- /dev/null
++++ b/media_softlet/linux/common/os/osservice/mos_compat.h.in
+@@ -0,0 +1,35 @@
++/*
++* Copyright (c) 2022, Intel Corporation
++*
++* Permission is hereby granted, free of charge, to any person obtaining a
++* copy of this software and associated documentation files (the "Software"),
++* to deal in the Software without restriction, including without limitation
++* the rights to use, copy, modify, merge, publish, distribute, sublicense,
++* and/or sell copies of the Software, and to permit persons to whom the
++* Software is furnished to do so, subject to the following conditions:
++*
++* The above copyright notice and this permission notice shall be included
++* in all copies or substantial portions of the Software.
++*
++* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++* OTHER DEALINGS IN THE SOFTWARE.
++*/
++
++#ifndef __MOS_COMPAT_H__
++#define __MOS_COMPAT_H__
++
++// clib implementations (musl, uClibc) might provide backtrace(3)
++// in different header files or not provide it all and rely on external
++// implementations. So, we need to detect which header to be used.
++#cmakedefine01 Backtrace_FOUND
++#if Backtrace_FOUND
++#include <${Backtrace_HEADER}>
++#endif
++
++#endif // __MOS_COMPAT_H__
++
+diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
+index 305a0e01c..02555837a 100644
+--- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
++++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
+@@ -34,13 +34,13 @@
+ #include <signal.h>
+ #include <unistd.h>  // fork
+ #include <algorithm>
+-#include <execinfo.h> // backtrace
+ #include <sys/types.h>
+ #include <sys/stat.h>  // fstat
+ #include <sys/ipc.h>  // System V IPC
+ #include <sys/types.h>
+ #include <sys/sem.h>
+ #include <sys/mman.h>
++#include "mos_compat.h" // libc variative definitions: backtrace
+ #include "mos_user_setting.h"
+ #include "mos_utilities_specific.h"
+ #include "mos_utilities.h"
+@@ -2492,6 +2492,7 @@ void MosUtilities::MosTraceEvent(
+                 MOS_FreeMemory(pTraceBuf);
+             }
+         }
++#if Backtrace_FOUND
+         if (m_mosTraceFilter(TR_KEY_CALL_STACK))
+         {
+             // reserve space for header and stack size field.
+@@ -2511,6 +2512,7 @@ void MosUtilities::MosTraceEvent(
+                 size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
+             }
+         }
++#endif
+     }
+     return;
+ }
diff --git a/package/intel-mediadriver/0002-Fix-build-with-libexecinfo.patch b/package/intel-mediadriver/0002-Fix-build-with-libexecinfo.patch
deleted file mode 100644
index 3a6705f2b8..0000000000
--- a/package/intel-mediadriver/0002-Fix-build-with-libexecinfo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c5177d6fc64ad8bc25c8fbbe324e52744ef52e18 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 12 Aug 2022 09:50:33 +0200
-Subject: [PATCH] Fix build with libexecinfo
-
-Fix the following build failure with musl or uclibc-ng and libexecinfo:
-
-/home/giuliobenetti/autobuild/run/instance-2/output-1/build/intel-mediadriver-22.5.1/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp:2481: undefined reference to `backtrace'
-
-Fixes:
- - http://autobuild.buildroot.org/results/3316e39c5113bb7600374eda45497a87c9ac9873
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/intel/media-driver/pull/1470]
----
- media_driver/media_top_cmake.cmake | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake
-index 0e19a47c9..936d8c35a 100755
---- a/media_driver/media_top_cmake.cmake
-+++ b/media_driver/media_top_cmake.cmake
-@@ -271,10 +271,16 @@ set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS})
- set_target_properties(${LIB_NAME}        PROPERTIES PREFIX "")
- set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "")
- 
-+set(MEDIA_LINK_EXTERNAL_LIBS "${PKG_PCIACCESS_LIBRARIES} m pthread dl")
-+find_package(Backtrace)
-+if(Backtrace_FOUND)
-+    set(MEDIA_LINK_EXTERNAL_LIBS "${MEDIA_LINK_EXTERNAL_LIBS} ${Backtrace_LIBRARY}")
-+endif()
-+
- bs_ufo_link_libraries_noBsymbolic(
-     ${LIB_NAME}
-     "${INCLUDED_LIBS}"
--    "${PKG_PCIACCESS_LIBRARIES} m pthread dl"
-+    "${MEDIA_LINK_EXTERNAL_LIBS}"
- )
- 
- if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" STREQUAL "")
--- 
-2.35.1
-
diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash
index d1698cbfb5..a42a7841d5 100644
--- a/package/intel-mediadriver/intel-mediadriver.hash
+++ b/package/intel-mediadriver/intel-mediadriver.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  bee655102b0c56ea3eee6e8d1d203a67bf7e0c4696ebde2b8ae40067eb12b23f  intel-media-22.6.0.tar.gz
+sha256  a59c4c9facf567ccbea3aab36b150d961c56e48461283a2aa7c438a311b4d2d0  intel-media-22.6.2.tar.gz
 sha256  74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3  LICENSE.md
diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk
index d1a9ca7789..e46241ffee 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 = 22.6.0
+INTEL_MEDIADRIVER_VERSION = 22.6.2
 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive
 INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz
 INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH/next 1/3] package/libdrm: bump version to 2.4.114

[Thomas Petazzoni via buildroot]

On Sun, 13 Nov 2022 12:42:21 +0100
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Release notes:
> https://lists.x.org/archives/xorg-announce/2022-November/003250.html
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/libdrm/libdrm.hash | 6 +++---
>  package/libdrm/libdrm.mk   | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)

Series applied to next. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot