diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2022-11-18 08:49:13 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-18 08:49:13 -0300 |
commit | fefd97bc11f51948f4a77cbfcbe74c5c731d4ec6 (patch) | |
tree | 21c06cce11f0ce0539679a46e8056e39e3d48cb2 | |
parent | 5af267b681f48c14780f3a1a61c4df25796d4a51 (diff) | |
parent | 09f140816b52a1f8aefcf156affac452b3274a45 (diff) | |
download | meta-freescale-fefd97bc11f51948f4a77cbfcbe74c5c731d4ec6.tar.gz |
Merge pull request #1307 from Freescale/backport-1306-to-kirkstone
[Backport kirkstone] Upgrade Graphics Packages to lf5.15.52_2.1.0
-rw-r--r-- | conf/machine/include/imx-base.inc | 2 | ||||
-rw-r--r-- | recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb (renamed from recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb) | 6 | ||||
-rw-r--r-- | recipes-graphics/imx-g2d/imx-g2d-samples_git.bb | 34 | ||||
-rw-r--r-- | recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb (renamed from recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb) | 10 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 15 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb (renamed from recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb) | 4 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb (renamed from recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb) | 4 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston_10.0.1.imx.bb (renamed from recipes-graphics/wayland/weston_10.0.0.imx.bb) | 6 |
8 files changed, 48 insertions, 33 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index e9b751e0..b32267ce 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -473,7 +473,7 @@ PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" | |||
473 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" | 473 | PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" |
474 | PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" | 474 | PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" |
475 | 475 | ||
476 | PREFERRED_VERSION_weston:imx-nxp-bsp ??= "10.0.0.imx" | 476 | PREFERRED_VERSION_weston:imx-nxp-bsp ??= "10.0.1.imx" |
477 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" | 477 | PREFERRED_VERSION_weston:imx-mainline-bsp = "" |
478 | 478 | ||
479 | PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.25.imx" | 479 | PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.25.imx" |
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb index e2f5912b..b3bcbdf1 100644 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb | |||
@@ -4,14 +4,14 @@ | |||
4 | 4 | ||
5 | DESCRIPTION = "G2D library using i.MX DPU" | 5 | DESCRIPTION = "G2D library using i.MX DPU" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
8 | 8 | ||
9 | DEPENDS = "libgal-imx libdrm" | 9 | DEPENDS = "libgal-imx libdrm" |
10 | PROVIDES += "virtual/libg2d" | 10 | PROVIDES += "virtual/libg2d" |
11 | 11 | ||
12 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 12 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
13 | SRC_URI[md5sum] = "fa60a480c8d98cee969aa520bc829bf4" | 13 | SRC_URI[md5sum] = "85daf26176695de80a024b5f67037f08" |
14 | SRC_URI[sha256sum] = "65acc7345dcaf39536d60ee4516ad731c403790ed05d61a818601392554a6620" | 14 | SRC_URI[sha256sum] = "1023814d810c0a85c91cb2170c77f663f624331261ba0e1ab1ce29e8c192e1bc" |
15 | 15 | ||
16 | inherit fsl-eula-unpack | 16 | inherit fsl-eula-unpack |
17 | 17 | ||
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index 8368aefc..46bd3a55 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb | |||
@@ -10,15 +10,39 @@ PV = "2.1+git${SRCPV}" | |||
10 | SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" | 10 | SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" |
11 | GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxpmicro/g2d-samples.git;protocol=https" | 11 | GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxpmicro/g2d-samples.git;protocol=https" |
12 | SRCBRANCH ?= "imx_2.1" | 12 | SRCBRANCH ?= "imx_2.1" |
13 | SRCREV = "3268f291a15b2d8d5f650f627764a52eb0a8fc15" | 13 | SRCREV = "5a38513b97ff83b46777cf73da3cbe37b4976498" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | inherit pkgconfig | 17 | inherit pkgconfig |
18 | 18 | ||
19 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" | 19 | PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}" |
20 | 20 | PACKAGECONFIG_IMPLEMENTATION = "" | |
21 | PACKAGECONFIG[wayland] = "USE_WAYLAND=true,USE_WAYLAND=false,wayland-native wayland-protocols" | 21 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu" |
22 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm" | ||
23 | PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev" | ||
24 | |||
25 | PACKAGECONFIG[dpu] = " \ | ||
26 | BUILD_IMPLEMENTATION=dpu, \ | ||
27 | , \ | ||
28 | imx-dpu-g2d wayland-native wayland-protocols, \ | ||
29 | , \ | ||
30 | , \ | ||
31 | gpu-drm gpu-fbdev" | ||
32 | PACKAGECONFIG[gpu-drm] = " \ | ||
33 | BUILD_IMPLEMENTATION=gpu-drm, \ | ||
34 | , \ | ||
35 | imx-gpu-g2d wayland-native wayland-protocols, \ | ||
36 | , \ | ||
37 | , \ | ||
38 | dpu gpu-fbdev" | ||
39 | PACKAGECONFIG[gpu-fbdev] = " \ | ||
40 | BUILD_IMPLEMENTATION=gpu-fbdev, \ | ||
41 | , \ | ||
42 | imx-gpu-g2d, \ | ||
43 | , \ | ||
44 | , \ | ||
45 | dpu gpu-drm" | ||
22 | 46 | ||
23 | EXTRA_OEMAKE += " \ | 47 | EXTRA_OEMAKE += " \ |
24 | SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ | 48 | SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ |
@@ -31,4 +55,6 @@ do_install() { | |||
31 | 55 | ||
32 | FILES:${PN} += "/opt" | 56 | FILES:${PN} += "/opt" |
33 | 57 | ||
58 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
59 | |||
34 | COMPATIBLE_MACHINE = "(imxgpu2d)" | 60 | COMPATIBLE_MACHINE = "(imxgpu2d)" |
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb index 223fb955..524f15e9 100644 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb | |||
@@ -5,17 +5,17 @@ | |||
5 | 5 | ||
6 | DESCRIPTION = "G2D library using i.MX GPU" | 6 | DESCRIPTION = "G2D library using i.MX GPU" |
7 | LICENSE = "Proprietary" | 7 | LICENSE = "Proprietary" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
9 | DEPENDS = "libgal-imx" | 9 | DEPENDS = "libgal-imx" |
10 | PROVIDES = "virtual/libg2d" | 10 | PROVIDES = "virtual/libg2d" |
11 | 11 | ||
12 | FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" | 12 | FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" |
13 | 13 | ||
14 | SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" | 14 | SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" |
15 | SRC_URI[aarch64.md5sum] = "bf2a4e45835863f0563760fc8a1b7d58" | 15 | SRC_URI[aarch64.md5sum] = "98d46bca2ae66e31b7e4878a7b622b99" |
16 | SRC_URI[aarch64.sha256sum] = "ff50ddfee2d989798a2aba84ef9114e01f8d867293891dc0aacfab1640cbf8a3" | 16 | SRC_URI[aarch64.sha256sum] = "8341d6e2cde3f3ffa035dc95b0487dd04a50531cc80f4cddc5a689ebc4946e02" |
17 | SRC_URI[arm.md5sum] = "45d0fce306a6e0c7237b27da7c787f26" | 17 | SRC_URI[arm.md5sum] = "ff96d069092424a50ba4542d6ef5e931" |
18 | SRC_URI[arm.sha256sum] = "0ba9806c4efa0154fc9f7be406e42bc2c50b975abd32cbe322cf7bcf6ae0d350" | 18 | SRC_URI[arm.sha256sum] = "7737a3372bcde34e2d275397df67c307df5033d5b133ac770f75cac4e1ec2580" |
19 | 19 | ||
20 | S = "${WORKDIR}/${FSLBIN_NAME}" | 20 | S = "${WORKDIR}/${FSLBIN_NAME}" |
21 | 21 | ||
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 5c4b68cc..169606c2 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | |||
@@ -6,7 +6,7 @@ | |||
6 | DESCRIPTION = "GPU driver and apps for i.MX" | 6 | DESCRIPTION = "GPU driver and apps for i.MX" |
7 | SECTION = "libs" | 7 | SECTION = "libs" |
8 | LICENSE = "Proprietary" | 8 | LICENSE = "Proprietary" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
10 | 10 | ||
11 | DEPENDS += " \ | 11 | DEPENDS += " \ |
12 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ | 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ |
@@ -177,9 +177,7 @@ IMX_SOC:mx8mq-nxp-bsp = "mx8mq" | |||
177 | IMX_SOC:mx8mn-nxp-bsp = "mx8mn" | 177 | IMX_SOC:mx8mn-nxp-bsp = "mx8mn" |
178 | IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" | 178 | IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" |
179 | 179 | ||
180 | LIBVULKAN_VERSION_MAJOR = "1" | 180 | LIBVULKAN_API_VERSION = "1.2.182" |
181 | LIBVULKAN_VERSION = "${LIBVULKAN_VERSION_MAJOR}.2.1" | ||
182 | LIBVULKAN_API_VERSION = "${LIBVULKAN_VERSION_MAJOR}.2.182" | ||
183 | 181 | ||
184 | do_install () { | 182 | do_install () { |
185 | install -d ${D}${libdir} | 183 | install -d ${D}${libdir} |
@@ -258,15 +256,6 @@ do_install () { | |||
258 | fi | 256 | fi |
259 | 257 | ||
260 | if [ "${IS_MX8}" = "1" ]; then | 258 | if [ "${IS_MX8}" = "1" ]; then |
261 | # Rename the vulkan implementation library which is wrapped by the vulkan-loader | ||
262 | # library of the same name | ||
263 | MAJOR=${LIBVULKAN_VERSION_MAJOR} | ||
264 | FULL=${LIBVULKAN_VERSION} | ||
265 | mv ${D}${libdir}/libvulkan.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$FULL | ||
266 | patchelf --set-soname libvulkan_VSI.so.$MAJOR ${D}${libdir}/libvulkan_VSI.so.$FULL | ||
267 | rm ${D}${libdir}/libvulkan.so.$MAJOR ${D}${libdir}/libvulkan.so | ||
268 | ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR | ||
269 | ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so | ||
270 | if [ -z "${PACKAGES_VULKAN}" ]; then | 259 | if [ -z "${PACKAGES_VULKAN}" ]; then |
271 | set -f | 260 | set -f |
272 | for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do | 261 | for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb index bb07fb10..2c7fbecc 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | require imx-gpu-viv-6.inc | 5 | require imx-gpu-viv-6.inc |
6 | 6 | ||
7 | SRC_URI[md5sum] = "8e83cb642033ac3b85a5473b6d92687e" | 7 | SRC_URI[md5sum] = "5cf2085e4b9706e4c964ed7fdb57bfe3" |
8 | SRC_URI[sha256sum] = "89197fdb13dfc21c49968297c2e8b5cb8dd5563502278151d36b2dce2a2092ed" | 8 | SRC_URI[sha256sum] = "5b9dd02cb2dfa564903872576cd6586fbf4a02abdb8e180978bd84205ab302a7" |
9 | 9 | ||
10 | COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)" | 10 | COMPATIBLE_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.3.p4.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb index 4136631b..531eb13c 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require imx-gpu-viv-6.inc | 1 | require imx-gpu-viv-6.inc |
2 | 2 | ||
3 | SRC_URI[md5sum] = "22de8a5f59a56a7ef499f590d1659b6f" | 3 | SRC_URI[md5sum] = "b899f9d4a179eab622880fd22ec7cb64" |
4 | SRC_URI[sha256sum] = "52921c0b59529f1598084e991eda1863100754f28a7744ba958158dff8074b3b" | 4 | SRC_URI[sha256sum] = "5c52bd15146c24d449638c6276c07103949c8efbc53d002518541bc37c57e424" |
5 | 5 | ||
6 | INSANE_SKIP:append:libc-musl = " file-rdeps" | 6 | INSANE_SKIP:append:libc-musl = " file-rdeps" |
7 | 7 | ||
diff --git a/recipes-graphics/wayland/weston_10.0.0.imx.bb b/recipes-graphics/wayland/weston_10.0.1.imx.bb index effef386..84cd9fd8 100644 --- a/recipes-graphics/wayland/weston_10.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_10.0.1.imx.bb | |||
@@ -160,13 +160,13 @@ SUMMARY = "Weston, a Wayland compositor, i.MX fork" | |||
160 | DEFAULT_PREFERENCE = "-1" | 160 | DEFAULT_PREFERENCE = "-1" |
161 | 161 | ||
162 | SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" | 162 | SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" |
163 | SRC_URI:prepend = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " | 163 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " |
164 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ | 164 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ |
165 | file://0001-g2d-renderer.c-Include-sys-stat.h.patch \ | 165 | file://0001-g2d-renderer.c-Include-sys-stat.h.patch \ |
166 | file://0001-tests-Add-dependency-on-screenshooter-client-protoco.patch \ | 166 | file://0001-tests-Add-dependency-on-screenshooter-client-protoco.patch \ |
167 | " | 167 | " |
168 | SRCBRANCH = "weston-imx-10.0" | 168 | SRCBRANCH = "weston-imx-10.0.1" |
169 | SRCREV = "c8c6e3106b03441db1037afa995f95fcb2f9f17d" | 169 | SRCREV = "3f8f336b5d2cf7ea7aa4e047d669d093fc46dfe6" |
170 | 170 | ||
171 | S = "${WORKDIR}/git" | 171 | S = "${WORKDIR}/git" |
172 | 172 | ||