--- branches/magellan-next/extras/mplayer/mplayer-1.0_svn33891-r1.smage2	2011/07/22 14:42:44	8598
+++ branches/magellan-next/extras/mplayer/mplayer-1.0_svn33891-r1.smage2	2011/07/22 14:57:05	8599
@@ -9,6 +9,8 @@
 DESCRIPTION="MPlayer is a movie player for linux supporting many codecs."
 HOMEPAGE="http://www.mplayerhq.hu/"
 
+FFMPEG_VERSION="20110713"
+
 DEPEND=">= sys-libs/ncurses-5.9
 	>= virtual/opengl
 	>= x11-libs/libXxf86vm-1
@@ -34,6 +36,7 @@
 	>= media-libs/xvid-1.3
 	>= media-libs/x264-201107
 	>= media-video/x264-encoder-201107
+	== media-video/ffmpeg-${FFMPEG_VERSION}
 	>= media-libs/libtheora-1.1
 	>= media-libs/speex-1.2_rc1
 	>= media-libs/nas-1.9
@@ -58,6 +61,9 @@
 SRCFILE="${PNAME}-${PVER}.tar.bz2"
 SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
 
+FFMPEG_SRCFILE="ffmpeg-${FFMPEG_VERSION}.tar.bz2"
+FFMPEG_SRCDIR="${BUILDDIR}/ffmpeg-${FFMPEG_VERSION}"
+
 SKINNAME1="Blue"
 SKINFILE1="${SKINNAME1}-1.7.tar.bz2"
 
@@ -76,6 +82,7 @@
 	http://www.mplayerhq.hu/MPlayer/skins/${SKINFILE1}
 	http://www.mplayerhq.hu/MPlayer/skins/${SKINFILE2}
 	http://www.mplayerhq.hu/MPlayer/skins/${SKINFILE3}
+	mirror://ffmpeg/${FFMPEG_SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 	mirror://${PNAME}/${SKINFILE1}
 	mirror://${PNAME}/${SKINFILE2}
@@ -88,6 +95,8 @@
 src_prepare()
 {
 	munpack ${SRCFILE} || die
+	munpack ${FFMPEG_SRCFILE} || die
+	mv ${FFMPEG_SRCDIR} ${SRCDIR}/ffmpeg || die
 	munpack ${SKINFILE1} || die
 	munpack ${SKINFILE2} || die
 	munpack ${SKINFILE3} || die
@@ -99,9 +108,6 @@
 		# fix mplayer version (displays UNKOWN)
 		sed "s:UNKOWN:SVN-r${PVER#*svn}:g" version.sh || die
 	fi
-
-	# prevent git pulls of ffmpeg
-	touch ${SRCDIR}/ffmpeg || die
 }
 
 src_compile()
@@ -112,7 +118,7 @@
 	unset CFLAGS CXXFLAGS || die
 
 	# do not enable --target=${CHOST}, it breaks vcd support !
-	# use external ffmpeg with --disable-ffmpeg_a 
+	# use external ffmpeg with --disable-ffmpeg_a
 	./configure \
 		--prefix=/usr \
 		--confdir=/etc/mplayer \
@@ -171,7 +177,7 @@
 		--enable-xvmc \
 		--with-xvmclib=XvMCW \
 		--charset=UTF-8 \
-		 --disable-ffmpeg_a \
+		--disable-ffmpeg_a \
 		|| die
 
 	# does not like optimations >= -j1
@@ -205,9 +211,10 @@
 	mlink ${DEFAULTSKIN} ${BINDIR}/usr/share/mplayer/Skin/default || die
 
 	# enable truetype fonts
-	echo "fontconfig=1" >> ${BINDIR}/etc/mplayer/mplayer.conf
-	echo "subfont-osd-scale=4" >> ${BINDIR}/etc/mplayer/mplayer.conf
-	echo "subfont-text-scale=3" >> ${BINDIR}/etc/mplayer/mplayer.conf
+	MCONFIG="/etc/mplayer/mplayer.conf"
+	maddconfig 'fontconfig=1'
+	maddconfig 'subfont-osd-scale=4'
+	maddconfig 'subfont-text-scale=3'
 
 	# desktop icon
 	minstallpixmap etc/mplayer.xpm || die