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 13:36:57 +0000 |
| commit | 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29 (patch) | |
| tree | fb4244c11305df99679b3960596c75f3be1fe03f /meta/recipes-graphics/xorg-lib | |
| parent | e303aeec9a97903479baad836671591b511b3e19 (diff) | |
| download | openembedded-core-50ad5230ea9e0982cdfda23fb9fcfccf89d28f29.tar.gz openembedded-core-50ad5230ea9e0982cdfda23fb9fcfccf89d28f29.tar.bz2 openembedded-core-50ad5230ea9e0982cdfda23fb9fcfccf89d28f29.zip | |
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 <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
4 files changed, 7 insertions, 6 deletions
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" |