diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-12-18 12:42:30 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-12-18 12:42:30 +0000 |
| commit | 302f1878f6adacd506a24dd55fecc262a57bf61e (patch) | |
| tree | 01d956bb40dd7f8320529dae39b4af672a78b759 /packages/mplayer | |
| parent | 1e95b071286b30ba0100992802d3bc00212b9b16 (diff) | |
| parent | f343e9fff25f88a986decc37872a60ced1f9ee27 (diff) | |
merge of '376e6271722a4507ea977a475f9ff512db8e21d2'
and 'da6646149e7acfedf7008af8e7c94f36f25654da'
Diffstat (limited to 'packages/mplayer')
| -rw-r--r-- | packages/mplayer/mplayer_0.0+1.0rc1.bb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 41b50bd656..3a63413d7a 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -19,6 +19,14 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \ file://imageon-video_out.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 +# discovers this is more general than please make this more general +# ie. for all armv4 machines. +SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1" +PACKAGE_ARCH_mplayer_collie = "collie" +PACKAGE_ARCH_mencoder_collie = "collie" + RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PR = "r4" |