summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-05-27 11:16:53 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 10:17:14 +0100
commit320d766fe405c686b5339897f6f5a1baaed4c61d (patch)
treeea1e7e9f35b015be8e264ed123960efb3068cbc2 /meta
parent346ef9245db8423796cb3e0675ea82fd973d80f1 (diff)
downloadpoky-320d766fe405c686b5339897f6f5a1baaed4c61d.tar.gz
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) (From OE-Core rev: f58ddacfa153e2bd9fcc79fa1e2c65ae6ef6af02) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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"
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ 3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
4 file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" 4 file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
5 5
6SRC_URI = "http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz" 6SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
7SRC_URI[md5sum] = "5020ecc249096c881e1f59ee961f3d41" 7SRC_URI[md5sum] = "c0d802bc3d0aba87c51e423a3a8bdd69"
8SRC_URI[sha256sum] = "340ee04172dba878249469018cd7ec9d1ecd41af26b612c741b8b52e713bca8e" 8SRC_URI[sha256sum] = "cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa"
9 9
10inherit cmake distro_features_check 10inherit cmake distro_features_check lib_package
11 11
12# This should be overridden per-machine to reflect the capabilities of the GL 12# This should be overridden per-machine to reflect the capabilities of the GL
13# stack. 13# stack.
@@ -17,16 +17,17 @@ PACKAGECONFIG ??= "glx"
17REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" 17REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
18 18
19# I say virtual/libgl, actually wants gl.pc 19# I say virtual/libgl, actually wants gl.pc
20PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11" 20PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/libgl libx11"
21 21
22# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland 22# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland
23# DISTRO_FEATURE. 23# DISTRO_FEATURE.
24PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,,virtual/libgl wayland" 24PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,-Dwaffle_has_wayland=0,virtual/libgl wayland"
25 25
26# I say virtual/libgl, actually wants gbm.pc egl.pc 26# I say virtual/libgl, actually wants gbm.pc egl.pc
27PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev" 27PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/libgl udev"
28 28
29# I say virtual/libgl, actually wants egl.pc 29# I say virtual/libgl, actually wants egl.pc
30PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb" 30PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/libgl libxcb"
31 31
32FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake" 32FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake \
33 ${libdir}/cmake/Waffle/"