diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 4 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston_6.0.1.imx.bb (renamed from recipes-graphics/wayland/weston_5.0.0.imx.bb) | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 5810253c..96cd4ec6 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -254,9 +254,7 @@ PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv" | |||
254 | PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" | 254 | PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" |
255 | PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d" | 255 | PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d" |
256 | 256 | ||
257 | PREFERRED_VERSION_weston_mx6 ?= "5.0.0.imx" | 257 | PREFERRED_VERSION_weston_imx ?= "6.0.1.imx" |
258 | PREFERRED_VERSION_weston_mx7 ?= "5.0.0.imx" | ||
259 | PREFERRED_VERSION_weston_mx8 ?= "5.0.0.imx" | ||
260 | 258 | ||
261 | PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.17.imx" | 259 | PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.17.imx" |
262 | PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.17.imx" | 260 | PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.17.imx" |
diff --git a/recipes-graphics/wayland/weston_5.0.0.imx.bb b/recipes-graphics/wayland/weston_6.0.1.imx.bb index a7778b41..a8d11196 100644 --- a/recipes-graphics/wayland/weston_5.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_6.0.1.imx.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ | |||
7 | 7 | ||
8 | DEFAULT_PREFERENCE = "-1" | 8 | DEFAULT_PREFERENCE = "-1" |
9 | 9 | ||
10 | SRCBRANCH = "weston-imx-5.0" | 10 | SRCBRANCH = "weston-imx-6.0.1" |
11 | SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ | 11 | SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ |
12 | file://weston.png \ | 12 | file://weston.png \ |
13 | file://weston.desktop \ | 13 | file://weston.desktop \ |
@@ -16,7 +16,7 @@ SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=http | |||
16 | file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ | 16 | file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ |
17 | file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \ | 17 | file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \ |
18 | " | 18 | " |
19 | SRCREV = "fb563901657b296c7c7c86d26602a622429e334f" | 19 | SRCREV = "4ee0a1da010053b35495e82ad30aa5a8b1c34e6c" |
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" | 22 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" |
@@ -38,6 +38,7 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" | |||
38 | 38 | ||
39 | EXTRA_OECONF = "--enable-setuid-install \ | 39 | EXTRA_OECONF = "--enable-setuid-install \ |
40 | --disable-rdp-compositor \ | 40 | --disable-rdp-compositor \ |
41 | --enable-autotools \ | ||
41 | " | 42 | " |
42 | EXTRA_OECONF_append_qemux86 = " \ | 43 | EXTRA_OECONF_append_qemux86 = " \ |
43 | WESTON_NATIVE_BACKEND=fbdev-backend.so \ | 44 | WESTON_NATIVE_BACKEND=fbdev-backend.so \ |