summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2006-12-18 11:43:26 +0000
committerGraeme Gregory <dp@xora.org.uk>2006-12-18 11:43:26 +0000
commit6283800eb68b451a3c68f754c711cec831c8c71a (patch)
treeecb069f2510980fd0e2c161fd8759f2f50ad0a37 /packages
parent875d1a0a804b0898e79e532476ee70fdbe1c6a1a (diff)
mplayer_0.0+1.0rc1.bb : add patch for #1666 for collie
Thanks to the reporter of #1666 for the patch.
Diffstat (limited to 'packages')
-rw-r--r--packages/mplayer/mplayer_0.0+1.0rc1.bb8
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"