diff options
author | Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
---|---|---|
committer | Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
commit | 4ee358534793381d2e87b01781079a3354fd5c1c (patch) | |
tree | 729f8b0ce4bdbcd8a16f561fb68da0d66c3a3eb8 /recipes/mplayer/mplayer_git.bb | |
parent | beb17e26ee9b4bc0cf334c3b30560c6eb66b1299 (diff) | |
parent | eda06ec3dde6169a46797f876a82499c4fff8f62 (diff) | |
download | openembedded-324a7c75ac7f591e950836686bfe14332ce6586b.tar.gz |
Merge branch 'org.openembedded.dev' into testing-nexttesting_2010-09-13
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" |