merge of '2516927691cb7bcdc148fa4797baf97a39ab6b0c'

     and 'e969264b78652c9f002dfe005ae2a8924f4aa450'

7 files changed, 227 insertions, 29 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 316860dfaa..19ffcdb42e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5818,10 +5818,6 @@ sha256=66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc
 md5=15de3830b751818a54a42899bd3ae72c
 sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 
-[http://gpephone.linuxtogo.org/download/gpephone/libchenabler-0.1/libchenabler-0.1.tar.gz]
-md5=f29e1e63fcc55e3ae4e81f5ee9dd7bdd
-sha256=448a3ab76109664bb6bd8bcc2c62d957c7d44b52e39c37d91b3b73b5cfe35a3f
-
 [http://gpe.linuxtogo.org/download/source/libcontactsdb-0.1.tar.bz2]
 md5=575442be0c61e4b1e05f2188e2ae3141
 sha256=33a61a28617e5513e58bde9c16ef21c82c582c1513a0a325735c090ebbd9aefe
@@ -6050,10 +6046,6 @@ sha256=d4423a582510a1e3f47af9995337b590b9c480248821116b5397bc0652aeb52e
 md5=64304da2d9e21239246c66f1d449b2c6
 sha256=2b384172b54074aef4ec23b3fcc8292c86c7c4fb0efb943e7dea9d886a1d4846
 
-[http://gpephone.linuxtogo.org/download/gpephone/libgemwidget-0.1/libgemwidget-0.1.tar.bz2]
-md5=95d269ad7e7cb7d3032498ad2e47643b
-sha256=b8a1da871aa34362caf0c76dcbd3df42aef7313a4ed08f38eddcb159b80302c5
-
 [ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-2.0.1.tar.bz2]
 md5=4d93f6b01510013ae429e91af432cfe2
 sha256=6386901d84cb41fb8a584f7aa1b54c984e0590f36f45ee016ef30aa45554194d
@@ -6426,10 +6418,6 @@ sha256=c80da366576501be18a987c28609bd8ffa340ed20fc03249c70c43634f077052
 md5=54935c6cff42df2f1daada267b701392
 sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
 
-[http://gpephone.linuxtogo.org/download/gpephone/libmsgenabler-1.0/libmsgenabler-1.0.tar.bz2]
-md5=53417c192cff3e32fb1d7b839201a04d
-sha256=8a58b9a9eb8cae0dc15453d7737050a3b241eb1030797f1559b4bbb5aff061e6
-
 [http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.2.tar.gz]
 md5=88d35af903665fecbdee77eb6d5e6cdd
 sha256=f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 98e1c6e22b..93b666c896 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -64,7 +64,7 @@ PREFERRED_VERSION_gcc-cross             = "4.2.1"
 PREFERRED_VERSION_gcc-cross-initial    	= "4.1.2"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	= "2.6.22"
+PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
 #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
 PREFERRED_VERSION_glibc 		= "2.6.1"
diff --git a/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf b/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
index 5faa6bcff3..f9fde86d2d 100644
--- a/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
+++ b/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
@@ -2,24 +2,24 @@
 # All sizes and positions have pixels as units.
 # The align setting is a positive value from 0 (left) to 10 (right).
 
-[Key 1]
+[Key 1]                                                        
 label = left
-width = 200
-height = 44
-xpos = 0
-ypos = 2
-xpos_menu = 1
-ypos_menu = 1
+width = 180
+height = 36
+xpos = 5
+ypos = 5
+xpos_menu = 5
+ypos_menu = 30
 align = 1
 key = F3
-
+              
 [Key 2]
 label = right
-width = 200
-height = 44
-xpos = 280
-ypos = 2
-xpos_menu = 1
-ypos_menu = 1
+width = 180
+height = 36
+xpos = 295
+ypos = 5
+xpos_menu = 5
+ypos_menu = 30
 align = 9
 key = F4
diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb
index 35342c11d2..1efcd793e0 100644
--- a/packages/gpephone/gpe-applauncher_0.11.bb
+++ b/packages/gpephone/gpe-applauncher_0.11.bb
@@ -2,7 +2,7 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r2"
+PR          = "r1"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
diff --git a/packages/linux/linux-bfin_svn.bb b/packages/linux/linux-bfin_svn.bb
index ee5b04910f..d7402e606a 100644
--- a/packages/linux/linux-bfin_svn.bb
+++ b/packages/linux/linux-bfin_svn.bb
@@ -1,5 +1,7 @@
 require linux.inc
 
+COMPATIBLE_HOST = 'bfin.*-uclinux'
+
 PV = "2.6.22.10+svnr${SRCREV}"
 
 SRC_URI = "svn://sources.blackfin.uclinux.org/linux-kernel/;module=trunk \
diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
new file mode 100644
index 0000000000..92b8b3ced9
--- /dev/null
+++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb
@@ -0,0 +1,208 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "multimedia"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.mplayerhq.hu/"
+DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11"
+DEPENDS_append_c7x0 = " libw100 "
+DEPENDS_append_hx4700 = " libw100 "
+
+RDEPENDS = "mplayer-common"
+LICENSE = "GPL"
+SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 \
+           file://vo_w100.c \
+           file://vo_w100_api.h \
+           file://vo_w100_fb.h \
+           file://vo_pxa.c \
+           file://vo_pxa.h \
+	   file://simple_idct_armv5te.S \
+           file://Makefile-codec-cfg.patch;patch=1 \
+           file://w100-configure-svn.patch;patch=1 \
+           file://w100-video_out.patch;patch=1 \
+           file://w100-mplayer.patch;patch= \
+           file://pld-onlyarm5.patch;patch=1 \
+           file://makefile-nostrip-svn.patch;patch=1 \
+           file://mplayer-imageon-svn.patch;patch=1 \
+           file://imageon-video_out.patch;patch=1 \
+           file://pxa_configure.patch;patch=1 \
+           file://pxa-video_out.patch;patch=1 "
+
+# This is required for the collie machine only as all stacks in that
+# machine seem to be set to executable by the toolchain. If someone
+# discovers this is more general than please make this more general
+# ie. for all armv4 machines.
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
+
+PACKAGE_ARCH_collie = "collie"
+PACKAGE_ARCH_c7x0 = "c7x0"
+PACKAGE_ARCH_hx4700 = "hx4700"
+
+RCONFLICTS_${PN} = "mplayer-atty"
+RREPLACES_${PN} = "mplayer-atty"
+
+PR = "r5"
+
+PARALLEL_MAKE = ""
+
+S = "${WORKDIR}/MPlayer-1.0rc2"
+
+PACKAGES =+ "mencoder"
+
+FILES_${PN} = "${bindir}/mplayer ${libdir}"
+FILES_mencoder = "${bindir}/mencoder"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " \
+        --prefix=/usr \
+	--mandir=${mandir} \
+        --target=${TARGET_SYS} \
+	\
+	--enable-mencoder \
+	--disable-gui \
+	--enable-largefiles \
+	--disable-linux-devfs \
+	--disable-lirc \
+	--disable-lircc \
+        --disable-joystick \
+        --disable-vm \
+        --disable-xf86keysym \
+	--disable-tv \
+        --disable-tv-v4l2 \
+        --disable-tv-bsdbt848 \
+	--enable-rtc \
+        --enable-network \
+        --disable-winsock2 \
+	--disable-smb \
+        --disable-live \
+	--disable-dvdnav \
+        --disable-dvdread \
+	--disable-libdvdcss-internal \
+	--disable-dvdread-internal \
+        --disable-cdparanoia \
+        --enable-freetype \
+        --disable-unrarlib \
+        --disable-menu \
+        --enable-sortsub \
+        --disable-fribidi \
+        --disable-enca \
+        --disable-macosx \
+        --disable-macosx-finder-support \
+        --disable-macosx-bundle \
+        --disable-ftp \
+        --disable-vstream \
+        \
+        --disable-gif \
+        --enable-png \
+        --enable-jpeg \
+        --disable-libcdio \
+        --disable-liblzo \
+        --disable-qtx \
+        --disable-xanim \
+        --disable-real \
+        --disable-xvid \
+        --disable-x264 \
+        \
+        --disable-libavutil_so \
+        --disable-libavcodec_so \
+        --disable-libavformat_so \
+        --disable-libpostproc_so \
+        \
+	--enable-tremor-low \
+        \
+        --disable-speex \
+        --disable-theora \
+        --disable-faac \
+        --disable-ladspa \
+        --disable-libdv \
+        --enable-mad \
+        --disable-toolame \
+        --disable-twolame \
+        --disable-xmms \
+	--disable-mp3lib \
+        --enable-libmpeg2 \
+        --disable-musepack \
+	\
+        --disable-gl \
+        --disable-vesa \
+        --disable-svga \
+	--enable-sdl \
+        --disable-aa \
+        --disable-caca \
+        --disable-ggi \
+        --disable-ggiwmh \
+        --disable-directx \
+        --disable-dxr2 \
+        --disable-dxr3 \
+        --disable-dvb \
+        --disable-dvbhead \
+        --disable-mga \
+        --disable-xmga \
+        --enable-xv \
+        --disable-xvmc \
+        --disable-vm \
+        --disable-xinerama \
+        --enable-x11 \
+	--enable-fbdev \
+        --disable-mlib \
+        --disable-3dfx \
+        --disable-tdfxfb \
+        --disable-s3fb \
+        --disable-directfb \
+        --disable-zr \
+        --disable-bl \
+        --disable-tdfxvid \
+        --disable-tga \
+        --disable-pnm \
+        --disable-md5sum \
+        \
+        --enable-alsa \
+        --enable-ossaudio \
+        --disable-arts \
+        --disable-esd \
+        --disable-polyp \
+        --disable-jack \
+        --disable-openal \
+        --disable-nas \
+        --disable-sgiaudio \
+        --disable-sunaudio \
+        --disable-win32waveout \
+        --enable-select \
+        \
+        "
+
+EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \
+			    --disable-encoder=vorbis_encoder"
+EXTRA_OECONF_append_c7x0 = " --enable-imageon "
+EXTRA_OECONF_append_hx4700 = " --enable-imageon "
+
+#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
+#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt 
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}"
+
+MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"
+TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"
+
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '--enable-runtime-cpudetection', '',d)} "
+
+do_configure() {
+	cp ${WORKDIR}/vo_w100.c ${S}/libvo
+	cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
+	cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
+	cp ${WORKDIR}/vo_pxa.c ${S}/libvo
+	cp ${WORKDIR}/vo_pxa.h ${S}/libvo
+	cp ${WORKDIR}/simple_idct_armv5te.S ${S}/libavcodec/armv4l/
+
+	sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
+	sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
+	sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
+	sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
+
+        ./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake
+}
+
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index e481247970..04035098fa 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -39,7 +39,7 @@ PACKAGE_ARCH_hx4700 = "hx4700"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-PV = "0.0+1.0rc1+svnr${SRCREV}"
+PV = "0.0+1.0rc2+svnr${SRCREV}"
 PR = "r5"
 DEFAULT_PREFERENCE = "-1"