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.tret...@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
