[oe-commits] org.oe.dev mplayer_0.0+1.0rc1.bb : add patch for #1666 for collie

xora commit openembedded-commits at lists.openembedded.org
Mon Dec 18 11:47:30 UTC 2006


mplayer_0.0+1.0rc1.bb : add patch for #1666 for collie

Thanks to the reporter of #1666 for the patch.

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: d8ef77dd104e8911dc8beccf81f4e0d3acd93ba5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d8ef77dd104e8911dc8beccf81f4e0d3acd93ba5
Files:
1
packages/mplayer/mplayer_0.0+1.0rc1.bb
Diffs:

#
# mt diff -rcfef3514561ff9ce852948e81d2ab88315d0481c -rd8ef77dd104e8911dc8beccf81f4e0d3acd93ba5
#
# 
# 
# patch "packages/mplayer/mplayer_0.0+1.0rc1.bb"
#  from [46579913cb2cfe550472d53d4cf2ed98a3845b52]
#    to [af3781a13435034f614b22a0d0a3ab8a77e1026d]
# 
============================================================
--- packages/mplayer/mplayer_0.0+1.0rc1.bb	46579913cb2cfe550472d53d4cf2ed98a3845b52
+++ packages/mplayer/mplayer_0.0+1.0rc1.bb	af3781a13435034f614b22a0d0a3ab8a77e1026d
@@ -19,6 +19,14 @@ SRC_URI = "http://www1.mplayerhq.hu/MPla
            ${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"






More information about the Openembedded-commits mailing list