summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/cogl
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:42 +0100
commit65e8bc44dfef167b3bedf25520debe46178a5458 (patch)
treec3c78939b2571a066d288ff1a8c0b60cd589f293 /meta/recipes-graphics/cogl
parent419daaaf0a2c773cadd67671fdb6234c598cd252 (diff)
downloadpoky-65e8bc44dfef167b3bedf25520debe46178a5458.tar.gz
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. (From OE-Core rev: 9d63188950ecd1877adf1e40de1ca1928729d866) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cogl')
-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"
8PACKAGES =+ "${PN}-examples \ 8PACKAGES =+ "${PN}-examples \
9 libcogl libcogl-dev \ 9 libcogl libcogl-dev \
10 libcogl-gles2 libcogl-gles2-dev \ 10 libcogl-gles2 libcogl-gles2-dev \
11 libcogl-pango libcogl-pango-dev" 11 libcogl-pango libcogl-pango-dev \
12 libcogl-path libcogl-path-dev"
12AUTOTOOLS_AUXDIR = "${S}/build" 13AUTOTOOLS_AUXDIR = "${S}/build"
13 14
14# Extra DEPENDS for PACKAGECONFIG 15# Extra DEPENDS for PACKAGECONFIG
@@ -75,6 +76,12 @@ FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \
75 ${libdir}/libcogl-pango.la \ 76 ${libdir}/libcogl-pango.la \
76 ${libdir}/pkgconfig/cogl-pango-1.0.pc" 77 ${libdir}/pkgconfig/cogl-pango-1.0.pc"
77 78
79FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}"
80FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \
81 ${libdir}/libcogl-path${SOLIBSDEV} \
82 ${libdir}/libcogl-path.la \
83 ${libdir}/pkgconfig/cogl-path-1.0.pc"
84
78# For backwards compatibility after Debian-renaming 85# For backwards compatibility after Debian-renaming
79RPROVIDES_libcogl = "cogl-1.0" 86RPROVIDES_libcogl = "cogl-1.0"
80RCONFLICTS_libcogl = "cogl-1.0" 87RCONFLICTS_libcogl = "cogl-1.0"