From: Martin Jansa Date: Mon, 23 Nov 2009 20:49:36 +0000 (+0100) Subject: preferred-shr-versions: remove preferred version of pixmap, increase DEFAULT_PREFERRE... X-Git-Tag: Release-2010-05/1~1648^2~17 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfc7ab397a63545d94392c58e78ed663b354bd2e;p=openembedded.git preferred-shr-versions: remove preferred version of pixmap, increase DEFAULT_PREFERRENCE in pixmap recipe for shr instead --- diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 72714f3951..d4a787235e 100644 --- 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 535f160276..1b5ca6388f 100644 --- 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 \