Patchwork cogl-1.0: Add libcogl-path package

login
register
mail settings
Submitter Otavio Salvador
Date July 25, 2014, 1:38 p.m.
Message ID <1406295506-29531-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/76679/
State Accepted
Commit 65e8bc44dfef167b3bedf25520debe46178a5458
Headers show

Comments

Otavio Salvador - July 25, 2014, 1:38 p.m.
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
`----

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-graphics/cogl/cogl-1.0.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
Ross Burton - July 25, 2014, 1:54 p.m.
Context is that upstream split this library out from libcogl20.so, so
the libcogl package no longer gets renamed to libcogl20 as it contains
multiple libraries.

Acked-by: Ross Burton <ross.burton@intel.com>

Ross

On 25 July 2014 14:38, Otavio Salvador <otavio@ossystems.com.br> wrote:
> 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
> `----
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  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"
> --
> 2.0.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

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"