summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-08-23 19:09:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-28 10:30:28 +0100
commit826ca01dfac0b94346330751dd619561b00ab295 (patch)
tree172c378cd01d929227bafcbeca496b51cc244ffa /meta
parent4304d0bfd88ca64262d3e3ca26a47a029c1a3f71 (diff)
downloadpoky-826ca01dfac0b94346330751dd619561b00ab295.tar.gz
cairo: merge cairo.inc into cairo recipe
Remove SUMMARY_${PN} and DESCRIPTION_${PN}, which duplicate the default SUMMARY and DESCRIPTION. (From OE-Core rev: f668491275ac0ba30366652b6747f87776e92120) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc48
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.14.12.bb75
2 files changed, 57 insertions, 66 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
deleted file mode 100644
index b432da0166..0000000000
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ /dev/null
@@ -1,48 +0,0 @@
1SUMMARY = "The Cairo 2D vector graphics library"
2DESCRIPTION = "Cairo is a multi-platform library providing anti-aliased \
3vector-based rendering for multiple target backends. Paths consist \
4of line segments and cubic splines and can be rendered at any width \
5with various join and cap styles. All colors may be specified with \
6optional translucence (opacity/alpha) and combined using the \
7extended Porter/Duff compositing algebra as found in the X Render \
8Extension."
9HOMEPAGE = "http://cairographics.org"
10BUGTRACKER = "http://bugs.freedesktop.org"
11SECTION = "libs"
12
13LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+"
14LICENSE_${PN} = "MPL-1 & LGPLv2.1"
15LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1"
16LICENSE_${PN}-doc = "MPL-1 & LGPLv2.1"
17LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1"
18LICENSE_${PN}-script-interpreter = "MPL-1 & LGPLv2.1"
19LICENSE_${PN}-perf-utils = "GPLv3+"
20
21X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
22DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
23
24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
25 ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
26 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
27
28PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
29PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
30PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
31PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind"
32PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl"
33PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2"
34PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
35
36EXTRA_OECONF += " \
37 ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-point', '', d)} \
38 --enable-tee \
39"
40
41inherit autotools pkgconfig upstream-version-is-even gtk-doc
42
43# We don't depend on binutils so we need to disable this
44export ac_cv_lib_bfd_bfd_openr="no"
45# Ensure we don't depend on LZO
46export ac_cv_lib_lzo2_lzo2a_decompress="no"
47
48BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/cairo/cairo_1.14.12.bb b/meta/recipes-graphics/cairo/cairo_1.14.12.bb
index 075ca1ed34..a902c26879 100644
--- a/meta/recipes-graphics/cairo/cairo_1.14.12.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.14.12.bb
@@ -1,7 +1,27 @@
1require cairo.inc 1SUMMARY = "The Cairo 2D vector graphics library"
2DESCRIPTION = "Cairo is a multi-platform library providing anti-aliased \
3vector-based rendering for multiple target backends. Paths consist \
4of line segments and cubic splines and can be rendered at any width \
5with various join and cap styles. All colors may be specified with \
6optional translucence (opacity/alpha) and combined using the \
7extended Porter/Duff compositing algebra as found in the X Render \
8Extension."
9HOMEPAGE = "http://cairographics.org"
10BUGTRACKER = "http://bugs.freedesktop.org"
11SECTION = "libs"
12
13LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+"
14LICENSE_${PN} = "MPL-1 & LGPLv2.1"
15LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1"
16LICENSE_${PN}-doc = "MPL-1 & LGPLv2.1"
17LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1"
18LICENSE_${PN}-script-interpreter = "MPL-1 & LGPLv2.1"
19LICENSE_${PN}-perf-utils = "GPLv3+"
2 20
3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" 21LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
4 22
23DEPENDS = "fontconfig glib-2.0 libpng pixman zlib"
24
5SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ 25SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
6 file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ 26 file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \
7 file://0001-cairo-Fix-CVE-2017-9814.patch \ 27 file://0001-cairo-Fix-CVE-2017-9814.patch \
@@ -10,16 +30,41 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
10SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165" 30SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165"
11SRC_URI[sha256sum] = "8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16" 31SRC_URI[sha256sum] = "8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16"
12 32
13PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" 33inherit autotools pkgconfig upstream-version-is-even gtk-doc
14 34
15SUMMARY_${PN} = "The Cairo 2D vector graphics library" 35X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
16DESCRIPTION_${PN} = "Cairo is a multi-platform library providing anti-aliased \ 36
17vector-based rendering for multiple target backends. Paths consist \ 37PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
18of line segments and cubic splines and can be rendered at any width \ 38 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
19with various join and cap styles. All colors may be specified with \ 39 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
20optional translucence (opacity/alpha) and combined using the \ 40
21extended Porter/Duff compositing algebra as found in the X Render \ 41PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
22Extension." 42PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
43PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
44PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind"
45PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl"
46PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2"
47PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
48
49EXTRA_OECONF += " \
50 ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-point', '', d)} \
51 --enable-tee \
52"
53
54# We don't depend on binutils so we need to disable this
55export ac_cv_lib_bfd_bfd_openr="no"
56# Ensure we don't depend on LZO
57export ac_cv_lib_lzo2_lzo2a_decompress="no"
58
59do_install_append () {
60 rm -rf ${D}${bindir}/cairo-sphinx
61 rm -rf ${D}${libdir}/cairo/cairo-fdr*
62 rm -rf ${D}${libdir}/cairo/cairo-sphinx*
63 rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr*
64 rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx*
65}
66
67PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
23 68
24SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library" 69SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library"
25DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API." 70DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API."
@@ -32,15 +77,9 @@ to replay rendering."
32DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" 77DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
33 78
34FILES_${PN} = "${libdir}/libcairo.so.*" 79FILES_${PN} = "${libdir}/libcairo.so.*"
35FILES_${PN}-dev += "${libdir}/cairo/*.so"
36FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*" 80FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*"
37FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" 81FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"
38FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*" 82FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*"
83FILES_${PN}-dev += "${libdir}/cairo/*.so"
39 84
40do_install_append () { 85BBCLASSEXTEND = "native"
41 rm -rf ${D}${bindir}/cairo-sphinx
42 rm -rf ${D}${libdir}/cairo/cairo-fdr*
43 rm -rf ${D}${libdir}/cairo/cairo-sphinx*
44 rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr*
45 rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx*
46}