[ptxdist] [PATCH 1/4] wayland-protocols: version bump 1.12 -> 1.13

[ptxdist] [PATCH 1/4] wayland-protocols: version bump 1.12 -> 1.13

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/wayland-protocols.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make
index 80b9c64b6..ec069fe7e 100644
--- a/rules/wayland-protocols.make
+++ b/rules/wayland-protocols.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols
 #
 # Paths and names
 #
-WAYLAND_PROTOCOLS_VERSION	:= 1.12
-WAYLAND_PROTOCOLS_MD5		:= ac83c4704003323b6bd5a1b91fb1be53
+WAYLAND_PROTOCOLS_VERSION	:= 1.13
+WAYLAND_PROTOCOLS_MD5		:= 29312149dafcd4a0e739ba94995a574d
 WAYLAND_PROTOCOLS		:= wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION)
 WAYLAND_PROTOCOLS_SUFFIX	:= tar.xz
 WAYLAND_PROTOCOLS_URL		:= https://wayland.freedesktop.org/releases/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX)
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/4] wayland: version bump 1.14 -> 1.15

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/wayland.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wayland.make b/rules/wayland.make
index 203caa4a9..5d5e44470 100644
--- a/rules/wayland.make
+++ b/rules/wayland.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WAYLAND) += wayland
 #
 # Paths and names
 #
-WAYLAND_VERSION	:= 1.14.0
-WAYLAND_MD5	:= 0235f6075c32c3be61cff94fa0b9f108
+WAYLAND_VERSION	:= 1.15.0
+WAYLAND_MD5	:= b7393c17fdce9a8d383edab656c92fd2
 WAYLAND		:= wayland-$(WAYLAND_VERSION)
 WAYLAND_SUFFIX	:= tar.xz
 WAYLAND_URL	:= http://wayland.freedesktop.org/releases/$(WAYLAND).$(WAYLAND_SUFFIX)
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/4] weston: version bump 3.0.0 -> 4.0.0

[Michael Tretter]

Split the version into major.minor.pl and use variable instead of hard
coded version for installing libweston.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/weston.in   |  1 -
 rules/weston.make | 26 ++++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 7db255202..a1755f510 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -13,7 +13,6 @@ menuconfig WESTON
 	select CAIRO
 	select CAIRO_PNG
 	select LIBDRM			if WESTON_DRM_COMPOSITOR
-	select MTDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
 	select UDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
 	select UDEV_LIBUDEV		if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
 	select MESALIB			if WESTON_DRM_COMPOSITOR
diff --git a/rules/weston.make b/rules/weston.make
index 6e7065982..06175a304 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -17,8 +17,11 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION	:= 3.0.0
-WESTON_MD5	:= 9c42a4c51a1b9f35d040fa9d45ada36d
+WESTON_MAJOR	:= 4
+WESTON_MINOR	:= 0
+WESTON_PL	:= 0
+WESTON_VERSION	:= $(WESTON_MAJOR).$(WESTON_MINOR).$(WESTON_PL)
+WESTON_MD5	:= 33709aa4d5916f89643fca0fc0064b39
 WESTON		:= weston-$(WESTON_VERSION)
 WESTON_SUFFIX	:= tar.xz
 WESTON_URL	:= http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
@@ -66,7 +69,6 @@ WESTON_CONF_OPT		:= \
 	--disable-junit-xml \
 	--disable-ivi-shell \
 	--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
-	--disable-libunwind \
 	--disable-demo-clients-install \
 	--disable-lcms \
 	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
@@ -96,23 +98,23 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/wcap-decode)
 endif
 
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3)
-	@$(call install_lib, weston, 0, 0, 0644, libweston-desktop-3)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR))
+	@$(call install_lib, weston, 0, 0, 0644, libweston-desktop-$(WESTON_MAJOR))
 ifdef PTXCONF_WESTON_XWAYLAND
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/xwayland)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/xwayland)
 endif
 ifdef PTXCONF_WESTON_DRM_COMPOSITOR
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/drm-backend)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/drm-backend)
 endif
 ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/headless-backend)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/headless-backend)
 endif
 ifdef PTXCONF_WESTON_FBDEV_COMPOSITOR
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/fbdev-backend)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/fbdev-backend)
 endif
 ifdef PTXCONF_WESTON_GL
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/wayland-backend)
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/gl-renderer)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/wayland-backend)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/gl-renderer)
 endif
 	@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
 	@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
@@ -135,7 +137,7 @@ endif
 		sign_maximize.png \
 		icon_window.png \
 		sign_close.png \
-		sign_maximize.png, \
+		sign_minimize.png, \
 		$(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image));)
 
 
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/4] weston: make dbus and weston-launch configurable

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/weston.in   | 13 +++++++++++++
 rules/weston.make |  7 +++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index a1755f510..49fc90e55 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -27,6 +27,7 @@ menuconfig WESTON
 	select XORG_LIB_XCURSOR		if WESTON_XWAYLAND
 	select XORG_SERVER		if WESTON_XWAYLAND && RUNTIME
 	select XORG_SERVER_XWAYLAND	if WESTON_XWAYLAND && RUNTIME
+	select DBUS			if WESTON_DBUS
 	select SYSTEMD			if WESTON_SYSTEMD
 	select SYSTEMD_LOGIND		if WESTON_SYSTEMD_LOGIND
 	prompt "weston                        "
@@ -56,6 +57,17 @@ config WESTON_FBDEV_COMPOSITOR
 	bool
 	prompt "fbdev compositor"
 
+config WESTON_LAUNCH
+	bool
+	prompt "weston-launch support"
+	help
+	  weston-launch is a setuid-root program which does privileged
+	  operations on Weston's behalf
+
+config WESTON_DBUS
+	bool
+	prompt "dbus support"
+
 config WESTON_SYSTEMD
 	bool
 	depends on INITMETHOD_SYSTEMD
@@ -65,6 +77,7 @@ config WESTON_SYSTEMD
 config WESTON_SYSTEMD_LOGIND
 	bool
 	depends on WESTON_SYSTEMD
+	depends on WESTON_DBUS
 	prompt "logind support"
 
 config WESTON_WCAP_TOOLS
diff --git a/rules/weston.make b/rules/weston.make
index 06175a304..30249e9f1 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -61,10 +61,10 @@ WESTON_CONF_OPT		:= \
 	--disable-simple-dmabuf-v4l-client \
 	--enable-clients \
 	--enable-resize-optimization \
-	--disable-weston-launch \
+	--$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
 	--enable-fullscreen-shell \
 	--disable-colord \
-	--disable-dbus \
+	--$(call ptx/endis, PTXCONF_WESTON_DBUS)-dbus \
 	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
 	--disable-junit-xml \
 	--disable-ivi-shell \
@@ -92,6 +92,9 @@ $(STATEDIR)/weston.targetinstall:
 
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
+ifdef PTXCONF_WESTON_LAUNCH
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
+endif
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
 
 ifdef PTXCONF_WESTON_WCAP_TOOLS
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 3/4] weston: version bump 3.0.0 -> 4.0.0

[Michael Olbrich]

On Tue, Apr 10, 2018 at 11:06:46AM +0200, Michael Tretter wrote:
> Split the version into major.minor.pl and use variable instead of hard
> coded version for installing libweston.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
>  rules/weston.in   |  1 -
>  rules/weston.make | 26 ++++++++++++++------------
>  2 files changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/rules/weston.in b/rules/weston.in
> index 7db255202..a1755f510 100644
> --- a/rules/weston.in
> +++ b/rules/weston.in
> @@ -13,7 +13,6 @@ menuconfig WESTON
>  	select CAIRO
>  	select CAIRO_PNG
>  	select LIBDRM			if WESTON_DRM_COMPOSITOR
> -	select MTDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
>  	select UDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
>  	select UDEV_LIBUDEV		if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
>  	select MESALIB			if WESTON_DRM_COMPOSITOR
> diff --git a/rules/weston.make b/rules/weston.make
> index 6e7065982..06175a304 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -17,8 +17,11 @@ PACKAGES-$(PTXCONF_WESTON) += weston
>  #
>  # Paths and names
>  #
> -WESTON_VERSION	:= 3.0.0
> -WESTON_MD5	:= 9c42a4c51a1b9f35d040fa9d45ada36d
> +WESTON_MAJOR	:= 4
> +WESTON_MINOR	:= 0
> +WESTON_PL	:= 0
> +WESTON_VERSION	:= $(WESTON_MAJOR).$(WESTON_MINOR).$(WESTON_PL)

I prefer the version in one line. And use this for the major version:

WESTON_MAJOR	:= $(basename $(basename $(WESTON_VERSION)))

> +WESTON_MD5	:= 33709aa4d5916f89643fca0fc0064b39
>  WESTON		:= weston-$(WESTON_VERSION)
>  WESTON_SUFFIX	:= tar.xz
>  WESTON_URL	:= http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
> @@ -66,7 +69,6 @@ WESTON_CONF_OPT		:= \
>  	--disable-junit-xml \
>  	--disable-ivi-shell \
>  	--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
> -	--disable-libunwind \
>  	--disable-demo-clients-install \
>  	--disable-lcms \
>  	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
> @@ -96,23 +98,23 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS
>  	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/wcap-decode)
>  endif
>  
> -	@$(call install_lib, weston, 0, 0, 0644, libweston-3)
> -	@$(call install_lib, weston, 0, 0, 0644, libweston-desktop-3)
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR))
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-desktop-$(WESTON_MAJOR))
>  ifdef PTXCONF_WESTON_XWAYLAND
> -	@$(call install_lib, weston, 0, 0, 0644, libweston-3/xwayland)
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/xwayland)
>  endif
>  ifdef PTXCONF_WESTON_DRM_COMPOSITOR
> -	@$(call install_lib, weston, 0, 0, 0644, libweston-3/drm-backend)
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/drm-backend)
>  endif
>  ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
> -	@$(call install_lib, weston, 0, 0, 0644, libweston-3/headless-backend)
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/headless-backend)
>  endif
>  ifdef PTXCONF_WESTON_FBDEV_COMPOSITOR
> -	@$(call install_lib, weston, 0, 0, 0644, libweston-3/fbdev-backend)
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/fbdev-backend)
>  endif
>  ifdef PTXCONF_WESTON_GL
> -	@$(call install_lib, weston, 0, 0, 0644, libweston-3/wayland-backend)
> -	@$(call install_lib, weston, 0, 0, 0644, libweston-3/gl-renderer)
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/wayland-backend)
> +	@$(call install_lib, weston, 0, 0, 0644, libweston-$(WESTON_MAJOR)/gl-renderer)
>  endif
>  	@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
>  	@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
> @@ -135,7 +137,7 @@ endif
>  		sign_maximize.png \
>  		icon_window.png \
>  		sign_close.png \
> -		sign_maximize.png, \
> +		sign_minimize.png, \

Please sort these while at it.

>  		$(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image));)

use $(ptx/nl) instead of ';' here.

Michael

>  
>  
> -- 
> 2.16.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/4] weston: make dbus and weston-launch configurable

[Michael Olbrich]

On Tue, Apr 10, 2018 at 11:06:47AM +0200, Michael Tretter wrote:
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
>  rules/weston.in   | 13 +++++++++++++
>  rules/weston.make |  7 +++++--
>  2 files changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/weston.in b/rules/weston.in
> index a1755f510..49fc90e55 100644
> --- a/rules/weston.in
> +++ b/rules/weston.in
> @@ -27,6 +27,7 @@ menuconfig WESTON
>  	select XORG_LIB_XCURSOR		if WESTON_XWAYLAND
>  	select XORG_SERVER		if WESTON_XWAYLAND && RUNTIME
>  	select XORG_SERVER_XWAYLAND	if WESTON_XWAYLAND && RUNTIME
> +	select DBUS			if WESTON_DBUS
>  	select SYSTEMD			if WESTON_SYSTEMD
>  	select SYSTEMD_LOGIND		if WESTON_SYSTEMD_LOGIND
>  	prompt "weston                        "
> @@ -56,6 +57,17 @@ config WESTON_FBDEV_COMPOSITOR
>  	bool
>  	prompt "fbdev compositor"
>  
> +config WESTON_LAUNCH
> +	bool
> +	prompt "weston-launch support"
> +	help
> +	  weston-launch is a setuid-root program which does privileged
> +	  operations on Weston's behalf
> +
> +config WESTON_DBUS
> +	bool
> +	prompt "dbus support"

Is this useful without logind? If not, then just use that option to enable
D-Bus.

> +
>  config WESTON_SYSTEMD
>  	bool
>  	depends on INITMETHOD_SYSTEMD
> @@ -65,6 +77,7 @@ config WESTON_SYSTEMD
>  config WESTON_SYSTEMD_LOGIND
>  	bool
>  	depends on WESTON_SYSTEMD
> +	depends on WESTON_DBUS

Is this dependency new in 4.0? If yes, then it should be part of the
version bump.

Michael

>  	prompt "logind support"
>  
>  config WESTON_WCAP_TOOLS
> diff --git a/rules/weston.make b/rules/weston.make
> index 06175a304..30249e9f1 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -61,10 +61,10 @@ WESTON_CONF_OPT		:= \
>  	--disable-simple-dmabuf-v4l-client \
>  	--enable-clients \
>  	--enable-resize-optimization \
> -	--disable-weston-launch \
> +	--$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
>  	--enable-fullscreen-shell \
>  	--disable-colord \
> -	--disable-dbus \
> +	--$(call ptx/endis, PTXCONF_WESTON_DBUS)-dbus \
>  	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
>  	--disable-junit-xml \
>  	--disable-ivi-shell \
> @@ -92,6 +92,9 @@ $(STATEDIR)/weston.targetinstall:
>  
>  	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
>  	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
> +ifdef PTXCONF_WESTON_LAUNCH
> +	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
> +endif
>  	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
>  
>  ifdef PTXCONF_WESTON_WCAP_TOOLS
> -- 
> 2.16.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 3/4] weston: version bump 3.0.0 -> 4.0.0

[Philipp Zabel]

On Tue, 2018-04-10 at 16:27 +0200, Michael Olbrich wrote:
> On Tue, Apr 10, 2018 at 11:06:46AM +0200, Michael Tretter wrote:
> > Split the version into major.minor.pl and use variable instead of hard
> > coded version for installing libweston.
> > 
> > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> > ---
> >  rules/weston.in   |  1 -
> >  rules/weston.make | 26 ++++++++++++++------------
> >  2 files changed, 14 insertions(+), 13 deletions(-)
> > 
> > diff --git a/rules/weston.in b/rules/weston.in
> > index 7db255202..a1755f510 100644
> > --- a/rules/weston.in
> > +++ b/rules/weston.in
> > @@ -13,7 +13,6 @@ menuconfig WESTON
> >  	select CAIRO
> >  	select CAIRO_PNG
> >  	select LIBDRM			if WESTON_DRM_COMPOSITOR
> > -	select MTDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
> >  	select UDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
> >  	select UDEV_LIBUDEV		if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
> >  	select MESALIB			if WESTON_DRM_COMPOSITOR
> > diff --git a/rules/weston.make b/rules/weston.make
> > index 6e7065982..06175a304 100644
> > --- a/rules/weston.make
> > +++ b/rules/weston.make
> > @@ -17,8 +17,11 @@ PACKAGES-$(PTXCONF_WESTON) += weston
> >  #
> >  # Paths and names
> >  #
> > -WESTON_VERSION	:= 3.0.0
> > -WESTON_MD5	:= 9c42a4c51a1b9f35d040fa9d45ada36d
> > +WESTON_MAJOR	:= 4
> > +WESTON_MINOR	:= 0
> > +WESTON_PL	:= 0
> > +WESTON_VERSION	:= $(WESTON_MAJOR).$(WESTON_MINOR).$(WESTON_PL)
> 
> I prefer the version in one line. And use this for the major version:
> 
> WESTON_MAJOR	:= $(basename $(basename $(WESTON_VERSION)))

The library version below is LIBWESTON_MAJOR in configure.ac, not
WESTON_VERSION_MAJOR. Both currently have the same value, but will
weston increase major version with every backwards incompatible
libweston API change? How about:

WESTON_VERSION	:= 4.0.0
LIBWESTON_MAJOR	:= 4

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/4] weston: make dbus and weston-launch configurable

[Michael Tretter]

On Tue, 10 Apr 2018 16:31:53 +0200, Michael Olbrich wrote:
> On Tue, Apr 10, 2018 at 11:06:47AM +0200, Michael Tretter wrote:
> > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> > ---
> >  rules/weston.in   | 13 +++++++++++++
> >  rules/weston.make |  7 +++++--
> >  2 files changed, 18 insertions(+), 2 deletions(-)
> > 
> > diff --git a/rules/weston.in b/rules/weston.in
> > index a1755f510..49fc90e55 100644
> > --- a/rules/weston.in
> > +++ b/rules/weston.in
> > @@ -27,6 +27,7 @@ menuconfig WESTON
> >  	select XORG_LIB_XCURSOR		if WESTON_XWAYLAND
> >  	select XORG_SERVER		if WESTON_XWAYLAND && RUNTIME
> >  	select XORG_SERVER_XWAYLAND	if WESTON_XWAYLAND && RUNTIME
> > +	select DBUS			if WESTON_DBUS
> >  	select SYSTEMD			if WESTON_SYSTEMD
> >  	select SYSTEMD_LOGIND		if WESTON_SYSTEMD_LOGIND
> >  	prompt "weston                        "
> > @@ -56,6 +57,17 @@ config WESTON_FBDEV_COMPOSITOR
> >  	bool
> >  	prompt "fbdev compositor"
> >  
> > +config WESTON_LAUNCH
> > +	bool
> > +	prompt "weston-launch support"
> > +	help
> > +	  weston-launch is a setuid-root program which does privileged
> > +	  operations on Weston's behalf
> > +
> > +config WESTON_DBUS
> > +	bool
> > +	prompt "dbus support"  
> 
> Is this useful without logind? If not, then just use that option to enable
> D-Bus.

Only logind uses D-Bus.

> 
> > +
> >  config WESTON_SYSTEMD
> >  	bool
> >  	depends on INITMETHOD_SYSTEMD
> > @@ -65,6 +77,7 @@ config WESTON_SYSTEMD
> >  config WESTON_SYSTEMD_LOGIND
> >  	bool
> >  	depends on WESTON_SYSTEMD
> > +	depends on WESTON_DBUS  
> 
> Is this dependency new in 4.0? If yes, then it should be part of the
> version bump.

The logind backend depends on D-Bus support since its addition in 1.4.0,
but since 4.0 configure actually fails if the dependency is not
fulfilled. Should be part of the version bump anyway.

Michael

> 
> Michael
> 
> >  	prompt "logind support"
> >  
> >  config WESTON_WCAP_TOOLS
> > diff --git a/rules/weston.make b/rules/weston.make
> > index 06175a304..30249e9f1 100644
> > --- a/rules/weston.make
> > +++ b/rules/weston.make
> > @@ -61,10 +61,10 @@ WESTON_CONF_OPT		:= \
> >  	--disable-simple-dmabuf-v4l-client \
> >  	--enable-clients \
> >  	--enable-resize-optimization \
> > -	--disable-weston-launch \
> > +	--$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
> >  	--enable-fullscreen-shell \
> >  	--disable-colord \
> > -	--disable-dbus \
> > +	--$(call ptx/endis, PTXCONF_WESTON_DBUS)-dbus \
> >  	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
> >  	--disable-junit-xml \
> >  	--disable-ivi-shell \
> > @@ -92,6 +92,9 @@ $(STATEDIR)/weston.targetinstall:
> >  
> >  	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
> >  	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
> > +ifdef PTXCONF_WESTON_LAUNCH
> > +	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
> > +endif
> >  	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
> >  
> >  ifdef PTXCONF_WESTON_WCAP_TOOLS
> > -- 
> > 2.16.1
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de  
> 

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 3/4] weston: version bump 3.0.0 -> 4.0.0

[Michael Tretter]

On Tue, 10 Apr 2018 16:59:51 +0200, Philipp Zabel wrote:
> On Tue, 2018-04-10 at 16:27 +0200, Michael Olbrich wrote:
> > On Tue, Apr 10, 2018 at 11:06:46AM +0200, Michael Tretter wrote:  
> > > Split the version into major.minor.pl and use variable instead of hard
> > > coded version for installing libweston.
> > > 
> > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> > > ---
> > >  rules/weston.in   |  1 -
> > >  rules/weston.make | 26 ++++++++++++++------------
> > >  2 files changed, 14 insertions(+), 13 deletions(-)
> > > 
> > > diff --git a/rules/weston.in b/rules/weston.in
> > > index 7db255202..a1755f510 100644
> > > --- a/rules/weston.in
> > > +++ b/rules/weston.in
> > > @@ -13,7 +13,6 @@ menuconfig WESTON
> > >  	select CAIRO
> > >  	select CAIRO_PNG
> > >  	select LIBDRM			if WESTON_DRM_COMPOSITOR
> > > -	select MTDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
> > >  	select UDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
> > >  	select UDEV_LIBUDEV		if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
> > >  	select MESALIB			if WESTON_DRM_COMPOSITOR
> > > diff --git a/rules/weston.make b/rules/weston.make
> > > index 6e7065982..06175a304 100644
> > > --- a/rules/weston.make
> > > +++ b/rules/weston.make
> > > @@ -17,8 +17,11 @@ PACKAGES-$(PTXCONF_WESTON) += weston
> > >  #
> > >  # Paths and names
> > >  #
> > > -WESTON_VERSION	:= 3.0.0
> > > -WESTON_MD5	:= 9c42a4c51a1b9f35d040fa9d45ada36d
> > > +WESTON_MAJOR	:= 4
> > > +WESTON_MINOR	:= 0
> > > +WESTON_PL	:= 0
> > > +WESTON_VERSION	:= $(WESTON_MAJOR).$(WESTON_MINOR).$(WESTON_PL)  
> > 
> > I prefer the version in one line. And use this for the major version:
> > 
> > WESTON_MAJOR	:= $(basename $(basename $(WESTON_VERSION)))  
> 
> The library version below is LIBWESTON_MAJOR in configure.ac, not
> WESTON_VERSION_MAJOR. Both currently have the same value, but will
> weston increase major version with every backwards incompatible
> libweston API change? How about:
> 
> WESTON_VERSION	:= 4.0.0
> LIBWESTON_MAJOR	:= 4

I see. Actually the LIBWESTON_MAJOR changes with the first ABI
break, while WESTON_VERSION changes with the release and they are only
for releases and more or less by coincidence the same. I'll split the
variables.

Michael

> 
> regards
> Philipp
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 0/4] wayland, weston: version bump

[Michael Tretter]

Changes since v1:

- add variable LIBWESTON_MAJOR instead of splitting WESTON_VERSION
- sort installed images in alphabetical order
- drop separate config item for Weston D-Bus support
- mark WESTON_LAUNCH as broken

Michael Tretter (4):
  wayland-protocols: version bump 1.12 -> 1.13
  wayland: version bump 1.14 -> 1.15
  weston: version bump 3.0.0 -> 4.0.0
  weston: make weston-launch configurable

 rules/wayland-protocols.make |  4 ++--
 rules/wayland.make           |  4 ++--
 rules/weston.in              | 17 ++++++++++++-----
 rules/weston.make            | 44 ++++++++++++++++++++++++--------------------
 4 files changed, 40 insertions(+), 29 deletions(-)

-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 1/4] wayland-protocols: version bump 1.12 -> 1.13

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/wayland-protocols.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make
index 80b9c64b6..ec069fe7e 100644
--- a/rules/wayland-protocols.make
+++ b/rules/wayland-protocols.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols
 #
 # Paths and names
 #
-WAYLAND_PROTOCOLS_VERSION	:= 1.12
-WAYLAND_PROTOCOLS_MD5		:= ac83c4704003323b6bd5a1b91fb1be53
+WAYLAND_PROTOCOLS_VERSION	:= 1.13
+WAYLAND_PROTOCOLS_MD5		:= 29312149dafcd4a0e739ba94995a574d
 WAYLAND_PROTOCOLS		:= wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION)
 WAYLAND_PROTOCOLS_SUFFIX	:= tar.xz
 WAYLAND_PROTOCOLS_URL		:= https://wayland.freedesktop.org/releases/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX)
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/4] wayland: version bump 1.14 -> 1.15

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/wayland.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wayland.make b/rules/wayland.make
index 203caa4a9..5d5e44470 100644
--- a/rules/wayland.make
+++ b/rules/wayland.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WAYLAND) += wayland
 #
 # Paths and names
 #
-WAYLAND_VERSION	:= 1.14.0
-WAYLAND_MD5	:= 0235f6075c32c3be61cff94fa0b9f108
+WAYLAND_VERSION	:= 1.15.0
+WAYLAND_MD5	:= b7393c17fdce9a8d383edab656c92fd2
 WAYLAND		:= wayland-$(WAYLAND_VERSION)
 WAYLAND_SUFFIX	:= tar.xz
 WAYLAND_URL	:= http://wayland.freedesktop.org/releases/$(WAYLAND).$(WAYLAND_SUFFIX)
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 3/4] weston: version bump 3.0.0 -> 4.0.0

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/weston.in   |  6 ++----
 rules/weston.make | 38 +++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 7db255202..56b85d26a 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -13,7 +13,6 @@ menuconfig WESTON
 	select CAIRO
 	select CAIRO_PNG
 	select LIBDRM			if WESTON_DRM_COMPOSITOR
-	select MTDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
 	select UDEV			if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
 	select UDEV_LIBUDEV		if WESTON_DRM_COMPOSITOR || WESTON_FBDEV_COMPOSITOR
 	select MESALIB			if WESTON_DRM_COMPOSITOR
@@ -30,6 +29,7 @@ menuconfig WESTON
 	select XORG_SERVER_XWAYLAND	if WESTON_XWAYLAND && RUNTIME
 	select SYSTEMD			if WESTON_SYSTEMD
 	select SYSTEMD_LOGIND		if WESTON_SYSTEMD_LOGIND
+	select DBUS			if WESTON_SYSTEMD_LOGIND
 	prompt "weston                        "
 	help
 	  Wayland compositor reference implementation
@@ -59,9 +59,7 @@ config WESTON_FBDEV_COMPOSITOR
 
 config WESTON_SYSTEMD
 	bool
-	depends on INITMETHOD_SYSTEMD
-	default y
-	prompt "systemd support"
+	default INITMETHOD_SYSTEMD
 
 config WESTON_SYSTEMD_LOGIND
 	bool
diff --git a/rules/weston.make b/rules/weston.make
index 6e7065982..61cb6b072 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -17,8 +17,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION	:= 3.0.0
-WESTON_MD5	:= 9c42a4c51a1b9f35d040fa9d45ada36d
+WESTON_VERSION	:= 4.0.0
+LIBWESTON_MAJOR := 4
+WESTON_MD5	:= 33709aa4d5916f89643fca0fc0064b39
 WESTON		:= weston-$(WESTON_VERSION)
 WESTON_SUFFIX	:= tar.xz
 WESTON_URL	:= http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
@@ -61,12 +62,11 @@ WESTON_CONF_OPT		:= \
 	--disable-weston-launch \
 	--enable-fullscreen-shell \
 	--disable-colord \
-	--disable-dbus \
+	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
 	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
 	--disable-junit-xml \
 	--disable-ivi-shell \
 	--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
-	--disable-libunwind \
 	--disable-demo-clients-install \
 	--disable-lcms \
 	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
@@ -96,23 +96,23 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/wcap-decode)
 endif
 
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3)
-	@$(call install_lib, weston, 0, 0, 0644, libweston-desktop-3)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR))
+	@$(call install_lib, weston, 0, 0, 0644, libweston-desktop-$(LIBWESTON_MAJOR))
 ifdef PTXCONF_WESTON_XWAYLAND
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/xwayland)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/xwayland)
 endif
 ifdef PTXCONF_WESTON_DRM_COMPOSITOR
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/drm-backend)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/drm-backend)
 endif
 ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/headless-backend)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/headless-backend)
 endif
 ifdef PTXCONF_WESTON_FBDEV_COMPOSITOR
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/fbdev-backend)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/fbdev-backend)
 endif
 ifdef PTXCONF_WESTON_GL
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/wayland-backend)
-	@$(call install_lib, weston, 0, 0, 0644, libweston-3/gl-renderer)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/wayland-backend)
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/gl-renderer)
 endif
 	@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
 	@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
@@ -127,16 +127,16 @@ endif
 
 
 	@$(foreach image, \
-		wayland.svg \
-		terminal.png \
-		wayland.png \
 		border.png \
-		pattern.png \
-		sign_maximize.png \
 		icon_window.png \
+		pattern.png \
 		sign_close.png \
-		sign_maximize.png, \
-		$(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image));)
+		sign_maximize.png \
+		sign_minimize.png \
+		terminal.png \
+		wayland.png \
+		wayland.svg, \
+		$(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
 
 
 	@$(call install_finish, weston)
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 4/4] weston: make weston-launch configurable

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/weston.in   | 9 +++++++++
 rules/weston.make | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/rules/weston.in b/rules/weston.in
index 56b85d26a..79512bc2a 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -57,6 +57,15 @@ config WESTON_FBDEV_COMPOSITOR
 	bool
 	prompt "fbdev compositor"
 
+config WESTON_LAUNCH
+	bool
+	prompt "weston-launch support"
+	# needs pam
+	depends on BROKEN
+	help
+	  weston-launch is a setuid-root program which does privileged
+	  operations on Weston's behalf
+
 config WESTON_SYSTEMD
 	bool
 	default INITMETHOD_SYSTEMD
diff --git a/rules/weston.make b/rules/weston.make
index 61cb6b072..dd942b0bb 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -59,7 +59,7 @@ WESTON_CONF_OPT		:= \
 	--disable-simple-dmabuf-v4l-client \
 	--enable-clients \
 	--enable-resize-optimization \
-	--disable-weston-launch \
+	--$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
 	--enable-fullscreen-shell \
 	--disable-colord \
 	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
@@ -90,6 +90,9 @@ $(STATEDIR)/weston.targetinstall:
 
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
+ifdef PTXCONF_WESTON_LAUNCH
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
+endif
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
 
 ifdef PTXCONF_WESTON_WCAP_TOOLS
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de