diff options
50 files changed, 134 insertions, 99 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 80e5b15d44..958b141c71 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -49,7 +49,7 @@ SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-illume ?= "170" SRCREV_pn-illume-theme-asu ?= "170" -SRCREV_pn-illume-theme-freesmartphone ?= "0f27c0b52b8dad255349e6c72d590fa787be8c3b" +SRCREV_pn-illume-theme-freesmartphone ?= "da904c73236ced2b04c272af5178eab4d66f144d" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" diff --git a/packages/directfb/files/use_limits_h.patch b/packages/directfb/files/use_limits_h.patch new file mode 100644 index 0000000000..327cd7a163 --- /dev/null +++ b/packages/directfb/files/use_limits_h.patch @@ -0,0 +1,10 @@ +--- FusionSound-1.0.0.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_cdda.c ++++ FusionSound-1.0.0/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_cdda.c +@@ -109,6 +109,7 @@ typedef struct { + + #if defined(__linux__) + ++#include <limits.h> + #include <linux/cdrom.h> + + static DFBResult diff --git a/packages/maemo/hildon-initscripts/.mtn2git_empty b/packages/directfb/fusionsound-1.1.0+git20070709/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/maemo/hildon-initscripts/.mtn2git_empty +++ b/packages/directfb/fusionsound-1.1.0+git20070709/.mtn2git_empty diff --git a/packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch b/packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch new file mode 100644 index 0000000000..0eb4c7519a --- /dev/null +++ b/packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch @@ -0,0 +1,23 @@ +--- git/fusionsound.pc.in~org 2008-08-19 11:04:27.000000000 -0400 ++++ git/fusionsound.pc.in 2008-08-19 11:06:20.000000000 -0400 +@@ -8,4 +8,4 @@ + Description: Multi application sound streaming and mixing + Version: @VERSION@ + Libs: -L${libdir} -lfusionsound +-Cflags: -I@INCLUDEDIR@ ++Cflags: -I${includedir}/fusionsound +--- git/fusionsound-internal.pc.in~org 2008-08-19 11:11:57.000000000 -0400 ++++ git/fusionsound-internal.pc.in 2008-08-19 11:08:31.000000000 -0400 +@@ -1,10 +1,10 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + moduledir=@MODULEDIR@ +-includedir=@INTERNALINCLUDEDIR@ ++includedir=@includedir@ + + Name: FusionSound-Internal + Description: Third party module support package for FusionSound. + Version: @VERSION@ + Requires: fusionsound = @VERSION@ +-Cflags: -I@INTERNALINCLUDEDIR@ ++Cflags: -I${includedir}/fusionsound -I${includedir} diff --git a/packages/directfb/fusionsound_1.0.0.bb b/packages/directfb/fusionsound_1.0.0.bb deleted file mode 100644 index 3cd4a385f6..0000000000 --- a/packages/directfb/fusionsound_1.0.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "FusionSound for DirectFB" -DEPENDS = "directfb libmad libvorbis" -SECTION = "libs" -LICENSE = "LGPL" - -SRC_URI = "http://www.directfb.org/downloads/Core/FusionSound-${PV}.tar.gz" -S = "${WORKDIR}/FusionSound-${PV}" - -inherit autotools pkgconfig - -do_configure_append() { - find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}/directfb:g' -} - -do_stage() { - autotools_stage_all -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -FILES_${PN} += "\ - ${libdir}/directfb-1.0-0/interfaces/*/*.so \ - ${libdir}/directfb-1.0-0/snddrivers/*.so \ -" - -FILES_${PN}-dbg += "\ - ${libdir}/directfb-1.0-0/*/*/.debug/*.so \ - ${libdir}/directfb-1.0-0/*/.debug/*.so \ -" - -FILES_${PN}-dev += "\ - ${libdir}/directfb-1.0-0/interfaces/*/*.la \ - ${libdir}/directfb-1.0-0/snddrivers/*.la \ -" - diff --git a/packages/directfb/fusionsound_1.1.0+git20070709.bb b/packages/directfb/fusionsound_1.1.0+git20070709.bb index 54e2ba211f..dda1de5333 100644 --- a/packages/directfb/fusionsound_1.1.0+git20070709.bb +++ b/packages/directfb/fusionsound_1.1.0+git20070709.bb @@ -2,9 +2,11 @@ DESCRIPTION = "FusionSound for DirectFB" DEPENDS = "directfb" SECTION = "libs" LICENSE = "LGPL" -PR = "r0" +PR = "r2" SRC_URI = "git://git.directfb.org/git/directfb/core/FusionSound;protocol=git;tag=0b2162b570c8314fd1240b08d6ab4a8d074ccf37 \ + file://fix-pkgconfig-cflags.patch;patch=1 \ + file://use_limits_h.patch;patch=1 \ " S = "${WORKDIR}/git" diff --git a/packages/efl1/imlib2_cvs.bb b/packages/efl1/imlib2_cvs.bb index 0008ca9122..6fd9b4ce36 100644 --- a/packages/efl1/imlib2_cvs.bb +++ b/packages/efl1/imlib2_cvs.bb @@ -2,6 +2,7 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu LICENSE = "BSD" # can also depend on tiff34, ungif or gif, z, bz2, id3tag DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" +PROVIDES = "virtual/imlib2" PV = "1.4.1.000+cvs${SRCDATE}" PR = "r2" diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 1eb3b20ed7..965a453aff 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r25" +PR = "r26" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" @@ -15,7 +15,7 @@ FFBRANCH ?= "master" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a" -SRCREV_arm = "36c4918f7bc8ff6296d38ed0c9a5f1a8785fcd32" +SRCREV_arm = "a1b91f5e7bf5612ea3a5c63579f220b0af8da1f8" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb index 25057072c2..efa81fd50a 100644 --- a/packages/ffmpeg/omapfbplay_git.bb +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r10" +PR = "r11" inherit module-base diff --git a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf index 64c00a4a92..d985bb342e 100644 --- a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf @@ -11,5 +11,10 @@ report4 = HEADSET,switch,2,0 # GTA01 has TI Calypso modemtype = ti_calypso +[ogpsd] +device = NMEADevice +channel = UDPChannel +path = 6000 + [opreferencesd] rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences diff --git a/packages/freesmartphone/illume-theme-freesmartphone_git.bb b/packages/freesmartphone/illume-theme-freesmartphone_git.bb index 3beffce09e..1ff193e87b 100644 --- a/packages/freesmartphone/illume-theme-freesmartphone_git.bb +++ b/packages/freesmartphone/illume-theme-freesmartphone_git.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Illume theme for the freesmartphone.org project" HOMEPAGE = "http://illume.projects.openmoko.org/" LICENSE = "MIT/BSD" +DEPENDS = "edje-native eet-native" PV = "0.0+gitr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master" S = "${WORKDIR}/git/illume" @@ -10,18 +11,27 @@ S = "${WORKDIR}/git/illume" do_compile() { cd illume && ./build.sh && cd .. cd illume_init && ./build.sh && cd .. + cd illume-config + eet -e e.cfg config e.src 1 + eet -e module.battery.cfg config module.battery.src 1 + eet -e module.illume.cfg config module.illume.src 1 } do_install() { install -d ${D}${sysconfdir}/enlightenment install -d ${D}${datadir}/enlightenment/data/themes/ install -d ${D}${datadir}/enlightenment/data/init/ + install -d ${D}${datadir}/enlightenment/data/config/fso/ - # Make illume the default profile - echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile + # Make fso the default profile + echo 'E_PROFILE="-profile fso"' > ${D}${sysconfdir}/enlightenment/default_profile - install -m 0644 ${S}/illume/illume.edj ${D}${datadir}/enlightenment/data/themes/ - install -m 0644 ${S}/illume_init/illume_init.edj ${D}${datadir}/enlightenment/data/init/ + install -m 0644 ${S}/illume/fso.edj ${D}${datadir}/enlightenment/data/themes/ + install -m 0644 ${S}/illume_init/fso_init.edj ${D}${datadir}/enlightenment/data/init/ + + install -m 0644 ${S}/illume-config/e.cfg ${D}${datadir}/enlightenment/data/config/fso/ + install -m 0644 ${S}/illume-config/module.battery.cfg ${D}${datadir}/enlightenment/data/config/fso/ + install -m 0644 ${S}/illume-config/module.illume.cfg ${D}${datadir}/enlightenment/data/config/fso/ } RPROVIDES_${PN} = "illume-theme" diff --git a/packages/gnash/files/libintl.patch b/packages/gnash/files/libintl.patch new file mode 100644 index 0000000000..22e1acb65b --- /dev/null +++ b/packages/gnash/files/libintl.patch @@ -0,0 +1,13 @@ +Index: gnash-0.8.3/gui/am-frag/fb.am +=================================================================== +--- gnash-0.8.3.orig/gui/am-frag/fb.am 2008-08-19 00:37:45.000000000 +0200 ++++ gnash-0.8.3/gui/am-frag/fb.am 2008-08-19 00:38:04.000000000 +0200 +@@ -30,7 +30,7 @@ + fb_gnash_CPPFLAGS += $(AGG_CFLAGS) + fb_gnash_SOURCES += + fb_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \ +- $(GNASH_LIBS) $(AGG_LIBS) ++ $(GNASH_LIBS) $(AGG_LIBS) $(INTLLIBS) + endif # BUILD_AGG_RENDERER + endif # BUILD_FB_GUI + diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb index bcfb88c42f..b5a9ca35a9 100644 --- a/packages/gnash/gnash-minimal_0.8.2.bb +++ b/packages/gnash/gnash-minimal_0.8.2.bb @@ -1,2 +1,3 @@ require gnash-minimal.inc +PR = "r1" diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb index b5bcf29683..55748151c5 100644 --- a/packages/gnash/gnash-minimal_0.8.3.bb +++ b/packages/gnash/gnash-minimal_0.8.3.bb @@ -1,12 +1,12 @@ require gnash-minimal.inc -PR = "r6" +PR = "r7" EXTRA_OECONF += " --without-included-ltdl \ --with-ltdl-include=${STAGING_INCDIR} \ --with-ltdl-lib=${STAGING_LIBDIR} \ " -SRC_URI += "file://libtool-2.2.patch;patch=1" +SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1" diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb index de0e6f9db9..73a7e8f9b2 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -1,6 +1,6 @@ require gnash-minimal.inc -PV = "0.8.2+cvs${SRCDATE}" +PV = "0.8.3+cvs${SRCDATE}" SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash" S = ${WORKDIR}/gnash diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb index aa96026891..f4f872ce01 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "ffmpeg gstreamer zlib" -PR = "r3" +PR = "r4" # This uses the systems ffmpeg, which is unsupported, but we can't build the internal one with the current autotools (ab)usage DEFAULT_PREFERENCE = "-1" diff --git a/packages/maemo/hildon-lgpl/.mtn2git_empty b/packages/nonworking/gpe-contacts/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/maemo/hildon-lgpl/.mtn2git_empty +++ b/packages/nonworking/gpe-contacts/.mtn2git_empty diff --git a/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb index 848209d850..848209d850 100644 --- a/packages/gpe-contacts/gpe-contacts-hildon_0.40.bb +++ b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb diff --git a/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb index 848209d850..848209d850 100644 --- a/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb +++ b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb diff --git a/packages/maemo/hildon-base-lib_0.8.6-2.bb b/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb index 58d7f54a8b..58d7f54a8b 100644 --- a/packages/maemo/hildon-base-lib_0.8.6-2.bb +++ b/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/nonworking/maemo/hildon-fm_0.9.1-2.bb index 40654295f9..40654295f9 100644 --- a/packages/maemo/hildon-fm_0.9.1-2.bb +++ b/packages/nonworking/maemo/hildon-fm_0.9.1-2.bb diff --git a/packages/maemo/hildon-libs/.mtn2git_empty b/packages/nonworking/maemo/hildon-initscripts/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/maemo/hildon-libs/.mtn2git_empty +++ b/packages/nonworking/maemo/hildon-initscripts/.mtn2git_empty diff --git a/packages/maemo/hildon-initscripts/hildon-initscripts-source.patch b/packages/nonworking/maemo/hildon-initscripts/hildon-initscripts-source.patch index 8e25b5f8a0..8e25b5f8a0 100644 --- a/packages/maemo/hildon-initscripts/hildon-initscripts-source.patch +++ b/packages/nonworking/maemo/hildon-initscripts/hildon-initscripts-source.patch diff --git a/packages/maemo/hildon-initscripts_0.8.14-1.bb b/packages/nonworking/maemo/hildon-initscripts_0.8.14-1.bb index ef93f007cb..ef93f007cb 100644 --- a/packages/maemo/hildon-initscripts_0.8.14-1.bb +++ b/packages/nonworking/maemo/hildon-initscripts_0.8.14-1.bb diff --git a/packages/maemo/hildon-navigator/.mtn2git_empty b/packages/nonworking/maemo/hildon-lgpl/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/maemo/hildon-navigator/.mtn2git_empty +++ b/packages/nonworking/maemo/hildon-lgpl/.mtn2git_empty diff --git a/packages/maemo/hildon-lgpl/hildon-lgpl-noWerror.patch b/packages/nonworking/maemo/hildon-lgpl/hildon-lgpl-noWerror.patch index 5f47dac7cc..5f47dac7cc 100644 --- a/packages/maemo/hildon-lgpl/hildon-lgpl-noWerror.patch +++ b/packages/nonworking/maemo/hildon-lgpl/hildon-lgpl-noWerror.patch diff --git a/packages/maemo/hildon-lgpl_0.9.14-2.bb b/packages/nonworking/maemo/hildon-lgpl_0.9.14-2.bb index c4ec3a50cf..c4ec3a50cf 100644 --- a/packages/maemo/hildon-lgpl_0.9.14-2.bb +++ b/packages/nonworking/maemo/hildon-lgpl_0.9.14-2.bb diff --git a/packages/maemo/sapwood/.mtn2git_empty b/packages/nonworking/maemo/hildon-libs/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/maemo/sapwood/.mtn2git_empty +++ b/packages/nonworking/maemo/hildon-libs/.mtn2git_empty diff --git a/packages/maemo/hildon-libs/hildon-libs-no-werror.patch b/packages/nonworking/maemo/hildon-libs/hildon-libs-no-werror.patch index 8b1c09eced..8b1c09eced 100644 --- a/packages/maemo/hildon-libs/hildon-libs-no-werror.patch +++ b/packages/nonworking/maemo/hildon-libs/hildon-libs-no-werror.patch diff --git a/packages/maemo/hildon-libs_0.9.6-2.bb b/packages/nonworking/maemo/hildon-libs_0.9.6-2.bb index 947f22ce66..947f22ce66 100644 --- a/packages/maemo/hildon-libs_0.9.6-2.bb +++ b/packages/nonworking/maemo/hildon-libs_0.9.6-2.bb diff --git a/packages/php/php-5.2.5/.mtn2git_empty b/packages/nonworking/maemo/hildon-navigator/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/php/php-5.2.5/.mtn2git_empty +++ b/packages/nonworking/maemo/hildon-navigator/.mtn2git_empty diff --git a/packages/maemo/hildon-navigator/source.patch b/packages/nonworking/maemo/hildon-navigator/source.patch index e56f42f0f9..e56f42f0f9 100644 --- a/packages/maemo/hildon-navigator/source.patch +++ b/packages/nonworking/maemo/hildon-navigator/source.patch diff --git a/packages/maemo/hildon-navigator_0.9.6-2.bb b/packages/nonworking/maemo/hildon-navigator_0.9.6-2.bb index 6772dbd118..6772dbd118 100644 --- a/packages/maemo/hildon-navigator_0.9.6-2.bb +++ b/packages/nonworking/maemo/hildon-navigator_0.9.6-2.bb diff --git a/packages/maemo/osso-screenshot-tool_1.20-1.bb b/packages/nonworking/maemo/osso-screenshot-tool_1.20-1.bb index 5568191fdf..5568191fdf 100644 --- a/packages/maemo/osso-screenshot-tool_1.20-1.bb +++ b/packages/nonworking/maemo/osso-screenshot-tool_1.20-1.bb diff --git a/packages/maemo/osso-thumbnail_0.3.1-1.bb b/packages/nonworking/maemo/osso-thumbnail_0.3.1-1.bb index 866e755b0d..866e755b0d 100644 --- a/packages/maemo/osso-thumbnail_0.3.1-1.bb +++ b/packages/nonworking/maemo/osso-thumbnail_0.3.1-1.bb diff --git a/packages/nonworking/maemo/sapwood/.mtn2git_empty b/packages/nonworking/maemo/sapwood/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nonworking/maemo/sapwood/.mtn2git_empty diff --git a/packages/maemo/sapwood/cflags.patch b/packages/nonworking/maemo/sapwood/cflags.patch index 841a9dd350..841a9dd350 100644 --- a/packages/maemo/sapwood/cflags.patch +++ b/packages/nonworking/maemo/sapwood/cflags.patch diff --git a/packages/maemo/sapwood/sockets.patch b/packages/nonworking/maemo/sapwood/sockets.patch index 1568206e2a..1568206e2a 100644 --- a/packages/maemo/sapwood/sockets.patch +++ b/packages/nonworking/maemo/sapwood/sockets.patch diff --git a/packages/maemo/sapwood_1.20-1.bb b/packages/nonworking/maemo/sapwood_1.20-1.bb index 8cd52fa602..8cd52fa602 100644 --- a/packages/maemo/sapwood_1.20-1.bb +++ b/packages/nonworking/maemo/sapwood_1.20-1.bb diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb index 6656ed3e27..1e9eb4f217 100644 --- a/packages/openmax/libomxil-bellagio_0.9.0.bb +++ b/packages/openmax/libomxil-bellagio_0.9.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multim LICENSE = "LGPLv2" DEPENDS = "libmad alsa-lib ffmpeg" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc index aad82cfe42..01d192c1dc 100644 --- a/packages/phoneme/phoneme-advanced.inc +++ b/packages/phoneme/phoneme-advanced.inc @@ -29,6 +29,8 @@ SRCREV = ${@bb.fatal('SRCREV is not defined in this phoneme-advanced recipe!')} COMMON_DIR = "${libdir_jvm}/${PN}" +PME_PROFILE ?= "foundation" + do_compile() { set_arch oe_runmake -C cdc/build/linux-$ARCH-generic bin @@ -50,9 +52,7 @@ do_configure() { cd cdc/build/linux-$ARCH-generic echo "Configuring PhoneME Advanced build" - # At the moment we do not support anything else than the foundation - #profiles. - pmo_start J2ME_CLASSLIB foundation + pmo_start J2ME_CLASSLIB ${PME_PROFILE} # Dispatch to arch-specific functions. oe_phoneme_config$ARCH diff --git a/packages/php/php-5.2.5/acinclude-xml2-config.patch b/packages/php/php-5.2.5/acinclude-xml2-config.patch deleted file mode 100644 index bf519d2934..0000000000 --- a/packages/php/php-5.2.5/acinclude-xml2-config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 -+++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 -@@ -2359,12 +2359,9 @@ - AC_DEFUN([PHP_SETUP_LIBXML], [ - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, - [ -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -+ -+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" -+ - ]) - - if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/packages/php/php-5.2.5/pear-makefile.patch b/packages/php/php-5.2.5/pear-makefile.patch deleted file mode 100644 index 26de98a48f..0000000000 --- a/packages/php/php-5.2.5/pear-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 -+++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 -@@ -6,7 +6,7 @@ - PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 - - install-pear-installer: $(SAPI_CLI_PATH) -- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" -+ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/packages/php/php-5.2.6/.mtn2git_empty b/packages/php/php-5.2.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/php/php-5.2.6/.mtn2git_empty diff --git a/packages/php/php-native_5.2.5.bb b/packages/php/php-native_5.2.6.bb index 19558c559d..d165f7a4a7 100644 --- a/packages/php/php-native_5.2.5.bb +++ b/packages/php/php-native_5.2.6.bb @@ -2,7 +2,7 @@ require php_${PV}.bb SECTION = "console/network" DEPENDS = "zlib-native libxml2-native mysql-native" -PR = "r2" +PR = "r1" S = "${WORKDIR}/php-${PV}" diff --git a/packages/php/php_5.2.5.bb b/packages/php/php_5.2.6.bb index a8dc83a444..6281cfe04e 100644 --- a/packages/php/php_5.2.5.bb +++ b/packages/php/php_5.2.6.bb @@ -1,6 +1,6 @@ require php.inc -PR = "r3" +PR = "r1" SRC_URI += "file://pear-makefile.patch;patch=1 " @@ -14,7 +14,7 @@ EXTRA_OECONF = " --without-iconv \ --enable-wddx \ --enable-embedded-mysqli \ --enable-magic-quotes \ - --with-zlib \ + --with-zlib \ --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ " diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 63fcec904f..b68bb7ee6c 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r27" +PR = "r33" inherit task @@ -9,7 +9,6 @@ RDEPENDS_task-openmoko-feed = "\ aspell enchant \ openmoko-agpsui \ gypsy \ - py-odeviced \ gsm0710muxd \ ppp \ bluez-hcidump \ @@ -29,8 +28,7 @@ RDEPENDS_task-openmoko-feed = "\ nano \ ntpclient ntp \ openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \ - python python-pygtk python-pyserial \ -# python-efl \ + python python-pygtk python-pyserial python-gst \ ruby \ libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \ settingsgui \ @@ -40,18 +38,55 @@ RDEPENDS_task-openmoko-feed = "\ vnc \ wxwidgets \ x11vnc \ - libswt3.4-gtk-java \ - cacao \ - jamvm \ - classpath \ +# libswt3.4-gtk-java \ +# cacao \ +# jamvm \ +# classpath \ gpsdrive \ asterisk \ - qtopia-phone \ - gnash \ +# gnash \ mono \ diversity-daemon \ diversity-nav \ diversity-maps-taipei \ +# om-maps-berlin \ +# om-maps-buenos-aires \ +# om-maps-london \ +# om-maps-new-york \ +# om-maps-paris \ +# om-maps-providence \ +# om-maps-san-francisco \ +# om-maps-sydney \ +# om-maps-taipei \ +# om-settings \ assassin \ +# assassin-thumbnail \ tangogps \ +# pyefl-sudoku \ + minicom \ + vim \ +# iotop \ +# evince \ + epdf \ + xprop \ + xev \ + xwininfo \ + gpsd \ + mc \ + devmem2 \ + bluez-utils-alsa \ + tcpdump \ + gdb \ + lsof \ +# openmoko-set-root-password \ +# qtopia-phone-enable-debug \ + git \ + navit \ + libnotify \ + notification-daemon \ + u-boot-openmoko \ + libxine \ +# subversion \ + task-openmoko-games \ + xournal \ " diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 2d57cfee5a..f8d9d3501b 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -8,6 +8,7 @@ HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" PR = "r18" PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" ALLOW_EMPTY = "1" #---------------------------------------------------------------------------------- diff --git a/packages/telepathy/telepathy-python_0.14.0.bb b/packages/telepathy/telepathy-python_0.14.0.bb index 5eec5b1fba..0898b321eb 100644 --- a/packages/telepathy/telepathy-python_0.14.0.bb +++ b/packages/telepathy/telepathy-python_0.14.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Telepathy framework - Python package" HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" LICENSE = "LGPL" -RDEPENDS_${PN} += "dbus-python" +RDEPENDS_${PN} += "python-dbus" SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz " diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb index 4d5ea6a12b..2701fa25f2 100644 --- a/packages/xmms-embedded/xmms-embedded_20040327.bb +++ b/packages/xmms-embedded/xmms-embedded_20040327.bb @@ -1,6 +1,6 @@ DESCRIPTION = "XMMS embedded - lightweight audio player with video and codec plugins" SECTION = "opie/multimedia" -DEPENDS = "zlib tremor libmad libid3tag libsidplay glib-2.0 libmikmod-3.1.11" +DEPENDS = "zlib tremor libmad libid3tag libsidplay glib-2.0 libmikmod" LICENSE = "GPL" PR = "r4" |