From 6897cd31ee6cee794f929a7291afb462338ed76e Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 6 Oct 2008 20:21:06 +0000 Subject: gnu_radio_svn.bb : Set DEFAULT_PREFERENCE="-1" and update SRCREV. --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7ccbd3248e..16753863b5 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,7 +48,7 @@ SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" -SRCREV_pn-gnuradio ?= "6377" +SRCREV_pn-gnuradio ?= "9721" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" -- cgit v1.2.3 From 281aae5cfefa90b89da1ab7692fd6f5807e99d74 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Tue, 7 Oct 2008 03:58:55 +0000 Subject: slugos.inc: set PREFERRED_VERSION for pango and glib-2.0 (the default pango does not like the older glib) --- conf/distro/include/slugos.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 4df461910c..71d5fd7b3c 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -152,6 +152,11 @@ IGNORE_STRIP_ERRORS = "" PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" +# New pango and older glib-2.0 versions don't mix, +# so specify exactly what we would like to build. +PREFERRED_VERSION_pango ?= 1.20.5 +PREFERRED_VERSION_glib-2.0 ?= 2.16.1 + # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -- cgit v1.2.3