From: Michael Tretter <m.tretter@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: [ptxdist] [PATCH 3/4] weston: version bump 3.0.0 -> 4.0.0
Date: Tue, 10 Apr 2018 11:06:46 +0200 [thread overview]
Message-ID: <20180410090647.25896-3-m.tretter@pengutronix.de> (raw)
In-Reply-To: <20180410090647.25896-1-m.tretter@pengutronix.de>
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
next prev parent reply other threads:[~2018-04-10 9:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-10 9:06 [ptxdist] [PATCH 1/4] wayland-protocols: version bump 1.12 -> 1.13 Michael Tretter
2018-04-10 9:06 ` [ptxdist] [PATCH 2/4] wayland: version bump 1.14 -> 1.15 Michael Tretter
2018-04-10 9:06 ` Michael Tretter [this message]
2018-04-10 14:27 ` [ptxdist] [PATCH 3/4] weston: version bump 3.0.0 -> 4.0.0 Michael Olbrich
2018-04-10 14:59 ` Philipp Zabel
2018-04-10 15:31 ` Michael Tretter
2018-04-10 9:06 ` [ptxdist] [PATCH 4/4] weston: make dbus and weston-launch configurable Michael Tretter
2018-04-10 14:31 ` Michael Olbrich
2018-04-10 15:26 ` Michael Tretter
2018-04-11 10:03 ` [ptxdist] [PATCH v2 0/4] wayland, weston: version bump Michael Tretter
2018-04-11 10:03 ` [ptxdist] [PATCH v2 1/4] wayland-protocols: version bump 1.12 -> 1.13 Michael Tretter
2018-04-11 10:03 ` [ptxdist] [PATCH v2 2/4] wayland: version bump 1.14 -> 1.15 Michael Tretter
2018-04-11 10:03 ` [ptxdist] [PATCH v2 3/4] weston: version bump 3.0.0 -> 4.0.0 Michael Tretter
2018-04-11 10:03 ` [ptxdist] [PATCH v2 4/4] weston: make weston-launch configurable Michael Tretter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180410090647.25896-3-m.tretter@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox