From 297fac9b424a54ec0340d8062661e2887636fb35 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 22 Apr 2006 11:55:50 +0000 Subject: libsdl-mixer: explicitely disable ogg/vorbis support (libraries not in DEPENDS)packages/libsdl/libsdl-mixer_1.2.6.bb --- packages/konqueror/konqueror-embedded_20030705.bb | 4 ++-- packages/libsdl/libsdl-mixer_1.2.6.bb | 4 ++-- packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb | 2 +- packages/meta/gpe-image.bb | 11 +++++++++-- packages/meta/meta-opie.bb | 4 ++-- packages/meta/opie-image.bb | 12 ++++++++++-- packages/opie-rdesktop/opie-rdesktop.inc | 4 +++- packages/python/python_2.4.2.bb | 2 +- 8 files changed, 30 insertions(+), 13 deletions(-) (limited to 'packages') diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index e3fc55a88f..3b2d5ea97c 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -1,7 +1,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition" SECTION = "opie/applications" PRIORITY = "optional" -DEPENDS = "libqpe-opie openssl pcre" +DEPENDS = "libqpe-opie pcre" LICENSE = "LGPL/GPL" PR = "r3" @@ -30,7 +30,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir} --enable-static --disable-shared --disable-debug \ --with-javascript=static --enable-qpe --enable-qt-embedded \ --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR} \ - --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/.. \ + --without-ssl \ --with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR} \ --enable-libsuffix="" ' diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb index 3aafa18d0c..7e76334e99 100644 --- a/packages/libsdl/libsdl-mixer_1.2.6.bb +++ b/packages/libsdl/libsdl-mixer_1.2.6.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "virtual/libsdl" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz" S = "${WORKDIR}/SDL_mixer-${PV}" @@ -13,7 +13,7 @@ export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config" inherit autotools -EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod" +EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod --disable-music-ogg" # although we build smpeg... need to find out how # to deal with optional dependencies diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb index 2e301a172d..58daef865d 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb @@ -6,7 +6,7 @@ PR = "r0" DEFAULT_PREFERENCE="-1" -KERNEL_CCSUFFIX = "-3.3.3" +KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 3767611af3..7d37c4f4fc 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -1,7 +1,15 @@ FEED_URIS_append_openzaurus = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 " FEED_URIS_append_opensimpad = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ gpe##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" + +DISTRO_FEEDS_append_familiar () { + +# x11 - additional packages specific to the x11 graphical environment +src/gz x11 ${DISTRO_FEED_PREFIX}/x11 +src/gz x11-${MACHINE} ${DISTRO_FEED_PREFIX}/x11/machine/${MACHINE} +} + +DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/x11" PR = "r21" @@ -55,7 +63,6 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \ ${XSERVER} \ ${GPE_EXTRA_INSTALL}" -IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp " ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index f82a69f367..6cc4ccbf98 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -118,7 +118,7 @@ task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \ opie-console opie-dagger opie-embeddedkonsole \ opie-euroconv opie-eye opie-ftp opie-gutenbrowser \ opie-helpbrowser opie-irc opie-keypebble opie-odict \ - opie-oxygen opie-rdesktop opie-reader opie-remote \ + opie-oxygen opie-reader opie-remote \ opie-sheet opie-tableviewer opie-tinykate \ opie-wellenreiter opie-write opie-zsafe" @@ -181,7 +181,7 @@ task-opie-irda = "irda-utils libopieobex0 obexftp obexpush" # task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \ - opie-rdesktop opie-wellenreiter opie-irc \ + opie-wellenreiter opie-irc \ opie-mediaplayer2 \ konqueror-embedded qpdf2" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index e012b2c34f..5c30876dec 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -3,7 +3,15 @@ export IMAGE_LINGUAS = "" FEED_URIS_append_openzaurus = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_opensimpad = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" -FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" + +DISTRO_FEEDS_append_familiar () { + +# opie - additional packages specific to the opie graphical environment +src/gz opie ${DISTRO_FEED_PREFIX}/opie +src/gz opie-${MACHINE} ${DISTRO_FEED_PREFIX}/opie/machine/${MACHINE} +} + +DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/opie" LICENSE = "MIT" PR = "r19" @@ -66,6 +74,6 @@ merge_feeds() { } # merge feed-sources into ipkg.conf and create /etc/timestamp from build date -IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" +IMAGE_PREPROCESS_COMMAND = "merge_feeds; " inherit image_ipk diff --git a/packages/opie-rdesktop/opie-rdesktop.inc b/packages/opie-rdesktop/opie-rdesktop.inc index 1924f9c7d6..2b69707f38 100644 --- a/packages/opie-rdesktop/opie-rdesktop.inc +++ b/packages/opie-rdesktop/opie-rdesktop.inc @@ -1,9 +1,11 @@ +# doesn't build without openssl enabled +BROKEN = "1" + DESCRIPTION = "Remote Desktop Protocol (RDP) Client" SECTION = "opie/applications" PRIORITY = "optional" MAINTAINER = "Team Opie " LICENSE = "GPL" -DEPENDS = "openssl" I18N_FILES = "ordesktop.ts" APPNAME = "ordesktop" APPTYPE = "binary" diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb index f065b68112..4ff07b3250 100644 --- a/packages/python/python_2.4.2.bb +++ b/packages/python/python_2.4.2.bb @@ -4,7 +4,7 @@ LICENSE = "PSF" SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "python-native readline zlib gdbm openssl tcl tk" +DEPENDS = "python-native readline zlib gdbm tcl tk" PR = "ml4" PYTHON_MAJMIN = "2.4" -- cgit 1.2.3-korg