Skip to contentSkip to conversation

package/weston-imx: Split weston-imx off from weston

PATCH Superseded James Hilliard 4 participants 9 messages Jun 25, 2019 – Jul 14, 2019 Arm i.MX and Layerscape

v1 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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
index bc529e0b56..1181793cb8 100644
@@ -331,6 +331,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
new file mode 100644
index 0000000000..759a9b6554
@@ -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
index f874b0cc6a..5a5e288540 100644
@@ -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
index a2dddf7a5b..c9b2d4b1ce 100644
@@ -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
index ee3d3be87e..154ae38b83 100644
@@ -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
#1 lore raw

PATCH 1/1 package/weston-imx: Split weston-imx off from weston

Hi James,

Adding Garry to Cc.

Quoted 3 lines · James Hilliard

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.

It might be easier to bump weston-imx to rel_imx_4.19.35_1.0.0 which is based on upstream version 6.0.0.

baruch

Quoted 1 line
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#2 lore raw

PATCH 1/1 package/weston-imx: Split weston-imx off from weston

Quoted 4 lines · Baruch Siach

Hi James,

Adding Garry to Cc.

Quoted 9 lines
Quoted 3 lines · James Hilliard

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.

It might be easier to bump weston-imx to rel_imx_4.19.35_1.0.0 which is based
on upstream version 6.0.0.

From what I could tell the imx features were only set up for autotools for that version as well.

Quoted 11 lines

baruch

Quoted 1 line

--
http://baruch.siach.name/blog/ ~. .~ Tk Open
Systems =}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190625/f5f496e1/attachment.html>

#3 lore raw

PATCH 1/1 package/weston-imx: Split weston-imx off from weston

Hi James, Baruch,

Quoted 11 lines · James Hilliard
Quoted 9 lines · Baruch Siach

Hi James,

Adding Garry to Cc.

Quoted 3 lines · James Hilliard

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.

Quoted 6 lines
Quoted 4 lines

It might be easier to bump weston-imx to rel_imx_4.19.35_1.0.0 which is based
on upstream version 6.0.0.

From what I could tell the imx features were only set up for autotools for that version as well.

Don't know much about meson to be honest but NXP patches indeed only change configure.ac and not meson_options.txt.

If the switch to meson is happening now, yes I guess the NXP fork will have to be split.

Also note that any update to the weston-imx version will imply using the NXP-forked version of wayland-protocols as well [1] :(

Regards,
Gary

[1] https://source.codeaurora.org/external/imx/wayland-protocols-imx/log/?h=rel_imx_4.14.98_2.0.0_ga

#4 lore raw

PATCH 1/1 package/weston-imx: Split weston-imx off from weston

Quoted 22 lines · Gary Bisson

Hi James, Baruch,

Quoted 11 lines · James Hilliard
Quoted 9 lines · Baruch Siach

Hi James,

Adding Garry to Cc.

Quoted 3 lines · James Hilliard

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.

Quoted 6 lines
Quoted 4 lines

It might be easier to bump weston-imx to rel_imx_4.19.35_1.0.0 which is based
on upstream version 6.0.0.

From what I could tell the imx features were only set up for autotools for that version as well.

Quoted 8 lines

Don't know much about meson to be honest but NXP patches indeed only change configure.ac and not meson_options.txt.

If the switch to meson is happening now, yes I guess the NXP fork will have to be split.

Also note that any update to the weston-imx version will imply using the NXP-forked version of wayland-protocols as well [1] :(

It doesn't look like we've been using the wayland-protocols-imx fork at all. Shouldn't the
upstream version for wayland-protocols work?

Quoted 5 lines

Regards,
Gary

[1] https://source.codeaurora.org/external/imx/wayland-protocols-imx/log/?h=rel_imx_4.14.98_2.0.0_ga

#5 lore raw

PATCH 1/1 package/weston-imx: Split weston-imx off from weston

In reply to James Hilliard

James, All,

Sorry for the delay in replying to this one...

On 2019-06-25 16:50 -0600, James Hilliard spake thusly:

Quoted 3 lines

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.

I agree that we should split it into its own package.

Quoted 2 lines

---

[--SNIP--]

package/weston-imx/Config.in line 43

Quoted 8 lines
package/weston-imx/Config.in new file +8 -0
+if BR2_PACKAGE_WESTON_IMX
+
+# Helper to make sure at least one compositor is selected.
+config BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR
+	bool
+
+config BR2_PACKAGE_WESTON_IMX_DRM
+	bool "DRM compositor"

Do all the backends really make sense for the imx fork?

I.e. I would expect that the drm, rdp, etc... backends do not make sense (maybe just the fbdev one?) and that the oter backends would be provided only by the real weston, leaving the imx fork nly provide the backend for imx.

Which implies that we should allow bioth westons to be installed side by side, and that the imx variant be installed as 'weston-imx', e.g. using the ./configure flag:

--program-suffix=-imx

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#6 lore raw

PATCH 1/1 package/weston-imx: Split weston-imx off from weston

Quoted 15 lines · Yann E. MORIN

James, All,

Sorry for the delay in replying to this one...

On 2019-06-25 16:50 -0600, James Hilliard spake thusly:

Quoted 3 lines

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.

I agree that we should split it into its own package.

Quoted 2 lines

---

[--SNIP--]

Quoted 10 lines

package/weston-imx/Config.in line 43

Quoted 8 lines
package/weston-imx/Config.in new file +8 -0
+if BR2_PACKAGE_WESTON_IMX
+
+# Helper to make sure at least one compositor is selected.
+config BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR
+     bool
+
+config BR2_PACKAGE_WESTON_IMX_DRM
+     bool "DRM compositor"

Do all the backends really make sense for the imx fork?

I'm not sure.

Quoted 9 lines

I.e. I would expect that the drm, rdp, etc... backends do not make sense (maybe just the fbdev one?) and that the oter backends would be provided only by the real weston, leaving the imx fork nly provide the backend for imx.

Which implies that we should allow bioth westons to be installed side by side, and that the imx variant be installed as 'weston-imx', e.g. using the ./configure flag:

Is there a use case for having both westons side by side?

Quoted 13 lines

--program-suffix=-imx

Regards,
Yann E. MORIN.

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

#7 lore raw

PATCH 1/1 package/weston-imx: Split weston-imx off from weston

James, All,

On 2019-07-14 12:37 -0600, James Hilliard spake thusly:

Quoted 5 lines · Yann E. MORIN
Quoted 4 lines

On 2019-06-25 16:50 -0600, James Hilliard spake thusly:

Quoted 3 lines

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.

[--SNIP--]

Quoted 4 lines
Quoted 3 lines

Which implies that we should allow bioth westons to be installed side by side, and that the imx variant be installed as 'weston-imx', e.g. using the ./configure flag:

Is there a use case for having both westons side by side?

Well, yes: the RDB stuff for example does not seem to depend on the hardware at all, in fact, so it would be better if it were provided by the real weston, which is more up-to-date with RDP than by the imx fork, which supports an older version of RDP. And it has caused grief in the past that when we update weston, it uses newer FreeRDP APIs, or the other way around, when we update FreeRDP, it no longer exports APIs needed by older weston.

So, I'd like we find a way for the imxc fork to be consrained to only the actual imx backend, and keep using the official weston for all the rest.

Regards,
Yann E. MORIN.

Quoted 12 lines
Quoted 12 lines

--program-suffix=-imx

Regards,
Yann E. MORIN.

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#8 lore raw

PATCH 1/1 package/weston-imx: Split weston-imx off from weston

Quoted 15 lines · Yann E. MORIN

James, All,

On 2019-07-14 12:37 -0600, James Hilliard spake thusly:

Quoted 5 lines · Yann E. MORIN
Quoted 4 lines

On 2019-06-25 16:50 -0600, James Hilliard spake thusly:

Quoted 3 lines

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.

[--SNIP--]

Quoted 4 lines
Quoted 3 lines

Which implies that we should allow bioth westons to be installed side by side, and that the imx variant be installed as 'weston-imx', e.g. using the ./configure flag:

Is there a use case for having both westons side by side?

Quoted 7 lines

Well, yes: the RDB stuff for example does not seem to depend on the hardware at all, in fact, so it would be better if it were provided by the real weston, which is more up-to-date with RDP than by the imx fork, which supports an older version of RDP. And it has caused grief in the past that when we update weston, it uses newer FreeRDP APIs, or the other way around, when we update FreeRDP, it no longer exports APIs needed by older weston.

Ah, I don't have any imx hardware so someone else would probably need to do that.

Quoted 4 lines

So, I'd like we find a way for the imxc fork to be consrained to only the actual imx backend, and keep using the official weston for all the rest.

I'm not sure how one would best go about that.

Quoted 24 lines

Regards,
Yann E. MORIN.

Quoted 5 lines
Quoted 5 lines

--program-suffix=-imx

Regards,
Yann E. MORIN.

Quoted 7 lines
Quoted 7 lines

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'