* [Buildroot] [PATCH 01/11] package/rpi-userland: rename patches
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:11 ` Thomas Petazzoni
2013-10-09 21:06 ` Peter Korsgaard
2013-10-08 22:09 ` [Buildroot] [PATCH 02/11] package/weston: fix variable name Yann E. MORIN
` (9 subsequent siblings)
10 siblings, 2 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Rename patches to follow standard naming scheme.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
...d-pkgconfig-files.patch => rpi-userland-000-add-pkgconfig-files.patch} | 0
...erland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename package/rpi-userland/{rpi-userland-add-pkgconfig-files.patch => rpi-userland-000-add-pkgconfig-files.patch} (100%)
rename package/rpi-userland/{rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch => rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch} (100%)
diff --git a/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch b/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
similarity index 100%
rename from package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
rename to package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch
diff --git a/package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch b/package/rpi-userland/rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
similarity index 100%
rename from package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
rename to package/rpi-userland/rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch
--
1.8.1.2
^ permalink raw reply [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 02/11] package/weston: fix variable name
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 01/11] package/rpi-userland: rename patches Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:19 ` Thomas Petazzoni
2013-10-09 21:07 ` Peter Korsgaard
2013-10-08 22:09 ` [Buildroot] [PATCH 03/11] package/weston: requires host-pkgconf Yann E. MORIN
` (8 subsequent siblings)
10 siblings, 2 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
The weston package uses the $(WAYLAND_VERSION) variable instead of
$(WESTON_VERSION).
This went unnoticed for now, as we were using the same version for
wayland and weston. But that's not always the case, since we have,
for example: wayland-1.2.1 and weston-1.2.2, and no wayland-1.2.2.
Fix this by using the correct variable.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/weston/weston.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 6f7703e..5d2c829 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -6,7 +6,7 @@
WESTON_VERSION = 1.1.0
WESTON_SITE = http://wayland.freedesktop.org/releases/
-WESTON_SOURCE = weston-$(WAYLAND_VERSION).tar.xz
+WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT
WESTON_LICENSE_FILES = COPYING
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 02/11] package/weston: fix variable name
2013-10-08 22:09 ` [Buildroot] [PATCH 02/11] package/weston: fix variable name Yann E. MORIN
@ 2013-10-08 22:19 ` Thomas Petazzoni
2013-10-09 21:07 ` Peter Korsgaard
1 sibling, 0 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2013-10-08 22:19 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Wed, 9 Oct 2013 00:09:48 +0200, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> The weston package uses the $(WAYLAND_VERSION) variable instead of
> $(WESTON_VERSION).
>
> This went unnoticed for now, as we were using the same version for
> wayland and weston. But that's not always the case, since we have,
> for example: wayland-1.2.1 and weston-1.2.2, and no wayland-1.2.2.
>
> Fix this by using the correct variable.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Obviously-acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 02/11] package/weston: fix variable name
2013-10-08 22:09 ` [Buildroot] [PATCH 02/11] package/weston: fix variable name Yann E. MORIN
2013-10-08 22:19 ` Thomas Petazzoni
@ 2013-10-09 21:07 ` Peter Korsgaard
1 sibling, 0 replies; 22+ messages in thread
From: Peter Korsgaard @ 2013-10-09 21:07 UTC (permalink / raw)
To: buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann> The weston package uses the $(WAYLAND_VERSION) variable instead of
Yann> $(WESTON_VERSION).
Yann> This went unnoticed for now, as we were using the same version for
Yann> wayland and weston. But that's not always the case, since we have,
Yann> for example: wayland-1.2.1 and weston-1.2.2, and no wayland-1.2.2.
Yann> Fix this by using the correct variable.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 03/11] package/weston: requires host-pkgconf
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 01/11] package/rpi-userland: rename patches Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 02/11] package/weston: fix variable name Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:13 ` Thomas Petazzoni
2013-10-09 21:07 ` Peter Korsgaard
2013-10-08 22:09 ` [Buildroot] [PATCH 04/11] package/wayland: bump version Yann E. MORIN
` (7 subsequent siblings)
10 siblings, 2 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
weston's configure.ac uses PKG_CHECK_MODULES,
so it needs to depend on host-pkgconf.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
It worked so far since weston depends on packages
that themselves depend on host-pkgconf. But for
sanity, make weston depend on it, too.
---
package/weston/weston.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 5d2c829..38647bd 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -10,7 +10,7 @@ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT
WESTON_LICENSE_FILES = COPYING
-WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng \
+WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
jpeg mtdev udev cairo
WESTON_CONF_OPT = \
--disable-egl \
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 03/11] package/weston: requires host-pkgconf
2013-10-08 22:09 ` [Buildroot] [PATCH 03/11] package/weston: requires host-pkgconf Yann E. MORIN
@ 2013-10-08 22:13 ` Thomas Petazzoni
2013-10-09 21:07 ` Peter Korsgaard
1 sibling, 0 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2013-10-08 22:13 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Wed, 9 Oct 2013 00:09:49 +0200, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> weston's configure.ac uses PKG_CHECK_MODULES,
> so it needs to depend on host-pkgconf.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 03/11] package/weston: requires host-pkgconf
2013-10-08 22:09 ` [Buildroot] [PATCH 03/11] package/weston: requires host-pkgconf Yann E. MORIN
2013-10-08 22:13 ` Thomas Petazzoni
@ 2013-10-09 21:07 ` Peter Korsgaard
1 sibling, 0 replies; 22+ messages in thread
From: Peter Korsgaard @ 2013-10-09 21:07 UTC (permalink / raw)
To: buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann> weston's configure.ac uses PKG_CHECK_MODULES,
Yann> so it needs to depend on host-pkgconf.
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 04/11] package/wayland: bump version
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
` (2 preceding siblings ...)
2013-10-08 22:09 ` [Buildroot] [PATCH 03/11] package/weston: requires host-pkgconf Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 05/11] package/weston: " Yann E. MORIN
` (6 subsequent siblings)
10 siblings, 0 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/wayland/wayland.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index b5fe94d..0810536 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WAYLAND_VERSION = 1.1.0
+WAYLAND_VERSION = 1.2.1
WAYLAND_SITE = http://wayland.freedesktop.org/releases/
WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
WAYLAND_LICENSE = MIT
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 05/11] package/weston: bump version
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
` (3 preceding siblings ...)
2013-10-08 22:09 ` [Buildroot] [PATCH 04/11] package/wayland: bump version Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 06/11] package/weston: fix configure.ac to check for wayland-scanner Yann E. MORIN
` (5 subsequent siblings)
10 siblings, 0 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/weston/weston.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 38647bd..990fb04 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WESTON_VERSION = 1.1.0
+WESTON_VERSION = 1.2.2
WESTON_SITE = http://wayland.freedesktop.org/releases/
WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 06/11] package/weston: fix configure.ac to check for wayland-scanner
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
` (4 preceding siblings ...)
2013-10-08 22:09 ` [Buildroot] [PATCH 05/11] package/weston: " Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:15 ` Thomas Petazzoni
2013-10-08 22:09 ` [Buildroot] [PATCH 07/11] package/weston: fix configure.ac for fbdev compositor Yann E. MORIN
` (4 subsequent siblings)
10 siblings, 1 reply; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
configure whines while checking for wayland-scanner.
wayland-scanner is used to generate the protocol parser C files from
the protocol definition XML files.
weston has a hard-dependency on wayland-scanner, so it can regenerate
its shell/mouse/keyboard/... "handlers".
Since we're using a tarball, those protocol files are already generated
and up-to-date, but the check is hard-coded and unconditional. If
wayland-scanner is missing, configure fails.
wayland-scanner is provided by wayland, so we'd have to have a
host-wayland if we want wayland scanner.
We could well patch away this check, but we'd have to carry and maintain
it probably for ever.
Better to fix it, and introduce a host-wayland. Make weston depend on
host-wayland. Add a patch from upstream weston to fix configure whining.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/wayland/wayland.mk | 1 +
...02-fix-configure.ac-check-wayland-scanner.patch | 26 ++++++++++++++++++++++
package/weston/weston.mk | 8 +++++--
3 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch
diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
index 0810536..093be90 100644
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -28,3 +28,4 @@ endef
WAYLAND_POST_CONFIGURE_HOOKS += WAYLAND_BUILD_SCANNER
$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch b/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch
new file mode 100644
index 0000000..ca7368f
--- /dev/null
+++ b/package/weston/weston-0002-fix-configure.ac-check-wayland-scanner.patch
@@ -0,0 +1,26 @@
+commit 9f43cb48aac9d27aa49fe955104f5cfd204703ed
+Author: Quentin Glidic <sardemff7+git@sardemff7.net>
+Date: Sat Aug 24 20:36:10 2013 +0200
+
+ autotools: Fix AC_PATH_PROG call
+
+ Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
+ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/configure.ac b/configure.ac
+index 0129157..43e5e5c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -424,8 +424,10 @@ if test "x$have_lcms" = xyes; then
+ fi
+ AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
+
+-AC_PATH_PROG([wayland_scanner], [wayland-scanner],
+- [AC_MSG_ERROR("wayland-scanner is needed to compile weston")])
++AC_PATH_PROG([wayland_scanner], [wayland-scanner])
++if test x$wayland_scanner = x; then
++ AC_MSG_ERROR([wayland-scanner is needed to compile weston])
++fi
+
+ AC_CONFIG_FILES([Makefile
+ shared/Makefile
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 990fb04..8b719b8 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -10,8 +10,12 @@ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
WESTON_LICENSE = MIT
WESTON_LICENSE_FILES = COPYING
-WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
- jpeg mtdev udev cairo
+WESTON_DEPENDENCIES = host-pkgconf host-wayland wayland libxkbcommon pixman \
+ libpng jpeg mtdev udev cairo
+
+# We touch configure.ac with one of our patches
+WESTON_AUTORECONF = YES
+
WESTON_CONF_OPT = \
--disable-egl \
--disable-xwayland \
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 06/11] package/weston: fix configure.ac to check for wayland-scanner
2013-10-08 22:09 ` [Buildroot] [PATCH 06/11] package/weston: fix configure.ac to check for wayland-scanner Yann E. MORIN
@ 2013-10-08 22:15 ` Thomas Petazzoni
2013-10-08 22:23 ` Yann E. MORIN
0 siblings, 1 reply; 22+ messages in thread
From: Thomas Petazzoni @ 2013-10-08 22:15 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Wed, 9 Oct 2013 00:09:52 +0200, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> configure whines while checking for wayland-scanner.
>
> wayland-scanner is used to generate the protocol parser C files from
> the protocol definition XML files.
>
> weston has a hard-dependency on wayland-scanner, so it can regenerate
> its shell/mouse/keyboard/... "handlers".
>
> Since we're using a tarball, those protocol files are already generated
> and up-to-date, but the check is hard-coded and unconditional. If
> wayland-scanner is missing, configure fails.
>
> wayland-scanner is provided by wayland, so we'd have to have a
> host-wayland if we want wayland scanner.
>
> We could well patch away this check, but we'd have to carry and maintain
> it probably for ever.
>
> Better to fix it, and introduce a host-wayland. Make weston depend on
> host-wayland. Add a patch from upstream weston to fix configure whining.
Huh? wayland.mk does build wayland-scanner with the native compiler
before starting the build itself. It doesn't work anymore with 1.2.x ?
Thomas
--
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 06/11] package/weston: fix configure.ac to check for wayland-scanner
2013-10-08 22:15 ` Thomas Petazzoni
@ 2013-10-08 22:23 ` Yann E. MORIN
2013-10-08 22:25 ` Thomas Petazzoni
0 siblings, 1 reply; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:23 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2013-10-09 00:15 +0200, Thomas Petazzoni spake thusly:
> Dear Yann E. MORIN,
>
> On Wed, 9 Oct 2013 00:09:52 +0200, Yann E. MORIN wrote:
> > From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >
> > configure whines while checking for wayland-scanner.
> >
> > wayland-scanner is used to generate the protocol parser C files from
> > the protocol definition XML files.
> >
> > weston has a hard-dependency on wayland-scanner, so it can regenerate
> > its shell/mouse/keyboard/... "handlers".
> >
> > Since we're using a tarball, those protocol files are already generated
> > and up-to-date, but the check is hard-coded and unconditional. If
> > wayland-scanner is missing, configure fails.
> >
> > wayland-scanner is provided by wayland, so we'd have to have a
> > host-wayland if we want wayland scanner.
> >
> > We could well patch away this check, but we'd have to carry and maintain
> > it probably for ever.
> >
> > Better to fix it, and introduce a host-wayland. Make weston depend on
> > host-wayland. Add a patch from upstream weston to fix configure whining.
>
> Huh? wayland.mk does build wayland-scanner with the native compiler
> before starting the build itself. It doesn't work anymore with 1.2.x ?
He! I did not even check... Yes, it does.
I basically did not expect wayland to build host tools.
I'll rework the series so wayland installs wayland-scanner to $(HOST),
and use that instead of host-wayland.
Thanks!
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 06/11] package/weston: fix configure.ac to check for wayland-scanner
2013-10-08 22:23 ` Yann E. MORIN
@ 2013-10-08 22:25 ` Thomas Petazzoni
2013-10-08 22:38 ` Yann E. MORIN
0 siblings, 1 reply; 22+ messages in thread
From: Thomas Petazzoni @ 2013-10-08 22:25 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Wed, 9 Oct 2013 00:23:18 +0200, Yann E. MORIN wrote:
> > Huh? wayland.mk does build wayland-scanner with the native compiler
> > before starting the build itself. It doesn't work anymore with 1.2.x ?
>
> He! I did not even check... Yes, it does.
> I basically did not expect wayland to build host tools.
>
> I'll rework the series so wayland installs wayland-scanner to $(HOST),
> and use that instead of host-wayland.
Well, using a host-wayland package is certainly an alternate approach.
But at least at the time of wayland 1.1.x, building wayland-scanner
manually was very easy, so I thought it was the best solution to just
do it manually in wayland.mk. Should the build process of
wayland-scanner become too complicated, having a host-wayland package
would certainly be the appropriate solution.
Thomas
--
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 06/11] package/weston: fix configure.ac to check for wayland-scanner
2013-10-08 22:25 ` Thomas Petazzoni
@ 2013-10-08 22:38 ` Yann E. MORIN
0 siblings, 0 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:38 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2013-10-09 00:25 +0200, Thomas Petazzoni spake thusly:
> Dear Yann E. MORIN,
>
> On Wed, 9 Oct 2013 00:23:18 +0200, Yann E. MORIN wrote:
>
> > > Huh? wayland.mk does build wayland-scanner with the native compiler
> > > before starting the build itself. It doesn't work anymore with 1.2.x ?
> >
> > He! I did not even check... Yes, it does.
> > I basically did not expect wayland to build host tools.
> >
> > I'll rework the series so wayland installs wayland-scanner to $(HOST),
> > and use that instead of host-wayland.
>
> Well, using a host-wayland package is certainly an alternate approach.
> But at least at the time of wayland 1.1.x, building wayland-scanner
> manually was very easy, so I thought it was the best solution to just
> do it manually in wayland.mk. Should the build process of
> wayland-scanner become too complicated, having a host-wayland package
> would certainly be the appropriate solution.
As discussed on IRC, I'll go for the hand-crafted wayland-scanner
install.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 07/11] package/weston: fix configure.ac for fbdev compositor
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
` (5 preceding siblings ...)
2013-10-08 22:09 ` [Buildroot] [PATCH 06/11] package/weston: fix configure.ac to check for wayland-scanner Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 08/11] package/weston: introduce infrastructure to select other compositors Yann E. MORIN
` (3 subsequent siblings)
10 siblings, 0 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Apply patch from upstream.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
...ompositor-fbdev-drop-dependency-on-libdrm.patch | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch
diff --git a/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch b/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch
new file mode 100644
index 0000000..dfc20de
--- /dev/null
+++ b/package/weston/weston-0003-compositor-fbdev-drop-dependency-on-libdrm.patch
@@ -0,0 +1,22 @@
+commit 7b8e970ad1f1ef96db23b379a41edeb40ef1e8b6
+Author: Adrian Negreanu <adrian.m.negreanu@intel.com>
+Date: Thu Sep 26 19:31:32 2013 +0300
+
+ compositor-fbdev: drop dependency on libdrm
+
+ Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com>
+ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/configure.ac b/configure.ac
+index 7c2da44..a43bf5b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -190,7 +190,7 @@ AM_CONDITIONAL([ENABLE_FBDEV_COMPOSITOR],
+ [test x$enable_fbdev_compositor = xyes])
+ AS_IF([test x$enable_fbdev_compositor = xyes], [
+ AC_DEFINE([BUILD_FBDEV_COMPOSITOR], [1], [Build the fbdev compositor])
+- PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0 libdrm >= 2.4.30])
++ PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0])
+ ])
+
+ AC_ARG_ENABLE([rdp-compositor], [ --enable-rdp-compositor],,
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 08/11] package/weston: introduce infrastructure to select other compositors
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
` (6 preceding siblings ...)
2013-10-08 22:09 ` [Buildroot] [PATCH 07/11] package/weston: fix configure.ac for fbdev compositor Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 09/11] package/rpi-userland: add patch to remove faulty assert() Yann E. MORIN
` (2 subsequent siblings)
10 siblings, 0 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/weston/Config.in | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/package/weston/Config.in b/package/weston/Config.in
index 56eb135..0f168ac 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -14,8 +14,6 @@ config BR2_PACKAGE_WESTON
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
# Runtime dependency
select BR2_PACKAGE_XKEYBOARD_CONFIG
- # Make sure at least one backend is selected
- select BR2_PACKAGE_WESTON_FBDEV
help
Weston is the reference implementation of a Wayland
compositor, and a useful compositor in its own right.
@@ -26,7 +24,16 @@ config BR2_PACKAGE_WESTON
if BR2_PACKAGE_WESTON
+# These two options make sure at least one compositor is selected.
+config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
+ bool
+config BR2_PACKAGE_WESTON_NEEDS_ONE_COMPOSITOR
+ def_bool y
+ depends on ! BR2_PACKAGE_WESTON_HAS_COMPOSITOR
+ select BR2_PACKAGE_WESTON_FBDEV
+
config BR2_PACKAGE_WESTON_FBDEV
bool "fbdev compositor"
+ default y
endif
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 09/11] package/rpi-userland: add patch to remove faulty assert()
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
` (7 preceding siblings ...)
2013-10-08 22:09 ` [Buildroot] [PATCH 08/11] package/weston: introduce infrastructure to select other compositors Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 10/11] package/weston: add RPi compositor Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 11/11] package/weston: add option to enable EGL Yann E. MORIN
10 siblings, 0 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
While porting wayland/weston to run on the RPi, I always tripped on
this assert.
Thinking there was an issue with weston, I poked the weston guys on
IRC about the issue. 'daniels' on irc.freenode.net/#wayland suggested
removing the assert altogether, as that's what they had pushed
upstream in their wayland pull-request:
https://github.com/raspberrypi/userland/pull/92
Turns out they forgot to include this in their pull-request, but that
they were using a patched rpi-userland without that assert.
And indeed, without that assert, weston runs on the RPi. :-)
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
The weston guys will probably push this upstream soon.
If not, then I'll take the burden to do it.
---
.../rpi-userland-002-remove-faulty-assert.patch | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch
diff --git a/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch b/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch
new file mode 100644
index 0000000..5075a1e
--- /dev/null
+++ b/package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch
@@ -0,0 +1,21 @@
+interface: remove faulty assert() to make weston happy at runtime
+
+This was removed after a discussion on IRC with the weston guys
+(at 'daniels' on irc.freenode.net/#wayland).
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+Upstream status: no, will be pushed by weston guys later.
+If not, I'll do it.
+
+diff -durN rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c
+--- rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c 2013-10-04 17:43:44.000000000 +0200
++++ rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c 2013-10-08 22:28:51.611433539 +0200
+@@ -1187,7 +1187,6 @@
+ continue;
+
+ if(dispmanx_client.update_callback ) {
+- vcos_assert( dispmanx_client.pending_update_handle == (DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1]);
+ dispmanx_client.update_callback((DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1], dispmanx_client.update_callback_param);
+ }
+ }
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 10/11] package/weston: add RPi compositor
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
` (8 preceding siblings ...)
2013-10-08 22:09 ` [Buildroot] [PATCH 09/11] package/rpi-userland: add patch to remove faulty assert() Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
2013-10-08 22:09 ` [Buildroot] [PATCH 11/11] package/weston: add option to enable EGL Yann E. MORIN
10 siblings, 0 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Procedure highly inspired by:
http://wayland.freedesktop.org/raspberrypi.html
The resulting weston works almost flawlessly, but requires a bit
of love:
- /boot/config.txt must include this line: dispmanx_offline=1
- at least 128MiB of RAM must be allocated to the GPU
- after 24-or-so terminal-clients are connected, the screen
turns black. Exiting a client restores the screen
It seems increasing/decreasing the amount of memory allocated to
the GPU makes the clients limit to wobble above/below 24 clients
at a time. YMMV, as they say...
Without dispmanx_offline=1, the limit is much below 24, arounf 13.
But changing the amount of memory allocated to the GPU does not
change this limit in this case. YMMV, again.
Anyway, there are not many different clients available, besides the
terminal client, since all other clients are EGL-based, and there
is (yet) no EGL support (for weston!) on the RPi. So the tests were
made only with the terminal client.
The system is rather smooth, but spwaning too many clients in a
rapid-fire is sure to exhibit some lag. Resizing windows is a bit
jerky, but moving them along is fine.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/weston/Config.in | 8 ++++++++
package/weston/weston.mk | 14 +++++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/package/weston/Config.in b/package/weston/Config.in
index 0f168ac..8c00bf6 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -36,4 +36,12 @@ config BR2_PACKAGE_WESTON_FBDEV
bool "fbdev compositor"
default y
+config BR2_PACKAGE_WESTON_RPI
+ bool "RPi compositor"
+ depends on BR2_arm # rpi-userland
+ depends on BR2_INSTALL_LIBSTDCPP # rpi-userland
+ depends on BR2_LARGEFILE # rpi-userland
+ select BR2_PACKAGE_RPI_USERLAND
+ select BR2_PACKAGE_WESTON_HAS_COMPOSITOR
+
endif
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 8b719b8..da3e2f5 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -23,8 +23,8 @@ WESTON_CONF_OPT = \
--disable-drm-compositor \
--disable-wayland-compositor \
--disable-headless-compositor \
- --disable-rpi-compositor \
--disable-weston-launch \
+ --disable-colord \
--disable-libunwind
ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
@@ -33,4 +33,16 @@ else
WESTON_CONF_OPT += --disable-fbdev-compositor
endif
+ifeq ($(BR2_PACKAGE_WESTON_RPI),y)
+WESTON_DEPENDENCIES += rpi-userland
+WESTON_CONF_OPT += --enable-rpi-compositor \
+ --disable-resize-optimization \
+ --disable-setuid-install \
+ --disable-xwayland-test \
+ --disable-simple-egl-clients \
+ WESTON_NATIVE_BACKEND=rpi-backend.so
+else
+WESTON_CONF_OPT += --disable-rpi-compositor
+endif # BR2_PACKAGE_WESTON_RPI
+
$(eval $(autotools-package))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 11/11] package/weston: add option to enable EGL
2013-10-08 22:09 [Buildroot] [pull request] Pull request for branch yem/rpi-wayland Yann E. MORIN
` (9 preceding siblings ...)
2013-10-08 22:09 ` [Buildroot] [PATCH 10/11] package/weston: add RPi compositor Yann E. MORIN
@ 2013-10-08 22:09 ` Yann E. MORIN
10 siblings, 0 replies; 22+ messages in thread
From: Yann E. MORIN @ 2013-10-08 22:09 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Add a no-prompt option to enable EGL. Compositors that can use
EGL can select this option.
Currently, no compositor (supported by Buildroot) selects EGL,
but this will be the case when westion 1.3.0 is out (since the
RPi compositor will have gained EGL support by that time with
commit #b4659eb in upstream weston).
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/weston/Config.in | 4 ++++
package/weston/weston.mk | 6 ++++++
2 files changed, 10 insertions(+)
diff --git a/package/weston/Config.in b/package/weston/Config.in
index 8c00bf6..4096671 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -24,6 +24,10 @@ config BR2_PACKAGE_WESTON
if BR2_PACKAGE_WESTON
+# Whether EGL support is needed
+config BR2_PACKAGE_WESTON_EGL
+ bool
+
# These two options make sure at least one compositor is selected.
config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
bool
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index da3e2f5..d8c5ec1 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -27,6 +27,12 @@ WESTON_CONF_OPT = \
--disable-colord \
--disable-libunwind
+ifeq ($(BR2_PACKAGE_WESTON_EGL),y)
+WESTON_CONF_OPT += --enable-egl
+else
+WESTON_CONF_OPT += --disable-egl --disable-simple-egl-clients
+endif
+
ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
WESTON_CONF_OPT += --enable-fbdev-compositor
else
--
1.8.1.2
^ permalink raw reply related [flat|nested] 22+ messages in thread