From 7222564137f89ccedc6bff6af871533dffedfd55 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 11 Jul 2013 00:56:35 +0000 Subject: [PATCH] cogl-1.0: put each library into its own package This allows to install cogl-gles2 and cogl-pango only when needed and enables Debian package renaming. This stops cogl-pango from dragging in unwanted runtime dependencies, if cogl-pango isn't used. (From OE-Core rev: bcccb87a3213f5315f52fb18610b7e9dab510a7e) Signed-off-by: Andreas Oberritter Signed-off-by: Richard Purdie --- meta/recipes-graphics/cogl/cogl-1.0.inc | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 55eb003..8400668 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -9,7 +9,10 @@ SRC_URI += "file://cogl_fixed_mul-constraint.patch \ inherit clutter DEPENDS = "pango glib-2.0 gdk-pixbuf" -PACKAGES =+ "${PN}-examples" +PACKAGES =+ "${PN}-examples \ + libcogl libcogl-dev \ + libcogl-gles2 libcogl-gles2-dev \ + libcogl-pango libcogl-pango-dev" AUTOTOOLS_AUXDIR = "${S}/build" # Extra DEPENDS for PACKAGECONFIG @@ -54,3 +57,25 @@ PACKAGECONFIG ??= "gl \ ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" +FILES_libcogl = "${libdir}/libcogl${SOLIBS}" +FILES_libcogl-dev = "${includedir}/cogl/cogl \ + ${libdir}/libcogl${SOLIBSDEV} \ + ${libdir}/libcogl.la \ + ${libdir}/pkgconfig/cogl-1.0.pc \ + ${libdir}/pkgconfig/cogl-2.0-experimental.pc \ + ${libdir}/pkgconfig/cogl-gl-1.0.pc" +FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" +FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \ + ${libdir}/libcogl-gles2${SOLIBSDEV} \ + ${libdir}/libcogl-gles2.la \ + ${libdir}/pkgconfig/cogl-gles2-experimental.pc" +FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" +FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \ + ${libdir}/libcogl-pango${SOLIBSDEV} \ + ${libdir}/libcogl-pango.la \ + ${libdir}/pkgconfig/cogl-pango-1.0.pc" + +# For backwards compatibility after Debian-renaming +RPROVIDES_libcogl = "cogl-1.0" +RCONFLICTS_libcogl = "cogl-1.0" +RREPLACES_libcogl = "cogl-1.0" -- 2.7.4