diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:10:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:10:52 +0200 |
| commit | 681a668edf704bbb000a49c835b3d71fa7035d86 (patch) | |
| tree | 27df7d51e37260f63812466b31369c1a144cdc45 /package/mplayer | |
| parent | 2d1f73d4334593134d3a47704a2614ffcae384ae (diff) | |
| parent | 6c2bc15eb5c40548f6a98c37ab0b825b9c163343 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/mplayer')
| -rw-r--r-- | package/mplayer/Makefile | 20 | ||||
| -rw-r--r-- | package/mplayer/files/mplayer.postinst | 4 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-libao2_ao_alsa_c | 14 |
3 files changed, 29 insertions, 9 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 8bedd1023..e46d63f0f 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -5,20 +5,21 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer PKG_VERSION:= 1.0-32749 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= aadc5d8cca503c8b18b3ed00b3a52cf5 PKG_DESCR:= popular video player PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses PKG_DEPENDS+= libogg libpng libpthread libvorbis giflib PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib -PKG_DEPENDS+= libxscrnsaver +PKG_DEPENDS+= libxscrnsaver libtheora libxvid libvpx PKG_BUILDDEP:= alsa-lib libmad libvorbis faad2 ncurses zlib -PKG_BUILDDEP+= libX11 libXv libpng libXext jpeg +PKG_BUILDDEP+= libX11 libXv libpng libXext jpeg libtheora +PKG_BUILDDEP+= xvidcore libvpx 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 +31,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 +70,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 @@ -96,13 +103,15 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-jpeg \ --enable-mad \ --enable-libvorbis \ + --enable-faac \ + --enable-theora \ + --enable-xvid \ --disable-ossaudio \ --disable-vm \ --disable-iconv \ --disable-lirc \ --disable-radio-v4l2 \ --disable-speex \ - --disable-faac \ --disable-libdv \ --disable-live \ --disable-pvr \ @@ -135,6 +144,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ ${CONFIGURE_DIRECTFB} XAKE_FLAGS+= AR="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" +TARGET_LDFLAGS+= -lxvidcore post-install: ${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin diff --git a/package/mplayer/files/mplayer.postinst b/package/mplayer/files/mplayer.postinst deleted file mode 100644 index 386bf95c2..000000000 --- a/package/mplayer/files/mplayer.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group video $gid 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); |