[oe-commits] org.oe.dev merge of '1ba9df24f1f8128a61ec636e73db71360782f1fc'

[hrw commit]

merge of '1ba9df24f1f8128a61ec636e73db71360782f1fc'
     and '1d14c551bc1dbe1ac63e66db38db383600d6a812'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2
ViewMTN: http://monotone.openembedded.org/revision/info/c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2
Files:
1
conf/machine/cm-x270.conf
packages/mplayer/files/mplayer-imageon-svn.patch
Diffs:

#
# mt diff -r1ba9df24f1f8128a61ec636e73db71360782f1fc -rc1ea3a8ae4f9e7d4be16a51f112cef674a5306d2
#
# 
# 
# patch "conf/machine/cm-x270.conf"
#  from [01698d66d048f367f36e135294ce9ba30856378a]
#    to [f9429eb200a306ada78b0ff137d01a378b020fbb]
# 
============================================================
--- conf/machine/cm-x270.conf	01698d66d048f367f36e135294ce9ba30856378a
+++ conf/machine/cm-x270.conf	f9429eb200a306ada78b0ff137d01a378b020fbb
@@ -8,7 +8,7 @@ PREFERRED_VERSION_linux = "2.6.22"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.22"
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 require conf/machine/include/tune-xscale.inc
 
@@ -41,7 +41,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian 
 	ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
 	"
 
-MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa iwmmxt"
 
 # to program the compulab NAND flash, the following scheme is suggested.  Create
 # a small rootfs that can fit in NOR flash using the following config:


#
# mt diff -r1d14c551bc1dbe1ac63e66db38db383600d6a812 -rc1ea3a8ae4f9e7d4be16a51f112cef674a5306d2
#
# 
# 
# patch "packages/mplayer/files/mplayer-imageon-svn.patch"
#  from [5f3e845098864e3a29e19d46b1bcd8fd947d58e1]
#    to [c30a4fa4d0746699cfe343a636b140a41c142baa]
# 
============================================================
--- packages/mplayer/files/mplayer-imageon-svn.patch	5f3e845098864e3a29e19d46b1bcd8fd947d58e1
+++ packages/mplayer/files/mplayer-imageon-svn.patch	c30a4fa4d0746699cfe343a636b140a41c142baa
@@ -5,9 +5,9 @@ Index: trunk/configure
 
 Index: trunk/configure
 ===================================================================
---- trunk.orig/configure
-+++ trunk/configure
-@@ -519,6 +519,7 @@ _svga=auto
+--- trunk.orig/configure	2007-10-07 20:31:56.000000000 +0100
++++ trunk/configure	2007-10-07 20:34:38.000000000 +0100
+@@ -545,6 +545,7 @@
  _vesa=auto
  _fbdev=auto
  _w100=no
@@ -15,7 +15,7 @@ Index: trunk/configure
  _dvb=auto
  _dvbhead=auto
  _dxr2=auto
-@@ -820,6 +821,8 @@ for ac_option do
+@@ -860,6 +861,8 @@
    --disable-fbdev)	_fbdev=no	;;
    --enable-w100)        _w100=yes       ;;
    --disable-w100)       _w100=no        ;;
@@ -24,7 +24,7 @@ Index: trunk/configure
    --enable-dvb)		_dvb=yes	;;
    --disable-dvb)        _dvb=no		;;
    --enable-dvbhead)	_dvbhead=yes	;;
-@@ -4329,6 +4332,18 @@ else
+@@ -4447,6 +4450,19 @@
  fi
  echores "$_w100"
  
@@ -32,6 +32,7 @@ Index: trunk/configure
 +if test "$_imageon" = yes ; then
 +  _def_imageon='#define HAVE_IMAGEON 1'
 +  _ld_imageon='-lw100'
++  _libs_mplayer="$_libs_mplayer $_ld_imageon"
 +  _vosrc="$_vosrc vo_imageon.c"
 +  _vomodules="imageon $_vomodules"
 +else
@@ -43,8 +44,8 @@ Index: trunk/configure
  
  echocheck "DVB"
  if test "$_dvb" = auto ; then
-@@ -8355,6 +8370,7 @@ $_def_xmga
- $_def_syncfb
+@@ -8453,6 +8469,7 @@
+ $_def_xmga
  $_def_fbdev
  $_def_w100
 +$_def_imageon
@@ -53,8 +54,8 @@ Index: trunk/libvo/vo_imageon.c
  $_def_ivtv
 Index: trunk/libvo/vo_imageon.c
 ===================================================================
---- /dev/null
-+++ trunk/libvo/vo_imageon.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/libvo/vo_imageon.c	2007-10-07 20:31:57.000000000 +0100
 @@ -0,0 +1,308 @@
 +#include <stdio.h>
 +#include <stdlib.h>