From 2df5dcf528a4be15d5a997936754e7973856d535 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 16 Jan 2012 15:43:12 +0000 Subject: cairo: replace cairo_1.10.2.bb and .inc files with .bbappend, change cairomm to use .inc from oe-core * cairo-native is needed for pango-native and PRINC is for slight packaging changes in oe-core version Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- meta-oe/recipes-graphics/cairo/cairo-fpu.inc | 6 ------ meta-oe/recipes-graphics/cairo/cairo.inc | 19 ------------------- meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb | 10 ---------- meta-oe/recipes-graphics/cairo/cairo_1.10.2.bbappend | 2 ++ meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb | 2 +- 5 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 meta-oe/recipes-graphics/cairo/cairo-fpu.inc delete mode 100644 meta-oe/recipes-graphics/cairo/cairo.inc delete mode 100644 meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb create mode 100644 meta-oe/recipes-graphics/cairo/cairo_1.10.2.bbappend diff --git a/meta-oe/recipes-graphics/cairo/cairo-fpu.inc b/meta-oe/recipes-graphics/cairo/cairo-fpu.inc deleted file mode 100644 index bdaf789799..0000000000 --- a/meta-oe/recipes-graphics/cairo/cairo-fpu.inc +++ /dev/null @@ -1,6 +0,0 @@ - -def get_cairo_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--disable-some-floating-point" - return "" - diff --git a/meta-oe/recipes-graphics/cairo/cairo.inc b/meta-oe/recipes-graphics/cairo/cairo.inc deleted file mode 100644 index 615700492f..0000000000 --- a/meta-oe/recipes-graphics/cairo/cairo.inc +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "libs" -DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0" -DESCRIPTION = "Cairo graphics library" -LICENSE = "MPL LGPL" - -#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -require cairo-fpu.inc -EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" - -PACKAGES =+ "cairo-trace cairo-trace-dev libcairo-script-interpreter libcairo-gobject" -FILES_libcairo-gobject = "${libdir}/libcairo-gobject.so.*" -FILES_libcairo-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" -FILES_cairo-trace = "${bindir}/*trace ${libdir}/cairo/libcairo-trace.so.*" -FILES_cairo-trace-dev = "${libdir}/cairo/*" - diff --git a/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb b/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb deleted file mode 100644 index 9de75ed643..0000000000 --- a/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require cairo.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" - -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz;name=cairo \ -" -SRC_URI[cairo.md5sum] = "f101a9e88b783337b20b2e26dfd26d5f" -SRC_URI[cairo.sha256sum] = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41" - - diff --git a/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bbappend b/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bbappend new file mode 100644 index 0000000000..f02e1292d2 --- /dev/null +++ b/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bbappend @@ -0,0 +1,2 @@ +BBCLASSEXTEND = "native" +PRINC := "${@int(PRINC) + 1}" diff --git a/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb b/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb index e4fec3c398..dbde45811c 100644 --- a/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb +++ b/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb @@ -1,4 +1,4 @@ -require cairo.inc +require recipes-graphics/cairo/cairo.inc DESCRIPTION = "C++ bindings for Cairo graphics library" -- cgit 1.2.3-korg