diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-09-19 11:32:35 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-19 11:32:35 +0000 |
| commit | b2b667e89381c5bee23b9a6e96ccd7f04a15fd1b (patch) | |
| tree | 320f60bb9ab4410501ef6bff7a9acc2d7f51e04e /packages/mplayer/mplayer_0.0+1.0rc1.bb | |
| parent | 7006d4aac3bf1eef960d032965ae18f88c4acdfc (diff) | |
| parent | 85693efa33378405956ca83c7b24d45f5138d223 (diff) | |
propagate from branch 'org.openembedded.dev' (head 0ba4bbe5ebdf7f3598dd1890a61d14cd356eab54)
to branch 'org.openembedded.dev.avr32' (head d4fef411c5337e77b35acf5e2a06ffb56d059326)
Diffstat (limited to 'packages/mplayer/mplayer_0.0+1.0rc1.bb')
| -rw-r--r-- | packages/mplayer/mplayer_0.0+1.0rc1.bb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 6d9cd754d5..c0062bddd9 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -22,7 +22,11 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ file://imageon-video_out.patch;patch=1 \ file://powerpc-is-ppc.diff;patch=1 \ file://pxa_configure.patch;patch=1 \ - file://pxa-video_out.patch;patch=1 " + file://pxa-video_out.patch;patch=1 \ + " + +SRC_URI_append_avr32 = " file://mplayer-1.0rc1-atmel.2.patch;patch=1 \ + " # This is required for the collie machine only as all stacks in that # machine seem to be set to executable by the toolchain. If someone @@ -34,7 +38,7 @@ PACKAGE_ARCH_mencoder_collie = "collie" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r14" +PR = "r15" PARALLEL_MAKE = "" |