From a92a9d0fd5ff1134e2e42c2a9e53cf38e51cede2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 3 Aug 2023 08:31:43 -0700 Subject: Revert "imx-atf: Explicitly demand BFD linker" This reverts commit 535a46d8fd17ef4fe5588e90c6fd741ef8537a28. --- recipes-bsp/imx-atf/imx-atf_2.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/imx-atf/imx-atf_2.8.bb b/recipes-bsp/imx-atf/imx-atf_2.8.bb index b6acd13d4..c1fd562cc 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.8.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.8.bb @@ -48,7 +48,7 @@ def remove_options_tail (in_string): from itertools import takewhile return ' '.join(takewhile(lambda x: not x.startswith('-'), in_string.split(' '))) -EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}.bfd"' +EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}"' EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"' -- cgit v1.2.3-54-g00ecf From 9aa3765b392cdef3d3002745a81f5b0f4916e461 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Aug 2023 18:39:41 -0700 Subject: imx-gpu-viv: Skip file-rdeps checks on musl Signed-off-by: Khem Raj --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 59d1716fa..64f367a41 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -424,3 +424,8 @@ FILES:imx-gpu-viv-demos = "/opt" INSANE_SKIP:imx-gpu-viv-demos += "rpaths dev-deps" FILES:libnn-imx = "${libdir}/libNN*${SOLIBS}" + +# It will use gcompat at runtime therefore checking for these at compile time wont be useful as +# they dont match musl/gcompat but it should run fine +INSANE_SKIP:append:libc-musl = " file-rdeps" + -- cgit v1.2.3-54-g00ecf From f46655cad34c3f3dbfbb8a2bfceded0877a70409 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Aug 2023 19:00:49 -0700 Subject: gstreamer1.0-plugins-base: Fix build with musl Signed-off-by: Khem Raj --- .../0001-gstallocator-Fix-typcasts.patch | 47 ++++++++++++++++++++++ .../gstreamer1.0-plugins-base_1.22.0.imx.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch new file mode 100644 index 000000000..3ab4bab45 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch @@ -0,0 +1,47 @@ +From 90b94ff95c72487054fd283fb7cb5ebd13822b3f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 7 Aug 2023 18:56:05 -0700 +Subject: [PATCH] gstallocator: Fix typcasts + +These are found when building with clang+musl +| ../git/gst-libs/gst/allocators/gstallocatorphymem.c:228:10: error: incompatible pointer to integer conversion returning 'gpointer' (aka 'void *') from a function with result type 'guintptr +' (aka 'unsigned long') [-Wint-conversion] +| 228 | return gst_phymem_get_phy (mem); +| | ^~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/nxp-imx/gst-plugins-base/pull/4] +Signed-off-by: Khem Raj +--- + gst-libs/gst/allocators/gstallocatorphymem.c | 2 +- + gst-libs/gst/gl/gstglphymemory.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gst-libs/gst/allocators/gstallocatorphymem.c b/gst-libs/gst/allocators/gstallocatorphymem.c +index f3c3306c7..f8a4511ab 100755 +--- a/gst-libs/gst/allocators/gstallocatorphymem.c ++++ b/gst-libs/gst/allocators/gstallocatorphymem.c +@@ -225,7 +225,7 @@ static guintptr + gst_allocator_phymem_get_phys_addr (GstPhysMemoryAllocator * allocator, + GstMemory * mem) + { +- return gst_phymem_get_phy (mem); ++ return (guintptr)gst_phymem_get_phy (mem); + } + + static void +diff --git a/gst-libs/gst/gl/gstglphymemory.c b/gst-libs/gst/gl/gstglphymemory.c +index d82c9a66a..1d8be0a5d 100644 +--- a/gst-libs/gst/gl/gstglphymemory.c ++++ b/gst-libs/gst/gl/gstglphymemory.c +@@ -337,7 +337,7 @@ gst_gl_physical_memory_setup_buffer (GstAllocator * allocator, + GST_VIDEO_INFO_HEIGHT (info), + viv_fmt, + memblk->vaddr, +- memblk->paddr, ++ (guint)memblk->paddr, + FALSE + }; + +-- +2.41.0 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb index 04cb5a5bc..df0b9912a 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb @@ -114,6 +114,7 @@ SRC_URI:remove = " \ file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch" SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " +SRC_URI:append = " file://0001-gstallocator-Fix-typcasts.patch" GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" SRCBRANCH = "MM_04.08.00_2305_L6.1.y" SRCREV = "aaaf7df211523b1835659ae85c510e5615d451d7" -- cgit v1.2.3-54-g00ecf