mplayer_1.0pre8.bb : remove dependancy on libungif as this causes an unwanted

dependancy on X11.
Fix the truetype font handling so we can have subtitles again. This was
a silly thinko on my part.

diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb
index 071b403..c434525 100644 (file)
--- 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 libungif liba52 fontconfig alsa-lib lzo ncurses lame"
+DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
@@ -21,7 +21,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
 MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r1"
+PR = "r2"
 
 PARALLEL_MAKE = ""
 
@@ -34,7 +34,7 @@ PACKAGES =+ "mencoder"
 FILES_${PN} = "${bindir}/mplayer"
 FILES_mencoder = "${bindir}/mencoder"
 
-inherit autotools
+inherit autotools pkgconfig
 
 EXTRA_OECONF = " \
         --prefix=/usr \
@@ -62,8 +62,7 @@ EXTRA_OECONF = " \
         --disable-dvdread \
         --disable-mpdvdkit \
         --disable-cdparanoia \
-        --disable-freetype \
-        --enable-fontconfig \
+        --enable-freetype \
         --disable-unrarlib \
         --disable-menu \
         --enable-sortsub \
@@ -75,7 +74,7 @@ EXTRA_OECONF = " \
         --disable-ftp \
         --disable-vstream \
         \
-        --enable-gif \
+        --disable-gif \
         --enable-png \
         --enable-jpeg \
         --disable-libcdio \