aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2006-02-14 05:40:35 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-14 05:40:35 +0000
commit340906f157306845073b25d62288c7e82ae3632d (patch)
tree294ba5dc10e68fd00d66b3ddeb4a9a75331a3014 /conf
parent4632ac851c71d4639f58324f7ddd359eaf792394 (diff)
downloadopenembedded-340906f157306845073b25d62288c7e82ae3632d.tar.gz
e: update to dev versions and make the images work
- All efl and e17 packages are updated to newer versions - Update preferred-e-versions and add it back into familiar and openzaurus conf files - Update e-image to use GPE progs instead of extra e progs which have fallen into disrepair -- GPE progs currently don't work in e-image, I suspect a missing dependency
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/familiar-0.8.3.conf7
-rw-r--r--conf/distro/openzaurus-3.5.4.conf2
-rw-r--r--conf/distro/preferred-e-versions.inc38
3 files changed, 31 insertions, 16 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf
index f75ad332b9..23a58106ab 100644
--- a/conf/distro/familiar-0.8.3.conf
+++ b/conf/distro/familiar-0.8.3.conf
@@ -84,10 +84,5 @@ include conf/distro/preferred-gpe-versions-2.7.inc
#
# E
#
-
-
-#23:57 < mickeyl> it's no longer necessary since our cleanup
-#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it
-
-#include conf/distro/preferred-e-versions.inc
+include conf/distro/preferred-e-versions.inc
diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index b67fed685e..08dc292da6 100644
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -68,5 +68,5 @@ include conf/distro/preferred-gpe-versions-2.7.inc
#
# E
#
-#include conf/distro/preferred-e-versions.inc
+include conf/distro/preferred-e-versions.inc
diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index d861944d53..836b28c9d9 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -2,12 +2,32 @@
# Specify which versions of E-related libraries and applications to build
#
-PREFERRED_VERSION_ecore = "0.9.9.013"
-PREFERRED_VERSION_edb = "1.0.5.004"
-PREFERRED_VERSION_edje = "0.5.0.013"
-PREFERRED_VERSION_eet = "0.9.10.013"
-PREFERRED_VERSION_embryo = "0.9.1.013"
-PREFERRED_VERSION_etox = "0.9.0.004"
-PREFERRED_VERSION_evas = "0.9.9.013"
-PREFERRED_VERSION_ewl = "0.0.4.004"
-PREFERRED_VERSION_imlib2 = "1.2.1.004"
+PREFERRED_VERSION_e = "0.16.999.023"
+PREFERRED_VERSION_ecore-x11 = "0.9.9.023"
+PREFERRED_VERSION_ecore-native = "0.9.9.023"
+PREFERRED_VERSION_edb = "1.0.5.005"
+PREFERRED_VERSION_edb-native = "1.0.5.005"
+PREFERRED_VERSION_edje = "0.5.0.023"
+PREFERRED_VERSION_edje-native = "0.5.0.023"
+PREFERRED_VERSION_eet = "0.9.10.023"
+PREFERRED_VERSION_eet-native = "0.9.10.023"
+PREFERRED_VERSION_embryo = "0.9.1.023"
+PREFERRED_VERSION_embryo-native = "0.9.1.023"
+PREFERRED_VERSION_emotion = "0.0.1.004"
+PREFERRED_VERSION_emotion-native = "0.0.1.004"
+PREFERRED_VERSION_epeg = "0.9.0.005"
+PREFERRED_VERSION_epsilon = "0.3.0.005"
+PREFERRED_VERSION_esmart-x11 = "0.9.0.005"
+PREFERRED_VERSION_evas-x11 = "0.9.9.023"
+PREFERRED_VERSION_evas-native = "0.9.9.023"
+PREFERRED_VERSION_ewl = "0.0.4.005"
+PREFERRED_VERSION_imlib2-x11 = "1.2.1.010"
+PREFERRED_VERSION_imlib2-native = "1.2.1.010"
+PREFERRED_VERSION_e-wm = "0.16.999.023"
+PREFERRED_VERSION_entrance = "0.9.0.005"
+
+PREFERRED_PROVIDER_virtual/evas = "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
+
+PREFERRED_VERSION_gcc = "3.4.4"