Skip to contentSkip to conversation

Wayland packaging

PATCH New Thomas Petazzoni 2 participants 9 messages Apr 29, 2013 – Apr 30, 2013

lore
Share & tools
lore
#0 lore raw

v2 cover Wayland packaging

Hello,

Here comes a second version of the Wayland packages. The only change since the first version is that the xkeyboard-config package now appears under "X libraries and helper libraries", as suggested by Arnout.

Best regards,

Thomas

Thomas Petazzoni (4):
xkeyboard-config: make available outside of X.org, reduce
dependencies
libxkbcommon: new package
wayland: new package
weston: new package

 package/Config.in                                  |    4 ++
 package/libxkbcommon/Config.in                     |    8 ++++
 package/libxkbcommon/libxkbcommon.mk               |   16 +++++++
 package/wayland/Config.in                          |   10 +++++
 package/wayland/wayland.mk                         |   30 +++++++++++++
 package/weston/Config.in                           |   29 ++++++++++++
 ...pendent-code-only-when-the-DRM-compositor.patch |   47 ++++++++++++++++++++
 package/weston/weston.mk                           |   32 +++++++++++++
 package/x11r7/Config.in                            |    1 -
 package/x11r7/xkeyboard-config/Config.in           |    7 +--
 package/x11r7/xkeyboard-config/xkeyboard-config.mk |    7 ++-
 11 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 package/libxkbcommon/Config.in
 create mode 100644 package/libxkbcommon/libxkbcommon.mk
 create mode 100644 package/wayland/Config.in
 create mode 100644 package/wayland/wayland.mk
 create mode 100644 package/weston/Config.in
 create mode 100644 package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
 create mode 100644 package/weston/weston.mk
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/4 xkeyboard-config: make available outside of X.org, reduce dependencies

xkeyboard-connfig was selectable only if X.org was enabled. However, weston, the reference implementation of the Wayland protocol, also needs xkeyboard-config, so we have to make this package available outside of the if BR2_PACKAGE_XORG7 ... endif conditional.

In addition to this, the xkeyboard-config currently pulls in xapp_xkbcomp as a runtime dependency, but this dependency is only needed with X.org. And it also pulls in xlib_libX11 and xproto_proto has build-time dependencies. But in fact those ones are runtime dependencies, and they are only needed under X.org. This helps reducing the number of dependencies of xkeyboard-config in a weston/wayland configuration.

---
 package/Config.in                                  |    1 +
 package/x11r7/Config.in                            |    1 -
 package/x11r7/xkeyboard-config/Config.in           |    7 ++++---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk |    7 ++++++-
 4 files changed, 11 insertions(+), 5 deletions(-)
package/Config.in +1 -0
index bcd3d8d..24dfe9c 100644
@@ -155,6 +155,7 @@ source "package/x11r7/Config.in"
 comment "X libraries and helper libraries"
 source "package/liberation/Config.in"
 source "package/libsexy/Config.in"
+source "package/x11r7/xkeyboard-config/Config.in"
 
 comment "X Window managers"
 source "package/enlightenment/Config.in"
package/x11r7/Config.in +0 -1
index 971ef37..f7487da 100644
@@ -257,7 +257,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdata_xbitmaps/Config.in
 		source package/x11r7/xdata_xcursor-themes/Config.in
 		source package/x11r7/xcursor-transparent-theme/Config.in
-		source package/x11r7/xkeyboard-config/Config.in
 	endmenu
 endif
 
package/x11r7/xkeyboard-config/Config.in +4 -3
index 640bb1d..5d1d6a7 100644
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_XKEYBOARD_CONFIG
 	bool "xkeyboard-config"
-	select BR2_PACKAGE_XAPP_XKBCOMP
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XPROTO_XPROTO
+	# Runtime dependencies
+	select BR2_PACKAGE_XAPP_XKBCOMP if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XPROTO_XPROTO if BR2_PACKAGE_XORG7
 	help
 	  keyboard configuration database for X
 
package/x11r7/xkeyboard-config/xkeyboard-config.mk +6 -1
index 78ed1ee..cdddd95 100644
@@ -3,10 +3,15 @@
 # xkeyboard-config
 #
 #############################################################
+
 XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto
+XKEYBOARD_CONFIG_LICENSE = MIT
+XKEYBAORD_CONFIG_LICENSE_FILES = COPYING
+
+XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp
+XKEYBOARD_CONFIG_CONF_OPT += --disable-runtime-deps
 
 $(eval $(autotools-package))
 
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v2 1/4 xkeyboard-config: make available outside of X.org, reduce dependencies

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> xkeyboard-connfig was selectable only if X.org was enabled. However, Thomas> weston, the reference implementation of the Wayland protocol, also Thomas> needs xkeyboard-config, so we have to make this package available Thomas> outside of the if BR2_PACKAGE_XORG7 ... endif conditional.

Thomas> In addition to this, the xkeyboard-config currently pulls in Thomas> xapp_xkbcomp as a runtime dependency, but this dependency is only Thomas> needed with X.org. And it also pulls in xlib_libX11 and xproto_proto Thomas> has build-time dependencies. But in fact those ones are runtime

s/has/as/

Otherwise it looks good - Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v2 2/4 libxkbcommon: new package

In reply to Thomas Petazzoni
---
 package/Config.in                    |    1 +
 package/libxkbcommon/Config.in       |    8 ++++++++
 package/libxkbcommon/libxkbcommon.mk |   16 ++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 package/libxkbcommon/Config.in
 create mode 100644 package/libxkbcommon/libxkbcommon.mk
package/Config.in +1 -0
index 24dfe9c..e359306 100644
@@ -470,6 +470,7 @@ source "package/libserial/Config.in"
 source "package/libusb/Config.in"
 source "package/libusb-compat/Config.in"
 source "package/libv4l/Config.in"
+source "package/libxkbcommon/Config.in"
 source "package/mtdev/Config.in"
 source "package/ne10/Config.in"
 source "package/neardal/Config.in"
package/libxkbcommon/Config.in new file +8 -0
new file mode 100644
index 0000000..0a52c6f
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBXKBCOMMON
+	bool "libxkbcommon"
+	help
+	  xkbcommon is a keymap compiler and support library which
+	  processes a reduced subset of keymaps as defined by the XKB
+	  specification.
+
+	  http://xkbcommon.org/
package/libxkbcommon/libxkbcommon.mk new file +16 -0
new file mode 100644
index 0000000..1ff851b
@@ -0,0 +1,16 @@
+#############################################################
+#
+# libxkbcommon
+#
+#############################################################
+
+LIBXKBCOMMON_VERSION = 0.3.0
+LIBXKBCOMMON_SITE = http://xkbcommon.org/download/
+LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz
+LIBXKBCOMMON_LICENSE = MIT/X11
+LIBXKBCOMMON_LICENSE_FILES = COPYING
+
+LIBXKBCOMMON_INSTALL_STAGING = YES
+LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH v2 2/4 libxkbcommon: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Thomas> +++ b/package/libxkbcommon/libxkbcommon.mk
Thomas> @@ -0,0 +1,16 @@
Thomas> +############################################################# Thomas> +#
Thomas> +# libxkbcommon
Thomas> +#
Thomas> +############################################################# Thomas> +
Thomas> +LIBXKBCOMMON_VERSION = 0.3.0
Thomas> +LIBXKBCOMMON_SITE = http://xkbcommon.org/download/
Thomas> +LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz Thomas> +LIBXKBCOMMON_LICENSE = MIT/X11
Thomas> +LIBXKBCOMMON_LICENSE_FILES = COPYING
Thomas> +
Thomas> +LIBXKBCOMMON_INSTALL_STAGING = YES
Thomas> +LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex

It uses C99 syntax, so we need to add -std=gnu99 to CFLAGS. Upstream adds it XORG_DEFAULT_OPTIONS (which pulls in AC_PROG_C_99), but it gets overwritten by our CFLAGS.

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH v2 3/4 wayland: new package

In reply to Thomas Petazzoni
---
 package/Config.in          |    1 +
 package/wayland/Config.in  |   10 ++++++++++
 package/wayland/wayland.mk |   30 ++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/wayland/Config.in
 create mode 100644 package/wayland/wayland.mk
package/Config.in +1 -0
index e359306..76feb7d 100644
@@ -448,6 +448,7 @@ source "package/pango/Config.in"
 source "package/pixman/Config.in"
 source "package/poppler/Config.in"
 source "package/tiff/Config.in"
+source "package/wayland/Config.in"
 source "package/webkit/Config.in"
 source "package/zxing/Config.in"
 endmenu
package/wayland/Config.in new file +10 -0
new file mode 100644
index 0000000..e5d2649
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_WAYLAND
+	bool "wayland"
+	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_EXPAT
+	help
+	  Wayland is a project to define a protocol for a compositor
+	  to talk to its clients as well as a library implementation
+	  of the protocol.
+
+	  http://wayland.freedesktop.org/
package/wayland/wayland.mk new file +30 -0
new file mode 100644
index 0000000..65381ec
@@ -0,0 +1,30 @@
+#############################################################
+#
+# wayland
+#
+#############################################################
+
+WAYLAND_VERSION = 1.1.0
+WAYLAND_SITE = http://wayland.freedesktop.org/releases/
+WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
+WAYLAND_LICENSE = MIT
+WAYLAND_LICENSE_FILES = COPYING
+
+WAYLAND_INSTALL_STAGING = YES
+WAYLAND_DEPENDENCIES = libffi host-pkgconf expat host-expat
+
+# wayland needs a wayland-scanner program to generate some of its
+# source code. By default, it builds it with CC, so it doesn't in
+# cross-compilation. Therefore, we build it manually, and tell wayland
+# that the tool is already available.
+WAYLAND_CONF_OPT = --disable-scanner
+
+define WAYLAND_BUILD_SCANNER
+	(cd $(@D)/src/; \
+		$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
+			-o wayland-scanner scanner.c wayland-util.c -lexpat)
+endef
+
+WAYLAND_POST_CONFIGURE_HOOKS += WAYLAND_BUILD_SCANNER
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH v2 3/4 wayland: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---

 Thomas>  package/Config.in          |    1 +
 Thomas>  package/wayland/Config.in  |   10 ++++++++++
 Thomas>  package/wayland/wayland.mk |   30 ++++++++++++++++++++++++++++++
 Thomas>  3 files changed, 41 insertions(+)
 Thomas>  create mode 100644 package/wayland/Config.in
 Thomas>  create mode 100644 package/wayland/wayland.mk

Thomas> diff --git a/package/Config.in b/package/Config.in Thomas> index e359306..76feb7d 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -448,6 +448,7 @@ source "package/pango/Config.in"

 Thomas>  source "package/pixman/Config.in"
 Thomas>  source "package/poppler/Config.in"
 Thomas>  source "package/tiff/Config.in"
 Thomas> +source "package/wayland/Config.in"
 Thomas>  source "package/webkit/Config.in"
 Thomas>  source "package/zxing/Config.in"
 Thomas>  endmenu
 Thomas> diff --git a/package/wayland/Config.in b/package/wayland/Config.in
 Thomas> new file mode 100644
 Thomas> index 0000000..e5d2649
 Thomas> --- /dev/null
 Thomas> +++ b/package/wayland/Config.in
 Thomas> @@ -0,0 +1,10 @@
 Thomas> +config BR2_PACKAGE_WAYLAND
 Thomas> +	bool "wayland"
 Thomas> +	select BR2_PACKAGE_LIBFFI
 Thomas> +	select BR2_PACKAGE_EXPAT
 Thomas> +	help
 Thomas> +	  Wayland is a project to define a protocol for a compositor
 Thomas> +	  to talk to its clients as well as a library implementation
 Thomas> +	  of the protocol.

Thomas> +
Thomas> + http://wayland.freedesktop.org/
Thomas> diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk Thomas> new file mode 100644
Thomas> index 0000000..65381ec
Thomas> --- /dev/null
Thomas> +++ b/package/wayland/wayland.mk
Thomas> @@ -0,0 +1,30 @@
Thomas> +############################################################# Thomas> +#
Thomas> +# wayland
Thomas> +#
Thomas> +############################################################# Thomas> +
Thomas> +WAYLAND_VERSION = 1.1.0
Thomas> +WAYLAND_SITE = http://wayland.freedesktop.org/releases/
Thomas> +WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz Thomas> +WAYLAND_LICENSE = MIT
Thomas> +WAYLAND_LICENSE_FILES = COPYING
Thomas> +
Thomas> +WAYLAND_INSTALL_STAGING = YES
Thomas> +WAYLAND_DEPENDENCIES = libffi host-pkgconf expat host-expat Thomas> +
Thomas> +# wayland needs a wayland-scanner program to generate some of its Thomas> +# source code. By default, it builds it with CC, so it doesn't in

s/doesn't in/doesn't work with/

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH v2 4/4 weston: new package

In reply to Thomas Petazzoni
---
 package/Config.in                                  |    1 +
 package/weston/Config.in                           |   29 ++++++++++++
 ...pendent-code-only-when-the-DRM-compositor.patch |   47 ++++++++++++++++++++
 package/weston/weston.mk                           |   32 +++++++++++++
 4 files changed, 109 insertions(+)
 create mode 100644 package/weston/Config.in
 create mode 100644 package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
 create mode 100644 package/weston/weston.mk
package/Config.in +1 -0
index 76feb7d..3c1c504 100644
@@ -151,6 +151,7 @@ endif
 
 source "package/qt5/Config.in"
 source "package/x11r7/Config.in"
+source "package/weston/Config.in"
 
 comment "X libraries and helper libraries"
 source "package/liberation/Config.in"
package/weston/Config.in new file +29 -0
new file mode 100644
index 0000000..15cc9e8
@@ -0,0 +1,29 @@
+comment "weston requires udev"
+	depends on BR2_PACKAGE_UDEV
+
+config BR2_PACKAGE_WESTON
+	bool "weston"
+	select BR2_PACKAGE_WAYLAND
+	select BR2_PACKAGE_LIBXKBCOMMON
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_CAIRO_PNG
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_MTDEV
+	depends on BR2_PACKAGE_UDEV
+	# 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.
+	  Weston has various backends that lets it run on Linux kernel
+	  modesetting and evdev input as well as under X11.
+
+if BR2_PACKAGE_WESTON
+
+config BR2_PACKAGE_WESTON_FBDEV
+	bool "fbdev compositor"
+
+endif
package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch new file +47 -0

47 lines not on this page · raw message

package/weston/weston.mk new file +32 -0
new file mode 100644
index 0000000..4e7cada
@@ -0,0 +1,32 @@
+#############################################################
+#
+# weston
+#
+#############################################################
+
+WESTON_VERSION = 1.1.0
+WESTON_SITE = http://wayland.freedesktop.org/releases/
+WESTON_SOURCE = weston-$(WAYLAND_VERSION).tar.xz
+WESTON_LICENSE = MIT
+WESTON_LICENSE_FILES = COPYING
+
+WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng jpeg mtdev udev
+WESTON_CONF_OPT = \
+	--disable-egl \
+	--disable-xwayland \
+	--disable-x11-compositor \
+	--disable-drm-compositor \
+	--disable-wayland-compositor \
+	--disable-headless-compositor \
+	--disable-rpi-compositor \
+	--disable-weston-launch \
+	--disable-libunwind
+
+ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
+WESTON_CONF_OPT += --enable-fbdev-compositor
+else
+WESTON_CONF_OPT += --disable-fbdev-compositor
+endif
+
+$(eval $(autotools-package))
+
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH v2 4/4 weston: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---

 Thomas>  package/Config.in                                  |    1 +
 Thomas>  package/weston/Config.in                           |   29 ++++++++++++
 Thomas>  ...pendent-code-only-when-the-DRM-compositor.patch |   47 ++++++++++++++++++++
 Thomas>  package/weston/weston.mk                           |   32 +++++++++++++
 Thomas>  4 files changed, 109 insertions(+)
 Thomas>  create mode 100644 package/weston/Config.in
 Thomas>  create mode 100644 package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
 Thomas>  create mode 100644 package/weston/weston.mk

Thomas> diff --git a/package/Config.in b/package/Config.in Thomas> index 76feb7d..3c1c504 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -151,6 +151,7 @@ endif

Thomas> source "package/qt5/Config.in"
Thomas> source "package/x11r7/Config.in"
Thomas> +source "package/weston/Config.in"

Thomas> comment "X libraries and helper libraries"
Thomas> source "package/liberation/Config.in"
Thomas> diff --git a/package/weston/Config.in b/package/weston/Config.in Thomas> new file mode 100644
Thomas> index 0000000..15cc9e8
Thomas> --- /dev/null
Thomas> +++ b/package/weston/Config.in
Thomas> @@ -0,0 +1,29 @@
Thomas> +comment "weston requires udev"
Thomas> + depends on BR2_PACKAGE_UDEV

It should be NOT (!) BR2_PACKAGE_UDEV

Thomas> +
Thomas> +config BR2_PACKAGE_WESTON
Thomas> + bool "weston"
Thomas> + select BR2_PACKAGE_WAYLAND
Thomas> + select BR2_PACKAGE_LIBXKBCOMMON
Thomas> + select BR2_PACKAGE_CAIRO
Thomas> + select BR2_PACKAGE_CAIRO_PNG
Thomas> + select BR2_PACKAGE_LIBPNG
Thomas> + select BR2_PACKAGE_JPEG
Thomas> + select BR2_PACKAGE_MTDEV
Thomas> + depends on BR2_PACKAGE_UDEV
Thomas> + # Runtime dependency
Thomas> + select BR2_PACKAGE_XKEYBOARD_CONFIG
Thomas> + # Make sure at least one backend is selected
Thomas> + select BR2_PACKAGE_WESTON_FBDEV
Thomas> + help

 Thomas> +	  Weston is the reference implementation of a Wayland
 Thomas> +	  compositor, and a useful compositor in its own right.
 Thomas> +	  Weston has various backends that lets it run on Linux kernel
 Thomas> +	  modesetting and evdev input as well as under X11.

Thomas> +

Upstream URL missing.

Committed with those fixes, thanks.

Signature · 1 line
Bye, Peter Korsgaard