From b166953274e82c03f54435ec8af0d4684c49dff7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Jul 2005 08:25:11 +0000 Subject: zaurus machine configurations: add orinoco-cs to poodle, specify 0.13e for Zaurus 2.4 kernels since later versions don't work there --- conf/machine/poodle-2.4.conf | 8 ++++++-- conf/machine/poodle-2.6.conf | 1 - conf/machine/zaurus-clamshell-2.4.conf | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/conf/machine/poodle-2.4.conf b/conf/machine/poodle-2.4.conf index bb3ae039d9..e8be12eef2 100644 --- a/conf/machine/poodle-2.4.conf +++ b/conf/machine/poodle-2.4.conf @@ -1,9 +1,13 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" +# Later versions are broken on kernel 2.4 +PREFERRED_VERSION_orinoco-cs = "0.13e" + BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \ -hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \ +hostap-modules orinoco-modules sharp-sdmmc-support \ hostap-utils prism3-firmware prism3-support" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \ + +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \ kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ hostap-utils prism3-firmware prism3-support" diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf index 72a751d19e..7edebad2d3 100644 --- a/conf/machine/poodle-2.6.conf +++ b/conf/machine/poodle-2.6.conf @@ -1,5 +1,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -PREFERRED_VERSION_orinoco-modules = "0.13e-26" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules" BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index cef670b450..4f6c56b182 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -2,6 +2,9 @@ PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix" PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x" PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" +# Later versions are broken on kernel 2.4 +PREFERRED_VERSION_orinoco-cs = "0.13e" + BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \ pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \ hostap-utils prism3-firmware prism3-support" -- cgit v1.2.3 From 76409ca865d597309d1b318b11f3bc7210d5e00d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Jul 2005 08:53:39 +0000 Subject: zaurus-configs: fix stupid typos introduced in last commit --- conf/machine/poodle-2.4.conf | 2 +- conf/machine/zaurus-clamshell-2.4.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/poodle-2.4.conf b/conf/machine/poodle-2.4.conf index e8be12eef2..dc603d3bcc 100644 --- a/conf/machine/poodle-2.4.conf +++ b/conf/machine/poodle-2.4.conf @@ -1,7 +1,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-cs = "0.13e" +PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \ hostap-modules orinoco-modules sharp-sdmmc-support \ diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 4f6c56b182..3291a00df6 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -3,7 +3,7 @@ PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x" PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-cs = "0.13e" +PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \ pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \ -- cgit v1.2.3 From 01fd94b639c82d3c1c571c3b6840fec37aea5e7a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Jul 2005 09:22:14 +0000 Subject: opie-collections: repair gathering OPIE_MORE_RDEPENDS depending on ROOT_FLASH_SIZE --- packages/meta/opie-collections.inc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 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)}" -- cgit v1.2.3 From ce2d08e5aa1e9df9c062a6babc27cde35dd530d5 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 13 Jul 2005 13:26:37 +0000 Subject: mplayer-atty: re-enabled its ability to render subtitles and OSD --- packages/mplayer/mplayer-atty_1.1.5.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 " -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" -- cgit v1.2.3