diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 26 | ||||
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 7 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 8 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.4.inc | 182 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 37 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 3 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 1 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 1 |
12 files changed, 130 insertions, 147 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 33349fcde1..cc5be470d2 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -116,7 +116,8 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-xorg-versions-X11R7.3.inc +require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc +require conf/distro/include/preferred-xorg-versions-X11R7.4.inc #avr32 only has patches for binutils 2.17 in OE PREFERRED_VERSION_binutils_avr32 = "2.17" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 0c7fe5be49..22a2c98a16 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -218,7 +218,7 @@ DISTRO_EXTRA_DEPENDS += " \ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ angstrom-version \ opkg opkg-collateral distro-feed-configs \ util-linux-mount util-linux-umount \ diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index f7c1161bf2..e58eb40519 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -12,6 +12,9 @@ PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.14.2" PREFERRED_VERSION_gtkmm = "2.14.1" PREFERRED_VERSION_inputproto = "1.4.4" +PREFERRED_VERSION_libgemwidget = "1.0" +PREFERRED_VERSION_libgpephone = "0.4" +PREFERRED_VERSION_libosip2 = "2.2.2" PREFERRED_VERSION_libsdl-x11 = "1.2.11" PREFERRED_VERSION_libtool = "2.2.4" PREFERRED_VERSION_libtool-native = "2.2.4" @@ -25,4 +28,3 @@ PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" PREFERRED_VERSION_udev = "124" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_xserver-xorg = "1.4.2" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 48cbb49d2c..5d250074c5 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -21,6 +21,32 @@ CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}" DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc +# ARM920T and up can use thumb mode to decrease binary size at the expense of speed +# (the complete story is a bit more nuanced due to cache starvation) +# Angstrom turns on thumb for armv4t machine according to this RFC: +# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html + +# We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc +ANGSTROM_ARM_INSTRUCTION_SET ?= "arm" +ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" + +ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" +# "arm" "thumb" +# The instruction set the compiler should use when generating application +# code. The kernel is always compiled with arm code at present. arm code +# is the original 32 bit ARM instruction set, thumb code is the 16 bit +# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) +# but requires more instructions (140% for 70% smaller code) so may be +# slower. + +THUMB_INTERWORK = "yes" +# "yes" "no" +# Whether to compile with code to allow interworking between the two +# instruction sets. This allows thumb code to be executed on a primarily +# arm system and vice versa. It is strongly recommended that DISTROs not +# turn this off - the actual cost is very small. + + #Use this variable in feeds and other parts that need a URI ANGSTROM_URI ?= "http://www.angstrom-distribution.org" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 9f5b7403a2..b63b9e0fe5 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -54,14 +54,13 @@ SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" -#SRCREV_pn-openocd ?= "${AUTOREV}" -#SRCREV_pn-openocd-native ?= "${AUTOREV}" +SRCREV_pn-openocd ?= "${AUTOREV}" +SRCREV_pn-openocd-native ?= "${AUTOREV}" SRCREV_pn-opkg ?= "${AUTOREV}" SRCREV_pn-opkg-native ?= "${AUTOREV}" SRCREV_pn-opkg-sdk ?= "${AUTOREV}" -#SRCREV_pn-packagekit ?= "${AUTOREV}" +SRCREV_pn-packagekit ?= "${AUTOREV}" SRCREV_pn-pyefl-sudoku ?= "${AUTOREV}" -SRCREV_pn-python-etk ?= "${AUTOREV}" SRCREV_pn-python-gsmd ?= "${AUTOREV}" SRCREV_pn-tichy ?= "${AUTOREV}" SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 43bdc8f259..96484d4d2c 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -231,7 +231,7 @@ PREFERRED_VERSION_dcopidl2cpp-native ?= "3.5.4" PREFERRED_VERSION_dcopidl-native ?= "3.5.4" PREFERRED_VERSION_dcron ?= "2.3.3" PREFERRED_VERSION_ddclient ?= "3.6.3" -PREFERRED_VERSION_debianutils ?= "2.19" +PREFERRED_VERSION_debianutils ?= "2.30" PREFERRED_VERSION_dejagnu ?= "1.4.4" PREFERRED_VERSION_dejagnu-native ?= "1.4.4" PREFERRED_VERSION_detect-stylus ?= "0.13" @@ -1713,7 +1713,7 @@ PREFERRED_VERSION_setserial ?= "2.17" PREFERRED_VERSION_setxkbmap ?= "1.0.4" PREFERRED_VERSION_sgml-common ?= "0.6.3" PREFERRED_VERSION_sgml-common-native ?= "0.6.3" -PREFERRED_VERSION_shared-mime-info ?= "0.22" +PREFERRED_VERSION_shared-mime-info ?= "0.51" PREFERRED_VERSION_sharp-compat-libs ?= "0.5" PREFERRED_VERSION_sharprom-toolchain-native ?= "1.0" PREFERRED_VERSION_shasum-native ?= "1.0" @@ -1932,8 +1932,8 @@ PREFERRED_VERSION_util-macros ?= "1.1.5" PREFERRED_VERSION_util-macros-native ?= "1.1.5" PREFERRED_VERSION_uucp ?= "1.07" PREFERRED_VERSION_v4l2apps ?= "20020317" -PREFERRED_VERSION_vala ?= "0.3.5" -PREFERRED_VERSION_vala-native ?= "0.3.5" +PREFERRED_VERSION_vala ?= "0.5.1" +PREFERRED_VERSION_vala-native ?= "0.5.1" PREFERRED_VERSION_vde ?= "2.0.2" PREFERRED_VERSION_vectoroids ?= "1.1.0" PREFERRED_VERSION_videoplayer ?= "0.1" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc new file mode 100644 index 0000000000..cf999a2a4d --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc @@ -0,0 +1,3 @@ +# This file is for updates after X11R7.4 was released + +PREFERRED_VERSION_xserver-xorg ?= "1.5.3" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index d6cdc13d5d..46fa8d496a 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -36,99 +36,44 @@ PREFERRED_VERSION_task-xorg ?= "X11R7.4" # app PREFERRED_VERSION_appres ?= "1.0.1" -PREFERRED_VERSION_bdftopcf ?= "1.0.1" -PREFERRED_VERSION_beforelight ?= "1.0.3" PREFERRED_VERSION_bitmap ?= "1.0.3" -PREFERRED_VERSION_editres ?= "1.0.3" -PREFERRED_VERSION_fontosfnt ?= "1.0.4" -PREFERRED_VERSION_fslsfonts ?= "1.0.2" -PREFERRED_VERSION_fstobdf ?= "1.0.3" PREFERRED_VERSION_iceauth ?= "1.0.2" -PREFERRED_VERSION_ico ?= "1.0.2" -PREFERRED_VERSION_lbxproxy ?= "1.0.1" -PREFERRED_VERSION_listres ?= "1.0.1" PREFERRED_VERSION_luit ?= "1.0.3" PREFERRED_VERSION_mkfontdir-native ?= "1.0.4" PREFERRED_VERSION_mkfontdir ?= "1.0.4" PREFERRED_VERSION_mkfontscale ?= "1.0.5" -PREFERRED_VERSION_oclock ?= "1.0.1" -PREFERRED_VERSION_proxymngr ?= "1.0.1" -PREFERRED_VERSION_rgb ?= "1.0.3" -PREFERRED_VERSION_rstart ?= "1.0.2" -PREFERRED_VERSION_scripts ?= "1.0.1" -PREFERRED_VERSION_sessreg ?= "1.0.3" +PREFERRED_VERSION_sessreg ?= "1.0.4" PREFERRED_VERSION_setxkbmap ?= "1.0.4" -PREFERRED_VERSION_showfont ?= "1.0.2" PREFERRED_VERSION_smproxy ?= "1.0.2" -PREFERRED_VERSION_twm ?= "1.0.4" -PREFERRED_VERSION_viewres ?= "1.0.1" PREFERRED_VERSION_x11perf ?= "1.5" PREFERRED_VERSION_xauth ?= "1.0.3" PREFERRED_VERSION_xbacklight ?= "1.1" -PREFERRED_VERSION_xbiff ?= "1.0.1" -PREFERRED_VERSION_xcalc ?= "1.0.2" -PREFERRED_VERSION_xclipboard ?= "1.0.1" -PREFERRED_VERSION_xclock ?= "1.0.3" -PREFERRED_VERSION_xcompmgr ?= "1.1.4" PREFERRED_VERSION_xcmsdb ?= "1.0.1" -PREFERRED_VERSION_xconsole ?= "1.0.3" PREFERRED_VERSION_xcursorgen ?= "1.0.2" -PREFERRED_VERSION_xdbedizzy ?= "1.0.2" -PREFERRED_VERSION_xditview ?= "1.0.1" -PREFERRED_VERSION_xdm ?= "1.1.8" PREFERRED_VERSION_xdpyinfo ?= "1.0.3" PREFERRED_VERSION_xdriinfo ?= "1.0.2" -PREFERRED_VERSION_xedit ?= "1.0.2" PREFERRED_VERSION_xev ?= "1.0.3" -PREFERRED_VERSION_xeyes ?= "1.0.1" -PREFERRED_VERSION_xxf86dga ?= "1.0.2" -PREFERRED_VERSION_xfd ?= "1.0.1" -PREFERRED_VERSION_xfindproxy ?= "1.0.1" -PREFERRED_VERSION_xfontsel ?= "1.0.2" -PREFERRED_VERSION_xfs ?= "1.0.8" -PREFERRED_VERSION_xfsinfo ?= "1.0.2" -PREFERRED_VERSION_xfwp ?= "1.0.1" PREFERRED_VERSION_xgamma ?= "1.0.2" -PREFERRED_VERSION_xgc ?= "1.0.1" PREFERRED_VERSION_xhost ?= "1.0.2" -PREFERRED_VERSION_xinit ?= "1.0.9" PREFERRED_VERSION_xinput ?= "1.3.0" PREFERRED_VERSION_xkbcomp ?= "1.0.5" PREFERRED_VERSION_xkbevd ?= "1.0.2" -PREFERRED_VERSION_xkbprint ?= "1.0.1" PREFERRED_VERSION_xkbutils ?= "1.0.1" PREFERRED_VERSION_xkill ?= "1.0.1" -PREFERRED_VERSION_xload ?= "1.0.2" -PREFERRED_VERSION_xlogo ?= "1.0.1" PREFERRED_VERSION_xlsatoms ?= "1.0.1" PREFERRED_VERSION_xlsclients ?= "1.0.1" -PREFERRED_VERSION_xlsfonts ?= "1.0.2" -PREFERRED_VERSION_xmag ?= "1.0.2" -PREFERRED_VERSION_xman ?= "1.0.3" -PREFERRED_VERSION_xmessage ?= "1.0.2" -PREFERRED_VERSION_xmh ?= "1.0.1" PREFERRED_VERSION_xmodmap ?= "1.0.3" -PREFERRED_VERSION_xmore ?= "1.0.1" -PREFERRED_VERSION_xphelloworld ?= "1.0.1" -PREFERRED_VERSION_xplsprinters ?= "1.0.1" PREFERRED_VERSION_xpr ?= "1.0.2" -PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1" PREFERRED_VERSION_xprop ?= "1.0.4" PREFERRED_VERSION_xrandr ?= "1.2.3" PREFERRED_VERSION_xrdb ?= "1.0.5" PREFERRED_VERSION_xrefresh ?= "1.0.2" -PREFERRED_VERSION_xrx ?= "1.0.1" PREFERRED_VERSION_xset ?= "1.0.4" PREFERRED_VERSION_xsetmode ?= "1.0.0" -PREFERRED_VERSION_xsetpointer ?= "1.0.1" PREFERRED_VERSION_xsetroot ?= "1.0.2" -PREFERRED_VERSION_xsm ?= "1.0.1" -PREFERRED_VERSION_xstdcmap ?= "1.0.1" -PREFERRED_VERSION_xtrap ?= "1.0.2" -PREFERRED_VERSION_xvidtune ?= "1.0.1" PREFERRED_VERSION_xvinfo ?= "1.0.2" -PREFERRED_VERSION_xwd ?= "1.0.1" -PREFERRED_VERSION_xwininfo ?= "1.0.3" +PREFERRED_VERSION_xwd ?= "1.0.2" +PREFERRED_VERSION_xwininfo ?= "1.0.4" PREFERRED_VERSION_xwud ?= "1.0.1" # data @@ -142,55 +87,35 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" # driver PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2" PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1" -PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2" -PREFERRED_VERSION_xf86-input-citron ?= "2.2.1" -PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1" -PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2" -PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2" -PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2" -PREFERRED_VERSION_xf86-input-elographics ?= "1.2.2" -PREFERRED_VERSION_xf86-input-evdev ?= "1.99.4" -PREFERRED_VERSION_xf86-input-fpit ?= "1.2.0" -PREFERRED_VERSION_xf86-input-hyperpen ?= "1.2.0" -PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0" -PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1" +PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" +PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2" PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1" -PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0" -PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" -PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0" -PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.0" -PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" -PREFERRED_VERSION_xf86-input-penmount ?= "1.3.0" -PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" -PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" -PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" -PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0" PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1" PREFERRED_VERSION_xf86-input-void ?= "1.1.1" PREFERRED_VERSION_xf86-video-apm ?= "1.2.0" PREFERRED_VERSION_xf86-video-ark ?= "0.7.0" PREFERRED_VERSION_xf86-video-ast ?= "0.85.0" -PREFERRED_VERSION_xf86-video-ati ?= "6.8.0" +PREFERRED_VERSION_xf86-video-ati ?= "6.9.0" PREFERRED_VERSION_xf86-video-chips ?= "1.2.0" PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1" -PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0" PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0" -PREFERRED_VERSION_xf86-video-geode ?= "2.9.0" -PREFERRED_VERSION_xf86-video-glide ?= "1.0.0" -PREFERRED_VERSION_xf86-video-glint ?= "1.2.0" -PREFERRED_VERSION_xf86-video-i128 ?= "1.3.0" +PREFERRED_VERSION_xf86-video-geode ?= "2.10.1" +PREFERRED_VERSION_xf86-video-glide ?= "1.0.1" +PREFERRED_VERSION_xf86-video-glint ?= "1.2.1" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1" PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0" -PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" -PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" -PREFERRED_VERSION_xf86-video-intel ?= "2.2.1" -PREFERRED_VERSION_xf86-video-mga ?= "1.4.8" +PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" +PREFERRED_VERSION_xf86-video-intel ?= "2.4.2" +PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.9" PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1" PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" -PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" -PREFERRED_VERSION_xf86-video-nv ?= "2.1.9" -PREFERRED_VERSION_xf86-video-radeonhd ?= "1.2.0" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.12" +PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903" +PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0" PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0" PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0" PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1" @@ -202,20 +127,20 @@ PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0" PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0" PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0" -PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0" PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0" PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0" -PREFERRED_VERSION_xf86-video-tga ?= "1.1.0" +PREFERRED_VERSION_xf86-video-tga ?= "1.2.0" PREFERRED_VERSION_xf86-video-trident ?= "1.3.0" PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0" PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0" -PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0" -PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" -PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" -PREFERRED_VERSION_xf86-video-via ?= "0.2.2" -PREFERRED_VERSION_xf86-video-vmware ?= "10.16.1" +PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" +PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0" +PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5" PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0" +PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1" +PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0" PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3" # font @@ -226,34 +151,35 @@ PREFERRED_VERSION_font-util ?= "1.0.1" PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1" # lib -PREFERRED_VERSION_diet-x11 ?= "1.1.3" +PREFERRED_VERSION_diet-x11 ?= "1.1.5" +PREFERRED_VERSION_libapplewm ?= "1.0.0" PREFERRED_VERSION_libdmx ?= "1.0.2" PREFERRED_VERSION_libfs ?= "1.0.1" -PREFERRED_VERSION_libfontenc ?= "1.0.4" PREFERRED_VERSION_libice ?= "1.0.4" -PREFERRED_VERSION_liblbxutil ?= "1.0.1" -PREFERRED_VERSION_libsm ?= "1.0.3" -PREFERRED_VERSION_libx11 ?= "1.1.4" +PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libsm ?= "1.1.0" +PREFERRED_VERSION_libwindowswm ?= "1.0.0" +PREFERRED_VERSION_libx11 ?= "1.1.5" PREFERRED_VERSION_libx11-native ?= "1.1.1" -PREFERRED_VERSION_libxau ?= "1.0.3" +PREFERRED_VERSION_libxau ?= "1.0.4" PREFERRED_VERSION_libxaw ?= "1.0.4" PREFERRED_VERSION_libxcomposite ?= "0.4.0" PREFERRED_VERSION_libxcursor ?= "1.1.9" -PREFERRED_VERSION_libxdamage ?= "1.0.4" +PREFERRED_VERSION_libxdamage ?= "1.1.1" PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" PREFERRED_VERSION_libxdmcp ?= "1.0.2" PREFERRED_VERSION_libxevie ?= "1.0.2" PREFERRED_VERSION_libxext ?= "1.0.4" PREFERRED_VERSION_libxfixes ?= "4.0.3" -PREFERRED_VERSION_libxfont ?= "1.3.2" +PREFERRED_VERSION_libxfont ?= "1.3.3" PREFERRED_VERSION_libxfontcache ?= "1.0.4" +PREFERRED_VERSION_libxft ?= "2.1.13" PREFERRED_VERSION_libxi ?= "1.1.3" PREFERRED_VERSION_libxinerama ?= "1.0.3" PREFERRED_VERSION_libxkbfile ?= "1.0.5" -PREFERRED_VERSION_libxkbui ?= "1.0.2" PREFERRED_VERSION_libxmu ?= "1.0.4" PREFERRED_VERSION_libxpm ?= "3.5.7" -PREFERRED_VERSION_libxrandr ?= "1.2.2" +PREFERRED_VERSION_libxrandr ?= "1.2.3" PREFERRED_VERSION_libxrender ?= "0.9.4" PREFERRED_VERSION_libxres ?= "1.0.3" PREFERRED_VERSION_libxscrnsaver ?= "1.1.3" @@ -263,24 +189,42 @@ PREFERRED_VERSION_libxv ?= "1.0.4" PREFERRED_VERSION_libxvmc ?= "1.0.4" PREFERRED_VERSION_libxxf86dga ?= "1.0.2" PREFERRED_VERSION_libxxf86misc ?= "1.0.1" -PREFERRED_VERSION_libxxf86vm ?= "1.0.1" -PREFERRED_VERSION_pixman ?= "0.10.0" -PREFERRED_VERSION_xtrans ?= "1.2" +PREFERRED_VERSION_libxxf86vm ?= "1.0.2" +PREFERRED_VERSION_xtrans ?= "1.2.1" + +# This should be here but is needed until bitbake can do +# versioned depends +PREFERRED_VERSION_mesa ?= "7.2" # proto +PREFERRED_VERSION_applewmproto ?= "1.0.3" +PREFERRED_VERSION_bigreqsproto ?= "1.0.2" PREFERRED_VERSION_compositeproto ?= "0.4" PREFERRED_VERSION_damageproto ?= "1.1.0" +PREFERRED_VERSION_dmxproto ?= "2.2.2" PREFERRED_VERSION_fixesproto ?= "4.0" +PREFERRED_VERSION_fontcacheproto ?= "0.1.2" +PREFERRED_VERSION_fontsproto ?= "2.0.2" PREFERRED_VERSION_glproto ?= "1.4.9" -PREFERRED_VERSION_inputproto ?= "1.4.3" +PREFERRED_VERSION_inputproto ?= "1.4.4" PREFERRED_VERSION_kbproto ?= "1.0.3" -PREFERRED_VERSION_printproto ?= "1.0.4" PREFERRED_VERSION_randrproto ?= "1.2.1" +PREFERRED_VERSION_recordproto ?= "1.13.2" PREFERRED_VERSION_renderproto ?= "0.9.3" +PREFERRED_VERSION_resourceproto ?= "1.0.2" PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" +PREFERRED_VERSION_trapproto ?= "3.4.3" +PREFERRED_VERSION_videoproto ?= "2.2.2" +PREFERRED_VERSION_windowswmproto ?= "1.0.3" +PREFERRED_VERSION_xmiscproto ?= "1.1.2" +PREFERRED_VERSION_xextproto ?= "7.0.3" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" -PREFERRED_VERSION_xproto-native ?= "7.0.12" -PREFERRED_VERSION_xproto ?= "7.0.12" +PREFERRED_VERSION_xf86driproto ?= "2.0.4" +PREFERRED_VERSION_xf86miscproto ?= "0.9.2" +PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" +PREFERRED_VERSION_xinemaroproto ?= "1.1.2" +PREFERRED_VERSION_xproto-native ?= "7.0.13" +PREFERRED_VERSION_xproto ?= "7.0.13" # util PREFERRED_VERSION_gccmakedep ?= "1.0.2" @@ -292,7 +236,7 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" # xserver PREFERRED_VERSION_xserver-kdrive ?= "1.4" -PREFERRED_VERSION_xserver-xorg ?= "1.4" +PREFERRED_VERSION_xserver-xorg ?= "1.5.1" # Unreleased packages SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index aa0f82322d..a5537876c3 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -46,16 +46,16 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-frameworkd ?= "a816e0412c687bf8e59e3505cce877f02e51f84d" +SRCREV_pn-frameworkd ?= "b4fc84fef759999e9e0cb73902e4b42fbbc8351d" SRCREV_pn-frameworkd-devel ?= "e8ad25f2e36e31e0a8afe08fbe11e54b9305aa8f" SRCREV_pn-fso-gpsd ?= "8f82d35ae83fdc00f2c4786257e98551b9dea995" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" -SRCREV_pn-gnuradio ?= "9721" +SRCREV_pn-gnuradio ?= "9809" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-sketchbook ?= "9547" -SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039" +SRCREV_pn-gsm0710muxd ?= "79e10fe8ad0828e5be9a5c087ac9ee04956674c1" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" @@ -86,7 +86,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" -SRCREV_pn-linux-openmoko ?= "f5b973489beb1a1239dfad53e3ad6e36ff7ee958" +SRCREV_pn-linux-openmoko ?= "9706327002caebe6633c93e605882ea37172ec57" SRCREV_pn-linux-openmoko-devel ?= "04f54c7001fb609e11ff4b2b4575c04188dbefef" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" @@ -98,8 +98,8 @@ SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-mickeydbus ?= "a63379b41241e6529e027e7ae812628a8f1f9f0b" -SRCREV_pn-mickeyterm ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a" +SRCREV_pn-mickeydbus ?= "e2698d54e2bec9a61ac858f9773d9ca1b78cc9a5" +SRCREV_pn-mickeyterm ?= "e2698d54e2bec9a61ac858f9773d9ca1b78cc9a5" SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "27659" @@ -110,7 +110,7 @@ SRCREV_pn-neod ?= "4617" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-networkmanager ?= "3202" SRCREV_pn-networkmanager-applet ?= "200" -SRCREV_pn-numptyphysics = "45" +SRCREV_pn-numptyphysics = "109" SRCREV_pn-om-locations ?= "28d56a504a41261c363c085a38f81721cdd6683e" SRCREV_pn-om-settings ?= "65" SRCREV_pn-oh-puzzles ?= "22" @@ -119,7 +119,7 @@ SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-agpsui ?= "7" -SRCREV_pn-openmoko-alsa-scenarios ?= "4406" +SRCREV_pn-openmoko-alsa-scenarios ?= "4732" SRCREV_pn-openmoko-appearance ?= "3262" SRCREV_pn-openmoko-appmanager2 ?= "4530" SRCREV_pn-openmoko-browser2 ?= "4172" @@ -150,7 +150,7 @@ SRCREV_pn-openmoko-sample2 ?= "3537" SRCREV_pn-openmoko-set-root-password ?= "4590" SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271" SRCREV_pn-openmoko-tasks2 ?= "399" -SRCREV_pn-openmoko-terminal2 ?= "4726" +SRCREV_pn-openmoko-terminal2 ?= "4782" SRCREV_pn-openmoko-theme-standard2 ?= "4338" SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today2 ?= "4168" @@ -159,9 +159,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4430" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "4640" -SRCREV_pn-opkg-native ?= "4640" -SRCREV_pn-opkg-sdk ?= "4640" +SRCREV_pn-opkg ?= "4755" +SRCREV_pn-opkg-native ?= "4755" +SRCREV_pn-opkg-sdk ?= "4755" SRCREV_pn-opkg-utils ?= "4534" SRCREV_pn-opkg-utils-native ?= "4534" SRCREV_pn-oprofileui ?= "173" @@ -184,6 +184,7 @@ QEMUSRCREV = "4242" SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" SRCREV_pn-qemu ?= "${QEMUSRCREV}" +SRCREV_pn-qi ?= "ed52486b43dca91891305b9e832c8366a2742798" SRCREV_pn-remoko = "115" SRCREV_pn-remoko-server = "115" SRCREV_pn-s3c24xx-gpio ?= "4130" @@ -194,10 +195,10 @@ SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-starling ?= "9574" SRCREV_pn-tichy ?= "168" SRCREV_pn-tmut ?= "60" -SRCREV_pn-u-boot-openmoko ?= "414367bf5b65942947dd5d569c27d2a8e8e5e562" -SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" +SRCREV_pn-u-boot-openmoko ?= "2b78a9413619902aa4ff55a986b12ece3021fbe3" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" +SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5" SRCREV_pn-webkit-gtk ?= "36540" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" @@ -205,15 +206,17 @@ SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1971" -SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7" -SRCREV_pn-zhone ?= "28e01227063ab76b9144e7a443319add6b195864" +SRCREV_pn-xserver-kdrive-glamo ?= "7fa46527131177dfba7e711d1530205a9efc5e79" +SRCREV_pn-zhone ?= "929c78f2e83faef526064231c17958eaef72eba3" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "36540" +EFL_SRCREV ?= "37324" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" +SRCREV_pn-eina-native ?= "${EFL_SRCREV}" +SRCREV_pn-eina ?= "${EFL_SRCREV}" SRCREV_pn-eet-native ?= "${EFL_SRCREV}" SRCREV_pn-eet ?= "${EFL_SRCREV}" SRCREV_pn-evas-native ?= "${EFL_SRCREV}" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 0e58afd243..fdbeb2d04c 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -158,6 +158,9 @@ PREFERRED_VERSION_pango ?= 1.20.5 PREFERRED_VERSION_glib-2.0 ?= 2.16.1 PREFERRED_VERSION_cairo ?= 1.4.8 +# Stay with older hal because of udev dependency +PREFERRED_VERSION_hal ?= 0.5.9 + # Stick with an older gettext and e2fsprogs stuff # and gnutls... (our autotools is too old at the moment) PREFERRED_VERSION_gnutls ?= "1.6.3" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index d36a6188df..a4a006f92c 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -60,6 +60,7 @@ PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" # for jalimo +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" PREFERRED_PROVIDER_classpath = "classpath" PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index b59057b6ff..5cb162524f 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -45,6 +45,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-initial:glibc-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" PREFERRED_PROVIDERS += " virtual/libc:glibc" |