[PATCH 0/2] meta-emenlow: fix for bug 2507

[PATCH 0/2] meta-emenlow: fix for bug 2507

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

The recent upgrade of cairo to 1.12.2 broke meta-emenlow; keeping
the old 1.10.2 recipe around in the meta-emenlow layer gets it
working again.

The following changes since commit bd00e28dd54b06a1f01f186be168d3af872f96d4:
  Richard Purdie (1):
        meta-emenlow: Update qt4 bbappend to 4.8.1

are available in the git repository at:

  git://git.yoctoproject.org/meta-intel.git tzanussi/2507-fix
  http://git.yoctoproject.org/cgit.cgi//log/?h=tzanussi/2507-fix

Tom Zanussi (2):
  meta-emenlow: add 1.10.2 cairo recipe
  meta-emenlow: prefer 1.10.2 cairo

 meta-emenlow/conf/machine/emenlow.conf             |    1 +
 .../recipes-graphics/cairo/cairo_1.10.2.bb         |   39 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 meta-emenlow/recipes-graphics/cairo/cairo_1.10.2.bb

[PATCH 1/2] meta-emenlow: add 1.10.2 cairo recipe

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

The emenlow graphics stack doesn't work with the cairo_1.12.2 library
upgrade; this adds the old 1.10.2 recipe from poky locally to the
emenlow layer in order to get it working again.

Fixes [YOCTO #2507]

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../recipes-graphics/cairo/cairo_1.10.2.bb         |   39 ++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 meta-emenlow/recipes-graphics/cairo/cairo_1.10.2.bb

diff --git a/meta-emenlow/recipes-graphics/cairo/cairo_1.10.2.bb b/meta-emenlow/recipes-graphics/cairo/cairo_1.10.2.bb
new file mode 100644
index 0000000..c832417
--- /dev/null
+++ b/meta-emenlow/recipes-graphics/cairo/cairo_1.10.2.bb
@@ -0,0 +1,39 @@
+require recipes-graphics/cairo/cairo.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
+
+PR = "r0"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "f101a9e88b783337b20b2e26dfd26d5f"
+SRC_URI[sha256sum] = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"
+
+PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
+
+SUMMARY_${PN} = "The Cairo 2D vector graphics library"
+DESCRIPTION_${PN} = "Cairo is a multi-platform library providing anti-aliased \
+vector-based rendering for multiple target backends. Paths consist \
+of line segments and cubic splines and can be rendered at any width \
+with various join and cap styles. All colors may be specified with \
+optional translucence (opacity/alpha) and combined using the \
+extended Porter/Duff compositing algebra as found in the X Render \
+Extension."
+
+SUMMARY_cairo-gobject = "The Cairo library GObject wrapper library"
+DESCRIPTION_cairo-gobject = "A GObject wrapper library for the Cairo API."
+
+SUMMARY_cairo-script-interpreter = "The Cairo library script interpreter"
+DESCRIPTION_cairo-script-interpreter = "The Cairo script interpreter implements \
+CairoScript.  CairoScript is used by tracing utilities to enable the ability \
+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.*"
-- 
1.7.0.4

[PATCH 2/2] meta-emenlow: prefer 1.10.2 cairo

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

emenlow needs to use the old 1.10.2 cairo library instead of the
upgraded version.

Fixes [YOCTO #2507]

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-emenlow/conf/machine/emenlow.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 1362434..26ca43b 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -18,6 +18,7 @@ PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
 PREFERRED_PROVIDER_mesa-dri = "xpsb-glx"
 PREFERRED_VERSION_libva ?= "0.31.0"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
+PREFERRED_VERSION_cairo ?= "1.10.2"
 XSERVER ?= "xserver-psb \
            xserver-psb-extension-dri \
            xserver-psb-extension-dri2 \
-- 
1.7.0.4