diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-07 18:24:25 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-07 18:24:25 +0000 |
| commit | 21d933f66c114a9d0972c1c104f8a91a1239dd57 (patch) | |
| tree | c5d441cf13eae28aa28eae42972de8e1819a088a /packages | |
| parent | e307ea2a862bd308504b3f18fb688423b9a87215 (diff) | |
| parent | e586b831d4c5c70b0e25c99f79c54bfe15360e12 (diff) | |
merge of 'eaf98be5dcfba80d61fd7d46052a466eef0710b7'
and 'efc59ba2f852cc347511e969a7a443ed2854c362'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/mplayer/files/pxa_configure.patch | 4 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_svn.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/mplayer/files/pxa_configure.patch b/packages/mplayer/files/pxa_configure.patch index 85530b77c5..94d41d13cc 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_IMAGEON' + _novomodules="pxa $_novomodules" +fi +echores "$_pxa" diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index 4d9c744e79..e481247970 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -40,7 +40,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc1+svnr${SRCREV}" -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE = "-1" PARALLEL_MAKE = "" |