From 2c9800fe9fd97f3498b5b8e93f50e8f68cd07820 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 15 Sep 2011 18:49:40 +0200 Subject: workaround segfault --- package/mplayer/Makefile | 8 +++++++- package/mplayer/patches/patch-libao2_ao_alsa_c | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 package/mplayer/patches/patch-libao2_ao_alsa_c (limited to 'package/mplayer') 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); -- cgit v1.2.3 From 3438aee79df2f634723cb77828edd30364ea0e43 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 18 Sep 2011 17:57:02 +0200 Subject: add support for theora/vorbis, some minor fixes --- package/ffmpeg/Makefile | 13 ++++++++++++- package/mplayer/Makefile | 12 ++++++++---- package/vlc/Makefile | 11 ++++++----- package/xvidcore/.Makefile.swp | Bin 12288 -> 0 bytes 4 files changed, 26 insertions(+), 10 deletions(-) delete mode 100644 package/xvidcore/.Makefile.swp (limited to 'package/mplayer') diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index c81fef65e..aabe94394 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -27,7 +27,8 @@ PKGSC_FFSERVER:= multimedia PKGSD_FFPROBE:= simple multimedia stream analyzer PKGSC_FFPROBE:= multimedia -PKG_FLAVOURS_LIBFFMPEG:= WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA WITH_XVID +PKG_FLAVOURS_LIBFFMPEG:= WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA +PKG_FLAVOURS_LIBFFMPEG+= WITH_XVID WITH_VORBIS PKGFD_WITH_AAC:= with AAC encoding support PKGFS_WITH_AAC:= libfaac @@ -64,6 +65,13 @@ ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y) PKG_FDEPENDS+= libxvid endif +PKGFD_WITH_VORBIS:= with Vorbis encoding support +PKGFS_WITH_VORBIS:= libvorbisenc +PKGFB_WITH_VORBIS:= libvorbis +ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS),y) +PKG_FDEPENDS+= libvorbisenc +endif + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk @@ -128,6 +136,9 @@ endif ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y) CONFIGURE_ARGS+= --enable-libxvid endif +ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS),y) +CONFIGURE_ARGS+= --enable-libvorbis +endif libffmpeg-install: ${INSTALL_DIR} ${IDIR_LIBFFMPEG}/usr/lib diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 8d00df04a..e46d63f0f 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -5,16 +5,17 @@ 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/ @@ -102,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 \ @@ -141,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/vlc/Makefile b/package/vlc/Makefile index 68417de05..9e2481658 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= vlc PKG_VERSION:= 1.1.11 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= a64846d6f21ea179ae8e8bfb6f9447fe PKG_DESCR:= Media Player PKG_SECTION:= multimedia -PKG_BUILDDEP:= ffmpeg xcb-util -PKG_DEPENDS:= libffmpeg xcb-util +PKG_BUILDDEP:= ffmpeg xcb-util libtheora libgcrypt +PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt PKG_URL:= http://www.videolan.org/vlc/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vlc/1.1.11/} @@ -26,10 +26,11 @@ CONFIGURE_ARGS+= --disable-lua \ --disable-fribidi \ --disable-qt4 \ --disable-skins2 \ - --disable-libgcrypt \ --disable-remoteosd \ --disable-dvdnav \ - --disable-libxml2 + --disable-libxml2 \ + --enable-libgcrypt \ + --enable-theora vlc-install: $(INSTALL_DIR) $(IDIR_VLC)/usr/bin diff --git a/package/xvidcore/.Makefile.swp b/package/xvidcore/.Makefile.swp deleted file mode 100644 index 2a882c77b..000000000 Binary files a/package/xvidcore/.Makefile.swp and /dev/null differ -- cgit v1.2.3 From b6b578b3321c3a593c69b7ba2d8ac605002a1b70 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 11 Oct 2011 06:20:14 +0200 Subject: add groups audio / video as default --- package/base-files/src/etc/group | 2 ++ package/mplayer/files/mplayer.postinst | 4 ---- package/xorg-server/files/xorg-server.postinst | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 package/mplayer/files/mplayer.postinst (limited to 'package/mplayer') diff --git a/package/base-files/src/etc/group b/package/base-files/src/etc/group index c4e77f316..bbf6c0603 100644 --- a/package/base-files/src/etc/group +++ b/package/base-files/src/etc/group @@ -1,2 +1,4 @@ root:x:0: +video:x:1: +audio:x:2: nogroup:x:65534: 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/xorg-server/files/xorg-server.postinst b/package/xorg-server/files/xorg-server.postinst index e26e54f3f..09f00dd35 100644 --- a/package/xorg-server/files/xorg-server.postinst +++ b/package/xorg-server/files/xorg-server.postinst @@ -1,5 +1,2 @@ #!/bin/sh if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/Xorg;fi -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group video $gid -- cgit v1.2.3