summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/imx6ulevk.conf8
-rw-r--r--conf/machine/imx6ullevk.conf4
-rw-r--r--conf/machine/imx6ulz-14x14-evk.conf4
-rw-r--r--conf/machine/imx8qm-mek.conf5
-rw-r--r--conf/machine/imx8qxp-mek.conf1
-rw-r--r--conf/machine/imx93-11x11-lpddr4x-evk.conf3
-rw-r--r--conf/machine/imx93-14x14-lpddr4x-evk.conf8
-rw-r--r--conf/machine/include/imx-base.inc53
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx_8.23.bb23
-rw-r--r--recipes-bsp/imx-lib/imx-lib_git.bb2
-rw-r--r--recipes-bsp/imx-mkimage/imx-boot_1.0.bb3
-rw-r--r--recipes-bsp/imx-test/imx-test_git.bb7
-rw-r--r--recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb1
-rw-r--r--recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb8
-rw-r--r--recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb (renamed from recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb)9
-rw-r--r--recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb (renamed from recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb)10
-rw-r--r--recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb)10
-rw-r--r--recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb)8
-rw-r--r--recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb)8
-rw-r--r--recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb)16
-rw-r--r--recipes-graphics/drm/libdrm_2.4.116.imx.bb (renamed from recipes-graphics/drm/libdrm_2.4.115.imx.bb)7
-rw-r--r--recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb38
-rw-r--r--recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb45
-rw-r--r--recipes-graphics/imx-g2d/imx-g2d-samples_git.bb22
-rw-r--r--recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb (renamed from recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.2.bb)14
-rw-r--r--recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb6
-rw-r--r--recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb12
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc22
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb10
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb10
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb10
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb10
-rw-r--r--recipes-graphics/mesa/mesa-gl_%.bbappend9
-rw-r--r--recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend (renamed from recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend)2
-rw-r--r--recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch (renamed from recipes-graphics/wayland/weston-10.0.4.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch)0
-rw-r--r--recipes-graphics/wayland/weston-10.0.5.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch (renamed from recipes-graphics/wayland/weston-10.0.4.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch)0
-rw-r--r--recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch15
-rw-r--r--recipes-graphics/wayland/weston/xwayland.weston-start4
-rw-r--r--recipes-graphics/wayland/weston_10.0.5.imx.bb (renamed from recipes-graphics/wayland/weston_10.0.4.imx.bb)4
-rw-r--r--recipes-graphics/wayland/weston_12.0.3.imx.bb (renamed from recipes-graphics/wayland/weston_11.0.3.imx.bb)40
-rw-r--r--recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb (renamed from recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2.bb)8
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb (renamed from recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb)4
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb4
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_6.6.bb23
-rw-r--r--recipes-kernel/linux/linux-fslc_6.6.bb4
-rw-r--r--recipes-multimedia/gstreamer/gst-devtools_1.22.0.imx.bb56
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.imx.bb36
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.0.imx.bb52
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.imx.bb52
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.0.imx.bb32
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.0.imx.bb37
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb64
53 files changed, 281 insertions, 564 deletions
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index b06e3031..10c7b6fb 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -13,13 +13,19 @@ MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
13 13
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 nxp/imx/imx6ul-14x14-evk-btwifi.dtb \ 15 nxp/imx/imx6ul-14x14-evk-btwifi.dtb \
16 nxp/imx/imx6ul-14x14-evk-btwifi-sdio3_0.dtb \
17 nxp/imx/imx6ul-14x14-evk-csi.dtb \ 16 nxp/imx/imx6ul-14x14-evk-csi.dtb \
18 nxp/imx/imx6ul-14x14-evk.dtb \ 17 nxp/imx/imx6ul-14x14-evk.dtb \
19 nxp/imx/imx6ul-14x14-evk-ecspi.dtb \ 18 nxp/imx/imx6ul-14x14-evk-ecspi.dtb \
20 nxp/imx/imx6ul-14x14-evk-ecspi-slave.dtb \ 19 nxp/imx/imx6ul-14x14-evk-ecspi-slave.dtb \
21 nxp/imx/imx6ul-14x14-evk-emmc.dtb \ 20 nxp/imx/imx6ul-14x14-evk-emmc.dtb \
22 nxp/imx/imx6ul-14x14-evk-gpmi-weim.dtb \ 21 nxp/imx/imx6ul-14x14-evk-gpmi-weim.dtb \
22 nxp/imx/imx6ul-14x14-evk-reve.dtb \
23 nxp/imx/imx6ul-14x14-evk-reve-btwifi.dtb \
24 nxp/imx/imx6ul-14x14-evk-reve-csi.dtb \
25 nxp/imx/imx6ul-14x14-evk-reve-ecspi.dtb \
26 nxp/imx/imx6ul-14x14-evk-reve-ecspi-slave.dtb \
27 nxp/imx/imx6ul-14x14-evk-reve-emmc.dtb \
28 nxp/imx/imx6ul-14x14-evk-reve-gpmi-weim.dtb \
23" 29"
24KERNEL_DEVICETREE:use-mainline-bsp = "nxp/imx/imx6ul-14x14-evk.dtb" 30KERNEL_DEVICETREE:use-mainline-bsp = "nxp/imx/imx6ul-14x14-evk.dtb"
25 31
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index a8d76a2c..f412c18d 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -19,6 +19,10 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
19 nxp/imx/imx6ull-14x14-evk-btwifi.dtb \ 19 nxp/imx/imx6ull-14x14-evk-btwifi.dtb \
20 nxp/imx/imx6ull-14x14-evk-emmc.dtb \ 20 nxp/imx/imx6ull-14x14-evk-emmc.dtb \
21 nxp/imx/imx6ull-14x14-evk-gpmi-weim.dtb \ 21 nxp/imx/imx6ull-14x14-evk-gpmi-weim.dtb \
22 nxp/imx/imx6ull-14x14-evk-reve.dtb \
23 nxp/imx/imx6ull-14x14-evk-reve-btwifi.dtb \
24 nxp/imx/imx6ull-14x14-evk-reve-emmc.dtb \
25 nxp/imx/imx6ull-14x14-evk-reve-gpmi-weim.dtb \
22" 26"
23 27
24UBOOT_MAKE_TARGET = "u-boot.imx" 28UBOOT_MAKE_TARGET = "u-boot.imx"
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index d1dcae99..c5fd91bf 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -18,6 +18,10 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
18 nxp/imx/imx6ulz-14x14-evk-btwifi.dtb \ 18 nxp/imx/imx6ulz-14x14-evk-btwifi.dtb \
19 nxp/imx/imx6ulz-14x14-evk-emmc.dtb \ 19 nxp/imx/imx6ulz-14x14-evk-emmc.dtb \
20 nxp/imx/imx6ulz-14x14-evk-gpmi-weim.dtb \ 20 nxp/imx/imx6ulz-14x14-evk-gpmi-weim.dtb \
21 nxp/imx/imx6ulz-14x14-evk-reve.dtb \
22 nxp/imx/imx6ulz-14x14-evk-reve-btwifi.dtb \
23 nxp/imx/imx6ulz-14x14-evk-reve-emmc.dtb \
24 nxp/imx/imx6ulz-14x14-evk-reve-gpmi-weim.dtb \
21" 25"
22 26
23UBOOT_MAKE_TARGET = "u-boot.imx" 27UBOOT_MAKE_TARGET = "u-boot.imx"
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index 5dea4e41..47cfde19 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -32,8 +32,11 @@ KERNEL_DEVICETREE = " \
32 freescale/imx8qm-mek-ca72.dtb \ 32 freescale/imx8qm-mek-ca72.dtb \
33 freescale/imx8qm-mek-dsi-rm67191.dtb \ 33 freescale/imx8qm-mek-dsi-rm67191.dtb \
34 freescale/imx8qm-mek-dsi-rm67199.dtb \ 34 freescale/imx8qm-mek-dsi-rm67199.dtb \
35 freescale/imx8qm-mek-dsi-serdes.dtb \
36 freescale/imx8qm-mek-dsi-serdes-dual-display.dtb \
37 freescale/imx8qm-mek-dsi-serdes-dual-display-rpmsg.dtb \
38 freescale/imx8qm-mek-dsi-serdes-rpmsg.dtb \
35 freescale/imx8qm-mek-enet2-tja1100.dtb \ 39 freescale/imx8qm-mek-enet2-tja1100.dtb \
36 freescale/imx8qm-mek-esai.dtb \
37 freescale/imx8qm-mek-hdmi.dtb \ 40 freescale/imx8qm-mek-hdmi.dtb \
38 freescale/imx8qm-mek-hdmi-rx.dtb \ 41 freescale/imx8qm-mek-hdmi-rx.dtb \
39 freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \ 42 freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 72867a95..87df30f4 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -24,6 +24,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
24 freescale/${KERNEL_DEVICETREE_BASENAME}-sof.dtb \ 24 freescale/${KERNEL_DEVICETREE_BASENAME}-sof.dtb \
25 freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ 25 freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \
26 freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ 26 freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \
27 freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8962.dtb \
27" 28"
28 29
29UBOOT_CONFIG_BASENAME = "imx8qxp_mek" 30UBOOT_CONFIG_BASENAME = "imx8qxp_mek"
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index 159a4472..f8bdc4d7 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -15,6 +15,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
15 freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \ 15 freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
16 freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ 16 freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
17 freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ 17 freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
18 freescale/${KERNEL_DEVICETREE_BASENAME}-ld.dtb \
18 freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \ 19 freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
19 freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \ 20 freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
20 freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \ 21 freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \
@@ -22,6 +23,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
22 freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \ 23 freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
23 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ 24 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
24 freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ 25 freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
26 freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
27 freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \
25 " 28 "
26 29
27UBOOT_CONFIG_BASENAME = "imx93_11x11_evk" 30UBOOT_CONFIG_BASENAME = "imx93_11x11_evk"
diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
index 9ac24b65..97559104 100644
--- a/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -10,10 +10,12 @@ KERNEL_DEVICETREE_BASENAME = "imx93-14x14-evk"
10 10
11KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 11KERNEL_DEVICETREE:append:use-nxp-bsp = " \
12 freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtb \ 12 freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtb \
13 freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \ 13 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-serdes.dtb \
14 freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \ 14 freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
15 freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
15 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ 16 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
16 freescale/${KERNEL_DEVICETREE_BASENAME}-lvds-it6263.dtb \ 17 freescale/${KERNEL_DEVICETREE_BASENAME}-sja1105.dtb \
18 freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \
17" 19"
18 20
19UBOOT_CONFIG_BASENAME = "imx93_14x14_evk" 21UBOOT_CONFIG_BASENAME = "imx93_14x14_evk"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 78c1e762..d1f8aca3 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -412,14 +412,14 @@ MACHINE_FIRMWARE:append:mx6sl-generic-bsp = " firmware-imx-epdc"
412MACHINE_FIRMWARE:append:mx6sll-generic-bsp = " firmware-imx-epdc" 412MACHINE_FIRMWARE:append:mx6sll-generic-bsp = " firmware-imx-epdc"
413MACHINE_FIRMWARE:append:mx6ull-generic-bsp = " firmware-imx-epdc" 413MACHINE_FIRMWARE:append:mx6ull-generic-bsp = " firmware-imx-epdc"
414MACHINE_FIRMWARE:append:mx7d-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" 414MACHINE_FIRMWARE:append:mx7d-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc"
415MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx8" 415MACHINE_FIRMWARE:append:mx8qm-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
416MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " linux-firmware-imx-sdma-imx7d" 416MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " linux-firmware-imx-sdma-imx7d"
417MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn" 417MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn"
418MACHINE_FIRMWARE:append:mx8mnul-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn" 418MACHINE_FIRMWARE:append:mx8mnul-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn"
419MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" 419MACHINE_FIRMWARE:append:mx8mp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx"
420MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d" 420MACHINE_FIRMWARE:append:mx8mq-generic-bsp = " linux-firmware-imx-sdma-imx7d"
421MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx8" 421MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
422MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx8" 422MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion"
423MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" 423MACHINE_FIRMWARE:append:imx-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
424 424
425MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" 425MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
@@ -519,22 +519,6 @@ PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.22.5.imx"
519PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.22.5.imx" 519PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.22.5.imx"
520PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.22.5.imx" 520PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.22.5.imx"
521 521
522# GStreamer copied recipes
523PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.22.0.imx"
524PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.22.0.imx"
525PREFERRED_VERSION_gstreamer1.0-omx:mx8-nxp-bsp ??= "1.22.0.imx"
526PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.22.0.imx"
527PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.22.0.imx"
528PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.22.0.imx"
529PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.22.0.imx"
530PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.22.0.imx"
531PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.22.0.imx"
532PREFERRED_VERSION_gstreamer1.0-omx:mx9-nxp-bsp ??= "1.22.0.imx"
533PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.22.0.imx"
534PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.22.0.imx"
535PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.22.0.imx"
536PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.22.0.imx"
537
538# GStreamer downgrade ffmpeg 522# GStreamer downgrade ffmpeg
539PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" 523PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
540PREFERRED_VERSION_ffmpeg:mx9-nxp-bsp ??= "4.4.1" 524PREFERRED_VERSION_ffmpeg:mx9-nxp-bsp ??= "4.4.1"
@@ -555,7 +539,8 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
555PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 539PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
556 540
557PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" 541PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv"
558PREFERRED_PROVIDER_virtual/libgl:imxgpu3d ?= "imx-gpu-viv" 542PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl"
543PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl"
559PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" 544PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv"
560PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" 545PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv"
561PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv" 546PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv"
@@ -567,10 +552,10 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv"
567PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" 552PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv"
568PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" 553PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv"
569 554
570PREFERRED_VERSION_weston:imx-nxp-bsp ??= "11.0.3.imx" 555PREFERRED_VERSION_weston:imx-nxp-bsp ??= "12.0.3.imx"
571# i.MX 6 & 7 stay on weston 10.0 for fbdev 556# i.MX 6 & 7 stay on weston 10.0 for fbdev
572PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.4.imx" 557PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx"
573PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.4.imx" 558PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx"
574PREFERRED_VERSION_weston:imx-mainline-bsp = "" 559PREFERRED_VERSION_weston:imx-mainline-bsp = ""
575 560
576PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.32.imx" 561PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.32.imx"
@@ -581,17 +566,17 @@ PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.32.imx"
581PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" 566PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
582 567
583# Use i.MX libdrm Version 568# Use i.MX libdrm Version
584PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.115.imx" 569PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.116.imx"
585PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.115.imx" 570PREFERRED_VERSION_libdrm:mx7-nxp-bsp ??= "2.4.116.imx"
586PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.115.imx" 571PREFERRED_VERSION_libdrm:mx8-nxp-bsp ??= "2.4.116.imx"
587PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.115.imx" 572PREFERRED_VERSION_libdrm:mx9-nxp-bsp ??= "2.4.116.imx"
588 573
589PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.239.0.imx" 574PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx"
590PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.239.0.imx" 575PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx"
591PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.239.0.imx" 576PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.261.1.imx"
592PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.239.0.imx" 577PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.261.1.imx"
593PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.239.0.imx" 578PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.261.1.imx"
594PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.239.0.imx" 579PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx"
595 580
596# Use i.MX optee Version 581# Use i.MX optee Version
597PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.0.0.imx" 582PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.0.0.imx"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb
index a9e36b5e..0c935b92 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb
@@ -1,5 +1,5 @@
1# Copyright (C) 2012-2016 Freescale Semiconductor 1# Copyright (C) 2012-2016 Freescale Semiconductor
2# Copyright 2017-2021 NXP 2# Copyright 2017-2021,2023 NXP
3# Copyright (C) 2018 O.S. Systems Software LTDA. 3# Copyright (C) 2018 O.S. Systems Software LTDA.
4SUMMARY = "Freescale i.MX firmware" 4SUMMARY = "Freescale i.MX firmware"
5DESCRIPTION = "Freescale i.MX firmware such as for the VPU" 5DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
@@ -10,14 +10,21 @@ PE = "1"
10 10
11inherit allarch 11inherit allarch
12 12
13IMX_USE_LINUX_FIRMWARE_SDMA ?= "1"
14
13do_install() { 15do_install() {
14 install -d ${D}${nonarch_base_libdir}/firmware/imx 16 install -d ${D}${nonarch_base_libdir}/firmware/imx
15 17
16 # SDMA Firmware section 18 # SDMA Firmware section
17 install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma 19 install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma
18 install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma 20 install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma
19 rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin 21 # Define IMX_USE_LINUX_FIRMWARE_SDMA = "0" in layer.conf, machine.conf, local.conf
20 rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin 22 # or in .bbappend to use sdma-imx6q/7d.bin from here and not linux-firmware
23 if [ ${IMX_USE_LINUX_FIRMWARE_SDMA} -gt 0 ]
24 then
25 rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin
26 rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin
27 fi
21 28
22 # EASRC Firmware section 29 # EASRC Firmware section
23 install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc 30 install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc
@@ -53,6 +60,11 @@ do_install() {
53 # as some of other files are provided by packages from other recipes. 60 # as some of other files are provided by packages from other recipes.
54 install -d ${D}${nonarch_base_libdir}/firmware/vpu 61 install -d ${D}${nonarch_base_libdir}/firmware/vpu
55 install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu 62 install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu
63 # Update i.MX8 vpu firmware path to align with kernel6.5+
64 install -d ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
65 mv ${D}${nonarch_base_libdir}/firmware/vpu/vpu_fw_imx8* ${D}${nonarch_base_libdir}/firmware/amphion/vpu/
66 # Install i.MX 95 VPU firmware
67 install -m 0644 ${S}/firmware/vpu/wave633c_codec_fw.bin ${D}${nonarch_base_libdir}/firmware
56} 68}
57 69
58# 70#
@@ -88,6 +100,7 @@ python populate_packages:prepend() {
88 100
89 os.chdir(cwd) 101 os.chdir(cwd)
90 102
103
91 easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d) 104 easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d)
92 do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin', 105 do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin',
93 output_pattern='firmware-imx-easrc-%s', 106 output_pattern='firmware-imx-easrc-%s',
@@ -144,7 +157,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu
144# is empty. 157# is empty.
145# Therefore, we opt-out from producing -dev package here, since also for firmware 158# Therefore, we opt-out from producing -dev package here, since also for firmware
146# files it makes no sense. 159# files it makes no sense.
147PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi" 160PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-wave"
148 161
149FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" 162FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
150FILES:${PN}-hdmi = " \ 163FILES:${PN}-hdmi = " \
@@ -152,5 +165,7 @@ FILES:${PN}-hdmi = " \
152 ${nonarch_base_libdir}/firmware/hdmirxfw.bin \ 165 ${nonarch_base_libdir}/firmware/hdmirxfw.bin \
153 ${nonarch_base_libdir}/firmware/dpfw.bin \ 166 ${nonarch_base_libdir}/firmware/dpfw.bin \
154" 167"
168FILES:${PN}-vpu-amphion = "${nonarch_base_libdir}/firmware/amphion/vpu/*"
169FILES:${PN}-vpu-wave = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin"
155 170
156COMPATIBLE_MACHINE = "(imx-generic-bsp)" 171COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 74b7bddf..d06ccfa1 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -13,7 +13,7 @@ PE = "1"
13PV = "5.9+${SRCPV}" 13PV = "5.9+${SRCPV}"
14 14
15SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" 15SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
16SRCBRANCH = "lf-6.1.55_2.2.0" 16SRCBRANCH = "lf-6.6.3_1.0.0"
17SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547" 17SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index a761870b..7792b27b 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -58,7 +58,8 @@ IMXBOOT_TARGETS ?= \
58BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}" 58BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}"
59BOOT_STAGING:mx8m-generic-bsp = "${S}/iMX8M" 59BOOT_STAGING:mx8m-generic-bsp = "${S}/iMX8M"
60BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX" 60BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX"
61BOOT_STAGING:mx9-generic-bsp = "${S}/iMX9" 61BOOT_STAGING:mx91p-generic-bsp = "${S}/iMX91"
62BOOT_STAGING:mx93-generic-bsp = "${S}/iMX93"
62 63
63SOC_FAMILY = "INVALID" 64SOC_FAMILY = "INVALID"
64SOC_FAMILY:mx8-generic-bsp = "mx8" 65SOC_FAMILY:mx8-generic-bsp = "mx8"
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 5d30179d..930cdf94 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -13,14 +13,15 @@ DEPENDS:append:imxvpu = " virtual/imxvpu"
13DEPENDS:append:mx6-nxp-bsp = " imx-lib" 13DEPENDS:append:mx6-nxp-bsp = " imx-lib"
14DEPENDS:append:mx7-nxp-bsp = " imx-lib" 14DEPENDS:append:mx7-nxp-bsp = " imx-lib"
15DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib" 15DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib"
16DEPENDS:append:mx93-nxp-bsp = " imx-lib"
16 17
17PE = "1" 18PE = "1"
18PV = "7.0+${SRCPV}" 19PV = "7.0+${SRCPV}"
19 20
20SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ 21SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
21 file://memtool_profile" 22 file://memtool_profile"
22SRCBRANCH = "lf-6.1.55_2.2.0" 23SRCBRANCH = "lf-6.6.3_1.0.0"
23SRCREV = "e8b3c9026553233491abb4df4185dd7291a8ffb2" 24SRCREV = "8a1fa37664a1e470cf86f1185c08e265e4602a9b"
24 25
25S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
26 27
@@ -39,6 +40,8 @@ PLATFORM:mx7d-nxp-bsp = "IMX7D"
39PLATFORM:mx7ulp-nxp-bsp = "IMX7D" 40PLATFORM:mx7ulp-nxp-bsp = "IMX7D"
40PLATFORM:mx8-nxp-bsp = "IMX8" 41PLATFORM:mx8-nxp-bsp = "IMX8"
41PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP" 42PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
43PLATFORM:mx93-nxp-bsp = "IMX8ULP"
44PLATFORM:mx95-nxp-bsp = "IMX8"
42 45
43PARALLEL_MAKE = "-j 1" 46PARALLEL_MAKE = "-j 1"
44EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" 47EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
index 383a0e2a..553f3993 100644
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
@@ -7,7 +7,6 @@ LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" 7LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
8 8
9PROVIDES = "virtual/imxvpu" 9PROVIDES = "virtual/imxvpu"
10RPROVIDES:${PN} = "virtual/imxvpu"
11 10
12PE = "1" 11PE = "1"
13 12
diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
index c01bfd4c..bb542e8c 100644
--- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
+++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
@@ -13,10 +13,10 @@ SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234"
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15do_install () { 15do_install () {
16 install -d ${D}/lib/firmware 16 install -d ${D}${nonarch_base_libdir}/firmware
17 install -d ${D}/boot/engine-pfe-bin 17 install -d ${D}/boot/engine-pfe-bin
18 install -m 644 ${S}/NXP-Binary-EULA.txt ${D}/lib/firmware 18 install -m 644 ${S}/NXP-Binary-EULA.txt ${D}${nonarch_base_libdir}/firmware
19 install -m 755 ${S}/ls1012a/slow_path/*.elf ${D}/lib/firmware 19 install -m 755 ${S}/ls1012a/slow_path/*.elf ${D}${nonarch_base_libdir}/firmware
20 install -m 755 ${S}/ls1012a/u-boot/* ${D}/boot/engine-pfe-bin 20 install -m 755 ${S}/ls1012a/u-boot/* ${D}/boot/engine-pfe-bin
21} 21}
22 22
@@ -27,7 +27,7 @@ do_deploy () {
27 27
28addtask deploy after do_install 28addtask deploy after do_install
29 29
30FILES:${PN} += "/lib/firmware /boot/" 30FILES:${PN} += "${nonarch_base_libdir}/firmware /boot/"
31INSANE_SKIP:${PN} += "arch already-stripped" 31INSANE_SKIP:${PN} += "arch already-stripped"
32INHIBIT_PACKAGE_STRIP = "1" 32INHIBIT_PACKAGE_STRIP = "1"
33INHIBIT_SYSROOT_STRIP = "1" 33INHIBIT_SYSROOT_STRIP = "1"
diff --git a/recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
index afd59cbc..945f0879 100644
--- a/recipes-downgrade/spir/spirv-headers_1.3.239.0.imx.bb
+++ b/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
@@ -1,15 +1,16 @@
1SUMMARY = "Machine-readable files for the SPIR-V Registry" 1SUMMARY = "Machine-readable files for the SPIR-V Registry"
2DESCRIPTION = "Headers are provided in the include directory, with up-to-date \
3headers in the unified1 subdirectory. Older headers are provided according to \
4their version."
5SECTION = "graphics" 2SECTION = "graphics"
6HOMEPAGE = "https://www.khronos.org/registry/spir-v" 3HOMEPAGE = "https://www.khronos.org/registry/spir-v"
7LICENSE = "MIT" 4LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
9 6
10SRCREV = "d13b52222c39a7e9a401b44646f0ca3a640fbd47" 7SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb"
11SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" 8SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
12PE = "1" 9PE = "1"
10# These recipes need to be updated in lockstep with each other:
11# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
12# The tags versions should always be sdk-x.y.z, as this is what
13# upstream considers a release.
13UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 14UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
14S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
15 16
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
index 5109bb53..69042882 100644
--- a/recipes-downgrade/spir/spirv-tools_1.3.239.0.imx.bb
+++ b/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
@@ -7,13 +7,17 @@ SECTION = "graphics"
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
9 9
10SRCREV = "63de608daeb7e91fbea6d7477a50debe7cac57ce" 10SRCREV = "e553b884c7c9febaa4e52334f683641fb5f196a0"
11SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" 11SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
12PE = "1" 12PE = "1"
13# These recipes need to be updated in lockstep with each other:
14# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
15# The tags versions should always be sdk-x.y.z, as this is what
16# upstream considers a release.
13UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
14S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
15 19
16inherit cmake python3native 20inherit cmake
17 21
18DEPENDS = "spirv-headers" 22DEPENDS = "spirv-headers"
19 23
@@ -28,7 +32,7 @@ do_install:append:class-target() {
28 # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent 32 # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent
29 # tools can find the right library 33 # tools can find the right library
30 sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ 34 sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \
31 -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/lib":' 35 -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":'
32} 36}
33 37
34# all the libraries are unversioned, so don't pack it on PN-dev 38# all the libraries are unversioned, so don't pack it on PN-dev
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
index a6b30fa8..01eb14b9 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.239.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
@@ -7,11 +7,11 @@ HOMEPAGE = "https://www.khronos.org/vulkan/"
7BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers" 7BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers"
8SECTION = "libs" 8SECTION = "libs"
9 9
10LICENSE = "Apache-2.0" 10LICENSE = "Apache-2.0 & MIT"
11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" 11LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625"
12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
13 13
14SRCREV = "2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8" 14SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
@@ -20,4 +20,8 @@ inherit cmake
20FILES:${PN} += "${datadir}/vulkan" 20FILES:${PN} += "${datadir}/vulkan"
21RDEPENDS:${PN} += "python3-core" 21RDEPENDS:${PN} += "python3-core"
22 22
23# These recipes need to be updated in lockstep with each other:
24# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
25# The tags versions should always be sdk-x.y.z, as this is what
26# upstream considers a release.
23UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 27UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
index e11f936a..01cbeafa 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.239.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
@@ -9,8 +9,8 @@ SECTION = "libs"
9 9
10LICENSE = "Apache-2.0" 10LICENSE = "Apache-2.0"
11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" 11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.239;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https"
13SRCREV = "fa421a02686e7f01c8e4af24650fa04374df8338" 13SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -35,4 +35,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
35 35
36RRECOMMENDS:${PN} = "mesa-vulkan-drivers" 36RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
37 37
38# These recipes need to be updated in lockstep with each other:
39# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
40# The tags versions should always be sdk-x.y.z, as this is what
41# upstream considers a release.
38UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 42UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
index 934bd53e..7a7edc9e 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.239.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
@@ -6,8 +6,8 @@ SECTION = "libs"
6 6
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" 8LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
9SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.239;protocol=https" 9SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
10SRCREV = "84c61c463aecdda385de33b0149c7368119c23f6" 10SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
@@ -29,4 +29,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
29PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" 29PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
30PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" 30PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
31 31
32# These recipes need to be updated in lockstep with each other:
33# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
34# The tags versions should always be sdk-x.y.z, as this is what
35# upstream considers a release.
32UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 36UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
index 5f699c2b..1e2a0ace 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.239.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
@@ -5,11 +5,11 @@ HOMEPAGE = "https://www.khronos.org/vulkan/"
5BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers" 5BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"
6SECTION = "libs" 6SECTION = "libs"
7 7
8LICENSE = "Apache-2.0" 8LICENSE = "Apache-2.0 & MIT"
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
10 10
11SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=main;protocol=https" 11SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https"
12SRCREV = "60e58bc683807fa396b1287deace8b45cfd957a3" 12SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
@@ -18,16 +18,12 @@ REQUIRED_DISTRO_FEATURES = "vulkan"
18DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang" 18DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang"
19 19
20# BUILD_TESTS - Not required for OE builds 20# BUILD_TESTS - Not required for OE builds
21# BUILD_WERROR - There are too many compiler warnings/errors due to upgrades in version
22# of clang. Requiring a number of patches from upstream. Disable compiler
23# -Werror to bypass build issues.
24# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms. 21# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
25# Yocto project doesn't contain a recipe for package so disabled it. 22# Yocto project doesn't contain a recipe for package so disabled it.
26EXTRA_OECMAKE = "\ 23EXTRA_OECMAKE = "\
27 -DBUILD_TESTS=OFF \ 24 -DBUILD_TESTS=OFF \
28 -DBUILD_WERROR=OFF \
29 -DUSE_ROBIN_HOOD_HASHING=OFF \ 25 -DUSE_ROBIN_HOOD_HASHING=OFF \
30 -DGLSLANG_INSTALL_DIR=${STAGING_DATADIR} \ 26 -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \
31 -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ 27 -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
32 -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ 28 -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
33 " 29 "
@@ -35,7 +31,7 @@ EXTRA_OECMAKE = "\
35PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" 31PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
36PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" 32PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
37 33
38PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" 34PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
39 35
40inherit cmake features_check pkgconfig 36inherit cmake features_check pkgconfig
41 37
diff --git a/recipes-graphics/drm/libdrm_2.4.115.imx.bb b/recipes-graphics/drm/libdrm_2.4.116.imx.bb
index ada0b7ae..ff23f35f 100644
--- a/recipes-graphics/drm/libdrm_2.4.115.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.116.imx.bb
@@ -13,8 +13,8 @@ DEPENDS = "libpthread-stubs"
13 13
14SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" 14SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}"
15IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https" 15IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https"
16SRCBRANCH ?= "libdrm-imx-2.4.115" 16SRCBRANCH = "libdrm-imx-2.4.116"
17SRCREV = "0f889a1f9640f6210132dd565141eb19005245fb" 17SRCREV = "2f1797674f94572ae8c365c8cbffb0263337ed57"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
20 20
@@ -45,7 +45,7 @@ PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,libxslt-nati
45 45
46ALLOW_EMPTY:${PN}-drivers = "1" 46ALLOW_EMPTY:${PN}-drivers = "1"
47PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ 47PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
48 ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \ 48 ${PN}-intel ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
49 ${PN}-etnaviv" 49 ${PN}-etnaviv"
50 50
51RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ 51RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
@@ -58,7 +58,6 @@ FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
58FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" 58FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*"
59FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" 59FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*"
60FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" 60FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
61FILES:${PN}-kms = "${libdir}/libkms*.so.*"
62FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" 61FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
63FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" 62FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids"
64FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" 63FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb
deleted file mode 100644
index 16011bd4..00000000
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb
+++ /dev/null
@@ -1,38 +0,0 @@
1# Copyright (C) 2016 Freescale Semiconductor
2# Copyright 2017-2022 NXP
3# Released under the MIT license (see COPYING.MIT for the terms)
4
5DESCRIPTION = "G2D library using i.MX DPU"
6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
8
9DEPENDS = "libgal-imx libdrm"
10PROVIDES += "virtual/libg2d"
11
12SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true"
13IMX_BIN_NAME = "${BP}-${IMX_SRCREV_ABBREV}"
14IMX_SRCREV_ABBREV = "7ed5396"
15SRC_URI[md5sum] = "eed4f724973192564474efbda83f67bc"
16SRC_URI[sha256sum] = "bca725e442c1438990cf1b41a59194e6efbd080c63d9b683a0d572e27f900e25"
17
18S = "${WORKDIR}/${IMX_BIN_NAME}"
19
20inherit fsl-eula-unpack
21
22do_install () {
23 install -d ${D}${libdir}
24 install -d ${D}${includedir}
25 cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
26 cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
27}
28
29INSANE_SKIP:append:libc-musl = " file-rdeps"
30RDEPENDS:${PN}:append:libc-musl = " gcompat"
31
32# The packaged binaries have been stripped of debug info, so disable
33# operations accordingly.
34INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
35INHIBIT_PACKAGE_STRIP = "1"
36INHIBIT_SYSROOT_STRIP = "1"
37
38COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb
new file mode 100644
index 00000000..b10cd997
--- /dev/null
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb
@@ -0,0 +1,45 @@
1# Copyright (C) 2016 Freescale Semiconductor
2# Copyright 2017-2024 NXP
3# Released under the MIT license (see COPYING.MIT for the terms)
4
5DESCRIPTION = "G2D library using i.MX DPU"
6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
8
9DEPENDS = "libdrm ${LIBGAL_IMX}"
10LIBGAL_IMX = "libgal-imx"
11LIBGAL_IMX:mx95-nxp-bsp = ""
12
13PROVIDES += "virtual/libg2d"
14
15SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
16IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
17
18IMX_SRCREV_ABBREV = "ee47ef7"
19IMX_SRC_URI_NAME = "v1"
20SRC_URI[v1.md5sum] = "4150f09e27178101fdccb792b7cbc526"
21SRC_URI[v1.sha256sum] = "bd7849376564f7e2eb55210f156afae00b49451de6de80cfbc5fbda15be6a2b0"
22
23IMX_SRCREV_ABBREV:mx95-nxp-bsp = "ee47ef7"
24IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
25SRC_URI[v2.md5sum] = "031396e175c432eb6c84aad8e0a6fc7d"
26SRC_URI[v2.sha256sum] = "0646d8cc8e53f22fc15a61f0b78cd5f73460520f91949bc1d29c10ecbf77307b"
27
28S = "${WORKDIR}/${IMX_BIN_NAME}"
29
30inherit fsl-eula-unpack
31
32do_install () {
33 install -d ${D}${libdir}
34 install -d ${D}${includedir}
35 cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
36 cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
37}
38
39# The packaged binaries have been stripped of debug info, so disable
40# operations accordingly.
41INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
42INHIBIT_PACKAGE_STRIP = "1"
43INHIBIT_SYSROOT_STRIP = "1"
44
45COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 649a16d2..55f88da3 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -9,8 +9,8 @@ PV = "2.1+git${SRCPV}"
9 9
10SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" 10SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
11GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https" 11GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https"
12SRCBRANCH ?= "imx_2.1" 12SRCBRANCH = "imx_2.1"
13SRCREV = "4391dcda499870418bb38fe395c3cba0664c5bab" 13SRCREV = "bec2f3839737b0e83b68b1c976373d9a78e5762f"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -19,6 +19,7 @@ inherit pkgconfig
19PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" 19PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}"
20PACKAGECONFIG_IMPLEMENTATION = "" 20PACKAGECONFIG_IMPLEMENTATION = ""
21PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" 21PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu"
22PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp = "dpu95"
22PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" 23PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm"
23PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" 24PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev"
24PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp" 25PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp"
@@ -29,28 +30,35 @@ PACKAGECONFIG[dpu] = " \
29 imx-dpu-g2d wayland-native wayland wayland-protocols, \ 30 imx-dpu-g2d wayland-native wayland wayland-protocols, \
30 , \ 31 , \
31 , \ 32 , \
32 gpu-drm gpu-fbdev pxp" 33 dpu95 gpu-drm gpu-fbdev pxp"
34PACKAGECONFIG[dpu95] = " \
35 BUILD_IMPLEMENTATION=dpu95, \
36 , \
37 imx-dpu-g2d wayland-native wayland wayland-protocols, \
38 , \
39 , \
40 dpu gpu-drm gpu-fbdev pxp"
33PACKAGECONFIG[gpu-drm] = " \ 41PACKAGECONFIG[gpu-drm] = " \
34 BUILD_IMPLEMENTATION=gpu-drm, \ 42 BUILD_IMPLEMENTATION=gpu-drm, \
35 , \ 43 , \
36 imx-gpu-g2d wayland-native wayland wayland-protocols, \ 44 imx-gpu-g2d wayland-native wayland wayland-protocols, \
37 , \ 45 , \
38 , \ 46 , \
39 dpu gpu-fbdev pxp" 47 dpu dpu95 gpu-fbdev pxp"
40PACKAGECONFIG[gpu-fbdev] = " \ 48PACKAGECONFIG[gpu-fbdev] = " \
41 BUILD_IMPLEMENTATION=gpu-fbdev, \ 49 BUILD_IMPLEMENTATION=gpu-fbdev, \
42 , \ 50 , \
43 imx-gpu-g2d, \ 51 imx-gpu-g2d, \
44 , \ 52 , \
45 , \ 53 , \
46 dpu gpu-drm pxp" 54 dpu dpu95 gpu-drm pxp"
47PACKAGECONFIG[pxp] = " \ 55PACKAGECONFIG[pxp] = " \
48 BUILD_IMPLEMENTATION=pxp, \ 56 BUILD_IMPLEMENTATION=pxp, \
49 , \ 57 , \
50 imx-pxp-g2d wayland-native wayland wayland-protocols, \ 58 imx-pxp-g2d wayland-native wayland wayland-protocols, \
51 , \ 59 , \
52 , \ 60 , \
53 dpu gpu-drm gpu-fbdev" 61 dpu dpu95 gpu-drm gpu-fbdev"
54 62
55EXTRA_OEMAKE += " \ 63EXTRA_OEMAKE += " \
56 SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ 64 SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
@@ -65,4 +73,4 @@ FILES:${PN} += "/opt"
65 73
66PACKAGE_ARCH = "${MACHINE_SOCARCH}" 74PACKAGE_ARCH = "${MACHINE_SOCARCH}"
67 75
68COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp)" 76COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx95-nxp-bsp)"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.2.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb
index b9a7d938..3ebb8f88 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.2.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb
@@ -1,21 +1,21 @@
1# Copyright (C) 2016 Freescale Semiconductor 1# Copyright (C) 2016 Freescale Semiconductor
2# Copyright 2017-2022 NXP 2# Copyright 2017-2024 NXP
3# Copyright 2018 (C) O.S. Systems Software LTDA. 3# Copyright 2018 (C) O.S. Systems Software LTDA.
4# Released under the MIT license (see COPYING.MIT for the terms) 4# Released under the MIT license (see COPYING.MIT for the terms)
5 5
6DESCRIPTION = "G2D library using i.MX GPU" 6DESCRIPTION = "G2D library using i.MX GPU"
7LICENSE = "Proprietary" 7LICENSE = "Proprietary"
8LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" 8LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
9DEPENDS = "libgal-imx" 9DEPENDS = "libgal-imx"
10PROVIDES = "virtual/libg2d" 10PROVIDES = "virtual/libg2d"
11 11
12SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" 12SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
13IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" 13IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}"
14IMX_SRCREV_ABBREV = "fd0148d" 14IMX_SRCREV_ABBREV = "b07999b"
15SRC_URI[aarch64.md5sum] = "ebc4cb8fdfa0b8ef9b11d7bb0fd4710f" 15SRC_URI[aarch64.md5sum] = "fa30ce75803697d5131d707b300258ee"
16SRC_URI[aarch64.sha256sum] = "1cedc606be965b01300613ccea81b4fd589d940306bb1caa30a37c41928616ec" 16SRC_URI[aarch64.sha256sum] = "2dff0279ead132ec5fa61dbe9b2b1969135e8ce9fe7487957371327357d70ac7"
17SRC_URI[arm.md5sum] = "77233957a27ae4da3f01d33b3fbc69d9" 17SRC_URI[arm.md5sum] = "c81be7c93b60c7d3f3eb5b7bfeda42a4"
18SRC_URI[arm.sha256sum] = "bc168b19096a997251e7137f82ffcff404c61709cf5f227c53a099f631569f76" 18SRC_URI[arm.sha256sum] = "e17ac373193622ec0c9aa490ef1b93551d22a2e88ee9f1098ed984e62f02a06c"
19 19
20S = "${WORKDIR}/${IMX_BIN_NAME}" 20S = "${WORKDIR}/${IMX_BIN_NAME}"
21 21
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index dedee983..50c37a2c 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -4,7 +4,7 @@
4 4
5DESCRIPTION = "G2D library using i.MX PXP" 5DESCRIPTION = "G2D library using i.MX PXP"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7" 7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f"
8 8
9PROVIDES += "virtual/libg2d" 9PROVIDES += "virtual/libg2d"
10 10
@@ -12,8 +12,8 @@ PV = "2.1.0+git${SRCPV}"
12 12
13SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" 13SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
14IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" 14IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
15SRCBRANCH ?= "imx_2.1" 15SRCBRANCH = "imx_2.1"
16SRCREV = "f3adab05bd0cbb7c38578110d772e8ddf52b4e8e" 16SRCREV = "9f9f41fa0e86757f856e1ec7824f56022fe94586"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
index a2f049a8..7d97f475 100644
--- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
+++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
@@ -2,7 +2,7 @@
2SUMMARY = "Samples for OpenGL ES" 2SUMMARY = "Samples for OpenGL ES"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50"
5DEPENDS = "imx-gpu-viv zlib libpng procps" 5DEPENDS = "zlib libpng procps"
6 6
7SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \ 7SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \
8 file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \ 8 file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \
@@ -18,11 +18,13 @@ PACKAGECONFIG_BACKEND:mx6-nxp-bsp = " \
18 bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ 18 bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \
19 '', d), d)} \ 19 '', d), d)} \
20" 20"
21PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}" 21PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}"
22PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle" 22PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle"
23PACKAGECONFIG_BACKEND:mx95-nxp-bsp = "waffle"
23 24
24PACKAGECONFIG_GPU2D = "" 25PACKAGECONFIG_GPU2D = ""
25PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" 26PACKAGECONFIG_GPU2D:imxgpu2d = "vivante"
27PACKAGECONFIG_GPU2D:mx95-nxp-bsp = ""
26 28
27PACKAGECONFIG ??= " \ 29PACKAGECONFIG ??= " \
28 egl \ 30 egl \
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 56a9ec4d..e33df444 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -1,6 +1,6 @@
1# Copyright (C) 2012-2016 Freescale Semiconductor 1# Copyright (C) 2012-2016 Freescale Semiconductor
2# Copyright (C) 2012-2018 O.S. Systems Software LTDA. 2# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
3# Copyright 2017-2023 NXP 3# Copyright 2017-2024 NXP
4# Released under the MIT license (see COPYING.MIT for the terms) 4# Released under the MIT license (see COPYING.MIT for the terms)
5 5
6DESCRIPTION = "GPU driver and apps for i.MX" 6DESCRIPTION = "GPU driver and apps for i.MX"
@@ -20,11 +20,6 @@ DEPENDS += " \
20DEPENDS:append:imxdrm = " libdrm wayland" 20DEPENDS:append:imxdrm = " libdrm wayland"
21DEPENDS:append:mx8-nxp-bsp = " patchelf-native" 21DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
22 22
23# imx-gpu-viv does not provide everything it needs to for virtual/libgl
24# on x11 backend or on Wayland backend with XWayland support.
25# We depend on mesa to fill in what is missing.
26DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
27
28DEPENDS:append:libc-musl = " gcompat" 23DEPENDS:append:libc-musl = " gcompat"
29 24
30PROVIDES += " \ 25PROVIDES += " \
@@ -40,7 +35,6 @@ EXTRA_PROVIDES = " \
40 ${PROVIDES_OPENVX} \ 35 ${PROVIDES_OPENVX} \
41" 36"
42EXTRA_PROVIDES:append:imxgpu3d = " \ 37EXTRA_PROVIDES:append:imxgpu3d = " \
43 virtual/libgl \
44 virtual/libgles1 \ 38 virtual/libgles1 \
45 virtual/libgles2 \ 39 virtual/libgles2 \
46" 40"
@@ -86,7 +80,6 @@ PACKAGECONFIG[valgrind] = ""
86 80
87# Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below 81# Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
88PACKAGES =+ " \ 82PACKAGES =+ " \
89 libgl-imx libgl-imx-dev \
90 libgles1-imx libgles1-imx-dev \ 83 libgles1-imx libgles1-imx-dev \
91 libgles2-imx libgles2-imx-dev \ 84 libgles2-imx libgles2-imx-dev \
92 libgles3-imx-dev \ 85 libgles3-imx-dev \
@@ -149,7 +142,7 @@ python __anonymous() {
149 142
150 # For the packages that make up the OpenGL interfaces, inject variables so that 143 # For the packages that make up the OpenGL interfaces, inject variables so that
151 # they don't get Debian-renamed (which would remove the -imx suffix). 144 # they don't get Debian-renamed (which would remove the -imx suffix).
152 for p in (("libegl", "libegl1"), ("libgl", "libgl1"), 145 for p in (("libegl", "libegl1"),
153 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), 146 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
154 ("libgles3",), ("libgbm",)): 147 ("libgles3",), ("libgbm",)):
155 fullp = p[0] + "-imx" 148 fullp = p[0] + "-imx"
@@ -291,8 +284,6 @@ do_install () {
291 if [ "${IS_MX6SL}" = "1" ]; then 284 if [ "${IS_MX6SL}" = "1" ]; then
292 rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ 285 rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \
293 \ 286 \
294 ${D}${libdir}/libGL* ${D}${includedir}/GL* ${D}${libdir}/pkgconfig/gl.pc \
295 \
296 ${D}${libdir}/libGLES* ${D}${libdir}/pkgconfig/gles*.pc \ 287 ${D}${libdir}/libGLES* ${D}${libdir}/pkgconfig/gles*.pc \
297 \ 288 \
298 ${D}${libdir}/libOpenCL* ${D}${includedir}/CL \ 289 ${D}${libdir}/libOpenCL* ${D}${includedir}/CL \
@@ -377,15 +368,6 @@ OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx
377OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev" 368OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev"
378INSANE_SKIP:libopenvx-imx += "dev-deps" 369INSANE_SKIP:libopenvx-imx += "dev-deps"
379 370
380FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS} ${libdir}/libGL${SOLIBS}"
381FILES:libgl-imx-dev = "${includedir}/GL ${libdir}/pkgconfig/gl.pc"
382# libGL is only targeting X11 backend, and in case if Wayland-only is used -
383# package QA complains on missing RDEPENDS, which are only available for X11.
384# Skip "file-rdeps" QA for this package.
385INSANE_SKIP:libgl-imx += "file-rdeps"
386# libEGL does dlopen of libGL.so
387INSANE_SKIP:libgl-imx += "dev-so"
388
389FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" 371FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
390FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc" 372FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc"
391RPROVIDES:libgles1-imx = "libgles-imx" 373RPROVIDES:libgles1-imx = "libgles-imx"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb
deleted file mode 100644
index 07a92246..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require imx-gpu-viv-6.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
4
5IMX_SRCREV_ABBREV = "fd0148d"
6
7SRC_URI[md5sum] = "267d3e2d580e264157b7de01df22fb66"
8SRC_URI[sha256sum] = "15efe6da5d4bac2a6067c2a898190be8754df6f14128c3db4756cff59c6da049"
9
10COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb
deleted file mode 100644
index cea83ddc..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require imx-gpu-viv-6.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
4
5IMX_SRCREV_ABBREV = "fd0148d"
6
7SRC_URI[md5sum] = "b76784e04f24ec9f2bedf2dd377ed5a8"
8SRC_URI[sha256sum] = "6e34f3718925ba37c362cd09a3228cc56d03cfad323ebae0932f64449dbaeb2e"
9
10COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb
new file mode 100644
index 00000000..2b172466
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb
@@ -0,0 +1,10 @@
1require imx-gpu-viv-6.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
4
5IMX_SRCREV_ABBREV = "b07999b"
6
7SRC_URI[md5sum] = "eae60321ac971293d3213c88b9198ca0"
8SRC_URI[sha256sum] = "ef9be89d3dd3b6448c720e061a8b81bdd26f7a5ff70de1786a5feef2e4836474"
9
10COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb
new file mode 100644
index 00000000..b3c39736
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb
@@ -0,0 +1,10 @@
1require imx-gpu-viv-6.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
4
5IMX_SRCREV_ABBREV = "b07999b"
6
7SRC_URI[md5sum] = "142d9b9ef6f440b8e307569873bdb6b5"
8SRC_URI[sha256sum] = "ba86656c357c5d9793058695f320e4cf650d4693e84321870bad392f2a622807"
9
10COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend
index dafd27f0..6545571f 100644
--- a/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/recipes-graphics/mesa/mesa-gl_%.bbappend
@@ -1 +1,8 @@
1COMPATIBLE_MACHINE:imxgpu = "(-)" 1DEPENDS:append:imxgpu = " virtual/egl"
2
3do_install:append:imxgpu() {
4 # imx-gpu-viv and mali-imx both provide /usr/include/KHR, so drop the mesa-gl one
5 rm -rf ${D}${includedir}/KHR
6}
7
8COMPATIBLE_MACHINE:imxgpu = "(imxgpu)"
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
index 05f566a8..c1a9902b 100644
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.imx.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
@@ -5,3 +5,5 @@ INSANE_SKIP:${PN} += "dev-so"
5 5
6# Override default mesa drivers with i.MX GPU drivers 6# Override default mesa drivers with i.MX GPU drivers
7RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx" 7RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx"
8# Override default mesa drivers with i.MX GPU drivers
9RRECOMMENDS:${PN}:mx95-nxp-bsp = "mali-imx-libvulkan"
diff --git a/recipes-graphics/wayland/weston-10.0.4.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
index 59f2a4b6..59f2a4b6 100644
--- a/recipes-graphics/wayland/weston-10.0.4.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
+++ b/recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
diff --git a/recipes-graphics/wayland/weston-10.0.4.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch b/recipes-graphics/wayland/weston-10.0.5.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch
index b9cb31fb..b9cb31fb 100644
--- a/recipes-graphics/wayland/weston-10.0.4.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch
+++ b/recipes-graphics/wayland/weston-10.0.5.imx/0001-g2d-renderer.c-Include-sys-stat.h.patch
diff --git a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
index 25a4770f..4d2a333a 100644
--- a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
+++ b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
@@ -26,16 +26,13 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
26 protocol/meson.build | 2 +- 26 protocol/meson.build | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-) 27 1 file changed, 1 insertion(+), 1 deletion(-)
28 28
29diff --git a/protocol/meson.build b/protocol/meson.build 29Index: git/protocol/meson.build
30index e8698530..ba52089b 100644 30===================================================================
31--- a/protocol/meson.build 31--- git.orig/protocol/meson.build
32+++ b/protocol/meson.build 32+++ git/protocol/meson.build
33@@ -1,4 +1,4 @@ 33@@ -1,4 +1,4 @@
34-dep_scanner = dependency('wayland-scanner', native: false) 34-dep_scanner = dependency('wayland-scanner', native: false)
35+dep_scanner = dependency('wayland-scanner', native: true) 35+dep_scanner = dependency('wayland-scanner', native: true)
36 prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) 36 prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner'))
37 37
38 dep_wp = dependency('wayland-protocols', version: '>= 1.26', 38 dep_wp = dependency('wayland-protocols', version: '>= 1.31',
39--
402.25.1
41
diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start
index 49204f21..342ac8d1 100644
--- a/recipes-graphics/wayland/weston/xwayland.weston-start
+++ b/recipes-graphics/wayland/weston/xwayland.weston-start
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3if type Xwayland >/dev/null 2>/dev/null; then 3if type Xwayland >/dev/null 2>/dev/null; then
4 mkdir -m 775 -p /tmp/.X11-unix 4 mkdir -m 775 -p /tmp/.X11-unix
5 chown root:video /tmp/.X11-unix 5 chown root:video /tmp/.X11-unix
6fi 6fi
diff --git a/recipes-graphics/wayland/weston_10.0.4.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index e31d2280..99624887 100644
--- a/recipes-graphics/wayland/weston_10.0.4.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -164,8 +164,8 @@ SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}
164SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " 164SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} "
165SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ 165SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \
166 file://0001-g2d-renderer.c-Include-sys-stat.h.patch" 166 file://0001-g2d-renderer.c-Include-sys-stat.h.patch"
167SRCBRANCH = "weston-imx-10.0.4" 167SRCBRANCH = "weston-imx-10.0.5"
168SRCREV = "6210a8f1302252273b50cc3c0ff55ec680dda479" 168SRCREV = "0cc822a1e5a8faea6835a4e9259887d8792b86b4"
169S = "${WORKDIR}/git" 169S = "${WORKDIR}/git"
170 170
171# Disable OpenGL for parts with GPU support for 2D but not 3D 171# Disable OpenGL for parts with GPU support for 2D but not 3D
diff --git a/recipes-graphics/wayland/weston_11.0.3.imx.bb b/recipes-graphics/wayland/weston_12.0.3.imx.bb
index 67eae268..8114ddbb 100644
--- a/recipes-graphics/wayland/weston_11.0.3.imx.bb
+++ b/recipes-graphics/wayland/weston_12.0.3.imx.bb
@@ -3,7 +3,7 @@
3# recipe. The second section customizes the recipe for i.MX. 3# recipe. The second section customizes the recipe for i.MX.
4 4
5########### OE-core copy ################## 5########### OE-core copy ##################
6# Upstream hash: 7f1932cb5a408320a5b542e20ba2807718349e8f 6# Upstream hash: 92a460b55e7290ec0006365219189761f7226f7c
7 7
8SUMMARY = "Weston, a Wayland compositor" 8SUMMARY = "Weston, a Wayland compositor"
9DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" 9DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
@@ -13,14 +13,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
13 file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ 13 file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \
14 " 14 "
15 15
16SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz \ 16SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
17 file://weston.png \ 17 file://weston.png \
18 file://weston.desktop \ 18 file://weston.desktop \
19 file://xwayland.weston-start \ 19 file://xwayland.weston-start \
20 file://systemd-notify.weston-start \ 20 file://systemd-notify.weston-start \
21 " 21 "
22 22
23SRC_URI[sha256sum] = "a413f68c252957fc3191c3650823ec356ae8c124ccc0cb440da5cdc4e2cb9e57" 23SRC_URI[sha256sum] = "eb686a7cf00992a23b17f192fca9a887313e92c346ee35d8575196983d656b4a"
24 24
25UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" 25UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
26UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" 26UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
@@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayla
44 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ 44 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
45 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ 45 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
46 ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ 46 ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
47 ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ 47 launcher-libseat \
48 image-jpeg \ 48 image-jpeg \
49 screenshare \ 49 screenshare \
50 shell-desktop \ 50 shell-desktop \
@@ -64,7 +64,7 @@ PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/eg
64# Weston on Wayland (nested Weston) 64# Weston on Wayland (nested Weston)
65PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" 65PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
66# Weston on X11 66# Weston on X11
67PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" 67PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcursor"
68# Headless Weston 68# Headless Weston
69PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" 69PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
70# Weston on RDP 70# Weston on RDP
@@ -77,10 +77,10 @@ PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl"
77PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" 77PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms"
78# Weston with webp support 78# Weston with webp support
79PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" 79PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
80# Weston with systemd-login support 80# Weston with systemd support
81PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" 81PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus"
82# Weston with Xwayland support (requires X11 and Wayland) 82# Weston with Xwayland support (requires X11 and Wayland)
83PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland" 83PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland"
84# colord CMS support 84# colord CMS support
85PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" 85PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord"
86# Clients support 86# Clients support
@@ -101,6 +101,13 @@ PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false"
101PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" 101PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
102# support libseat based launch 102# support libseat based launch
103PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" 103PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd"
104# deprecated and superseded by libseat launcher
105PACKAGECONFIG[launcher-logind] = "-Ddeprecated-launcher-logind=true,-Ddeprecated-launcher-logind=false,"
106# screencasting via PipeWire
107PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire"
108# VNC remote screensharing
109PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc"
110
104 111
105do_install:append() { 112do_install:append() {
106 # Weston doesn't need the .la files to load modules, so wipe them 113 # Weston doesn't need the .la files to load modules, so wipe them
@@ -132,7 +139,7 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland',
132 libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" 139 libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
133 140
134FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" 141FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so"
135FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" 142FILES:${PN} = "${sysconfdir} ${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}"
136 143
137FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" 144FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so"
138SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." 145SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'."
@@ -159,21 +166,20 @@ LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
159 166
160DEFAULT_PREFERENCE = "-1" 167DEFAULT_PREFERENCE = "-1"
161 168
162SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz" 169SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz"
163SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " 170SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} "
164SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" 171SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch"
165SRCBRANCH = "weston-imx-11.0.3" 172SRCBRANCH = "weston-imx-12.0.3"
166SRCREV = "a509c319b7bfc72638c9b9d8f5e4b6259aba0ab7" 173SRCREV = "b0d890915ee191ceb10e79ea9a830281f5c6258f"
167S = "${WORKDIR}/git" 174S = "${WORKDIR}/git"
168 175
169PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" 176PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
170PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" 177PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
171 178
172PACKAGECONFIG:append:imxgpu2d = " imxg2d" 179PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
173PACKAGECONFIG:append:mx93-nxp-bsp = " imxg2d" 180PACKAGECONFIG_G2D ??= ""
174 181PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d"
175# Override 182PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
176PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor xwayland"
177 183
178# Weston with i.MX G2D renderer 184# Weston with i.MX G2D renderer
179PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" 185PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
diff --git a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend b/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend
index e1708a96..f71ba16c 100644
--- a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend
+++ b/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend
@@ -9,7 +9,7 @@ OPENGL_PKGCONFIGS_REMOVE_IMXGPU = ""
9OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx" 9OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx"
10OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx" 10OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx"
11OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" 11OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx"
12 12OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx9-nxp-bsp = "glamor glx"
13 13
14# links with imx-gpu libs which are pre-built for glibc 14# links with imx-gpu libs which are pre-built for glibc
15# gcompat will address it during runtime 15# gcompat will address it during runtime
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb
index 7aae0cd7..e48d7258 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb
@@ -1,5 +1,5 @@
1# Copyright (C) 2015-2016 Freescale Semiconductor 1# Copyright (C) 2015-2016 Freescale Semiconductor
2# Copyright (C) 2017-2021 NXP 2# Copyright (C) 2017-2024 NXP
3 3
4SUMMARY = "Kernel loadable module for Vivante GPU" 4SUMMARY = "Kernel loadable module for Vivante GPU"
5DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \ 5DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d
10SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ 10SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \
11 file://Add-makefile.patch" 11 file://Add-makefile.patch"
12KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" 12KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
13SRCBRANCH = "lf-6.1.y" 13SRCBRANCH = "lf-6.6.y"
14LOCALVERSION = "-6.1.55-2.2.0" 14LOCALVERSION = "-6.6.3-1.0.0"
15SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" 15SRCREV = "3571388e9660f96b65b5fdcc093cc973ee502949"
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
18 18
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb
index d5804634..d2c63aa0 100644
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.0.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
6 6
7SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" 7SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
8ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" 8ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
9SRCBRANCH = "lf-6.1.55_2.2.0" 9SRCBRANCH = "lf-6.6.3_1.0.0"
10SRCREV = "2c762259b979d7ec5a2e17df6ad823de49d43a28" 10SRCREV = "2102360b58d9d1b36bc0c654c8301e4014b33951"
11 11
12S = "${WORKDIR}/git/vvcam/v4l2" 12S = "${WORKDIR}/git/vvcam/v4l2"
13 13
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index 0bf6154d..48e9cc3b 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -8,10 +8,10 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
8RPROVIDES:${PN} = "kernel-module-nxp89xx" 8RPROVIDES:${PN} = "kernel-module-nxp89xx"
9RCONFLICTS:${PN} = "kernel-module-nxp89xx" 9RCONFLICTS:${PN} = "kernel-module-nxp89xx"
10 10
11SRCBRANCH = "lf-6.1.55_2.2.0" 11SRCBRANCH = "lf-6.6.3_1.0.0"
12MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" 12MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
13SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" 13SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
14SRCREV = "952d10f3349426f917636a4560974117eb6eef5b" 14SRCREV = "a84df583155bad2a396a937056805550bdf655ab"
15 15
16S = "${WORKDIR}/git/mxm_wifiex/wlan_src" 16S = "${WORKDIR}/git/mxm_wifiex/wlan_src"
17 17
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.6.bb
index 6e31c1e2..9511d654 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.6.bb
@@ -12,8 +12,8 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
12############################################################################### 12###############################################################################
13# This recipe (and corresponding kernel repository and branch) receives updates 13# This recipe (and corresponding kernel repository and branch) receives updates
14# from 3 different sources: 14# from 3 different sources:
15# 1. Stable [linux-6.1.y] branch updates of korg; 15# 1. Stable [linux-6.6.y] branch updates of korg;
16# 2. NXP-specific updates via branch [lf-6.1.y] shared via GitHub NXP repo; 16# 2. NXP-specific updates via branch [lf-6.6.y] shared via GitHub NXP repo;
17# 3. Critical patches, which are not (yet) integrated into either of 2 above 17# 3. Critical patches, which are not (yet) integrated into either of 2 above
18# sources, but are required to be applied to the kernel tree. 18# sources, but are required to be applied to the kernel tree.
19# 19#
@@ -28,23 +28,20 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
28# ------------------------------------------------------------------------------ 28# ------------------------------------------------------------------------------
29# 1. Stable (tag or SHA(s)) 29# 1. Stable (tag or SHA(s))
30# ------------------------------------------------------------------------------ 30# ------------------------------------------------------------------------------
31# tag: v6.1.70 31# tag: v6.6.28
32# 32#
33# ------------------------------------------------------------------------------ 33# ------------------------------------------------------------------------------
34# 2. NXP-specific (tag or SHA(s)) 34# 2. NXP-specific (tag or SHA(s))
35# ------------------------------------------------------------------------------ 35# ------------------------------------------------------------------------------
36# tag: lf-6.1.55-2.2.0 36# tag: lf-6.6.3-1.0.00
37# 37#
38# ------------------------------------------------------------------------------ 38# ------------------------------------------------------------------------------
39# 3. Critical patches (SHA(s)) 39# 3. Critical patches (SHA(s))
40# ------------------------------------------------------------------------------ 40# ------------------------------------------------------------------------------
41# - 77a660738af5 Revert "net: stmmac: fix FPE events losing" 41# - f67cb9a5b4fb7 Revert "net: stmmac: fix FPE events losing"
42# - d9e9cb8ce9bc hx280enc_vc8000e: fix misplaced #endif 42# - 1918c2eb8b07f Revert "dmaengine: fsl-edma: fix DMA channel leak in eDMAv4"
43# - 3f1f2ea72955 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS 43# - 42289407ee38f Revert "dmaengine: fsl-edma: Add judgment on enabling round robin arbitration"
44# - b73c6797ee42 ARM: imx_v7_defconfig: Remove KERNEL_LZO config 44# - 952f79923f055 Revert "dmaengine: fsl-edma: Do not suspend and resume the masked dma channel when the system is sleeping"
45# - ec33c7fc43be touchscreen: Kconfig: add I2C dependency for CT36X
46# - 6c41233a2cfb pwm: pwm-adp5585: fix get_state callback prototype
47# - 9c7540ecb891 pwm: pwm-rpmsg-imx: fix get_state callback prototype
48# 45#
49# NOTE to upgraders: 46# NOTE to upgraders:
50# This recipe should NOT collect individual patches, they should be applied to 47# This recipe should NOT collect individual patches, they should be applied to
@@ -56,14 +53,14 @@ require linux-imx.inc
56 53
57KBRANCH = "6.6-1.0.x-imx" 54KBRANCH = "6.6-1.0.x-imx"
58SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" 55SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
59SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a" 56SRCREV = "776652a165f5bbf30c68a5f6213d75b02e8df11c"
60 57
61# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 58# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
62# required by kernel-yocto.bbclass. 59# required by kernel-yocto.bbclass.
63# 60#
64# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 61# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
65# should be updated once patchlevel is merged. 62# should be updated once patchlevel is merged.
66LINUX_VERSION = "6.6.3" 63LINUX_VERSION = "6.6.28"
67 64
68KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" 65KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
69KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" 66KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.6.bb
index e0e68c0b..9132435e 100644
--- a/recipes-kernel/linux/linux-fslc_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc_6.6.bb
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
19# 19#
20# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 20# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
21# should be updated once patchlevel is merged. 21# should be updated once patchlevel is merged.
22LINUX_VERSION = "6.6.26" 22LINUX_VERSION = "6.6.28"
23 23
24KBRANCH = "6.6.x+fslc" 24KBRANCH = "6.6.x+fslc"
25SRCREV = "829705b49b55e0ea4dbb12ed23996a12d01898bf" 25SRCREV = "3beb6fac2c3bda9015892dae8556c5559f2ee234"
26 26
27KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" 27KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
28KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" 28KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gst-devtools_1.22.0.imx.bb
deleted file mode 100644
index 4006f3eb..00000000
--- a/recipes-multimedia/gstreamer/gst-devtools_1.22.0.imx.bb
+++ /dev/null
@@ -1,56 +0,0 @@
1SUMMARY = "Gstreamer validation tool"
2DESCRIPTION = "A Tool to test GStreamer components"
3HOMEPAGE = "https://gstreamer.freedesktop.org/documentation/gst-devtools/index.html"
4SECTION = "multimedia"
5
6LICENSE = "LGPL-2.1-or-later"
7LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
8
9S = "${WORKDIR}/gst-devtools-${@get_gst_ver('${PV}')}"
10
11SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${@get_gst_ver('${PV}')}.tar.xz \
12 file://0001-connect-has-a-different-signature-on-musl.patch \
13 "
14
15SRC_URI[sha256sum] = "4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195"
16
17DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
18RRECOMMENDS:${PN} = "git"
19
20FILES:${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*"
21
22inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection
23
24# Drop .imx from PV
25def get_gst_ver(v):
26 return oe.utils.trim_version(v, 3)
27
28# TODO: put this in a gettext.bbclass patch
29def gettext_oemeson(d):
30 if d.getVar('USE_NLS') == 'no':
31 return '-Dnls=disabled'
32 # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set
33 if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'):
34 return '-Dnls=disabled'
35 return '-Dnls=enabled'
36
37# Build GstValidateVideo
38PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
39
40EXTRA_OEMESON += " \
41 -Ddoc=disabled \
42 -Ddebug_viewer=disabled \
43 -Dtests=disabled \
44 -Dvalidate=enabled \
45 ${@gettext_oemeson(d)} \
46"
47
48do_install:append () {
49 for fn in ${bindir}/gst-validate-launcher \
50 ${libdir}/gst-validate-launcher/python/launcher/config.py; do
51 sed -i -e 's,${B},/usr/src/debug/${PN},g' -e 's,${S},/usr/src/debug/${PN},g' ${D}$fn
52 done
53}
54
55GIR_MESON_ENABLE_FLAG = "enabled"
56GIR_MESON_DISABLE_FLAG = "disabled"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.imx.bb
deleted file mode 100644
index 742004d8..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.imx.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1SUMMARY = "Libav-based GStreamer 1.x plugin"
2DESCRIPTION = "Contains a GStreamer plugin for using the encoders, decoders, \
3muxers, and demuxers provided by FFmpeg."
4HOMEPAGE = "http://gstreamer.freedesktop.org/"
5SECTION = "multimedia"
6
7# ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency
8LICENSE_FLAGS = "commercial"
9LICENSE = "LGPL-2.1-or-later"
10LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
11 file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
12 "
13
14SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz \
15 file://ffmpeg-6.0.patch \
16 "
17SRC_URI[sha256sum] = "0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1"
18
19S = "${WORKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
20
21DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
22
23inherit meson pkgconfig upstream-version-is-even
24
25EXTRA_OEMESON += " \
26 -Dtests=disabled \
27"
28
29# Drop .imx from PV
30def get_gst_ver(v):
31 return oe.utils.trim_version(v, 3)
32
33FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
34FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
35
36COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.0.imx.bb
deleted file mode 100644
index dc4bccd7..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.0.imx.bb
+++ /dev/null
@@ -1,52 +0,0 @@
1SUMMARY = "OpenMAX IL plugins for GStreamer"
2DESCRIPTION = "Wraps available OpenMAX IL components and makes them available as standard GStreamer elements."
3HOMEPAGE = "http://gstreamer.freedesktop.org/"
4SECTION = "multimedia"
5
6LICENSE = "LGPL-2.1-or-later"
7LICENSE_FLAGS = "commercial"
8LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
9 file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f"
10
11SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${@get_gst_ver('${PV}')}.tar.xz"
12
13SRC_URI[sha256sum] = "dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341"
14
15S = "${WORKDIR}/gst-omx-${@get_gst_ver('${PV}')}"
16
17DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad virtual/libomxil"
18
19inherit meson pkgconfig upstream-version-is-even
20
21GSTREAMER_1_0_OMX_TARGET ?= "bellagio"
22GSTREAMER_1_0_OMX_CORE_NAME ?= "${libdir}/libomxil-bellagio.so.0"
23
24EXTRA_OEMESON += "-Dtarget=${GSTREAMER_1_0_OMX_TARGET}"
25
26python __anonymous () {
27 omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET")
28 if omx_target in ['generic', 'bellagio']:
29 # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,#
30 # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros);
31 # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this
32 d.appendVar("CFLAGS", " -I${S}/omx/openmax")
33 elif omx_target == "rpi":
34 # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific
35 d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH"))
36}
37
38set_omx_core_name() {
39 sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf"
40}
41
42# Drop .imx from PV
43def get_gst_ver(v):
44 return oe.utils.trim_version(v, 3)
45
46do_install[postfuncs] += " set_omx_core_name "
47
48FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
49FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
50
51VIRTUAL-RUNTIME_libomxil ?= "libomxil"
52RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_libomxil}"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.imx.bb
deleted file mode 100644
index 17522a93..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.imx.bb
+++ /dev/null
@@ -1,52 +0,0 @@
1require gstreamer1.0-plugins-common.inc
2require gstreamer1.0-plugins-license.inc
3
4SUMMARY = "'Ugly GStreamer plugins"
5HOMEPAGE = "https://gstreamer.freedesktop.org/"
6BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/issues"
7
8LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
9 "
10
11LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
12LICENSE_FLAGS = "commercial"
13
14SRC_URI = " \
15 https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \
16 "
17SRC_URI[sha256sum] = "a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c"
18
19S = "${WORKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
20
21DEPENDS += "gstreamer1.0-plugins-base"
22
23GST_PLUGIN_SET_HAS_EXAMPLES = "0"
24
25PACKAGECONFIG ??= " \
26 ${GSTREAMER_ORC} \
27 a52dec mpeg2dec \
28"
29
30PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
31PACKAGECONFIG[amrwb] = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr"
32PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52"
33PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
34PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
35PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec"
36PACKAGECONFIG[x264] = "-Dx264=enabled,-Dx264=disabled,x264"
37
38GSTREAMER_GPL = "${@bb.utils.filter('PACKAGECONFIG', 'a52dec cdio dvdread mpeg2dec x264', d)}"
39
40EXTRA_OEMESON += " \
41 -Ddoc=disabled \
42 -Dsidplay=disabled \
43"
44
45# Drop .imx from PV
46def get_gst_ver(v):
47 return oe.utils.trim_version(v, 3)
48
49FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
50FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
51
52COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.0.imx.bb
deleted file mode 100644
index 6f38929a..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.0.imx.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1SUMMARY = "Python bindings for GStreamer 1.0"
2DESCRIPTION = "GStreamer Python binding overrides (complementing the bindings \
3provided by python-gi) "
4HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-python/"
5SECTION = "multimedia"
6
7LICENSE = "LGPL-2.1-or-later"
8LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
9
10SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver('${PV}')}.tar.xz"
11SRC_URI[sha256sum] = "6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5"
12
13DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
14RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
15
16PNREAL = "gst-python"
17
18S = "${WORKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
19
20EXTRA_OEMESON += "\
21 -Dtests=disabled \
22 -Dplugin=enabled \
23 -Dlibpython-dir=${libdir} \
24"
25
26# Drop .imx from PV
27def get_gst_ver(v):
28 return oe.utils.trim_version(v, 3)
29
30inherit meson pkgconfig setuptools3-base upstream-version-is-even
31
32FILES:${PN} += "${libdir}/gstreamer-1.0"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.0.imx.bb
deleted file mode 100644
index d569ea9f..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.0.imx.bb
+++ /dev/null
@@ -1,37 +0,0 @@
1SUMMARY = "A library on top of GStreamer for building an RTSP server"
2HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/"
3SECTION = "multimedia"
4LICENSE = "LGPL-2.1-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770"
6
7DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
8
9PNREAL = "gst-rtsp-server"
10
11SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
12
13SRC_URI[sha256sum] = "aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed"
14
15S = "${WORKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
16
17inherit meson pkgconfig upstream-version-is-even gobject-introspection
18
19EXTRA_OEMESON += " \
20 -Ddoc=disabled \
21 -Dexamples=disabled \
22 -Dtests=disabled \
23"
24
25GIR_MESON_ENABLE_FLAG = "enabled"
26GIR_MESON_DISABLE_FLAG = "disabled"
27
28# Drop .imx from PV
29def get_gst_ver(v):
30 return oe.utils.trim_version(v, 3)
31
32# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
33require gstreamer1.0-plugins-packaging.inc
34
35CVE_PRODUCT += "gst-rtsp-server"
36
37COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb
deleted file mode 100644
index 02dc86e4..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.0.imx.bb
+++ /dev/null
@@ -1,64 +0,0 @@
1SUMMARY = "VA-API support to GStreamer"
2HOMEPAGE = "https://gstreamer.freedesktop.org/"
3DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \
4based plugins for GStreamer and helper libraries: `vaapidecode', \
5`vaapiconvert', and `vaapisink'."
6
7REALPN = "gstreamer-vaapi"
8
9LICENSE = "LGPL-2.1-or-later"
10LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
11
12SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${@get_gst_ver('${PV}')}.tar.xz"
13
14SRC_URI[sha256sum] = "593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5"
15
16S = "${WORKDIR}/${REALPN}-${@get_gst_ver('${PV}')}"
17DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
18
19inherit meson pkgconfig features_check upstream-version-is-even
20
21REQUIRED_DISTRO_FEATURES ?= "opengl"
22
23EXTRA_OEMESON += " \
24 -Ddoc=disabled \
25 -Dexamples=disabled \
26 -Dtests=enabled \
27"
28
29# Drop .imx from PV
30def get_gst_ver(v):
31 return oe.utils.trim_version(v, 3)
32
33PACKAGES =+ "${PN}-tests"
34
35# OpenGL packageconfig factored out to make it easy for distros
36# and BSP layers to pick either glx, egl, or no GL. By default,
37# try detecting X11 first, and if found (with OpenGL), use GLX,
38# otherwise try to check if EGL can be used.
39PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', \
40 bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', \
41 '', d), d)}"
42
43PACKAGECONFIG ??= "drm encoders \
44 ${PACKAGECONFIG_GL} \
45 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
46
47PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,udev libdrm"
48PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl"
49PACKAGECONFIG[encoders] = "-Dencoders=enabled,-Dencoders=disabled"
50PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/libgl"
51PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols"
52PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libxrandr libxrender"
53
54FILES:${PN} += "${libdir}/gstreamer-*/*.so"
55FILES:${PN}-dbg += "${libdir}/gstreamer-*/.debug"
56FILES:${PN}-dev += "${libdir}/gstreamer-*/*.a"
57FILES:${PN}-tests = "${bindir}/*"
58
59# correct .pc install location - fixed in upstream trunk
60do_install:append() {
61 mkdir -p ${D}/${libdir}/pkgconfig
62 mv ${D}/${libdir}/gstreamer-1.0/pkgconfig/*.pc ${D}/${libdir}/pkgconfig
63 rmdir ${D}/${libdir}/gstreamer-1.0/pkgconfig/
64}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-17 01:40:27 +0000