From 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Jan 2012 15:04:45 -0800 Subject: 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 Signed-off-by: Khem Raj --- meta/recipes-graphics/cairo/cairo_1.10.2.bb | 2 +- meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb | 2 +- meta/recipes-graphics/menu-cache/menu-cache_0.3.2.bb | 4 ++-- meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +- meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb | 2 +- meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb | 4 ++-- meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb | 4 ++-- meta/recipes-graphics/xorg-lib/pixman_0.24.2.bb | 3 ++- 8 files changed, 12 insertions(+), 11 deletions(-) (limited to 'meta/recipes-graphics') 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 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -PR = "r3" +PR = "r4" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" 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 @@ require libmatchbox.inc -PR = "r8" +PR = "r9" SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ 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 \ file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111" SECTION = "x11/libs" -DEPENDS = "glib-2.0" +DEPENDS = "glib-2.0 zlib" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz" SRC_URI[md5sum] = "ac4a9ea77db68d3db3f9f53cc75af66a" SRC_URI[sha256sum] = "6b7c1627b5102d8301a8a3e845f673a7181a71dde32f6455abf22d03e392b89f" -PR = "r0" +PR = "r1" 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 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -PR = "r6" +PR = "r7" SRC_URI += "file://no-tests.patch" 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" LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" DEPENDS += "zlib xproto font-util" -PR = "r1" +PR = "r2" PE = "1" 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 LICENSE= "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" -DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" +DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc zlib" PROVIDES = "xfont" -PR = "r0" +PR = "r1" PE = "1" 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" DESCRIPTION = "FontCache is an extension that is used by X-TrueType to cache \ information about fonts." -DEPENDS += "libxext fontcacheproto" +DEPENDS += "libxext fontcacheproto zlib" LIC_FILES_CHKSUM = "file://COPYING;md5=62a75d5d3da40f1f6eb1cbe3bcc0a5d0" -PR = "r0" +PR = "r1" PE = "1" 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 \ file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ " +DEPENDS += "zlib libpng" PE = "1" -PR = "r0" +PR = "r1" EXTRA_OECONF="--disable-gtk" -- cgit v1.2.3