diff options
| author |   Lei Maohui <leimaohui@cn.fujitsu.com> | 2015-04-17 14:15:40 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-19 13:34:06 +0100 |
| commit | 9e29a8bec3e6bcba38cf097181e50f1266b33221 (patch) | |
| tree | 7b46a0db7d281ffbfa3d4977ea2fe277098b95ef | |
| parent | 18cc7893e453bb10e395ff81dd10c0b5872a1742 (diff) | |
| download | openembedded-core-contrib-9e29a8bec3e6bcba38cf097181e50f1266b33221.tar.gz | |
cairo_1.14.2: Modified the license of cairo-trace.
Because the license of cairo-trace is GPLv3(util/cairo-trace/COPYING).
So pickup cairo-trace,and modified the license to GPLv3.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/cairo/cairo.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-graphics/cairo/cairo_1.14.2.bb | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index cd375597f0..98add5a858 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -9,7 +9,11 @@ Extension." HOMEPAGE = "http://cairographics.org" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" -LICENSE = "MPL-1 & LGPLv2.1" +LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+" +LICENSE_${PN} = "MPL-1 & LGPLv2.1" +LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1" +LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1" +LICENSE_${PN}-perf-utils = "GPLv3+" X11DEPENDS = "virtual/libx11 libsm libxrender libxext" DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" diff --git a/meta/recipes-graphics/cairo/cairo_1.14.2.bb b/meta/recipes-graphics/cairo/cairo_1.14.2.bb index 3272eb3e98..3817dbf286 100644 --- a/meta/recipes-graphics/cairo/cairo_1.14.2.bb +++ b/meta/recipes-graphics/cairo/cairo_1.14.2.bb @@ -29,12 +29,10 @@ to replay rendering." DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" FILES_${PN} = "${libdir}/libcairo.so.*" -FILES_${PN}-dev += "${libdir}/cairo/*.la ${libdir}/cairo/*.so" -#FILES_${PN}-dbg += "${libdir}/cairo/.debug" -#FILES_${PN}-staticdev += "${libdir}/cairo/*.a" -FILES_cairo-gobject = "${libdir}/libcairo-gobject.so.*" -FILES_cairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" -FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*" +FILES_${PN}-dev += "${libdir}/cairo/*.so" +FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*" +FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" +FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*" do_install_append () { rm -rf ${D}${bindir}/cairo-sphinx |