diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-15 18:49:40 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-15 18:49:40 +0200 |
| commit | 2c9800fe9fd97f3498b5b8e93f50e8f68cd07820 (patch) | |
| tree | ba6805282acd32e7b43c59ea470ad389cb96190b | |
| parent | 6a64884dbf951f39eab4d7d11cee75062d16b7c9 (diff) | |
workaround segfault
| -rw-r--r-- | package/mplayer/Makefile | 8 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-libao2_ao_alsa_c | 14 |
2 files changed, 21 insertions, 1 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 8bedd1023..8d00df04a 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -18,7 +18,7 @@ PKG_BUILDDEP+= libX11 libXv libpng libXext jpeg PKG_URL:= http://www.mplayerhq.hu/ PKG_SITES:= http://openadk.org/distfiles/ -PKG_ARCH_DEPENDS:= x86 mips +PKG_ARCH_DEPENDS:= x86 mips arm PKG_FLAVOURS_MPLAYER:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support @@ -30,6 +30,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +XAKE_FLAGS+= GCC_HONOUR_COPTS=s # gcc 4.5 produces internal compiler error with -Os TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS)) @@ -68,6 +69,11 @@ CONFIGURE_CPU_OPTS+= --enable-sse2 else CONFIGURE_CPU_OPTS+= --disable-sse2 endif +#ifeq (${ADK_TARGET_CPU_WITH_IWMMXT},y) +#CONFIGURE_CPU_OPTS+= --enable-iwmmxt +#else +#CONFIGURE_CPU_OPTS+= --disable-iwmmxt +#endif ifeq ($(ADK_DEBUG),y) CONFIGURE_DEBUG= --enable-debug diff --git a/package/mplayer/patches/patch-libao2_ao_alsa_c b/package/mplayer/patches/patch-libao2_ao_alsa_c new file mode 100644 index 000000000..26d0832dc --- /dev/null +++ b/package/mplayer/patches/patch-libao2_ao_alsa_c @@ -0,0 +1,14 @@ +--- mplayer-1.0-32749.orig/libao2/ao_alsa.c 2011-01-03 11:26:52.000000000 +0100 ++++ mplayer-1.0-32749/libao2/ao_alsa.c 2011-09-14 20:52:35.457990653 +0200 +@@ -760,8 +760,9 @@ static int play(void* data, int len, int + { + int num_frames; + snd_pcm_sframes_t res = 0; +- if (!(flags & AOPLAY_FINAL_CHUNK)) +- len = len / ao_data.outburst * ao_data.outburst; ++ // SIGFPE on Sharp Zaurus ARM CPU ++ //if (!(flags & AOPLAY_FINAL_CHUNK)) ++ // len = len / ao_data.outburst * ao_data.outburst; + num_frames = len / bytes_per_sample; + + //mp_msg(MSGT_AO,MSGL_ERR,"alsa-play: frames=%i, len=%i\n",num_frames,len); |