diff options
author | Graeme Gregory <dp@xora.org.uk> | 2006-07-10 12:29:44 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-10 12:29:44 +0000 |
commit | 85c7ce92f6dfecfcd5c858838c296f86a93bd872 (patch) | |
tree | 20fef722b7d5a0d158250770cbc05a0c3d69dbf1 | |
parent | 92b85e13e4cdd03bba753ce5273323cb651e5e38 (diff) | |
parent | 9b4705fcbfe65883d928610f26ca34dcbbec77e5 (diff) |
merge of 08b99a6246391bc67af5422397346b95d3d3b3e3
and f3515be6618dd23c0a5917c27c9607c052d6df83
-rw-r--r-- | packages/mplayer/mplayer_1.0pre8.bb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index 071b403695..c434525701 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 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 \ |