diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-07-13 18:07:47 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-13 18:07:47 +0000 |
| commit | 5a5bb7411fc66507d8677bacc4c81abcb71d6fe6 (patch) | |
| tree | d2061603ac6108133d13beeefd301b403758632f /packages | |
| parent | 25979309f8be6cd0a7120e298e5e5344660fe46b (diff) | |
| parent | ce2d08e5aa1e9df9c062a6babc27cde35dd530d5 (diff) | |
propagate from branch 'org.openembedded.dev' (head 026dfb76437b8ee365af6ed7b1a122bd595d202f)
to branch 'org.openembedded.nslu2-linux' (head 43007d439c7ed96133926d0748cef53fa1b321d0)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/meta/opie-collections.inc | 14 | ||||
| -rw-r--r-- | packages/mplayer/mplayer-atty_1.1.5.bb | 5 |
2 files changed, 8 insertions, 11 deletions
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index c2d15dee58..60cc77356a 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -93,14 +93,10 @@ def opie_more_depends(d): else: return " " def opie_more_rdepends(d): - import bb - root_flash_size = int( bb.data.getVar( "ROOT_FLASH_SIZE", d, True ) or "16" ) - if root_flash_size >= 24: return bb.data.getVar( "OPIE_RDEPENDS_24", d, True ) - else: return " " + import bb + root_flash_size = int( bb.data.getVar( "ROOT_FLASH_SIZE", d, True ) or "16" ) + if root_flash_size >= 24: return bb.data.getVar( "OPIE_RDEPENDS_24", d, True ) + else: return " " OPIE_MORE_DEPENDS := "${@opie_more_depends(d)}" - - - - -# # OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}" +OPIE_MORE_RDEPENDS := "${@opie_more_rdepends(d)}" diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb index 9afdab203b..1ee4a49936 100644 --- a/packages/mplayer/mplayer-atty_1.1.5.bb +++ b/packages/mplayer/mplayer-atty_1.1.5.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://atty.jp/?Zaurus%2Fmplayer" -DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg" +DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg" LICENSE = "GPL" RCONFLICTS = "mplayer" MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" -PR = "r1" +PR = "r2" SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0 \ @@ -65,6 +65,7 @@ EXTRA_OECONF = " \ --disable-ipp \ --disable-iwmmxt \ \ + --enable-freetype \ --with-extralibdir=${STAGING_LIBDIR} " EXTRA_OECONF_append_c7x0 = " --enable-w100" |