diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2020-11-16 13:06:25 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-11-20 09:00:09 +0100 |
| commit | 1312352dbe18d42b95910c95b4a00b815cda2f3f (patch) | |
| tree | 2ec9329544e962b3f209b750e0616d1cb3897f00 /rules | |
| parent | 7978b087de8b7f07f8e7a5fd5a05c9e2a17180b8 (diff) | |
| download | ptxdist-1312352dbe18d42b95910c95b4a00b815cda2f3f.tar.gz ptxdist-1312352dbe18d42b95910c95b4a00b815cda2f3f.tar.xz | |
waffle: version bump 1.5.2 -> 1.6.1
- version bump
- use ptx/onoff configuration helper
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Message-Id: <20201116120627.17891-2-l.stach@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/waffle.make | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/rules/waffle.make b/rules/waffle.make index f2c724207..7a384476e 100644 --- a/rules/waffle.make +++ b/rules/waffle.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle # # Paths and names # -WAFFLE_VERSION := 1.5.2 -WAFFLE_MD5 := c669c91bf2f7e13a5d781c3dbb30fd8c +WAFFLE_VERSION := 1.6.1 +WAFFLE_MD5 := c91529e579483f44fb330052872b9c73 WAFFLE := waffle-$(WAFFLE_VERSION) WAFFLE_SUFFIX := tar.xz WAFFLE_URL := http://www.waffle-gl.org/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX) @@ -32,10 +32,16 @@ WAFFLE_LICENSE_FILES := \ WAFFLE_CONF_TOOL := cmake WAFFLE_CONF_OPT := \ $(CROSS_CMAKE_USR) \ - -Dwaffle_has_glx=$(call ptx/ifdef,PTXCONF_WAFFLE_GLX,1,0) \ - -Dwaffle_has_wayland=$(call ptx/ifdef,PTXCONF_WAFFLE_WAYLAND,1,0) \ - -Dwaffle_has_x11_egl=$(call ptx/ifdef,PTXCONF_WAFFLE_X11_EGL,1,0) \ - -Dwaffle_has_gbm=$(call ptx/ifdef,PTXCONF_WAFFLE_GBM,1,0) + -Dwaffle_build_examples=OFF \ + -Dwaffle_build_htmldocs=OFF \ + -Dwaffle_build_manpages=OFF \ + -Dwaffle_build_tests=OFF \ + -Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \ + -Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \ + -Dwaffle_has_nacl=OFF \ + -Dwaffle_has_surfaceless_egl=OFF \ + -Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \ + -Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \ # ---------------------------------------------------------------------------- |