diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2008-02-29 16:13:29 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2008-02-29 16:13:29 +0000 |
commit | 339144112d488d42d84fe5e1d91ba20bde769f76 (patch) | |
tree | 7875c8c21e291d8d1bb96b50394480ef6f1f2c10 | |
parent | 69c3a4e292aabe37e7ae28bb521462a1619a3fa2 (diff) | |
parent | d9ce834542de0a4225a52b3c129082468d3cfa79 (diff) |
merge of '6d9979f4d29d1dff2350a558f25813ce7f2c8c9e'
and '9d51ade6b4318612931d9e49436a802f6c1fa43f'
44 files changed, 564 insertions, 153 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 596674eca0..b2878021a9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -286,6 +286,10 @@ sha256=5194ae0f07aaf274e46712cd3f2be553ca75970d2124ac388ce444adee5e2878 md5=b014170483cf85a93d08ee59196c53f9 sha256=1428a61246a98411c2f16fcaf051c7acb53fb1507b1982da52d5b6aa70f78c2b +[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.808.tar.gz] +md5=72120d9195ab1649c2d787eb1102a90c +sha256=22e0778a16bb9ac0526efc99f7e03265e19ca5844aee7540f3f47a643ad5b9e4 + [http://downloads.sourceforge.net/plone/Plone-2.1.2.tar.gz] md5=863311e29550f9b4bf6c2502fdbed1fa sha256=e9c0b53d887b53310daab656ef83b0abecdde39b679806a0f04f3cda222fbac2 @@ -4278,10 +4282,14 @@ sha256=e6a055689ad05f6adba7dbb9490891a18a240d1a30e34424b3a034f4152f2c28 md5=1ad07e10f34e46ffdaf10688743f2f43 sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8 -[http://www.gpsdrive.cc/gpsdrive-2.10pre2.tar.gz] +[http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz] md5=28b13b7253c8f019433be68686070558 sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227 +[http://www.gpsdrive.de/packages/gpsdrive-2.10pre4.tar.gz] +md5=5d0c7dc9163b2fd9a92ddd886ed7cfab +sha256=ebefe385ec41e3ff26fa55c0fcecbed75d4cd5581ae5ae39038aac796af126c6 + [http://downloads.sourceforge.net/gpstk/gpstk-1.2-src.tar.gz] md5=541ec5a5b86cf9e56f0b23cf6c80dd6e sha256=c1378384b1737b2fa330f8d63d7777db311c976bb20e0c0e0fcd5dac0e78672a diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index c5390811c6..aa2d39f3db 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -9,6 +9,10 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" +SRCREV_pn-opkg ?= "${AUTOREV}" +SRCREV_pn-opkg-native ?= "${AUTOREV}" + +SRCREV_pn-multitap-pad ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" @@ -30,6 +34,7 @@ SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" +SRCREV_pn-openmoko-panel-memory ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 7b92333189..10af8675e8 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1,6 +1,9 @@ +PREFERRED_VERSION_asterisk = "1.4.17" PREFERRED_VERSION_busybox = "1.9.1" PREFERRED_VERSION_dbus = "1.1.20" PREFERRED_VERSION_dbus-glib = "0.74" +PREFERRED_VERSION_gnash = "0.8.1" +PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.24" PREFERRED_VERSION_pulseaudio = "0.9.9" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 28f9b3dc20..652c5ba542 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -64,6 +64,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "24587" +SRCREV_pn-multitap-pad ?= "337" SRCREV_pn-neod ?= "3421" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-networkmanager ?= "2887" @@ -107,6 +108,7 @@ SRCREV_pn-openmoko-panel-demo-simple ?= "1328" SRCREV_pn-openmoko-panel-gps ?= "2900" SRCREV_pn-openmoko-panel-gsm ?= "3664" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" +SRCREV_pn-openmoko-panel-memory ?= "3903" SRCREV_pn-openmoko-panel-usb ?= "3360" SRCREV_pn-openmoko-sample2 ?= "3528" SRCREV_pn-openmoko-session ?= "152" @@ -134,7 +136,7 @@ SRCREV_pn-opkg ?= "4022" SRCREV_pn-opkg-native ?= "4019" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" -SRCREV_pn-pyneod ?= "85" +SRCREV_pn-pyneod ?= "86" SRCREV_pn-pyneog ?= "85" SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "127" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 55237c89b8..8fab5e5058 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -14,6 +14,7 @@ DISTRO_NAME = "OpenMoko" DISTRO_VERSION = "P1-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" +DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat" OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" @@ -63,7 +64,11 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" +# for jalimo +PREFERRED_PROVIDER_classpath = "classpath" +PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" +PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" + # deploy gta01 and gta02 in ${MACHINE_CLASS} directory DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" - diff --git a/packages/gsm/files/fic-gta01/.mtn2git_empty b/contrib/artwork/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gsm/files/fic-gta01/.mtn2git_empty +++ b/contrib/artwork/.mtn2git_empty diff --git a/contrib/oe.svg b/contrib/artwork/oe.svg index 8f3dd17041..8f3dd17041 100644 --- a/contrib/oe.svg +++ b/contrib/artwork/oe.svg diff --git a/contrib/powered-by-oe.svg b/contrib/artwork/powered-by-oe.svg index 7e1c382f57..7e1c382f57 100644 --- a/contrib/powered-by-oe.svg +++ b/contrib/artwork/powered-by-oe.svg diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb index cecb403262..46bc90b25f 100644 --- a/packages/asterisk/asterisk_1.4.17.bb +++ b/packages/asterisk/asterisk_1.4.17.bb @@ -78,7 +78,7 @@ do_configure () { do_compile() { ( #make sure that menuselect gets build using host toolchain - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB cd menuselect ./configure oe_runmake diff --git a/packages/busybox/busybox-1.9.1/defconfig b/packages/busybox/busybox-1.9.1/defconfig index 40ec933361..770ef6eb12 100644 --- a/packages/busybox/busybox-1.9.1/defconfig +++ b/packages/busybox/busybox-1.9.1/defconfig @@ -300,7 +300,7 @@ CONFIG_WHICH=y # CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y -# CONFIG_CMP is not set +CONFIG_CMP=y CONFIG_DIFF=y CONFIG_FEATURE_DIFF_BINARY=y CONFIG_FEATURE_DIFF_DIR=y diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb index c25f453405..cec4af8d59 100644 --- a/packages/busybox/busybox_1.9.1.bb +++ b/packages/busybox/busybox_1.9.1.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r3" +PR = "r4" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \ diff --git a/packages/freesmartphone/enter_0.0.2.bb b/packages/freesmartphone/enter_0.0.2.bb new file mode 100644 index 0000000000..7f1dd09a25 --- /dev/null +++ b/packages/freesmartphone/enter_0.0.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION="A easy-to-use virtual keyboard for small touchscreen displays" +SECTION = "openmoko/inputmethods" +DEPENDS = "ecore evas edje" +PR = "r0" + +inherit autotools + +SRC_URI = "http://gstaedtner.net/projects/enter/enter.tar.gz" + +FILES_${PN} += "${datadir}" diff --git a/packages/freesmartphone/pyneod_svn.bb b/packages/freesmartphone/pyneod_svn.bb index 68938ed424..1ca728afe1 100644 --- a/packages/freesmartphone/pyneod_svn.bb +++ b/packages/freesmartphone/pyneod_svn.bb @@ -4,11 +4,11 @@ SECTION = "console/network" DEPENDS = "python" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" inherit update-rc.d -INITSCRIPT_NAME = "init.d.pyneod" +INITSCRIPT_NAME = "pyneod" INITSCRIPT_PARAMS = "defaults 40" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod" diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc new file mode 100644 index 0000000000..197cea06b6 --- /dev/null +++ b/packages/gnash/gnash.inc @@ -0,0 +1,79 @@ +DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" + +LICENSE = "GPL-2" +HOMEPAGE = "http://www.gnu.org/software/gnash" + +DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl" + +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" + + +EXTRA_OECONF = "--enable-gui=gtk \ + --enable-renderer=cairo \ + --enable-media=none \ + --disable-klash \ + --enable-z \ + --enable-jpeg \ + --disable-glext \ + --enable-Xft \ + --enable-expat \ + --enable-mad \ + --enable-cairo \ + --disable-plugin \ + --disable-cygnal \ + --with-boost-incl=${STAGING_INCDIR} \ + --with-boost-lib=${STAGING_LIBDIR} \ + --with-libxml-incl=${STAGING_INCDIR}/libxml2 \ + --with-libxml-lib=${STAGING_LIBDIR} \ + --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \ +# --with-glib-lib=${STAGING_LIBDIR} \ + --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \ + --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \ +# --with-pango-lib=${STAGING_LIBDIR} \ + --with-sdl-incl=${STAGING_INCDIR}/SDL \ + --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \ + --with-Xft-incl=${STAGING_INCDIR}/X11 \ + --with-expat-incl=${STAGING_INCDIR} \ + --with-mad-incl=${STAGING_INCDIR} \ + --with-cairo-incl=${STAGING_INCDIR}/cairo \ + --with-curl-incl=${STAGING_INCDIR} \ + --with-curl-lib=${STAGING_LIBDIR} \ + " + +inherit autotools pkgconfig + +LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt " +CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ " + +do_configure_append() { + for i in `find . -name Makefile` ; do + sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i + done +} + + +PARALLEL_MAKE = "" + +do_compile() { + oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \ + 'ZLIB_INCLUDE=${STAGING_INCDIR}' \ + 'ZLIB_LIBS=${STAGING_LIBDIR}' \ + 'PNG_INCLUDE=${STAGING_INCDIR}' \ + 'PNG_LIBS=${STAGING_LIBDIR}' +} + + +PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " + +FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" +FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" +FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" +FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" +FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" +FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" +FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/gnash/gnash_0.8.0.bb b/packages/gnash/gnash_0.8.0.bb index 197cea06b6..da4b281e94 100644 --- a/packages/gnash/gnash_0.8.0.bb +++ b/packages/gnash/gnash_0.8.0.bb @@ -1,79 +1 @@ -DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" - -LICENSE = "GPL-2" -HOMEPAGE = "http://www.gnu.org/software/gnash" - -DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl" - -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" - - -EXTRA_OECONF = "--enable-gui=gtk \ - --enable-renderer=cairo \ - --enable-media=none \ - --disable-klash \ - --enable-z \ - --enable-jpeg \ - --disable-glext \ - --enable-Xft \ - --enable-expat \ - --enable-mad \ - --enable-cairo \ - --disable-plugin \ - --disable-cygnal \ - --with-boost-incl=${STAGING_INCDIR} \ - --with-boost-lib=${STAGING_LIBDIR} \ - --with-libxml-incl=${STAGING_INCDIR}/libxml2 \ - --with-libxml-lib=${STAGING_LIBDIR} \ - --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \ -# --with-glib-lib=${STAGING_LIBDIR} \ - --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \ - --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \ -# --with-pango-lib=${STAGING_LIBDIR} \ - --with-sdl-incl=${STAGING_INCDIR}/SDL \ - --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \ - --with-Xft-incl=${STAGING_INCDIR}/X11 \ - --with-expat-incl=${STAGING_INCDIR} \ - --with-mad-incl=${STAGING_INCDIR} \ - --with-cairo-incl=${STAGING_INCDIR}/cairo \ - --with-curl-incl=${STAGING_INCDIR} \ - --with-curl-lib=${STAGING_LIBDIR} \ - " - -inherit autotools pkgconfig - -LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt " -CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ " - -do_configure_append() { - for i in `find . -name Makefile` ; do - sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i - done -} - - -PARALLEL_MAKE = "" - -do_compile() { - oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \ - 'ZLIB_INCLUDE=${STAGING_INCDIR}' \ - 'ZLIB_LIBS=${STAGING_LIBDIR}' \ - 'PNG_INCLUDE=${STAGING_INCDIR}' \ - 'PNG_LIBS=${STAGING_LIBDIR}' -} - - -PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " - -FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" -FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" -FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" -FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" -FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" -FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" -FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" - -do_stage() { - autotools_stage_all -} - +require gnash.inc diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb new file mode 100644 index 0000000000..da4b281e94 --- /dev/null +++ b/packages/gnash/gnash_0.8.1.bb @@ -0,0 +1 @@ +require gnash.inc diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch new file mode 100644 index 0000000000..878cb1dba9 --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch @@ -0,0 +1,128 @@ +diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl +--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100 +@@ -35,6 +35,7 @@ + modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk> + modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au> + modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl> ++modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support) + Version svn-$Version + "; + +@@ -176,6 +177,25 @@ + 15812 => 3 , + 7906 => 2, + 3953 => 1 ++ }, ++ openstreetmap_tah => { ++ 256*576000 => 1, ++ 128*576000 => 2, ++ 64*576000 => 3, ++ 32*576000 => 4, ++ 16*576000 => 5, ++ 8*576000 => 6, ++ 4*576000 => 7, ++ 2*576000 => 8, ++ 576000 => 9, ++ 288000 => 10, ++ 144000 => 11, ++ 72000 => 12, ++ 36000 => 13, ++ 18000 => 14, ++ 9000 => 15, ++ 4500 => 16, ++ 2250 => 17 + } + }; + +@@ -331,7 +351,6 @@ + exit(); + } + +- + # Verify that we have the options that we need + pod2usage(1) if (&error_check); + +@@ -417,6 +436,13 @@ + print "+-----------------------------------------------------------+\n"; + print "| Landsat Maps are Copyright, ..... |\n"; + print "| They are free for non commercial use. |\n"; ++}elsif ( $mapserver eq 'openstreetmap_tah' ){ ++ print "+-----------------------------------------------------------+\n"; ++ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n"; ++ print "| project. |\n"; ++ print "| They are free for use under the terms of the |\n"; ++ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n"; ++ print "| license. See http://www.openstreetmap.org for details. |\n"; + } elsif ( ! $force) { + print "You are violating the map servers copyright!\n"; + print "Are you sure you want to continue? [y|n] "; +@@ -700,6 +726,11 @@ + { + ($url,$mapscale)=googlemap_url($lati,$long,$scale); + } ++ elsif ( $mapserver eq 'openstreetmap_tah') ++ { ++ $filename=~s/\.gif/.png/; ++ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale); ++ } + else + { + print "Unknown map sever :", $mapserver, "\n"; +@@ -935,6 +966,37 @@ + return ($url,$mapscale); + } + ++############################################################################# ++sub openstreetmap_tah_url($$$){ ++ my $lati = shift; ++ my $long = shift; ++ my $scale = shift; ++ ++ my $mapscale = $scale; ++ my $zoom = undef; ++ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) { ++ next unless $s == $scale; ++ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s}; ++ $mapscale = $s; ++ last; ++ } ++ ++ unless ( $zoom ) { ++ print "Error calculating Zoomlevel for Scale: $scale\n"; ++ return (undef,undef); ++ } ++ ++ if ($debug) { ++ print "\n"; ++ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n"; ++ print "lat: $lati\n"; ++ print "lon: $long\n"; ++ } ++ ++ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png"; ++# print "$url\n"; ++ return ($url,$mapscale); ++} + + ############################################################################# + sub eniro_url($$$){ +@@ -2284,7 +2346,7 @@ + =item B<--mapserver <MAPSERVER>> + + Mapserver to download from. Default: 'expedia'. +-Currently can use: landsat or expedia. ++Currently usable: landsat, expedia or openstreetmap_tah. + + geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, + but they are !!!NOT!!!! in the right scale. +@@ -2294,6 +2356,9 @@ + + landsat covers the whole world with satelite Photos + ++openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see ++ http://www.openstreetmap.org and http://tah.openstreetmap.org. ++ + gov_au is for Australia + + incrementp for japanese Maps diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch new file mode 100644 index 0000000000..c51c80931c --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch @@ -0,0 +1,18 @@ +Index: src/map_handler.c +=================================================================== +--- aa/src/map_handler.c (Revision 1699) ++++ aa/src/map_handler.c (Revision 1700) +@@ -660,9 +660,12 @@ + if (maploaded) + gdk_pixbuf_unref (image); + ++#ifdef MAPNIK + if ( !strcmp (filename,"mapnik") ) { + limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL); +- } else { ++ } else ++#endif ++ { + limage = gdk_pixbuf_new_from_file (filename, NULL); + if (limage == NULL) + { diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch new file mode 100644 index 0000000000..c8c0fe9c6a --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch @@ -0,0 +1,96 @@ +diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am +--- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100 +@@ -14,14 +14,14 @@ + -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \ + -DLIBDIR=\"${libdir}\" \ + -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \ +- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\ +- -I/usr/include/ \ +- -I/usr/local/include \ +- -I/opt/boost_1_35/include/boost-1_35 \ +- -I/usr/local/include/freetype2 \ +- -I/usr/include/freetype2 \ ++ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK} ++# -I/usr/include/ \ ++# -I/usr/local/include \ ++# -I/opt/boost_1_35/include/boost-1_35 \ ++# -I/usr/local/include/freetype2 \ ++# -I/usr/include/freetype2 \ + -I. \ +- -L/usr/local/lib ++# -L/usr/local/lib + + # -I/usr/include/dbus-1.0/ + +diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure +--- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100 +@@ -35950,10 +35950,13 @@ + # Yep, its ebil, but I does not know better... + #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` + # default on debian should be: /usr/share/perl5/ +-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` ++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` + #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` +-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` + ++# hard code path for OpenEmbedded environment as I don't know a way ++# to detect it automatically ++PERL_PACKAGE_DIR="/usr/share/perl5" + + ac_perl_modules="File::Basename " + # Make sure we have perl +@@ -37840,11 +37843,11 @@ + # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') + #fi + +-if test -f /usr/include/mysql/mysql.h; then +- CFLAGS="$CFLAGS -I/usr/include/mysql" +-else +- CFLAGS="$CFLAGS -Imysql" +-fi ++#if test -f /usr/include/mysql/mysql.h; then ++# CFLAGS="$CFLAGS -I/usr/include/mysql" ++#else ++# CFLAGS="$CFLAGS -Imysql" ++#fi + + CFLAGS="$CFLAGS $OPT_CFLAGS" + CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" +diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac +--- gpsdrive-2.10pre4.orig/configure.ac 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/configure.ac 2008-01-06 14:48:50.000000000 +0100 +@@ -662,9 +662,12 @@ + # Yep, its ebil, but I does not know better... + #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` + # default on debian should be: /usr/share/perl5/ +-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` ++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` + #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` +-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++# hard code path for OpenEmbedded environment as I don't know a way ++# to detect it automatically ++PERL_PACKAGE_DIR="/usr/share/perl5" + AC_SUBST(PERL_PACKAGE_DIR) + + AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename)) +@@ -719,11 +722,11 @@ + # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') + #fi + +-if test -f /usr/include/mysql/mysql.h; then +- CFLAGS="$CFLAGS -I/usr/include/mysql" +-else +- CFLAGS="$CFLAGS -Imysql" +-fi ++#if test -f /usr/include/mysql/mysql.h; then ++# CFLAGS="$CFLAGS -I/usr/include/mysql" ++#else ++# CFLAGS="$CFLAGS -Imysql" ++#fi + + CFLAGS="$CFLAGS $OPT_CFLAGS" + CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop new file mode 100644 index 0000000000..96e8155861 --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GPSDrive +Comment=GPS map software +Exec=gpsdrive -M pda -1 +Icon=gpsicon +Terminal=false +Type=Application +Categories=Graphics;Network;Geography;Application;Other +StartupNotify=true diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb new file mode 100644 index 0000000000..071a5691e3 --- /dev/null +++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "GPS navigation/map display software" +SECTION = "x11" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql" +RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl" +PR = "r1" + +SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ + file://gpsdrive_2.10pre4.desktop \ + file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \ + file://gpsdrive-ifdef-mapnik.patch;patch=1 \ + file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-garmin" + +do_install_append () { + mkdir -p ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop + mkdir -p ${D}${datadir}/pixmaps + cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps + # remove stuff we don't want to package + rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one + rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux + rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo +} + +PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons" + +FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml" +FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi" +FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils" +FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small" +FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg" +FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt" +FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation" + +CFLAGS += "-D_GNU_SOURCE" + +DEFAULT_PREFERENCE = "1" diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd deleted file mode 100644 index d8323e202c..0000000000 --- a/packages/gsm/files/fic-gta01/gsmd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# gsmd This shell script starts and stops gsmd. -# -# chkconfig: 345 90 40 -# description: Gsmd manages access to a serial- or USB-connected GSM -# processname: gsmd - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -[ -f /etc/default/rcS ] && . /etc/default/rcS -[ -f /etc/default/gsmd ] && . /etc/default/gsmd - -case "$1" in - start) - stty -F "$GSM_DEV" -crtscts - [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) - stty -F "$GSM_DEV" -echo - [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) - - echo -n "Starting GSM daemon: " - start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 & - - if [ $? = 0 ]; then - echo "gsmd." - else - echo "(failed.)" - fi - ;; - stop) - echo -n "Stopping GSM daemon: " - start-stop-daemon -K -x /usr/sbin/gsmd - stty -F "$GSM_DEV" -crtscts - [ -n "$GSM_POW" ] && echo "0" >$GSM_POW - echo "gsmd." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 72f66a17ad..fadae76aee 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -13,8 +13,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin case "$1" in start) - [ -n "$GSM_DL" ] && echo "1" >$GSM_DL; - + [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 ) [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb index f86fcfba58..a7dc463faf 100644 --- a/packages/images/moko-underground-image.bb +++ b/packages/images/moko-underground-image.bb @@ -4,6 +4,15 @@ IMAGE_LINGUAS = "" +ADD_INSTALL = "\ + fontconfig \ + \ + ttf-dejavu-common \ + ttf-dejavu-sans \ + ttf-dejavu-serif \ + \ +" + IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ task-base \ @@ -28,6 +37,8 @@ IMAGE_INSTALL = "\ gsm0710muxd \ pyneod \ pyneog \ + \ + ${ADD_INSTALL} \ " DEPENDS = "\ diff --git a/packages/multitap-pad/.mtn2git_empty b/packages/multitap-pad/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/multitap-pad/.mtn2git_empty diff --git a/packages/multitap-pad/files/.mtn2git_empty b/packages/multitap-pad/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/multitap-pad/files/.mtn2git_empty diff --git a/packages/multitap-pad/files/80multitappad b/packages/multitap-pad/files/80multitappad new file mode 100644 index 0000000000..d2b12ea7cc --- /dev/null +++ b/packages/multitap-pad/files/80multitappad @@ -0,0 +1,20 @@ +#!/bin/sh + +CMD="" + +if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then + if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then + CMD="multitap-pad -d -o landscape" + elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then + CMD="multitap-pad -d -o portrait" + fi +else + CMD="multitap-pad -d" +fi + + +# Delay to make sure the window manager is active + +if [ "$CMD" ]; then + (sleep 2 && $CMD) & +fi diff --git a/packages/multitap-pad/multitap-pad_svn.bb b/packages/multitap-pad/multitap-pad_svn.bb new file mode 100644 index 0000000000..7543a44d72 --- /dev/null +++ b/packages/multitap-pad/multitap-pad_svn.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "Multi-tap input method for GTK" +LICENSE = "GPL" +DEPENDS = "libfakekey gtk+ matchbox-panel-2" +RCONFLICTS = matchbox-keyboard-inputmethod +SECTION = "x11" +PV = "0.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \ + file://80multitappad" + +inherit autotools pkgconfig + +S = "${WORKDIR}/${PN}" + +FILES_${PN} = "${bindir}/* \ + ${libdir} \ + ${sysconfdir} \ + ${datadir}" + +FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \ + ${libdir}/matchbox-panel/.debug" + +FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \ + ${libdir}/gtk-2.0/2.10.0/immodules/*.la \ + ${libdir}/matchbox-panel/*.a \ + ${libdir}/matchbox-panel/*.la" + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d/ + install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/ +} + +pkg_postinst_multitap-pad () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} + +pkg_postrm_multitap-pad () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb new file mode 100644 index 0000000000..8e8af7a086 --- /dev/null +++ b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel" +DEPENDS = "libnotify" +RDEPENDS = "openmoko-dialer2" +PV = "0.0.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko-panel-plugin diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch new file mode 100644 index 0000000000..c6f34f4131 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch @@ -0,0 +1,13 @@ +Index: openmoko-dialer2/src/phone-kit/moko-notify.c +=================================================================== +--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800 ++++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800 +@@ -38,7 +38,7 @@ + + #define DEFAULT_RINGTONE "/default_ringtone.ogg" + #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" +-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" ++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" + + struct _MokoNotifyPrivate + { diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch new file mode 100644 index 0000000000..72c516f5d6 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch @@ -0,0 +1,15 @@ +Index: openmoko-dialer2/src/phone-kit/moko-notify.c +=================================================================== +--- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051) ++++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy) +@@ -37,8 +37,8 @@ + MOKO_TYPE_NOTIFY, MokoNotifyPrivate)) + + #define DEFAULT_RINGTONE "/default_ringtone.ogg" +-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" +-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" ++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl" ++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" + + struct _MokoNotifyPrivate + { diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 3378e43503..4f15ac07dc 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -2,11 +2,14 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify" PV = "0.1.0+svnr${SRCREV}" -PR = "r6" +PR = "r7" PE = "1" inherit openmoko2 +SRC_URI_append_fic-gta01 = " file://kernel-2.6.24.patch;patch=1" +SRC_URI_append_fic-gta02 = " file://kernel-2.6.24.patch;patch=1" + EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 3d8c9109e1..02489f5621 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,7 +4,7 @@ SECTION = "x11" RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r63" +PR = "r64" SRC_URI = "\ file://etc \ diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 9eea32a45d..f4d1ee9b11 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -7,6 +7,6 @@ phone-kit & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & matchbox-panel-2 --start-applets systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,keyboard --titlebar & + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,keyboard --titlebar & exec neod diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb new file mode 100644 index 0000000000..68fdcbbbe5 --- /dev/null +++ b/packages/perl/libwww-perl-native_5.808.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libwww-perl_${PV}.bb diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb new file mode 100644 index 0000000000..2bea48a2d0 --- /dev/null +++ b/packages/perl/libwww-perl_5.808.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web" +SECTION = "libs" +LICENSE = "Artistic" +DEPENDS = "liburi-perl-native" +RDEPENDS = "liburi-perl" +PR = "r1" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz" + +S = "${WORKDIR}/libwww-perl-${PV}" + +inherit cpan diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 24b49f37ed..e6667cc04b 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -82,8 +82,11 @@ do_install() { require python-${PYTHON_MAJMIN}-manifest.inc +# manual additions RPROVIDES_python-core = "python" RRECOMMENDS_python-core = "python-readline" +RRECOMMENDS_python-crypt = "openssl" +PR_python-crypt = "ml1" # add sitecustomize FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 77aa07de00..15835508aa 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r62" +PR = "r63" inherit task diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb index a5d13e7e08..310d3f07c3 100644 --- a/packages/tasks/task-openmoko-base.bb +++ b/packages/tasks/task-openmoko-base.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r71" +PR = "r72" inherit task @@ -12,10 +12,11 @@ DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, App RDEPENDS_task-openmoko-base = "\ matchbox-panel-2 \ matchbox-panel-2-applets \ - matchbox-keyboard-inputmethod \ - matchbox-keyboard-im \ - matchbox-keyboard-applet \ +# matchbox-keyboard-inputmethod \ +# matchbox-keyboard-im \ +# matchbox-keyboard-applet \ matchbox-stroke \ + multitap-pad \ openmoko-terminal2 \ # openmoko-keyboard \ openmoko-panel-battery \ diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb index 49e4e66859..474efff79d 100644 --- a/packages/tasks/task-openmoko-phone.bb +++ b/packages/tasks/task-openmoko-phone.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r72" +PR = "r73" inherit task @@ -14,5 +14,6 @@ RDEPENDS_task-openmoko-phone = "\ libgsmd-tools \ openmoko-dialer2 \ openmoko-panel-gsm \ + openmoko-panel-memory \ # ppp \ " diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb index 737cf8ef0c..020fd421c6 100644 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb @@ -35,12 +35,6 @@ do_svnrev() { echo "echo ${LOCALVERSION}" >>tools/setlocalversion } -do_configure_prepend() { - find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1 -} - do_compile () { chmod +x board/neo1973/gta*/split_by_variant.sh for mach in ${UBOOT_MACHINES} |