summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-01-30 15:04:45 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-10 14:38:44 +0000
commita142cbd47eb78b4ea63459286d97ab5e769c7bdc (patch)
treeea9296d1fccd617a7257258064aaf5b89c4f9c55 /meta/recipes-graphics/xorg-lib
parent65d296a235a7d2f2689c530c91557ed6263afc01 (diff)
downloadpoky-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/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/libfontenc_1.1.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfont_1.4.4.bb4
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb4
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.24.2.bb3
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"
9LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" 9LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1"
10 10
11DEPENDS += "zlib xproto font-util" 11DEPENDS += "zlib xproto font-util"
12PR = "r1" 12PR = "r2"
13PE = "1" 13PE = "1"
14 14
15BBCLASSEXTEND = "native" 15BBCLASSEXTEND = "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
9LICENSE= "MIT & MIT-style & BSD" 9LICENSE= "MIT & MIT-style & BSD"
10LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" 10LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c"
11 11
12DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" 12DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc zlib"
13PROVIDES = "xfont" 13PROVIDES = "xfont"
14 14
15PR = "r0" 15PR = "r1"
16PE = "1" 16PE = "1"
17 17
18XORG_PN = "libXfont" 18XORG_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"
5DESCRIPTION = "FontCache is an extension that is used by X-TrueType to cache \ 5DESCRIPTION = "FontCache is an extension that is used by X-TrueType to cache \
6information about fonts." 6information about fonts."
7 7
8DEPENDS += "libxext fontcacheproto" 8DEPENDS += "libxext fontcacheproto zlib"
9LIC_FILES_CHKSUM = "file://COPYING;md5=62a75d5d3da40f1f6eb1cbe3bcc0a5d0" 9LIC_FILES_CHKSUM = "file://COPYING;md5=62a75d5d3da40f1f6eb1cbe3bcc0a5d0"
10PR = "r0" 10PR = "r1"
11PE = "1" 11PE = "1"
12 12
13XORG_PN = "libXfontcache" 13XORG_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 "
15DEPENDS += "zlib libpng"
15 16
16PE = "1" 17PE = "1"
17PR = "r0" 18PR = "r1"
18 19
19EXTRA_OECONF="--disable-gtk" 20EXTRA_OECONF="--disable-gtk"
20 21