diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb index f7db1bc955..a5179db1da 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb @@ -20,18 +20,21 @@ PACKAGECONFIG ??= "glx" # libx11 requires x11 in DISTRO_FEATURES. REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" +# virtual/libgl requires opengl in DISTRO_FEATURES. +REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" + # I say virtual/libgl, actually wants gl.pc -PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/libgl libx11" +PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/${MLPREFIX}libgl libx11" # I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland # DISTRO_FEATURE. -PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,-Dwaffle_has_wayland=0,virtual/libgl wayland" +PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,-Dwaffle_has_wayland=0,virtual/${MLPREFIX}libgl wayland" # I say virtual/libgl, actually wants gbm.pc egl.pc -PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/libgl udev" +PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/${MLPREFIX}libgl udev" # I say virtual/libgl, actually wants egl.pc -PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/libgl libxcb" +PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/${MLPREFIX}libgl libxcb" FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake \ ${libdir}/cmake/Waffle/" |