From c5c47bc30be52e3b70d74cf89d5c68adbbb1a402 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 4 Apr 2016 14:28:55 +0100 Subject: cogl: fix G-I .typelib installation 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/cogl/cogl-1.0.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/cogl/cogl-1.0.inc') diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index fc7cffee4b..690ea3b86e 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}" -- cgit 1.2.3-korg