diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-20 16:25:04 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-20 16:25:04 +0000 |
| commit | 040cac4381dad6ccdfc469947707801635b637f3 (patch) | |
| tree | 43baba065d1d11e16f6643c71f0058088cee27e1 /packages/mplayer/mplayer_0.0+1.0rc1.bb | |
| parent | 38b93f84292c8c73dbe31a819af460a25c6366c5 (diff) | |
| parent | 4eb9df8f9417be05b68b75b697300bb2321e9968 (diff) | |
merge of '81438ff8d532d4511d52cc48caae759eaf02741c'
and '8e96e2bb9c496749e3561f9bbb1bd1de9ae3258e'
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" |