By default gobject-introspection puts .typelib files into $PN, but the cogl-1.0
recipe doesn't use PN. Installing cogl-1.0 is impossible as libcogl
conflicts/replaces with cogl-1.0 due to a previous upgrade.
Fix this by putting the .typelib files into the right subpackages, and
explicitly setting FILES_${PN} to "" so that nothing accidently ends up in PN.
Signed-off-by: Ross Burton <[email protected]>
---
meta/recipes-graphics/cogl/cogl-1.0.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc
b/meta/recipes-graphics/cogl/cogl-1.0.inc
index fc7cffe..690ea3b 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -61,10 +61,11 @@ do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs"
}
+FILES_${PN} = ""
FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
-FILES_libcogl = "${libdir}/libcogl${SOLIBS}"
+FILES_libcogl = "${libdir}/libcogl${SOLIBS}
${libdir}/girepository-1.0/Cogl-*.typelib"
FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}"
-FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}"
+FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}
${libdir}/girepository-1.0/CoglPango*.typelib"
FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}"
--
2.7.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
