diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 11 | ||||
| -rw-r--r-- | conf/distro/include/preferred-opie-versions-1.2.3-pre.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 59 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 2 |
4 files changed, 53 insertions, 21 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 52a475f8f6..34a02514d3 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -98,6 +98,7 @@ PACKAGE_EXTRA_ARCHS_collie = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi" PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi" +PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" FEED_URIS += " \ no-arch##${ANGSTROM_URI}/unstable/feed/all \ @@ -127,7 +128,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh11" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh12" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" @@ -149,6 +150,10 @@ PREFERRED_VERSION_pango = "1.16.4" PREFERRED_VERSION_atk = "1.10.3" PREFERRED_VERSION_gtk+ = "2.10.12" +# newer poppler cvs breaks some apps, fix until popper 6 and apps +# catch up with api changes +PREFERRED_VERSION_poppler = "0.5.4" + # older gtk-webcore releases don't work on ARM/EABI # We need to switch to a fixed SRCDATE or release as soon as possible PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" @@ -160,7 +165,7 @@ PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" +PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" PREFERRED_VERSION_libxrandr ?= "1.2.1" PREFERRED_VERSION_xrandr ?= "1.2.0" PREFERRED_VERSION_randrproto ?= "1.2.1" @@ -303,7 +308,7 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" #EXTRA_STUFF_append_akita += "altboot" #EXTRA_STUFF_append_poodle += "altboot" #EXTRA_STUFF_append_tosa += "altboot" -EXTRA_STUFF_append_spitz += "altboot" +#EXTRA_STUFF_append_spitz += "altboot" # do some task-base stuff here diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc index 55a4c79e75..a7a63374b5 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070703" +OPIE_SRCDATE ?= "20070717" OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 1d80cad05b..7e344b01db 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -50,22 +50,49 @@ SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" -# Enlightenment (libs) -SRCDATE_edb ?= "20070601" -SRCDATE_enhanve ?= "20070601" -SRCDATE_engrave ?= "20070601" -SRCDATE_exml ?= "20070601" +# Enlightenment Foundation Libraries +# Caution: This is not alphabetically, but (roughly) dependency-sorted. +# Please leave it like that. +SRCDATE_edb-native = "20070721" +SRCDATE_edb ?= "20070721" +SRCDATE_eet-native = "20070721" +SRCDATE_eet ?= "20070721" +SRCDATE_evas-native ?= "20070721" +SRCDATE_evas ?= "20070721" +SRCDATE_ecore-native ?= "20070721" +SRCDATE_ecore ?= "20070721" +SRCDATE_edbus ?= "20070721" +SRCDATE_embryo-native ?= "20070721" +SRCDATE_embryo ?= "20070721" +SRCDATE_edje-native ?= "20070721" +SRCDATE_edje ?= "20070721" +SRCDATE_emotion ?= "20070721" +SRCDATE_etk-native ?= "20070721" +SRCDATE_etk ?= "20070721" +SRCDATE_ewl ?= "20070721" +SRCDATE_epeg ?= "20070721" +SRCDATE_epsilon ?= "20070721" +SRCDATE_epdf ?= "20070721" +SRCDATE_esmart ?= "20070721" +SRCDATE_efreet ?= "20070721" +SRCDATE_exml ?= "20070721" +SRCDATE_enhance ?= "20070721" +SRCDATE_engrave ?= "20070721" +SRCDATE_evolve-native ?= "20070721" +SRCDATE_evolve ?= "20070721" -# Enlightenment (apps) -SRCDATE_edje-viewer = "20070601" -SRCDATE_emphasis = "20070601" -SRCDATE_ephoto = "20070601" -SRCDATE_examine = "20070601" -SRCDATE_expedite = "20070601" -SRCDATE_elitaire = "20070504" -SRCDATE_entice = "20070601" -SRCDATE_e-utils = "20070601" -SRCDTE_exhibit = "20070601" +# Enlightenment Applications +SRCDATE_edje-viewer ?= "20070601" +SRCDATE_edje-editor ?= "20070721" +SRCDATE_emphasis ?= "20070601" +SRCDATE_ephoto ?= "20070601" +SRCDATE_examine ?= "20070601" +SRCDATE_exhibit ?= "20070721" +SRCDATE_expedite ?= "20070601" +SRCDATE_elitaire ?= "20070504" +SRCDATE_entice ?= "20070601" +SRCDATE_e-utils ?= "20070601" +SRCDATE_enna ?= "20070721" # Misc apps, sorted by alphabet SRCDATE_avetanabt ?= "20060814" @@ -108,5 +135,5 @@ SRCDATE_yamonenv ?= "20060814" SRCDATE_zroadmap ?= "20060814" # Freedesktop.org -SRCDATE_poppler = "20070708" +SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c2970d2b99..bb1605e41b 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.5" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" |