propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6c141f8)

            to branch 'org.openembedded.dev.avr32' (head 6a2246abf3d894c89fc60280e99b73072b879e02)

3 files changed, 23 insertions, 17 deletions

diff --git a/packages/mplayer/files/mplayer-imageon-svn.patch b/packages/mplayer/files/mplayer-imageon-svn.patch
index c8bb8709cd..744a520b13 100644
--- a/packages/mplayer/files/mplayer-imageon-svn.patch
+++ b/packages/mplayer/files/mplayer-imageon-svn.patch
@@ -5,9 +5,9 @@
 
 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/configure
  $_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>
diff --git a/packages/mplayer/files/pxa_configure.patch b/packages/mplayer/files/pxa_configure.patch
index 85530b77c5..079d3086de 100644
--- a/packages/mplayer/files/pxa_configure.patch
+++ b/packages/mplayer/files/pxa_configure.patch
@@ -25,11 +25,11 @@ Index: MPlayer-1.0rc1/configure
  
 +echocheck "PXA27x Overlay Support"
 +if test "$_pxa" = yes ; then
-+  _def_imageon='#define HAVE_PXA 1'
++  _def_pxa='#define HAVE_PXA 1'
 +  _vosrc="$_vosrc vo_pxa.c"
 +  _vomodules="pxa $_vomodules"
 +else
-+  _def_imageon='#undef HAVE_IMAGEON'
++  _def_pxa='#undef HAVE_PXA'
 +  _novomodules="pxa $_novomodules"
 +fi
 +echores "$_pxa"
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index bd2bc96b52..e481247970 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -3,6 +3,9 @@ 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 = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
@@ -28,14 +31,16 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
 # 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_mplayer_collie = "collie"
-PACKAGE_ARCH_mencoder_collie = "collie"
+
+PACKAGE_ARCH_collie = "collie"
+PACKAGE_ARCH_c7x0 = "c7x0"
+PACKAGE_ARCH_hx4700 = "hx4700"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc1+svnr${SRCREV}"
-PR = "r3"
+PR = "r5"
 DEFAULT_PREFERENCE = "-1"
 
 PARALLEL_MAKE = ""
@@ -165,13 +170,12 @@ EXTRA_OECONF = " \
         --disable-win32waveout \
         --enable-select \
         \
-        --disable-runtime-cpudetection \
         "
 
 EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \
 			    --disable-encoder=vorbis_encoder"
-
-EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
+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 
@@ -182,6 +186,7 @@ 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