diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-03-21 11:38:35 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-03-21 11:38:35 +0000 |
| commit | 5ae92a6786c33dd187635e9d1674c9195fdf63ec (patch) | |
| tree | 0b2b241d78a14f87b7f84e84e68de8a860a98477 | |
| parent | 7263517b3939ba055d443a0ecbaf5ef9a3e91c38 (diff) | |
| parent | 33c2929e38f8a4271be33ab99f41ef861f7e6d22 (diff) | |
merge of '02a6624c71727e9ca8fc9cb4497b838837b84379'
and 'fef7c2b78ae5793c1c732ea85c614ee80e04b0e1'
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 4f603f4534..e4951dbf2b 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "36" +DISTRO_REVISION = "37" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -107,16 +107,14 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_esound ?= "pulseaudio" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.0" - -#work around a segfault in gcc for armv4t -PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" -PREFERRED_VERSION_glib-2.0_h6300 = "2.12.3" +PREFERRED_VERSION_cairo = "1.4.2" +PREFERRED_VERSION_glib-2.0 = "2.12.10" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" |