diff options
Diffstat (limited to 'meta/recipes-graphics/cogl/cogl-1.0.inc')
| -rw-r--r-- | meta/recipes-graphics/cogl/cogl-1.0.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index b763dd5ba8..af06484903 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -42,7 +42,7 @@ PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDE # EGL backends PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" -PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" # Wayland (server-side) @@ -55,7 +55,9 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" # default. PACKAGECONFIG ??= "cogl-pango gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ + " + FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" FILES_libcogl = "${libdir}/libcogl${SOLIBS}" @@ -69,18 +71,18 @@ FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \ ${libdir}/libcogl-gles2${SOLIBSDEV} \ ${libdir}/libcogl-gles2.la \ - ${libdir}/pkgconfig/cogl-gles2-experimental.pc" + ${libdir}/pkgconfig/cogl-gles2-*.pc" FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \ ${libdir}/libcogl-pango${SOLIBSDEV} \ ${libdir}/libcogl-pango.la \ - ${libdir}/pkgconfig/cogl-pango-1.0.pc" + ${libdir}/pkgconfig/cogl-pango-*.pc" FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \ ${libdir}/libcogl-path${SOLIBSDEV} \ ${libdir}/libcogl-path.la \ - ${libdir}/pkgconfig/cogl-path-1.0.pc" + ${libdir}/pkgconfig/cogl-path-*.pc" # For backwards compatibility after Debian-renaming RPROVIDES_libcogl = "cogl-1.0" |