summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-04 14:28:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-05 09:55:47 +0100
commitc5c47bc30be52e3b70d74cf89d5c68adbbb1a402 (patch)
treeed4cb8e132a586bafb835c5ba76c41600574a735
parentddc60aea113e587f27df03645620d6eb677ff28a (diff)
downloadopenembedded-core-contrib-c5c47bc30be52e3b70d74cf89d5c68adbbb1a402.tar.gz
openembedded-core-contrib-c5c47bc30be52e3b70d74cf89d5c68adbbb1a402.tar.bz2
openembedded-core-contrib-c5c47bc30be52e3b70d74cf89d5c68adbbb1a402.zip
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc5
1 files 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 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}"