summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-01-31 13:35:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 23:59:40 +0000
commitcfe132799f9ff724babd250dc63e3176763e13df (patch)
treee2258c9ffd05258a9ac2dfff3c5ed96a18c75be8
parent18acdfb7d4440a33aa5312aebfbf0ecd529b06fc (diff)
downloadpoky-cfe132799f9ff724babd250dc63e3176763e13df.tar.gz
pixman: downgrade from development release 0.21.4 to stable release 0.20.2
pixman's stable releases have even minor version numbers, e.g., 0.18.x, 0.20.x. Odd minor version numbers mean development snapshots that may contain bugs and experimental features. The next stable release should be 0.22.0. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb (renamed from meta/recipes-graphics/xorg-lib/pixman_0.21.4.bb)7
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 52be0aaea1..3a4bd335f7 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -82,7 +82,7 @@ PREFERRED_VERSION_libxxf86vm ?= "1.1.1"
82PREFERRED_VERSION_lndir ?= "1.0.1" 82PREFERRED_VERSION_lndir ?= "1.0.1"
83PREFERRED_VERSION_makedepend ?= "1.0.3" 83PREFERRED_VERSION_makedepend ?= "1.0.3"
84PREFERRED_VERSION_makedepend-native ?= "1.0.3" 84PREFERRED_VERSION_makedepend-native ?= "1.0.3"
85PREFERRED_VERSION_pixman ?= "0.21.4" 85PREFERRED_VERSION_pixman ?= "0.20.2"
86PREFERRED_VERSION_printproto ?= "1.0.5" 86PREFERRED_VERSION_printproto ?= "1.0.5"
87PREFERRED_VERSION_randrproto ?= "1.3.2" 87PREFERRED_VERSION_randrproto ?= "1.3.2"
88PREFERRED_VERSION_randrproto-nativesdk ?= "1.3.2" 88PREFERRED_VERSION_randrproto-nativesdk ?= "1.3.2"
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.21.4.bb b/meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb
index 45f6b1959e..dfd883e82c 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.21.4.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb
@@ -3,17 +3,18 @@ DESCRIPTION = "Library for lowlevel pixel operations"
3require xorg-lib-common.inc 3require xorg-lib-common.inc
4 4
5LICENSE = "MIT & MIT-style & Public Domain" 5LICENSE = "MIT & MIT-style & Public Domain"
6LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=fea989a44fb012b5e79584972a863d22 \
7 file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ 7 file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \
8 file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ 8 file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \
9 file://pixman/pixman-x64-mmx-emulation.h;beginline=4;endline=9;md5=4e32716f2efaa6c4659222667c339bb8" 9 file://pixman/pixman-x64-mmx-emulation.h;beginline=4;endline=9;md5=4e32716f2efaa6c4659222667c339bb8"
10 10
11DEPENDS = "virtual/libx11" 11DEPENDS = "virtual/libx11"
12 12
13PE = "1"
13PR = "r0" 14PR = "r0"
14 15
15EXTRA_OECONF="--disable-gtk" 16EXTRA_OECONF="--disable-gtk"
16 17
17SRC_URI[md5sum] = "ae57f4fa9121ab9895b9789b2e81f1e0" 18SRC_URI[md5sum] = "7ed10a0f0fde6853613105a99735e7e7"
18SRC_URI[sha256sum] = "7809f8aa7dcd99bc0e3a12eef65266d34e1f2988df4c814e5f747ddceed22ddf" 19SRC_URI[sha256sum] = "30316f269a6b84c32b47545ca7fc428fd16875849fea644dc6910b3f8c33f4a9"
19 20