summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-07-25 10:38:26 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-25 16:54:27 +0100
commit9d63188950ecd1877adf1e40de1ca1928729d866 (patch)
tree35ba5160844df422abb7419ef781bc2319d70716
parent6d2dc279faa8b28a00895dc6a620d80e2dbac685 (diff)
downloadopenembedded-core-contrib-9d63188950ecd1877adf1e40de1ca1928729d866.tar.gz
openembedded-core-contrib-9d63188950ecd1877adf1e40de1ca1928729d866.tar.bz2
openembedded-core-contrib-9d63188950ecd1877adf1e40de1ca1928729d866.zip
cogl-1.0: Add libcogl-path package
The new library needs to be put in a specific package, or rootfs generation fails as: ,----[ Error in rootfs generation ] | Updating cache... ########################### [100%] | Computing transaction...error: Can't install | libclutter-1.0-0-1.18.2-r0@cortexa9hf_vfp_neon_mx6: unable to | install provider for libcogl-path.so.20: | error: libcogl-path20-1.18.2-r0@cortexa9hf_vfp_neon_mx6 is | conflicted by libcogl20-1.18.2-r0@cortexa9hf_vfp_neon_mx6 `---- Upstream split this library out from libcogl20.so, sothe libcogl package no longer gets renamed to libcogl20 as it contains multiple libraries. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index e25968e468..b763dd5ba8 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -8,7 +8,8 @@ DEPENDS = "glib-2.0 gdk-pixbuf"
PACKAGES =+ "${PN}-examples \
libcogl libcogl-dev \
libcogl-gles2 libcogl-gles2-dev \
- libcogl-pango libcogl-pango-dev"
+ libcogl-pango libcogl-pango-dev \
+ libcogl-path libcogl-path-dev"
AUTOTOOLS_AUXDIR = "${S}/build"
# Extra DEPENDS for PACKAGECONFIG
@@ -75,6 +76,12 @@ FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \
${libdir}/libcogl-pango.la \
${libdir}/pkgconfig/cogl-pango-1.0.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"
+
# For backwards compatibility after Debian-renaming
RPROVIDES_libcogl = "cogl-1.0"
RCONFLICTS_libcogl = "cogl-1.0"