merge of 8f7f4f1a6f08da91c5fe2312650063893394888b

     and f69ed55f40216d16d8f1cb7559d13b46385991b2

1 files changed, 115 insertions, 5 deletions

diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb
index 9c66221f57..071b403695 100644
--- a/packages/mplayer/mplayer_1.0pre8.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
+DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses lame"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
@@ -15,12 +15,13 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
 	   file://w100-video_out.patch;patch=1 \
 	   file://w100-mplayer.patch;patch=1 \
            file://libmpdemux-ogg-include.patch;patch=1 \
-           file://libmpcodecs-ogg-include.patch;patch=1"
+           file://libmpcodecs-ogg-include.patch;patch=1 \
+           file://pld-onlyarm5.patch;patch=1"
 
 MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r0"
+PR = "r1"
 
 PARALLEL_MAKE = ""
 
@@ -46,17 +47,126 @@ EXTRA_OECONF = " \
 	--disable-linux-devfs \
 	--disable-lirc \
 	--disable-lircc \
+        --disable-joystick \
+        --disable-vm \
+        --disable-xf86keysym \
 	--disable-tv \
+        --disable-tv-v4l \
+        --disable-tv-v4l2 \
+        --disable-tv-bsdbt848 \
 	--enable-rtc \
+        --enable-network \
+        --disable-winsock2 \
 	--disable-smb \
+        --disable-live \
+        --disable-dvdread \
+        --disable-mpdvdkit \
+        --disable-cdparanoia \
+        --disable-freetype \
+        --enable-fontconfig \
+        --disable-unrarlib \
+        --disable-menu \
+        --enable-sortsub \
+        --disable-fribidi \
+        --disable-enca \
+        --disable-macosx \
+        --disable-macosx-finder-support \
+        --disable-macosx-bundle \
+        --disable-ftp \
+        --disable-vstream \
+        \
+        --enable-gif \
+        --enable-png \
+        --enable-jpeg \
+        --disable-libcdio \
+        --enable-liblzo \
 	--disable-win32 \
+        --disable-dshow \
+        --disable-qtx \
+        --disable-xanim \
+        --disable-real \
+        --disable-xvid \
+        --disable-x264 \
+        --disable-divx4linux \
+        --disable-opendivx \
+        \
+        --disable-libavutil_so \
+        --disable-libavcodec_so \
+        --disable-libavformat_so \
+        --disable-libpostproc_so \
+        --disable-libfame \
 	\
 	--enable-tremor-low \
+        \
+        --disable-speex \
+        --disable-theora \
+        --disable-external-faad \
+        --disable-faac \
+        --disable-ladspa \
+        --disable-libdv \
+        --enable-mad \
+        --disable-toolame \
+        --disable-twolame \
+        --disable-xmms \
 	--disable-mp3lib \
+        --disable-libdts \
+        --enable-libmpeg2 \
+        --disable-musepack \
+        --disable-amr_nb \
+        --disable-amr_nb-fixed \
+        --disable-amr_wb \
 	\
-	--disable-x11 \
+        --disable-internal-vidix \
+        --disable-external-vidix \
+        --disable-gl \
+        --disable-dga \
+        --disable-vesa \
+        --disable-svga \
 	--enable-sdl \
-	--enable-fbdev "
+        --disable-aa \
+        --disable-caca \
+        --disable-ggi \
+        --disable-ggiwmh \
+        --disable-directx \
+        --disable-dxr2 \
+        --disable-dxr3 \
+        --disable-dvb \
+        --disable-dvbhead \
+        --disable-mga \
+        --disable-xmga \
+        --disable-xv \
+        --disable-xvmc \
+        --disable-vm \
+        --disable-xinerama \
+        --disable-x11 \
+	--enable-fbdev \
+        --disable-mlib \
+        --disable-3dfx \
+        --disable-tdfxfb \
+        --disable-s3fb \
+        --disable-directfb \
+        --disable-zr \
+        --disable-bl \
+        --disable-tdfxvid \
+        --disable-tga \
+        --disable-pnm \
+        --disable-md5sum \
+        \
+        --enable-alsa \
+        --enable-ossaudio \
+        --disable-arts \
+        --disable-esd \
+        --disable-polyp \
+        --disable-jack \
+        --disable-openal \
+        --disable-nas \
+        --disable-sgiaudio \
+        --disable-sunaudio \
+        --disable-win32waveout \
+        --enable-select \
+        \
+        --disable-runtime-cpudetection \
+        "
 
 EXTRA_OECONF_append_c7x0 = " --enable-w100 "