X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Fmultimedia%2Fmplayer%2Fmplayer;h=a62490624d03bafff43ebee475353e8b657c475e;hp=e6e7a7db50b33fa57e06f9cd9fc3085d5586a7bc;hb=44395e5227c39f31ee6dcebc41fcb9afb70087e5;hpb=5c31fce36bb2f759bb112595573c07b5f027ba3e

diff --git a/packages/multimedia/mplayer/mplayer b/packages/multimedia/mplayer/mplayer
index e6e7a7d..a624906 100644
--- a/packages/multimedia/mplayer/mplayer
+++ b/packages/multimedia/mplayer/mplayer
@@ -6,12 +6,13 @@
 # [S] 3-8
 # [D] mplayer.tar.bz2 cvs:anonymous:mplayerhq.hu:cvsroot/mplayer:main
 # [D] ffmpeg.tar.bz2 cvs:anonymous:mplayerhq.hu:cvsroot/ffmpeg:ffmpeg
-# [D] win32codecs-20040703.tar.bz2 ftp://mplayerhq.hu/MPlayer/releases/codecs/
-# [D] qt6dlls-20040626.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/codecs/
+# [D] all-20050412.tar.bz2 http://www2.mplayerhq.hu/MPlayer/releases/codecs/
 
+codecs_ver="20050412"
 srcdir="main"
 
 confopt="--prefix=$prefix --confdir=$sysconfdir --language=en"
+confopt="$confopt --enable-gui --enable-tv-v4l2"
 confopt="$confopt --enable-linux-devfs --enable-fbdev"
 confopt="$confopt --enable-xinerama --enable-directfb"
 confopt="$confopt --with-win32libdir=$prefix/lib/win32codecs"
@@ -23,8 +24,11 @@ pre_install()	{
 	# prepeare libavcodec
 	tar --use-compress-program=bzip2 -xvf \
 	$hdw_home_dir/download/multimedia/mplayer/ffmpeg.tar.bz2
-	mkdir -p libavcodec
-	cp -a ffmpeg/libavcodec/* libavcodec && rm -rf ffmpeg
+	mkdir -p libavcodec libavutil libavformat
+	cp -a ffmpeg/libavcodec/* libavcodec
+	cp -a ffmpeg/libavutil/* libavutil
+	cp -a ffmpeg/libavformat/* libavformat
+	rm -rf ffmpeg
 
 	# copy codecs.conf
 	cp ./etc/codecs.conf $root/etc/
@@ -33,12 +37,7 @@ pre_install()	{
 	rm -rf $prefix/lib/win32codecs
 	mkdir -p $prefix/lib
 	tar --use-compress-program=bzip2 -xvf \
-		$archdir/win32codecs-20040703.tar.bz2 \
+		$archdir/all-${codecs_ver}.tar.bz2 \
 		-C $prefix/lib
-	mv $prefix/lib/win32codecs-* $prefix/lib/win32codecs
-	tar --use-compress-program=bzip2 -xvf \
-		$archdir/qt6dlls-20040626.tar.bz2 \
-		-C $prefix/lib
-	mv $prefix/lib/qt6dlls-*/* $prefix/lib/win32codecs
-	rm -rf $prefix/lib/qt6dlls-*
+	mv $prefix/lib/all-${codecs_ver} $prefix/lib/win32codecs
 		}