preferred-shr-versions: remove preferred version of pixmap, increase DEFAULT_PREFERRE...

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 72714f39518f54212d15664b9bbf72be735be49f..d4a787235e1355b4c0af3126be8a547b9796e5b3 100644 (file)
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -15,7 +15,6 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.29"
 EFL_SRCREV ?= "43898"
 
 # upgrades used in Angstrom
-PREFERRED_VERSION_pixman        = "0.17.1"
 PREFERRED_VERSION_gtk+          = "2.18.3"
 PREFERRED_VERSION_hal           = "0.5.13"
 PREFERRED_VERSION_libtool       = "2.2.6a"

diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb
index 535f1602760606fe31e9a1ea275c3d045b4e952c..1b5ca6388fe732ac6453581fe41dd6e8a6488b6c 100644 (file)
--- a/recipes/xorg-lib/pixman_git.bb
+++ b/recipes/xorg-lib/pixman_git.bb
@@ -11,6 +11,7 @@ SRCREV = "c97b1e803fc214e9880eaeff98410c8fa37f9ddc"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
+DEFAULT_PREFERENCE_shr = "1"
 
 SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git \
            file://nearest-neighbour.patch;patch=1 \