diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-01-30 15:04:45 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-10 14:38:44 +0000 |
commit | a142cbd47eb78b4ea63459286d97ab5e769c7bdc (patch) | |
tree | ea9296d1fccd617a7257258064aaf5b89c4f9c55 /meta/recipes-graphics | |
parent | 65d296a235a7d2f2689c530c91557ed6263afc01 (diff) | |
download | poky-a142cbd47eb78b4ea63459286d97ab5e769c7bdc.tar.gz |
zlib: Upgrade 1.2.5 -> 1.2.6
Dont use autotools, it really not so autoconf like.
the configure script gets updated with every release of zlib
and we overwrite that. Instead use the upstream provided
configure
copyright year was changed in zlib.h which caused change in
LIC_FILE_CHECKSUM
fix.inverted.LFS.logic.patch is already applied upstream so drop it
Drop the configure.ac and Makefile.am scripts since we do not
autoreconf anymore and do not inherit autotools anymore
Bump PR for depending recipes so a rebuild it ensues so that
they dont depend on .la anymore
and add missing dependencies discovered during incremental
build
(From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
8 files changed, 12 insertions, 11 deletions
diff --git a/meta/recipes-graphics/cairo/cairo_1.10.2.bb b/meta/recipes-graphics/cairo/cairo_1.10.2.bb index 826681f375..a74a2cc784 100644 --- a/meta/recipes-graphics/cairo/cairo_1.10.2.bb +++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb | |||
@@ -2,7 +2,7 @@ require cairo.inc | |||
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" |
4 | 4 | ||
5 | PR = "r3" | 5 | PR = "r4" |
6 | 6 | ||
7 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" | 7 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" |
8 | 8 | ||
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb index 6083d984e4..2ce59522f2 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require libmatchbox.inc | 1 | require libmatchbox.inc |
2 | 2 | ||
3 | PR = "r8" | 3 | PR = "r9" |
4 | 4 | ||
5 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ | 5 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ |
6 | file://16bppfixes.patch \ | 6 | file://16bppfixes.patch \ |
diff --git a/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb index 3d212562bd..87f9826d66 100644 --- a/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb +++ b/meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb | |||
@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
9 | file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111" | 9 | file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111" |
10 | 10 | ||
11 | SECTION = "x11/libs" | 11 | SECTION = "x11/libs" |
12 | DEPENDS = "glib-2.0" | 12 | DEPENDS = "glib-2.0 zlib" |
13 | 13 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz" | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz" |
15 | 15 | ||
16 | SRC_URI[md5sum] = "ac4a9ea77db68d3db3f9f53cc75af66a" | 16 | SRC_URI[md5sum] = "ac4a9ea77db68d3db3f9f53cc75af66a" |
17 | SRC_URI[sha256sum] = "6b7c1627b5102d8301a8a3e845f673a7181a71dde32f6455abf22d03e392b89f" | 17 | SRC_URI[sha256sum] = "6b7c1627b5102d8301a8a3e845f673a7181a71dde32f6455abf22d03e392b89f" |
18 | 18 | ||
19 | PR = "r0" | 19 | PR = "r1" |
20 | 20 | ||
21 | inherit autotools pkgconfig | 21 | inherit autotools pkgconfig |
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb index 9681f9e110..8d71de0458 100644 --- a/meta/recipes-graphics/pango/pango_1.28.4.bb +++ b/meta/recipes-graphics/pango/pango_1.28.4.bb | |||
@@ -2,7 +2,7 @@ require pango.inc | |||
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" |
4 | 4 | ||
5 | PR = "r6" | 5 | PR = "r7" |
6 | 6 | ||
7 | SRC_URI += "file://no-tests.patch" | 7 | SRC_URI += "file://no-tests.patch" |
8 | SRC_URI += "file://noconst.patch" | 8 | SRC_URI += "file://noconst.patch" |
diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb index 3d900428aa..c489f39c35 100644 --- a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb +++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb | |||
@@ -9,7 +9,7 @@ LICENSE = "MIT" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" |
10 | 10 | ||
11 | DEPENDS += "zlib xproto font-util" | 11 | DEPENDS += "zlib xproto font-util" |
12 | PR = "r1" | 12 | PR = "r2" |
13 | PE = "1" | 13 | PE = "1" |
14 | 14 | ||
15 | BBCLASSEXTEND = "native" | 15 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb index 8af0ac90bc..3e44fc8ac5 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb | |||
@@ -9,10 +9,10 @@ require xorg-lib-common.inc | |||
9 | LICENSE= "MIT & MIT-style & BSD" | 9 | LICENSE= "MIT & MIT-style & BSD" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" |
11 | 11 | ||
12 | DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" | 12 | DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc zlib" |
13 | PROVIDES = "xfont" | 13 | PROVIDES = "xfont" |
14 | 14 | ||
15 | PR = "r0" | 15 | PR = "r1" |
16 | PE = "1" | 16 | PE = "1" |
17 | 17 | ||
18 | XORG_PN = "libXfont" | 18 | XORG_PN = "libXfont" |
diff --git a/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb index b254eb94b5..065daf1187 100644 --- a/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb +++ b/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb | |||
@@ -5,9 +5,9 @@ SUMMARY = "XFontCache: X Font Cache extension library" | |||
5 | DESCRIPTION = "FontCache is an extension that is used by X-TrueType to cache \ | 5 | DESCRIPTION = "FontCache is an extension that is used by X-TrueType to cache \ |
6 | information about fonts." | 6 | information about fonts." |
7 | 7 | ||
8 | DEPENDS += "libxext fontcacheproto" | 8 | DEPENDS += "libxext fontcacheproto zlib" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=62a75d5d3da40f1f6eb1cbe3bcc0a5d0" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=62a75d5d3da40f1f6eb1cbe3bcc0a5d0" |
10 | PR = "r0" | 10 | PR = "r1" |
11 | PE = "1" | 11 | PE = "1" |
12 | 12 | ||
13 | XORG_PN = "libXfontcache" | 13 | XORG_PN = "libXfontcache" |
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.24.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.24.2.bb index b55e547746..c710b42231 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.24.2.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.24.2.bb | |||
@@ -12,9 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ | |||
12 | file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ | 12 | file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ |
13 | file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ | 13 | file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ |
14 | " | 14 | " |
15 | DEPENDS += "zlib libpng" | ||
15 | 16 | ||
16 | PE = "1" | 17 | PE = "1" |
17 | PR = "r0" | 18 | PR = "r1" |
18 | 19 | ||
19 | EXTRA_OECONF="--disable-gtk" | 20 | EXTRA_OECONF="--disable-gtk" |
20 | 21 | ||