summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/include/imx-base.inc12
-rw-r--r--recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb (renamed from recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb)3
-rw-r--r--recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb (renamed from recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb)3
-rw-r--r--recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb)5
-rw-r--r--recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb)7
-rw-r--r--recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb)5
-rw-r--r--recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb (renamed from recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb)9
-rw-r--r--recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb (renamed from recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb)12
-rw-r--r--recipes-graphics/imx-g2d/imx-g2d-samples_git.bb4
-rw-r--r--recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb (renamed from recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb)10
-rw-r--r--recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb10
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc10
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb10
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb10
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb9
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb9
-rw-r--r--recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch52
-rw-r--r--recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend (renamed from recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend)6
-rw-r--r--recipes-graphics/wayland/weston_12.0.4.imx.bb5
19 files changed, 131 insertions, 60 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b4f85388..baca3fc4 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -597,12 +597,12 @@ PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
597# Use i.MX libdrm Version 597# Use i.MX libdrm Version
598PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx" 598PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx"
599 599
600PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.261.1.imx" 600PREFERRED_VERSION_spirv-headers:imxvulkan ??= "1.3.275.0.imx"
601PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.261.1.imx" 601PREFERRED_VERSION_spirv-tools:imxvulkan ??= "1.3.275.0.imx"
602PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.261.1.imx" 602PREFERRED_VERSION_vulkan-headers:imxvulkan ??= "1.3.275.0.imx"
603PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.261.1.imx" 603PREFERRED_VERSION_vulkan-loader:imxvulkan ??= "1.3.275.0.imx"
604PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.261.1.imx" 604PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.275.0.imx"
605PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx" 605PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
606 606
607# Use i.MX optee Version 607# Use i.MX optee Version
608PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.2.0.imx" 608PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.2.0.imx"
diff --git a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
index 945f0879..598a8fc2 100644
--- a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
@@ -4,11 +4,12 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
6 6
7SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb" 7SRCREV = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
8SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" 8SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
9PE = "1" 9PE = "1"
10# These recipes need to be updated in lockstep with each other: 10# These recipes need to be updated in lockstep with each other:
11# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 11# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
12# vulkan-validation-layers, vulkan-utility-libraries.
12# The tags versions should always be sdk-x.y.z, as this is what 13# The tags versions should always be sdk-x.y.z, as this is what
13# upstream considers a release. 14# upstream considers a release.
14UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 15UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
index 69042882..05c6de1b 100644
--- a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
+++ b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
@@ -7,11 +7,12 @@ 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 = "e553b884c7c9febaa4e52334f683641fb5f196a0" 10SRCREV = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
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: 13# These recipes need to be updated in lockstep with each other:
14# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 14# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
15# vulkan-validation-layers, vulkan-utility-libraries.
15# The tags versions should always be sdk-x.y.z, as this is what 16# The tags versions should always be sdk-x.y.z, as this is what
16# upstream considers a release. 17# upstream considers a release.
17UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 18UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
index 01eb14b9..aacec8ca 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0 & MIT"
11LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" 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 = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50" 14SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
@@ -21,7 +21,8 @@ FILES:${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: 23# These recipes need to be updated in lockstep with each other:
24# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 24# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
25# vulkan-validation-layers, vulkan-utility-libraries.
25# The tags versions should always be sdk-x.y.z, as this is what 26# The tags versions should always be sdk-x.y.z, as this is what
26# upstream considers a release. 27# upstream considers a release.
27UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 28UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
index 01cbeafa..7caed672 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.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=main;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https"
13SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0" 13SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -36,7 +36,8 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
36RRECOMMENDS:${PN} = "mesa-vulkan-drivers" 36RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
37 37
38# These recipes need to be updated in lockstep with each other: 38# These recipes need to be updated in lockstep with each other:
39# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 39# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
40# vulkan-validation-layers, vulkan-utility-libraries.
40# The tags versions should always be sdk-x.y.z, as this is what 41# The tags versions should always be sdk-x.y.z, as this is what
41# upstream considers a release. 42# upstream considers a release.
42UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 43UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
index 7a7edc9e..f86912c9 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
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=main;protocol=https" 9SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
10SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1" 10SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
@@ -15,7 +15,7 @@ inherit cmake features_check pkgconfig
15ANY_OF_DISTRO_FEATURES = "x11 wayland" 15ANY_OF_DISTRO_FEATURES = "x11 wayland"
16REQUIRED_DISTRO_FEATURES = "vulkan" 16REQUIRED_DISTRO_FEATURES = "vulkan"
17 17
18DEPENDS += "vulkan-headers vulkan-loader" 18DEPENDS += "vulkan-headers vulkan-loader vulkan-volk"
19 19
20EXTRA_OECMAKE = "\ 20EXTRA_OECMAKE = "\
21 -DBUILD_TESTS=OFF \ 21 -DBUILD_TESTS=OFF \
@@ -31,6 +31,7 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
31 31
32# These recipes need to be updated in lockstep with each other: 32# These recipes need to be updated in lockstep with each other:
33# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools 33# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
34# vulkan-validation-layers, vulkan-utility-libraries.
34# The tags versions should always be sdk-x.y.z, as this is what 35# The tags versions should always be sdk-x.y.z, as this is what
35# upstream considers a release. 36# upstream considers a release.
36UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 37UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
index 1e2a0ace..23958910 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
@@ -8,14 +8,14 @@ SECTION = "libs"
8LICENSE = "Apache-2.0 & MIT" 8LICENSE = "Apache-2.0 & MIT"
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
10 10
11SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https" 11SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https"
12SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6" 12SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
16REQUIRED_DISTRO_FEATURES = "vulkan" 16REQUIRED_DISTRO_FEATURES = "vulkan"
17 17
18DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang" 18DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries"
19 19
20# BUILD_TESTS - Not required for OE builds 20# BUILD_TESTS - Not required for OE builds
21# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms. 21# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
@@ -42,7 +42,8 @@ FILES_SOLIBSDEV = ""
42 42
43# These recipes need to be updated in lockstep with each other: 43# These recipes need to be updated in lockstep with each other:
44# glslang, vulkan-headers, vulkan-loader, vulkan-tools, 44# glslang, vulkan-headers, vulkan-loader, vulkan-tools,
45# vulkan-validation-layers, spirv-headers, spirv-tools 45# vulkan-validation-layers, spirv-headers, spirv-tools,
46# vulkan-utility-libraries.
46# The tags versions should always be sdk-x.y.z, as this is what 47# The tags versions should always be sdk-x.y.z, as this is what
47# upstream considers a release. 48# upstream considers a release.
48UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" 49UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
index 23168ae1..5e8f5402 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
@@ -4,7 +4,7 @@
4 4
5DESCRIPTION = "G2D library using i.MX DPU" 5DESCRIPTION = "G2D library using i.MX DPU"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 7LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
8 8
9DEPENDS = "libdrm ${LIBGAL_IMX}" 9DEPENDS = "libdrm ${LIBGAL_IMX}"
10LIBGAL_IMX = "libgal-imx" 10LIBGAL_IMX = "libgal-imx"
@@ -15,15 +15,13 @@ PROVIDES += "virtual/libg2d"
15SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}" 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}" 16IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
17 17
18IMX_SRCREV_ABBREV = "6a00326" 18IMX_SRCREV_ABBREV = "7943590"
19IMX_SRC_URI_NAME = "v1" 19IMX_SRC_URI_NAME = "v1"
20SRC_URI[v1.md5sum] = "470ad0bdef7dec171395991d47b39e2c" 20SRC_URI[v1.sha256sum] = "bf347f53e8f390a0554c0db76707819bb50cf4aaa564a9c86821ae9add26e113"
21SRC_URI[v1.sha256sum] = "4d8e4b536bd24eedfbce375a06c19ab74603291b8b5a5be36b03fbf6e016e940"
22 21
23IMX_SRCREV_ABBREV:mx95-nxp-bsp = "6a00326" 22IMX_SRCREV_ABBREV:mx95-nxp-bsp = "7943590"
24IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2" 23IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
25SRC_URI[v2.md5sum] = "cf807c38a110763c19a12d6d595b4b09" 24SRC_URI[v2.sha256sum] = "c0a87908cd04c208659423746a57eaee6a30b4d680ec871f3495ad4a2acb5076"
26SRC_URI[v2.sha256sum] = "1b86d4fecd5026e871da0de8ed6382c962460468d8151ae2f95b72d00bca17ee"
27 25
28S = "${WORKDIR}/${IMX_BIN_NAME}" 26S = "${WORKDIR}/${IMX_BIN_NAME}"
29 27
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 0f0c1896..ab0819c6 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
5 5
6DEPENDS = "cairo" 6DEPENDS = "cairo"
7 7
8PV = "2.1+git${SRCPV}" 8PV = "2.2+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.2"
13SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d" 13SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
index d12d9c1a..7ce542d0 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
@@ -5,17 +5,15 @@
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=10c0fda810c63b052409b15a5445671a" 8LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
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 = "bc7b6a2" 14IMX_SRCREV_ABBREV = "95408a4"
15SRC_URI[aarch64.md5sum] = "4b12d0434d612b57ff4d7df690c3154f" 15SRC_URI[aarch64.sha256sum] = "48327fe6315aa739d5665004289412ff2e3a4e0084d1664f837276f09d35b032"
16SRC_URI[aarch64.sha256sum] = "b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918" 16SRC_URI[arm.sha256sum] = "f28b2cd7b29302cd654fc845a0695d6fe935e383b56556e36933488dfa014830"
17SRC_URI[arm.md5sum] = "4bead15838f47793f59cb374c10c2dd2"
18SRC_URI[arm.sha256sum] = "413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663"
19 17
20S = "${WORKDIR}/${IMX_BIN_NAME}" 18S = "${WORKDIR}/${IMX_BIN_NAME}"
21 19
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 4481188b..88fc60ae 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,19 +1,19 @@
1# Copyright (C) 2016 Freescale Semiconductor 1# Copyright (C) 2016 Freescale Semiconductor
2# Copyright 2017-2023 NXP 2# Copyright 2017-2024 NXP
3# Released under the MIT license (see COPYING.MIT for the terms) 3# Released under the MIT license (see COPYING.MIT for the terms)
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=10c0fda810c63b052409b15a5445671a" 7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
8 8
9PROVIDES += "virtual/libg2d" 9PROVIDES += "virtual/libg2d"
10 10
11PV = "2.1.0+git${SRCPV}" 11PV = "2.2+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.2"
16SRCREV = "edd234c4e1c58cd2453963d19155d4d5d3800d07" 16SRCREV = "5e633f895a84cec809ca98d77c879af3591b3b20"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
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 2d02d7ab..52d87833 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -22,6 +22,10 @@ DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
22 22
23DEPENDS:append:libc-musl = " gcompat" 23DEPENDS:append:libc-musl = " gcompat"
24 24
25DEPENDS:remove:imx-nxp-bsp = "mesa"
26PACKAGES:remove:imx-nxp-bsp = "libgl-imx libgl-imx-dev"
27PROVIDES:remove:imx-nxp-bsp = "virtual/libgl"
28
25PROVIDES += " \ 29PROVIDES += " \
26 imx-gpu-viv \ 30 imx-gpu-viv \
27 libgal-imx \ 31 libgal-imx \
@@ -63,6 +67,12 @@ PROVIDES_OPENVX:mx8mm-nxp-bsp = ""
63 67
64RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv" 68RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
65 69
70RPROVIDES_OPENCL = "opencl-icd-loader-dev"
71RPROVIDES_OPENCL:mx7-nxp-bsp = ""
72RPROVIDES_OPENCL:mx8mm-nxp-bsp = ""
73
74RPROVIDES:${PN}:append:imx-nxp-bsp = " ${RPROVIDES_OPENCL}"
75
66PE = "1" 76PE = "1"
67 77
68inherit fsl-eula-unpack 78inherit fsl-eula-unpack
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
deleted file mode 100644
index db99b1c7..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require imx-gpu-viv-6.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
4
5IMX_SRCREV_ABBREV = "bc7b6a2"
6
7SRC_URI[md5sum] = "d921b6daf89eba252b0b5b59abe0d690"
8SRC_URI[sha256sum] = "cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3"
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.6-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
deleted file mode 100644
index fb73322a..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require imx-gpu-viv-6.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
4
5IMX_SRCREV_ABBREV = "bc7b6a2"
6
7SRC_URI[md5sum] = "e6ac75617944d9a9dbba90f863f07e0f"
8SRC_URI[sha256sum] = "5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1"
9
10COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
new file mode 100644
index 00000000..4cdc1d6a
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
@@ -0,0 +1,9 @@
1require imx-gpu-viv-6.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
4
5IMX_SRCREV_ABBREV = "95408a4"
6
7SRC_URI[sha256sum] = "c479c98e83866a7e95e5a6ae29b21ae41f9599326298d9a1debf009cac6e9406"
8
9COMPATIBLE_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.8-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb
new file mode 100644
index 00000000..c5208b55
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb
@@ -0,0 +1,9 @@
1require imx-gpu-viv-6.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
4
5IMX_SRCREV_ABBREV = "95408a4"
6
7SRC_URI[sha256sum] = "aadfcf558d07da253a57acfd5aa4ca41d4c8195f04324d0c2f6746f6f18c5a46"
8
9COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
new file mode 100644
index 00000000..da738aab
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
@@ -0,0 +1,52 @@
1From 3448c245b15928aa5a5a3695d9271fb201eb2e3b Mon Sep 17 00:00:00 2001
2From: Yuan Tian <yuan.tian@nxp.com>
3Date: Sat, 27 Apr 2024 06:06:54 +0800
4Subject: [PATCH] LF-11869 change mali wsi layer activating order
5
6Upstream-Status: Inappropriate [i.MX specific]
7
8Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
9---
10 loader/loader.c | 12 ++++++++++++
11 1 file changed, 12 insertions(+)
12
13diff --git a/loader/loader.c b/loader/loader.c
14index e646b28b4..55912c178 100644
15--- a/loader/loader.c
16+++ b/loader/loader.c
17@@ -2906,6 +2906,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
18 #if !defined(_WIN32)
19 char temp_path[2048];
20 #endif
21+ bool has_wsi_layer = false;
22
23 // Now, parse the paths
24 next_file = search_path;
25@@ -2965,6 +2966,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
26 name = full_path;
27
28 VkResult local_res;
29+ if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) {
30+ has_wsi_layer = true;
31+ continue;
32+ }
33 local_res = add_if_manifest_file(inst, name, out_files);
34
35 // Incomplete means this was not a valid data file.
36@@ -2975,6 +2980,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
37 break;
38 }
39 }
40+
41+ if(has_wsi_layer) {
42+ name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json";
43+ vk_result = add_if_manifest_file(inst, name, out_files);
44+ has_wsi_layer = false;
45+ }
46+
47 loader_closedir(inst, dir_stream);
48 if (vk_result != VK_SUCCESS) {
49 goto out;
50--
512.34.1
52
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
index c1a9902b..9b0ce3b9 100644
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
@@ -1,3 +1,9 @@
1FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}:"
2
3SRC_URI:append:imx-nxp-bsp = " \
4 file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
5"
6
1# libvulkan.so is loaded dynamically, so put it in the main package 7# libvulkan.so is loaded dynamically, so put it in the main package
2SOLIBS = ".so*" 8SOLIBS = ".so*"
3FILES_SOLIBSDEV = "" 9FILES_SOLIBSDEV = ""
diff --git a/recipes-graphics/wayland/weston_12.0.4.imx.bb b/recipes-graphics/wayland/weston_12.0.4.imx.bb
index 87593e4b..8003da07 100644
--- a/recipes-graphics/wayland/weston_12.0.4.imx.bb
+++ b/recipes-graphics/wayland/weston_12.0.4.imx.bb
@@ -172,7 +172,7 @@ SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
172WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https" 172WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
173SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" 173SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch"
174SRCBRANCH = "weston-imx-12.0.4" 174SRCBRANCH = "weston-imx-12.0.4"
175SRCREV = "461c49d20677cfd36d01a95dafbd9eedf2a4b09c" 175SRCREV = "c3c1f9ff7824123dd4808ace3c9476345cb84177"
176S = "${WORKDIR}/git" 176S = "${WORKDIR}/git"
177 177
178PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" 178PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
@@ -186,6 +186,9 @@ PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
186# Weston with i.MX G2D renderer 186# Weston with i.MX G2D renderer
187PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" 187PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
188 188
189# Weston on RDP, fix for base recipe
190PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp"
191
189# links with imx-gpu libs which are pre-built for glibc 192# links with imx-gpu libs which are pre-built for glibc
190# gcompat will address it during runtime 193# gcompat will address it during runtime
191LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" 194LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 10:45:53 +0000