summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorLei Maohui <leimaohui@cn.fujitsu.com>2015-04-17 14:15:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-19 13:34:43 +0100
commitccb2feb6fdd992fb4cc36070eacb428d392f3b24 (patch)
tree03b27392c7d42d67a5ce1e22d1e9f37de74dc5ec /meta/recipes-graphics
parent760dec203bfd18096279e6a993bb4cffd3ebd61b (diff)
downloadpoky-ccb2feb6fdd992fb4cc36070eacb428d392f3b24.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. (From OE-Core rev: 9e29a8bec3e6bcba38cf097181e50f1266b33221) Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc6
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.14.2.bb10
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."
9HOMEPAGE = "http://cairographics.org" 9HOMEPAGE = "http://cairographics.org"
10BUGTRACKER = "http://bugs.freedesktop.org" 10BUGTRACKER = "http://bugs.freedesktop.org"
11SECTION = "libs" 11SECTION = "libs"
12LICENSE = "MPL-1 & LGPLv2.1" 12LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+"
13LICENSE_${PN} = "MPL-1 & LGPLv2.1"
14LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1"
15LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1"
16LICENSE_${PN}-perf-utils = "GPLv3+"
13X11DEPENDS = "virtual/libx11 libsm libxrender libxext" 17X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
14DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" 18DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
15 19
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."
29DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" 29DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
30 30
31FILES_${PN} = "${libdir}/libcairo.so.*" 31FILES_${PN} = "${libdir}/libcairo.so.*"
32FILES_${PN}-dev += "${libdir}/cairo/*.la ${libdir}/cairo/*.so" 32FILES_${PN}-dev += "${libdir}/cairo/*.so"
33#FILES_${PN}-dbg += "${libdir}/cairo/.debug" 33FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*"
34#FILES_${PN}-staticdev += "${libdir}/cairo/*.a" 34FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"
35FILES_cairo-gobject = "${libdir}/libcairo-gobject.so.*" 35FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*"
36FILES_cairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"
37FILES_cairo-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.*"
38 36
39do_install_append () { 37do_install_append () {
40 rm -rf ${D}${bindir}/cairo-sphinx 38 rm -rf ${D}${bindir}/cairo-sphinx