diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-12-18 11:51:39 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-12-18 11:51:39 +0000 |
| commit | f343e9fff25f88a986decc37872a60ced1f9ee27 (patch) | |
| tree | 325a4c68f194bb611239513b79f96b4b0d28a58f /packages/mplayer/mplayer_0.0+1.0rc1.bb | |
| parent | 3945a6db23241d715cddf8f517ed8d915859d5ba (diff) | |
| parent | 6283800eb68b451a3c68f754c711cec831c8c71a (diff) | |
merge of '3ac74c1bd7ff1bde609181b634938ce9bed0a3d3'
and 'd8ef77dd104e8911dc8beccf81f4e0d3acd93ba5'
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, 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" |