[oe-commits] Otavio Salvador : cogl-1.0: Add libcogl-path package

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 9d63188950ecd1877adf1e40de1ca1928729d866
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9d63188950ecd1877adf1e40de1ca1928729d866

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Fri Jul 25 10:38:26 2014 -0300

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 at cortexa9hf_vfp_neon_mx6: unable to
|   install provider for libcogl-path.so.20:
|      error: libcogl-path20-1.18.2-r0 at cortexa9hf_vfp_neon_mx6 is
|        conflicted by libcogl20-1.18.2-r0 at 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 at ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-graphics/cogl/cogl-1.0.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index e25968e..b763dd5 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"