diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-05-27 11:16:53 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-27 17:44:56 +0100 |
| commit | f58ddacfa153e2bd9fcc79fa1e2c65ae6ef6af02 (patch) | |
| tree | f8490c3664e47d7fca4f133fa11ce6684bd9e939 /meta/recipes-graphics | |
| parent | e5e2c18ce4344c14d9e52ece916333bd0a619281 (diff) | |
| download | openembedded-core-f58ddacfa153e2bd9fcc79fa1e2c65ae6ef6af02.tar.gz openembedded-core-f58ddacfa153e2bd9fcc79fa1e2c65ae6ef6af02.tar.bz2 openembedded-core-f58ddacfa153e2bd9fcc79fa1e2c65ae6ef6af02.zip | |
waffle: Upgrade 1.3.0 -> 1.5.1
* Update SRC_URI to waffle-gl.org
* Add new cmake files to -dev package
* Inherit lib_package so the new wflinfo binary is packaged properly
* Fix PACKAGECONFIG line for gbm
* Add the not-found configuration for all PACKAGECONFIG options to make
builds reproducible (the default builds if dependencies are there)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/waffle/waffle_1.5.1.bb (renamed from meta/recipes-graphics/waffle/waffle_1.3.0.bb) | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/meta/recipes-graphics/waffle/waffle_1.3.0.bb b/meta/recipes-graphics/waffle/waffle_1.5.1.bb index a21fcbb302..b8aa05a2db 100644 --- a/meta/recipes-graphics/waffle/waffle_1.3.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.5.1.bb @@ -3,11 +3,11 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" -SRC_URI = "http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "5020ecc249096c881e1f59ee961f3d41" -SRC_URI[sha256sum] = "340ee04172dba878249469018cd7ec9d1ecd41af26b612c741b8b52e713bca8e" +SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "c0d802bc3d0aba87c51e423a3a8bdd69" +SRC_URI[sha256sum] = "cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa" -inherit cmake distro_features_check +inherit cmake distro_features_check lib_package # This should be overridden per-machine to reflect the capabilities of the GL # stack. @@ -17,16 +17,17 @@ PACKAGECONFIG ??= "glx" REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" # I say virtual/libgl, actually wants gl.pc -PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11" +PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/libgl libx11" # I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland # DISTRO_FEATURE. -PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,,virtual/libgl wayland" +PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,-Dwaffle_has_wayland=0,virtual/libgl wayland" # I say virtual/libgl, actually wants gbm.pc egl.pc -PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev" +PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/libgl udev" # I say virtual/libgl, actually wants egl.pc -PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb" +PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/libgl libxcb" -FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake" +FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake \ + ${libdir}/cmake/Waffle/" |