From: Koen Kooi <koen@openembedded.org>
Date: Sat, 28 Oct 2006 16:30:42 +0000 (+0000)
Subject: angstrom: nobody wants to support either an opie-based image nor opie itself for... 
X-Git-Tag: Release-2010-05/1~9453^2~566
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11b8b94b06fd3405d59351a1eaa3db7c46342626;p=openembedded.git

angstrom: nobody wants to support either an opie-based image nor opie itself for angstrom, so lets remove the opie bits and select appropriate defaults for xine and sdl
---

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 187ddb9cfe..ca7f6eeb3f 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -42,17 +42,13 @@ CVS_TARBALL_STASH = "\
 http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
 "
 
-# Opie
-#use 1337 mt version of opie to have a webbrowser
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-require conf/distro/include/preferred-opie-versions.inc
-
 # GPE
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
+
 
 PREFERRED_VERSION_fontconfig = "2.3.95"
 PREFERRED_VERSION_freetype = "2.2.1"
@@ -128,11 +124,14 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 
 
 # Busybox <1.1.0 doesn't have EABI support
-PREFERRED_VERSION_busybox = "1.2.1"
+PREFERRED_VERSION_busybox = "1.2.2"
 
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
 PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
+
 PREFERRED_VERSION_dbus ?= "0.92"
+PREFERRED_VERSION_dbus-glib ?= "0.71"
+
 PREFERRED_VERSION_gstreamer ?= "0.10.6"
 
 PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"