summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-21 13:41:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-31 09:43:21 +0000
commit283c7b8553d57caca0eb320bbb1e0d301aa32553 (patch)
treef8704fa6bdce77f5393d5ce5ed399f469cec6c53 /meta/recipes-support
parentce2414a557d403939476657cf6c2967749d5c2a5 (diff)
downloadpoky-283c7b8553d57caca0eb320bbb1e0d301aa32553.tar.gz
libcroco: upgrade to 0.6.8
License checksum modification due to: src/cr-rgb.c: code (not license) change croco.patch: removed - it doesn't apply anymore - not needed anymore libcroco_fix_for_automake-1.12.patch: removed - problem not reprodicible anymore (From OE-Core rev: c672f27f8f121df9083db28d3fc1d3f3071a1b37) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libcroco/files/croco.patch15
-rw-r--r--meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch22
-rw-r--r--meta/recipes-support/libcroco/libcroco_0.6.8.bb (renamed from meta/recipes-support/libcroco/libcroco_0.6.3.bb)11
3 files changed, 5 insertions, 43 deletions
diff --git a/meta/recipes-support/libcroco/files/croco.patch b/meta/recipes-support/libcroco/files/croco.patch
deleted file mode 100644
index 88bdb09f97..0000000000
--- a/meta/recipes-support/libcroco/files/croco.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- opie/configure.in.old 2006-05-19 20:57:30.000000000 +0100
4+++ opie/configure.in 2006-05-19 20:57:56.000000000 +0100
5@@ -131,8 +131,8 @@
6 dnl Define the CROCO_LIBS and CROCO_CFLAGS variables. These will be used
7 dnl by client application to know where to find croco include files and libs.
8 dnl
9-CROCO_LIBS="-L${libdir} -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
10-CROCO_CFLAGS="-I${includedir}/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
11+CROCO_LIBS='-L${libdir}'" -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
12+CROCO_CFLAGS='-I${includedir}'"/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
13
14 AC_SUBST(LIBXML2_LIBS)
15 AC_SUBST(LIBXML2_CFLAGS)
diff --git a/meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch b/meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch
deleted file mode 100644
index 9dcf7b039d..0000000000
--- a/meta/recipes-support/libcroco/files/libcroco_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Pending
2
3This patch fixes following kind of issues with automake 1.12
4
5| configure.in:51: error: automatic de-ANSI-fication support has been removed
6
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
82012/05/03
9
10Index: libcroco-0.6.3/configure.in
11===================================================================
12--- libcroco-0.6.3.orig/configure.in
13+++ libcroco-0.6.3/configure.in
14@@ -47,8 +47,6 @@ AC_PROG_CC
15 AC_PROG_INSTALL
16 AC_PROG_CPP
17
18-dnl Make sure we have an ANSI compiler
19-AM_C_PROTOTYPES
20 test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
21
22 dnl Checks for libraries.
diff --git a/meta/recipes-support/libcroco/libcroco_0.6.3.bb b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
index d9ff8de7e4..6f5995f51d 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.3.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
@@ -4,17 +4,16 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
4 4
5LICENSE = "LGPLv2 & LGPLv2.1" 5LICENSE = "LGPLv2 & LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
7 file://src/cr-rgb.c;endline=25;md5=1df8189094ba7bbed953225785032826 \ 7 file://src/cr-rgb.c;endline=25;md5=cbb4f64cc46ee9fcf602d3b0836cee56 \
8 file://tests/cr-test-utils.c;endline=21;md5=2382c27934cae1d3792fcb17a6142c4e" 8 file://tests/cr-test-utils.c;endline=21;md5=2382c27934cae1d3792fcb17a6142c4e"
9 9
10SECTION = "x11/utils" 10SECTION = "x11/utils"
11DEPENDS = "glib-2.0 libxml2 zlib" 11DEPENDS = "glib-2.0 libxml2 zlib"
12PR = "r3" 12PR = "r0"
13 13
14inherit autotools pkgconfig gnome 14inherit autotools pkgconfig gnome
15 15
16SRC_URI_append = " file://croco.patch;apply=yes \ 16GNOME_COMPRESS_TYPE = "xz"
17 file://libcroco_fix_for_automake-1.12.patch "
18 17
19SRC_URI[archive.md5sum] = "e1e93eeff4367c896f3959af34ba20eb" 18SRC_URI[archive.md5sum] = "767e73c4174f75b99695d4530fd9bb80"
20SRC_URI[archive.sha256sum] = "746192d979263c74094d41e5ff0e19900b3d81eb2bd42c27c1c320dd94008034" 19SRC_URI[archive.sha256sum] = "ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570"