package/weston-imx: Split weston-imx off from weston
PATCH v4 1/3 package/weston-imx: Split weston-imx off from weston
This is in preparation for migration of weston to the meson build system. Since weston-imx is based off of a much older version of weston it is difficult to maintain as part of the weston package.
--- package/Config.in | 1 + package/weston-imx/Config.in | 108 ++++++++++++++++++++++ package/weston-imx/weston-imx.hash | 2 + package/weston-imx/weston-imx.mk | 144 +++++++++++++++++++++++++++++ package/weston/Config.in | 2 + package/weston/weston.hash | 2 - package/weston/weston.mk | 16 ---- 7 files changed, 257 insertions(+), 18 deletions(-) create mode 100644 package/weston-imx/Config.in create mode 100644 package/weston-imx/weston-imx.hash create mode 100644 package/weston-imx/weston-imx.mk
package/Config.in +1 -0
@@ -335,6 +335,7 @@ comment "QT libraries and helper libraries" endif source "package/tekui/Config.in" source "package/weston/Config.in" + source "package/weston-imx/Config.in" source "package/x11r7/Config.in" comment "X applications"
package/weston-imx/Config.in new file +108 -0
108 lines not on this page · raw message
package/weston-imx/weston-imx.hash new file +2 -0
@@ -0,0 +1,2 @@ +# locally computed +sha256 f39f7a24a01b023aa204ad47977a6476c17a307769f29d408621a05b5cbbcfc7 weston-imx-rel_imx_4.9.51_8mq_ga.tar.gz
package/weston-imx/weston-imx.mk new file +144 -0
144 lines not on this page · raw message
package/weston/Config.in +2 -0
@@ -1,10 +1,12 @@ comment "weston needs udev and a toolchain w/ locale, threads, dynamic library, headers >= 3.0" + depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS || \ !BR2_ENABLE_LOCALE config BR2_PACKAGE_WESTON bool "weston" + depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_STATIC_LIBS # wayland
package/weston/weston.hash +0 -2
@@ -3,5 +3,3 @@ md5 e7b10710ef1eac82258f97bfd41fe534 weston-6.0.1.tar.xz sha1 3b39e454b3dc8dc32598790cfcc65728b448378b weston-6.0.1.tar.xz sha256 bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4 weston-6.0.1.tar.xz sha512 3da04ff9b884480ce0824950347185e55584e3938021fe62014423d3d51577eafdda8de650a5de6eb37a842130c9cb14c7a952a560f6be93ff973164363af3d9 weston-6.0.1.tar.xz -# locally computed -sha256 0f0de7b7b1f65870139c95dde7abc19ed305631ae7c5d37c386db40cde108632 weston-rel_imx_4.9.51_8mq_ga.tar.gz
package/weston/weston.mk +0 -16
@@ -4,16 +4,9 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) -WESTON_VERSION = rel_imx_4.9.51_8mq_ga -WESTON_SITE = https://source.codeaurora.org/external/imx/weston-imx -WESTON_SITE_METHOD = git -WESTON_AUTORECONF = YES -else WESTON_VERSION = 6.0.1 WESTON_SITE = http://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz -endif WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING
@@ -58,15 +51,6 @@ else WESTON_CONF_OPTS += --disable-weston-launch endif -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) -WESTON_DEPENDENCIES += imx-gpu-g2d -# --enable-imxg2d actually disables it, so no CONF_OPTS -else -WESTON_CONF_OPTS += --disable-imxg2d -endif -endif - ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) WESTON_CONF_OPTS += --enable-egl WESTON_DEPENDENCIES += libegl libgles
Signature · 1 line
2.20.1
PATCH v4 2/3 package/wayland-protocols: bump to version 1.18
--- package/wayland-protocols/wayland-protocols.hash | 8 ++++---- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
package/wayland-protocols/wayland-protocols.hash +4 -4
@@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2018-November/039662.html -md5 55ddd5fdb02b73b9de9559aaec267315 wayland-protocols-1.17.tar.xz -sha1 7d2569c838c776545e3eb1b1049b9c37178aae24 wayland-protocols-1.17.tar.xz -sha256 df1319cf9705643aea9fd16f9056f4e5b2471bd10c0cc3713d4a4cdc23d6812f wayland-protocols-1.17.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-July/040756.html +md5 af38f22d8e233c2f2e00ddc8dcc94694 wayland-protocols-1.18.tar.xz +sha1 aa2f132c082f3c790bd046283b3ef7ce3fb11370 wayland-protocols-1.18.tar.xz +sha256 3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3 wayland-protocols-1.18.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING
package/wayland-protocols/wayland-protocols.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.17 +WAYLAND_PROTOCOLS_VERSION = 1.18 WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT
Signature · 1 line
2.20.1
PATCH v4 3/3 package/weston: bump to version 7.0.0
In reply to James HilliardThe autotools build system is deprecated and replaced with meson for weston.
We need to enable pango when building demo clients since it is required by meson.
The dbus option in autotools is replaced with launcher-logind in meson.
We need to explicitly set the image-webp option to avoid failures when building without webp.
Replaced WESTON_NATIVE_BACKEND with backend-default in meson.
---
Changes v3 -> v4:
- bump weston from 6.0.1 to 7.0.0
Changes v2 -> v3:
- fix dmabuf-v4l headers check
- add choice menu to select default weston backend
Changes v1 -> v2:
- Require both systemd and dbus for launcher-logind
- Move dmabuf-v4l out of egl/gl block
- Update imx-gpu-g2d requirement block
--- package/weston/Config.in | 33 +++++++++++ package/weston/weston.hash | 10 ++-- package/weston/weston.mk | 113 ++++++++++++++++++++----------------- 3 files changed, 98 insertions(+), 58 deletions(-)
package/weston/Config.in +33 -0
@@ -35,6 +35,26 @@ config BR2_PACKAGE_WESTON if BR2_PACKAGE_WESTON +choice + prompt "Backend default" + depends on BR2_PACKAGE_WESTON_FBDEV || \ + BR2_PACKAGE_WESTON_DRM || \ + BR2_PACKAGE_WESTON_X11 + +config BR2_PACKAGE_WESTON_DEFAULT_BACKEND_FBDEV + bool "fbdev" + depends on BR2_PACKAGE_WESTON_FBDEV + +config BR2_PACKAGE_WESTON_DEFAULT_BACKEND_DRM + bool "drm" + depends on BR2_PACKAGE_WESTON_DRM + +config BR2_PACKAGE_WESTON_DEFAULT_BACKEND_X11 + bool "X11" + depends on BR2_PACKAGE_WESTON_X11 + +endchoice + # Helper to make sure at least one compositor is selected. config BR2_PACKAGE_WESTON_HAS_COMPOSITOR bool
@@ -102,7 +122,20 @@ comment "XWayland support needs libepoxy and X.org enabled" config BR2_PACKAGE_WESTON_DEMO_CLIENTS bool "demo clients" + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_USE_WCHAR # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango + depends on BR2_USE_MMU # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + select BR2_PACKAGE_PANGO help This enables the installation of Weston's demo clients. +comment "demo clients needs OpenGL EGL and a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_MESA3D_OPENGL_EGL + endif
package/weston/weston.hash +5 -5
@@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-June/040661.html -md5 e7b10710ef1eac82258f97bfd41fe534 weston-6.0.1.tar.xz -sha1 3b39e454b3dc8dc32598790cfcc65728b448378b weston-6.0.1.tar.xz -sha256 bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4 weston-6.0.1.tar.xz -sha512 3da04ff9b884480ce0824950347185e55584e3938021fe62014423d3d51577eafdda8de650a5de6eb37a842130c9cb14c7a952a560f6be93ff973164363af3d9 weston-6.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-August/040812.html +md5 cbfda483bc2501d0831af3f33c707850 weston-7.0.0.tar.xz +sha1 914c6d0ee569c54c13377a1c5582e534ed7c71f9 weston-7.0.0.tar.xz +sha256 a00a6d207b6a45f95f4401c604772a307c3767e5e2beecf3d879110c43909a64 weston-7.0.0.tar.xz +sha512 fa14467ab89fb12175830d9cf29d89dc04899fd21d801e60e85836e8e52e17e144be78098b3eedfab6c51b7fb055ecfabb456a8a74f4e40485134da59ac58ea3 weston-7.0.0.tar.xz
package/weston/weston.mk +60 -53
190 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 3/3 package/weston: bump to version 7.0.0
Am Sun, 25 Aug 2019 18:47:42 -0600 schrieb James Hilliard:
package/weston/Config.in comment "XWayland support needs libepoxy and X.org enabled" · line 125
Quoted 3 lines
config
BR2_PACKAGE_WESTON_DEMO_CLIENTSpackage/weston/Config.in +1
-0bool "demo clients" + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
Hi,
demo clients seems to need glesv2 as well:
Run-time dependency glesv2 found: NO (tried pkgconfig and cmake)
clients/meson.build:292:4: ERROR: Problem encountered: weston-subsurfaces requires 'glesv2' which was not found. If you rather not build this, set '-Ddemo-clients=false'.
https://cgit.freedesktop.org/wayland/weston/tree/clients/meson.build?
h=7.0.0#n279
Mesa3d was configured with these options:
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER=y
BR2_PACKAGE_MESA3D_DRIVER=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
Regards, Bernd