diff options
| author |   Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2010-09-12 17:12:28 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2010-09-12 23:06:54 +0200 |
| commit | 67995a2671f08f07a1fb03e52945908c05d2fa5b (patch) | |
| tree | 52337a8fd915cf875d307c201b00eda631e8db07 /recipes/mplayer/mplayer_git.bb | |
| parent | 9d7e58705342fe622a233c621609762ddddd3eca (diff) | |
| download | openembedded-67995a2671f08f07a1fb03e52945908c05d2fa5b.tar.gz | |
mplayer_git: fix omapfb patchset and bump PR
omapfb.patch was rebased and added as mplayer-git_omapfb.patch
vo_omapfb.c had to be patched due to API change,
hence the omapfb_control_arguments.patch
Thanks to kergoth(on #oe on Freenode) for help on how to patch a file that is copied only
in do_configure_prepend which comes after do_patch
The first attempt :
file://omapfb_control_arguments.patch;patchdir=${WORKDIR}
resulted in a strange behaviour such as:
NOTE: Handling BitBake files: \ (0675/7073) [ 9 %]NOTE: <type 'exceptions.RuntimeError'>:maximum recursion depth exceeded while evaluating:
${PN}-${EXTENDPE}${PV}-${PR}
NOTE: <type 'exceptions.RuntimeError'>:maximum recursion depth exceeded while evaluating:
${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}
so I used patchdir=.. as advised:
<kergoth> you could try using patchdir=..
Thanks a lot for all the help.
Diffstat (limited to 'recipes/mplayer/mplayer_git.bb')
| -rw-r--r-- | recipes/mplayer/mplayer_git.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index b9cb16cdda..afeb5b3480 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -12,9 +12,10 @@ SRC_URI = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=master \ " SRC_URI_append_armv7a = " \ - file://omapfb.patch \ + file://mplayer-git_omapfb.patch \ file://vo_omapfb.c \ file://yuv.S \ + file://omapfb_control_arguments.patch;patchdir=.. \ " # This is required for the collie machine only as all stacks in that @@ -35,7 +36,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc4+gitr${SRCPV}" -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "2" |