diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-21 11:18:00 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-21 11:18:00 +0000 |
| commit | eabaa88ffbd6d0125d31c629534614f3ede92b43 (patch) | |
| tree | ebb3845832061ec8e9bc757133e780e058516c9c /packages/mplayer | |
| parent | 373c52d20c06479a59091293dbeb1cc22ed74dc4 (diff) | |
| parent | 5a1269e53c80708c3e3f53569791c66eab0cae12 (diff) | |
merge of '740568b10a465e2c82673155e6c544f4bf1fd4c3'
and '76e7f9f8a56e5ea977d7491ec4871f97befb0507'
Diffstat (limited to 'packages/mplayer')
| -rw-r--r-- | packages/mplayer/files/disable-executable-stack-test.patch | 30 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_0.0+1.0rc1.bb | 8 |
2 files changed, 38 insertions, 0 deletions
diff --git a/packages/mplayer/files/disable-executable-stack-test.patch b/packages/mplayer/files/disable-executable-stack-test.patch new file mode 100644 index 0000000000..dc8871b6ae --- /dev/null +++ b/packages/mplayer/files/disable-executable-stack-test.patch @@ -0,0 +1,30 @@ +Removes the "noexecstack" check from configure so we don't end up with: + + mplayer: error while loading shared libraries: libmad.so.0: cannot + enable executable stack as shared object requires: Error 14 + +at runtime. + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- MPlayer-1.0pre8/configure~disable-executable-stack-test ++++ MPlayer-1.0pre8/configure +@@ -7193,15 +7193,7 @@ + fi + + echocheck "compiler support for noexecstack" +-cat > $TMPC <<EOF +-int main(void) { return 0; } +-EOF +-if cc_check -Wl,-z,noexecstack ; then +- _ld_extra="-Wl,-z,noexecstack $_ld_extra" +- echores "yes" +-else +- echores "no" +-fi ++echores "no" + + echocheck "ftello()" + # if we don't have ftello use the osdep/ compatibility module 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" |