diff options
Diffstat (limited to 'recipes-graphics')
14 files changed, 61 insertions, 75 deletions
diff --git a/recipes-graphics/drm/libdrm_2.4.116.imx.bb b/recipes-graphics/drm/libdrm_2.4.123.imx.bb index ff23f35f..81b97782 100644 --- a/recipes-graphics/drm/libdrm_2.4.116.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.123.imx.bb | |||
@@ -13,8 +13,8 @@ DEPENDS = "libpthread-stubs" | |||
13 | 13 | ||
14 | SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" | 14 | SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}" |
15 | IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https" | 15 | IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https" |
16 | SRCBRANCH = "libdrm-imx-2.4.116" | 16 | SRCBRANCH = "libdrm-imx-2.4.123" |
17 | SRCREV = "2f1797674f94572ae8c365c8cbffb0263337ed57" | 17 | SRCREV = "c7c4953161a0f8f2cc7bee70284bf3263c9cfcf5" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb index 2ebff0c2..77f01d79 100644 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.3.0.bb | |||
@@ -4,7 +4,7 @@ | |||
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=ca53281cc0caa7e320d4945a896fb837" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" |
8 | 8 | ||
9 | DEPENDS = "libdrm ${LIBGAL_IMX}" | 9 | DEPENDS = "libdrm ${LIBGAL_IMX}" |
10 | LIBGAL_IMX = "" | 10 | LIBGAL_IMX = "" |
@@ -15,13 +15,13 @@ PROVIDES += "virtual/libg2d" | |||
15 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}" | 15 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}" |
16 | IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}" | 16 | IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}" |
17 | 17 | ||
18 | IMX_SRCREV_ABBREV = "e2dce80" | 18 | IMX_SRCREV_ABBREV = "8d2a88d" |
19 | IMX_SRC_URI_NAME = "v1" | 19 | IMX_SRC_URI_NAME = "v1" |
20 | SRC_URI[v1.sha256sum] = "d43b5d4b8e6015a029c6e8854982aa5d57de25bc0e3ff8209d4aab7679c2d240" | 20 | SRC_URI[v1.sha256sum] = "20325a7c6090b79e012339aed25fa4c3b760efcc32be339e389a36a15e44bdfc" |
21 | 21 | ||
22 | IMX_SRCREV_ABBREV:imxmali = "e2dce80" | 22 | IMX_SRCREV_ABBREV:imxmali = "8d2a88d" |
23 | IMX_SRC_URI_NAME:imxmali = "v2" | 23 | IMX_SRC_URI_NAME:imxmali = "v2" |
24 | SRC_URI[v2.sha256sum] = "d9845356e0c9c959b1d57ebb3ee668ba6aa2b864999263a8c33cb053b83584e6" | 24 | SRC_URI[v2.sha256sum] = "eb7108256cb55d996c07f6941d0d4a76beaf73458494b2c902d907bc8228eeeb" |
25 | 25 | ||
26 | S = "${WORKDIR}/${IMX_BIN_NAME}" | 26 | S = "${WORKDIR}/${IMX_BIN_NAME}" |
27 | 27 | ||
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index ab0819c6..884b41ff 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb | |||
@@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91" | |||
5 | 5 | ||
6 | DEPENDS = "cairo" | 6 | DEPENDS = "cairo" |
7 | 7 | ||
8 | PV = "2.2+git${SRCPV}" | 8 | PV = "2.3+git${SRCPV}" |
9 | 9 | ||
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/nxp-imx/g2d-samples.git;protocol=https" | 11 | GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https" |
12 | SRCBRANCH = "imx_2.2" | 12 | SRCBRANCH = "imx_2.3" |
13 | SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d" | 13 | SRCREV = "7d12c50c07d73650b4c97906ce917aff429238f8" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb index 342c29f0..1b9d04f6 100644 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p3.0.bb | |||
@@ -5,15 +5,15 @@ | |||
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=ca53281cc0caa7e320d4945a896fb837" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" |
9 | DEPENDS = "libgal-imx" | 9 | DEPENDS = "libgal-imx" |
10 | PROVIDES = "virtual/libg2d" | 10 | PROVIDES = "virtual/libg2d" |
11 | 11 | ||
12 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" | 12 | SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" |
13 | IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" | 13 | IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" |
14 | IMX_SRCREV_ABBREV = "accdd64" | 14 | IMX_SRCREV_ABBREV = "c600d03" |
15 | SRC_URI[aarch64.sha256sum] = "780479f19142126ed58e12222b80f8f3b882ad3d223ff61b7ea02001f517ff03" | 15 | SRC_URI[aarch64.sha256sum] = "e6c336c0b876efab7598a2d7817111772284487f646d5d83c400692f2cdfebe3" |
16 | SRC_URI[arm.sha256sum] = "cd4fd05dd6f6880edc3255c85fe08094a07ea4cd3eee947df004dcb8f37bc8fa" | 16 | SRC_URI[arm.sha256sum] = "6e1a42f2c570582b8038d1b5c86dbdcd645e75cc10a1db23e716f662d1c1329f" |
17 | 17 | ||
18 | S = "${WORKDIR}/${IMX_BIN_NAME}" | 18 | S = "${WORKDIR}/${IMX_BIN_NAME}" |
19 | 19 | ||
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb index 88fc60ae..7184539e 100644 --- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb | |||
@@ -4,16 +4,16 @@ | |||
4 | 4 | ||
5 | DESCRIPTION = "G2D library using i.MX PXP" | 5 | DESCRIPTION = "G2D library using i.MX PXP" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c0fb372b5d7f12181de23ef480f225f3" |
8 | 8 | ||
9 | PROVIDES += "virtual/libg2d" | 9 | PROVIDES += "virtual/libg2d" |
10 | 10 | ||
11 | PV = "2.2+git${SRCPV}" | 11 | PV = "2.3+git${SRCPV}" |
12 | 12 | ||
13 | SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" | 13 | SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" |
14 | IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" | 14 | IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" |
15 | SRCBRANCH = "imx_2.2" | 15 | SRCBRANCH = "imx_2.3" |
16 | SRCREV = "5e633f895a84cec809ca98d77c879af3591b3b20" | 16 | SRCREV = "f3aabbcb7977a0a17c962c62b02bc829855f8edf" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${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 b2b1ca2b..b9fe6bb8 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | |||
@@ -71,8 +71,7 @@ PE = "1" | |||
71 | inherit fsl-eula-unpack | 71 | inherit fsl-eula-unpack |
72 | 72 | ||
73 | FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:" | 73 | FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:" |
74 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \ | 74 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" |
75 | file://imx_icd.json" | ||
76 | 75 | ||
77 | S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" | 76 | S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" |
78 | 77 | ||
@@ -184,8 +183,6 @@ IMX_SOC:mx8mq-nxp-bsp = "mx8mq" | |||
184 | IMX_SOC:mx8mn-nxp-bsp = "mx8mn" | 183 | IMX_SOC:mx8mn-nxp-bsp = "mx8mn" |
185 | IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" | 184 | IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" |
186 | 185 | ||
187 | LIBVULKAN_API_VERSION = "1.3.204" | ||
188 | |||
189 | do_install () { | 186 | do_install () { |
190 | install -d ${D}${libdir} | 187 | install -d ${D}${libdir} |
191 | install -d ${D}${includedir} | 188 | install -d ${D}${includedir} |
@@ -253,8 +250,7 @@ do_install () { | |||
253 | rm -rf ${D}/opt/viv_samples/cl11 | 250 | rm -rf ${D}/opt/viv_samples/cl11 |
254 | else | 251 | else |
255 | # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) | 252 | # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) |
256 | install -d ${D}${sysconfdir}/OpenCL/vendors/ | 253 | install -Dm 0644 ${S}/gpu-core/etc/OpenCL/vendors/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd |
257 | install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd | ||
258 | 254 | ||
259 | if [ "${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}" = "" ]; then | 255 | if [ "${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}" = "" ]; then |
260 | rm -f ${D}${includedir}/CL/cl_viv_vx_ext.h | 256 | rm -f ${D}${includedir}/CL/cl_viv_vx_ext.h |
@@ -277,9 +273,8 @@ do_install () { | |||
277 | rm -rf ${D}$f | 273 | rm -rf ${D}$f |
278 | done | 274 | done |
279 | else | 275 | else |
280 | install -Dm 0644 ${UNPACKDIR}/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json | 276 | install -Dm 0644 ${S}/gpu-core/etc/vulkan/icd.d/imx_icd.json ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json |
281 | sed -i "s,%libdir%,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json | 277 | sed -i "s,/usr/lib,${libdir}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json |
282 | sed -i "s,%api_version%,${LIBVULKAN_API_VERSION}," ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json | ||
283 | fi | 278 | fi |
284 | fi | 279 | fi |
285 | 280 | ||
@@ -335,7 +330,7 @@ FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/ | |||
335 | INSANE_SKIP:libegl-imx += "dev-so" | 330 | INSANE_SKIP:libegl-imx += "dev-so" |
336 | 331 | ||
337 | FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" | 332 | FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" |
338 | FILES:libgal-imx-dev = "${includedir}/HAL" | 333 | FILES:libgal-imx-dev:remove = "${includedir}/HAL" |
339 | RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}" | 334 | RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}" |
340 | RPROVIDES:libgal-imx += "libgal-imx" | 335 | RPROVIDES:libgal-imx += "libgal-imx" |
341 | RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv" | 336 | RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv" |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json deleted file mode 100644 index 21d83f94..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/imx_icd.json +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | { | ||
2 | "file_format_version": "1.0.0", | ||
3 | "ICD": { | ||
4 | "library_path": "%libdir%/libvulkan_VSI.so.1", | ||
5 | "api_version": "%api_version%" | ||
6 | } | ||
7 | } | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb deleted file mode 100644 index 753ab5ad..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "accdd64" | ||
6 | |||
7 | SRC_URI[sha256sum] = "2242c7cbf1a2b07d40eefe5d1507747e477c54912f179ee0585a5d7965074ce0" | ||
8 | |||
9 | 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.11.p2.10-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb deleted file mode 100644 index 6a6c6a7c..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "accdd64" | ||
6 | |||
7 | SRC_URI[sha256sum] = "8108fd146de6986486f34860227511a5101b31072b99cd78ae38afba8939fd4e" | ||
8 | |||
9 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch32.bb new file mode 100644 index 00000000..9fbb7e92 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch32.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "c600d03" | ||
6 | |||
7 | SRC_URI[sha256sum] = "fe8fc231f18047b9547a038e111c08e855760190d0e9848ead22b383d793499d" | ||
8 | |||
9 | 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.11.p3.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch64.bb new file mode 100644 index 00000000..aeed17fe --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.0-aarch64.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require imx-gpu-viv-6.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" | ||
4 | |||
5 | IMX_SRCREV_ABBREV = "c600d03" | ||
6 | |||
7 | SRC_URI[sha256sum] = "82e1bb6304d2aac70c72b691239d1bb5f6738cadfa812d07196db2f580c63d29" | ||
8 | |||
9 | COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" | ||
diff --git a/recipes-graphics/mali/mali-imx_r50.2.bb b/recipes-graphics/mali/mali-imx_r53.0.bb index 97f6db71..65b91f55 100644 --- a/recipes-graphics/mali/mali-imx_r50.2.bb +++ b/recipes-graphics/mali/mali-imx_r53.0.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | require mali-imx.inc | 1 | require mali-imx.inc |
2 | 2 | ||
3 | LICENSE = "Proprietary" | 3 | LICENSE = "Proprietary" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" |
5 | 5 | ||
6 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" | 6 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" |
7 | SRC_URI[sha256sum] = "947881cdad085a29dcb52dc4431f803b73c06141b31e06520f9bfe17d324f774" | 7 | SRC_URI[sha256sum] = "67a008bc64af4f3d9ad91465af3c0c3ac90ff8dcbcdaed96036eccc62880c7a3" |
8 | IMX_SRCREV_ABBREV = "710cfb6" | 8 | IMX_SRCREV_ABBREV = "f2226b0" |
9 | 9 | ||
10 | S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" | 10 | S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" |
11 | 11 | ||
diff --git a/recipes-graphics/wayland/wayland-protocols_1.32.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb index 131f227d..393278bc 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.32.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \ | |||
12 | SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH}" | 12 | SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH}" |
13 | WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https" | 13 | WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https" |
14 | SRCBRANCH = "wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}" | 14 | SRCBRANCH = "wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}" |
15 | SRCREV = "7ece577d467f8afb2f5a2f7fff3761a1e0ee9dad" | 15 | SRCREV = "831a5389062e56dcb1aac4a5419e55e3002aafaf" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
diff --git a/recipes-graphics/wayland/weston_12.0.4.imx.bb b/recipes-graphics/wayland/weston_14.0.1.imx.bb index c988561e..f6697470 100644 --- a/recipes-graphics/wayland/weston_12.0.4.imx.bb +++ b/recipes-graphics/wayland/weston_14.0.1.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: 92a460b55e7290ec0006365219189761f7226f7c | 6 | # Upstream hash: 23271a1f908a223b4eb56d6034cbb1ac23da14fe |
7 | 7 | ||
8 | SUMMARY = "Weston, a Wayland compositor" | 8 | SUMMARY = "Weston, a Wayland compositor" |
9 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" | 9 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" |
@@ -14,17 +14,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ | |||
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ |
17 | file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \ | ||
17 | file://weston.png \ | 18 | file://weston.png \ |
18 | file://weston.desktop \ | 19 | file://weston.desktop \ |
19 | file://xwayland.weston-start \ | 20 | file://xwayland.weston-start \ |
20 | file://systemd-notify.weston-start \ | 21 | file://systemd-notify.weston-start \ |
21 | file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \ | ||
22 | " | 22 | " |
23 | 23 | ||
24 | SRC_URI[sha256sum] = "eb686a7cf00992a23b17f192fca9a887313e92c346ee35d8575196983d656b4a" | 24 | SRC_URI[sha256sum] = "27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093" |
25 | 25 | ||
26 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" | 26 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" |
27 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 27 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
28 | 28 | ||
29 | inherit meson pkgconfig useradd | 29 | inherit meson pkgconfig useradd |
30 | 30 | ||
@@ -45,7 +45,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayla | |||
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ | 45 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ |
46 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ | 46 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ |
47 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ | 47 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ |
48 | launcher-libseat \ | ||
49 | image-jpeg \ | 48 | image-jpeg \ |
50 | screenshare \ | 49 | screenshare \ |
51 | shell-desktop \ | 50 | shell-desktop \ |
@@ -61,7 +60,7 @@ SIMPLECLIENTS ?= "all" | |||
61 | # Compositor choices | 60 | # Compositor choices |
62 | # | 61 | # |
63 | # Weston on KMS | 62 | # Weston on KMS |
64 | PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev" | 63 | PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev seatd virtual/egl virtual/libgles2 virtual/libgbm mtdev" |
65 | # Weston on Wayland (nested Weston) | 64 | # Weston on Wayland (nested Weston) |
66 | PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" | 65 | PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" |
67 | # Weston on X11 | 66 | # Weston on X11 |
@@ -69,7 +68,7 @@ PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libx | |||
69 | # Headless Weston | 68 | # Headless Weston |
70 | PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" | 69 | PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" |
71 | # Weston on RDP | 70 | # Weston on RDP |
72 | PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" | 71 | PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp" |
73 | # VA-API desktop recorder | 72 | # VA-API desktop recorder |
74 | PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" | 73 | PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" |
75 | # Weston with EGL support | 74 | # Weston with EGL support |
@@ -100,10 +99,6 @@ PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" | |||
100 | PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" | 99 | PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" |
101 | # JPEG image loading support | 100 | # JPEG image loading support |
102 | PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" | 101 | PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" |
103 | # support libseat based launch | ||
104 | PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" | ||
105 | # deprecated and superseded by libseat launcher | ||
106 | PACKAGECONFIG[launcher-logind] = "-Ddeprecated-launcher-logind=true,-Ddeprecated-launcher-logind=false," | ||
107 | # screencasting via PipeWire | 102 | # screencasting via PipeWire |
108 | PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" | 103 | PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" |
109 | # VNC remote screensharing | 104 | # VNC remote screensharing |
@@ -167,14 +162,17 @@ LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70" | |||
167 | 162 | ||
168 | DEFAULT_PREFERENCE = "-1" | 163 | DEFAULT_PREFERENCE = "-1" |
169 | 164 | ||
165 | DEPENDS:append = " libdisplay-info" | ||
166 | |||
170 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" | 167 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" |
171 | SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} " | 168 | SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} " |
172 | WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https" | 169 | WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https" |
173 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" | 170 | SRCBRANCH = "weston-imx-14.0.1" |
174 | SRCBRANCH = "weston-imx-12.0.4" | 171 | SRCREV = "0fd5d3ab75346e525b565039a7b8bf5d9008be78" |
175 | SRCREV = "de7f8df4b4275e9bb345cacab6962d1a490d9eab" | ||
176 | S = "${WORKDIR}/git" | 172 | S = "${WORKDIR}/git" |
177 | 173 | ||
174 | SRC_URI:remove = "file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch" | ||
175 | |||
178 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" | 176 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" |
179 | PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" | 177 | PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" |
180 | 178 | ||
@@ -183,12 +181,12 @@ PACKAGECONFIG_G2D ??= "" | |||
183 | PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d" | 181 | PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d" |
184 | PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d" | 182 | PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d" |
185 | 183 | ||
184 | # Remove no longer supported colord | ||
185 | PACKAGECONFIG[colord] = "" | ||
186 | |||
186 | # Weston with i.MX G2D renderer | 187 | # Weston with i.MX G2D renderer |
187 | PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" | 188 | PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" |
188 | 189 | ||
189 | # Weston on RDP, fix for base recipe | ||
190 | PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp" | ||
191 | |||
192 | # links with imx-gpu libs which are pre-built for glibc | 190 | # links with imx-gpu libs which are pre-built for glibc |
193 | # gcompat will address it during runtime | 191 | # gcompat will address it during runtime |
194 | LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" | 192 | LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" |