diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-12 11:37:45 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-12 11:37:45 +0000 |
| commit | 1c5df3f485ba9992931e06d07f28c57a29d89e5e (patch) | |
| tree | f1f786842f479fcdef015d6bfb430f8ea599fac1 /packages/mplayer/files | |
| parent | d6fd6d24ea9cef7d661bed9424f54a7719bea5dc (diff) | |
| parent | 276e2ad3fd901d3fca0291979abc9c10455232ee (diff) | |
propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6c141f8)
to branch 'org.openembedded.dev.avr32' (head 6a2246abf3d894c89fc60280e99b73072b879e02)
Diffstat (limited to 'packages/mplayer/files')
| -rw-r--r-- | packages/mplayer/files/mplayer-imageon-svn.patch | 19 | ||||
| -rw-r--r-- | packages/mplayer/files/pxa_configure.patch | 4 |
2 files changed, 12 insertions, 11 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" |