wok rev 3337

Fix: mplayer-svn compile with gcc44, smplayer, gnome-mplayer work (but still no skin)
author Rohit Joshi <jozee@slitaz.org>
date Wed Jun 10 16:38:49 2009 +0000 (2009-06-10)
parents 10271d25aec8
children 9886ef43f57a
files mplayer-svn/receipt mplayer-svn/stuff/mplayer-svn-29268-liba52-gcc44.u
line diff
     1.1 --- a/mplayer-svn/receipt	Wed Jun 10 15:51:00 2009 +0000
     1.2 +++ b/mplayer-svn/receipt	Wed Jun 10 16:38:49 2009 +0000
     1.3 @@ -26,6 +26,18 @@
     1.4  	[ -f mplayer/configure ] || svn checkout -r $VERSION \
     1.5  		svn://svn.mplayerhq.hu/mplayer/trunk mplayer 
     1.6  	cd mplayer
     1.7 +	
     1.8 +	   while read file; do
     1.9 +    	[ -f done.$file ] && continue
    1.10 +    	echo "Apply $file..."
    1.11 +		cp ../../stuff/$PACKAGE-$VERSION-$file .
    1.12 +    	patch -p0 < $PACKAGE-$VERSION-$file || return 1
    1.13 +	touch done.$file
    1.14 +    done <<EOT
    1.15 +liba52-gcc44.u
    1.16 +EOT
    1.17 +	#patch -Np0 < $PACKAGE-$VERSION-liba52_gcc44.u || return 1 
    1.18 +	
    1.19  	./configure \
    1.20  		--prefix=/usr \
    1.21  		--confdir=/etc/mplayer \
    1.22 @@ -48,7 +60,8 @@
    1.23  		--disable-fribidi --target=i386-linux --disable-libavutil_a \
    1.24  		--disable-tv --disable-tv-teletext --disable-radio-v4l2 --disable-v4l2 \
    1.25  		--disable-musepack --disable-dvdnav --disable-esd --disable-mga \
    1.26 -		--disable-libamr_nb --disable-lirc --disable-nas --enable-gui &&
    1.27 +		--disable-libamr_nb --disable-lirc --disable-nas --disable-vdpau \
    1.28 +		--enable-gui --enable-freetype &&
    1.29  	make &&
    1.30  	make DESTDIR=$PWD/../_pkg install
    1.31  }
    1.32 @@ -72,3 +85,5 @@
    1.33  	cd .. && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
    1.34  }
    1.35  
    1.36 +
    1.37 +
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/mplayer-svn/stuff/mplayer-svn-29268-liba52-gcc44.u	Wed Jun 10 16:38:49 2009 +0000
     2.3 @@ -0,0 +1,12 @@
     2.4 +--- configure	2009-04-16 12:02:10.000000000 +0200
     2.5 ++++ configure	2009-05-22 15:23:38.000000000 +0200
     2.6 +@@ -6426,6 +6426,7 @@
     2.7 + def_liba52='#undef CONFIG_LIBA52'
     2.8 + def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
     2.9 + if test "$_liba52_internal" = yes ; then
    2.10 ++	test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo $CFLAGS|sed "s/ *-O4 */ -O2 /")
    2.11 +   _liba52=yes
    2.12 +   def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
    2.13 +   _res_comment="internal"
    2.14 +
    2.15 +