From e30dc57c1d794b3a2ecec7414acba7b6ef0e3747 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 30 Jul 2007 21:24:02 +0000 Subject: It's OpenMoko not OpenMoKo. --- conf/distro/include/openmoko.inc | 2 +- conf/distro/openmoko.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 457aa997dd..7c3c4a8f41 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -1,7 +1,7 @@ # # Header # -DISTRO_NAME = "OpenMoKo" +DISTRO_NAME = "OpenMoko" # # Naming schemes diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 1f46be09d6..3788b54637 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -9,7 +9,7 @@ require conf/distro/angstrom-2007.1.conf # # Header # -DISTRO_NAME = "OpenMoKo" +DISTRO_NAME = "OpenMoko" DISTRO_VERSION = ".dev-snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" -- cgit v1.2.3 From 918e226afe2c8fe51e6796d45ad6abcf1baeb679 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 30 Jul 2007 21:37:19 +0000 Subject: openmoko-theme-standard[2]: set CONFFILES, fix SRC_URI --- packages/openmoko-base/openmoko-theme-standard_svn.bb | 4 +++- packages/openmoko2/openmoko-theme-standard2_svn.bb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb index 6265526de6..8bf59ac707 100644 --- a/packages/openmoko-base/openmoko-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" PV = "0.0+svn${SRCDATE}" -PR = "r4" +PR = "r5" inherit openmoko-base @@ -21,5 +21,7 @@ do_install() { echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc } +CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc" + PACKAGE_ARCH = "all" FILES_${PN} = "${datadir} ${sysconfdir}" diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb index b925edce1a..3af6dc78a9 100644 --- a/packages/openmoko2/openmoko-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb @@ -6,7 +6,7 @@ PR = "r1" inherit openmoko2 -SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2008/artwork/themes;module=openmoko-standard-2;proto=http" +SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http" S = "${WORKDIR}/openmoko-standard-2" do_install() { @@ -19,5 +19,7 @@ do_install() { echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc } +CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc" + PACKAGE_ARCH = "all" FILES_${PN} = "${datadir} ${sysconfdir}" -- cgit v1.2.3 From 65b57203d5134e993f4a99c72c99fc6804bb1439 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 30 Jul 2007 21:41:21 +0000 Subject: task-openmoko|openmoko-image: adjust for OM-2007.2 --- packages/images/openmoko-devel-image.bb | 2 -- packages/images/openmoko-image.bb | 1 - packages/tasks/task-openmoko.bb | 53 ++++++++------------------------- 3 files changed, 12 insertions(+), 44 deletions(-) diff --git a/packages/images/openmoko-devel-image.bb b/packages/images/openmoko-devel-image.bb index 56890b5c34..9c72533f8d 100644 --- a/packages/images/openmoko-devel-image.bb +++ b/packages/images/openmoko-devel-image.bb @@ -1,7 +1,5 @@ require openmoko-image.bb export PACKAGE_INSTALL += "\ - task-openmoko-demo \ task-openmoko-debug \ - task-openmoko-examples \ " diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 632963076c..0f1359fb19 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -14,7 +14,6 @@ export PACKAGE_INSTALL = "\ task-openmoko-phone \ task-openmoko-finger \ task-openmoko-pim \ - task-openmoko-demo \ " DEPENDS = "\ diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 8ef66b6080..94836847d4 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r49" +PR = "r50" ALLOW_EMPTY = "1" PACKAGE_ARCH = "all" @@ -65,9 +65,8 @@ RDEPENDS_task-openmoko-ui = "\ xset \ xrandr \ settings-daemon \ - openmoko-common \ - openmoko-session \ - openmoko-theme-standard \ + openmoko-session2 \ + openmoko-theme-standard2 \ openmoko-icon-theme-standard \ openmoko-sound-system \ openmoko-sound-theme-standard \ @@ -83,10 +82,10 @@ RDEPENDS_task-openmoko-base = "\ matchbox-panel-2 \ matchbox-panel-2-applets \ matchbox-applet-inputmanager \ - openmoko-appmanager \ +# openmoko-appmanager \ + matchbox-keyboard \ + matchbox-stroke \ openmoko-keyboard \ - openmoko-footer \ - openmoko-taskmanager \ openmoko-panel-mainmenu \ openmoko-panel-battery \ openmoko-panel-bt \ @@ -102,7 +101,7 @@ DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services" RDEPENDS_task-openmoko-phone = "\ gsmd \ libgsmd-tools \ - openmoko-dialer \ + openmoko-dialer2 \ openmoko-panel-gsm \ # ppp \ " @@ -112,7 +111,7 @@ RDEPENDS_task-openmoko-phone = "\ # DESCRIPTION_task-openmoko-finger = "OpenMoko: Finger UI Applications" RDEPENDS_task-openmoko-finger = "\ - openmoko-calculator \ +# openmoko-calculator \ " # @@ -121,12 +120,10 @@ RDEPENDS_task-openmoko-finger = "\ DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications" RDEPENDS_task-openmoko-pim = "\ eds-dbus \ - openmoko-contacts \ - openmoko-dates \ - openmoko-tasks \ - openmoko-today \ - openmoko-messages \ - openmoko-rssreader \ + openmoko-contacts2 \ + openmoko-today2 \ +# openmoko-messages \ +# openmoko-rssreader \ " # @@ -138,32 +135,6 @@ RDEPENDS_task-openmoko-net = "\ bridge-utils \ " -# -# task-openmoko-demo -# -DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications" -RDEPENDS_task-openmoko-demo = "\ - matchbox-desktop-2 \ - matchbox-keyboard \ - matchbox-stroke \ - matchbox-config-gtk \ - xcursor-transparent-theme \ - web \ - mtpaint \ -" - -# -# task-openmoko-examples -# -DESCRIPTION_task-openmoko-examples = "OpenMoko: Example Applications" -RDEPENDS_task-openmoko-examples = "\ - openmoko-stylus-demo-simple \ - openmoko-stylus-demo \ - openmoko-finger-demo \ - openmoko-panel-demo-simple \ - openmoko-panel-demo \ - openmoko-chordmaster" - # # task-openmoko-debug # -- cgit v1.2.3 From 8f9ec3748314f3992b7c71700b07a2d6a0068dae Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 30 Jul 2007 22:01:41 +0000 Subject: sane-srcdates.inc: openmoko*: add SRCDATE = now until the integration work for new OpenMoko stuff has been done. --- conf/distro/include/sane-srcdates.inc | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 59e8b81fb1..9a5e2f330e 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -1,4 +1,5 @@ -# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version +# Lock down some SRCDATEs +# (see http://svn.o-hand.com/view/poky/trunk/meta/conf/distro/poky.conf for wher it comes from) # Kernel modules SRCDATE_at76c503a-modules ?= "20060814" @@ -31,6 +32,7 @@ SRCDATE_matchbox-desktop ?= "20060612" SRCDATE_matchbox-keyboard ?= "20060725" SRCDATE_matchbox-panel ?= "20060612" SRCDATE_matchbox-panel-manager ?= "20060612" +SRCDATE_matchbox-panel-2 ?= "20070720" SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" @@ -50,7 +52,7 @@ SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" -# Enlightenment Foundation Libraries +# Enlightenment Foundation Libraries (EFL) # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. SRCDATE_edb-native = "20070721" @@ -138,3 +140,20 @@ SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" +# OpenMoko +SRCDATE_libgsmd ?= "now" +SRCDATE_libmokogsmd2 ?= "now" +SRCDATE_libmokoui2 ?= "now" +SRCDATE_libmokojournal2 ?= "now" +SRCDATE_libmokopanelui2 ?= "now" +SRCDATE_openmoko-today2 ?= "now" +SRCDATE_openmoko-dialer2 ?= "now" +SRCDATE_openmoko-contacts2 ?= "now" + +SRCDATE_openmoko-panel-battery ?= "now" +SRCDATE_openmoko-panel-clock ?= "now" +SRCDATE_openmoko-panel-gsm ?= "now" +SRCDATE_openmoko-panel-usb ?= "now" +SRCDATE_openmoko-panel-bt ?= "now" +SRCDATE_openmoko-panel-gps ?= "now" + -- cgit v1.2.3 From b350099f15032f0c9ee22ae29c74b624d9666a4a Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 30 Jul 2007 22:37:46 +0000 Subject: Add missing libmokopanelui2 dep for all panel applets. --- classes/openmoko-panel-plugin.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/openmoko-panel-plugin.bbclass b/classes/openmoko-panel-plugin.bbclass index 4ef42b5015..6a22a92ac8 100644 --- a/classes/openmoko-panel-plugin.bbclass +++ b/classes/openmoko-panel-plugin.bbclass @@ -1,5 +1,5 @@ SECTION = "openmoko/panel-plugin" -DEPENDS += "matchbox-panel-2" +DEPENDS += "matchbox-panel-2 libmokopanelui2" inherit openmoko2 -- cgit v1.2.3 From 936b86600b1a0daae20157a57f7e5945d7c35771 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 30 Jul 2007 23:01:14 +0000 Subject: bitbake.conf: Add SRCREV definiton. This is for developers offline use only until we increase the bitbake version requirements. --- conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index e305dc3251..38a716af00 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -365,6 +365,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" SRCDATE = "${DATE}" +SRCREV = "${@bb.fetch.get_srcrev(d)}" SRC_URI = "file://${FILE}" -- cgit v1.2.3 From 541f656ea246ee025650961a2bac6c48e8ac0dde Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 30 Jul 2007 23:34:06 +0000 Subject: openmoko-session2: don't ship $bindir/matchbox-session, rather depend on matchbox-common --- packages/openmoko2/openmoko-session2.bb | 8 +++----- .../openmoko2/openmoko-session2/matchbox-session | 24 ---------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 packages/openmoko2/openmoko-session2/matchbox-session diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 006948109f..d24d57e008 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,16 +1,14 @@ DESCRIPTION = "Custom MB session files for poky" LICENSE = "GPL" SECTION = "x11" -RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" -RCONFLICTS = "matchbox-common openmoko-session" -PR = "r20" +RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" +RCONFLICTS = "openmoko-session" +PR = "r21" SRC_URI = "file://etc file://matchbox-session" S = ${WORKDIR} do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/matchbox-session ${D}/${bindir} cp -R ${S}/etc ${D}/etc rm -fR ${D}/etc/.svn rm -fR ${D}/etc/matchbox/.svn diff --git a/packages/openmoko2/openmoko-session2/matchbox-session b/packages/openmoko2/openmoko-session2/matchbox-session deleted file mode 100644 index 658ce4bcfc..0000000000 --- a/packages/openmoko2/openmoko-session2/matchbox-session +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# Very simple session manager for matchbox tools -# - -# Uncomment below to enable parsing of debian menu entrys -# export MB_USE_DEB_MENUS=1 - -if [ -e $HOME/.matchbox/session ] -then -exec $HOME/.matchbox/session -fi - -if [ -e /etc/matchbox/session ] -then -exec /etc/matchbox/session -fi - -# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session -# dont exist. - -matchbox-desktop-2 & -matchbox-panel-2 --orientation south & -exec matchbox-window-manager $@ -- cgit v1.2.3 From 5f840b334eed0b95d53b4faa97bd6ca98543abd6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 30 Jul 2007 23:38:25 +0000 Subject: openmoko-session2: remove matchbox-session from SRC_URI --- packages/openmoko2/openmoko-session2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index d24d57e008..96c027f3db 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -5,7 +5,7 @@ RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" RCONFLICTS = "openmoko-session" PR = "r21" -SRC_URI = "file://etc file://matchbox-session" +SRC_URI = "file://etc" S = ${WORKDIR} do_install() { -- cgit v1.2.3 From bef115e0ada1064bd59c7abeb95079036dc31511 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 04:21:47 +0000 Subject: move libmnetutil and minisip to nonworking. neither snapshots nor svn is fetchable --- packages/libmnetutil/.mtn2git_empty | 0 packages/libmnetutil/libmnetutil0_0.2.2.bb | 23 ------------------ packages/libmnetutil/libmnetutil0_svn.bb | 25 ------------------- packages/minisip/.mtn2git_empty | 0 packages/minisip/minisip-video_svn.bb | 25 ------------------- packages/minisip/minisip_0.6.2.bb | 21 ---------------- packages/minisip/minisip_svn.bb | 28 ---------------------- packages/nonworking/libmnetutil/.mtn2git_empty | 0 .../nonworking/libmnetutil/libmnetutil0_0.2.2.bb | 23 ++++++++++++++++++ .../nonworking/libmnetutil/libmnetutil0_svn.bb | 25 +++++++++++++++++++ packages/nonworking/minisip/minisip-video_svn.bb | 25 +++++++++++++++++++ packages/nonworking/minisip/minisip_0.6.2.bb | 21 ++++++++++++++++ packages/nonworking/minisip/minisip_1.0a.bb | 13 ---------- packages/nonworking/minisip/minisip_svn.bb | 28 ++++++++++++++++++++++ 14 files changed, 122 insertions(+), 135 deletions(-) delete mode 100644 packages/libmnetutil/.mtn2git_empty delete mode 100644 packages/libmnetutil/libmnetutil0_0.2.2.bb delete mode 100644 packages/libmnetutil/libmnetutil0_svn.bb delete mode 100644 packages/minisip/.mtn2git_empty delete mode 100644 packages/minisip/minisip-video_svn.bb delete mode 100644 packages/minisip/minisip_0.6.2.bb delete mode 100644 packages/minisip/minisip_svn.bb create mode 100644 packages/nonworking/libmnetutil/.mtn2git_empty create mode 100644 packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb create mode 100644 packages/nonworking/libmnetutil/libmnetutil0_svn.bb create mode 100644 packages/nonworking/minisip/minisip-video_svn.bb create mode 100644 packages/nonworking/minisip/minisip_0.6.2.bb delete mode 100644 packages/nonworking/minisip/minisip_1.0a.bb create mode 100644 packages/nonworking/minisip/minisip_svn.bb diff --git a/packages/libmnetutil/.mtn2git_empty b/packages/libmnetutil/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libmnetutil/libmnetutil0_0.2.2.bb b/packages/libmnetutil/libmnetutil0_0.2.2.bb deleted file mode 100644 index a7866b35ec..0000000000 --- a/packages/libmnetutil/libmnetutil0_0.2.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "LGPL" - -DESCRIPTION = "Networking class library for C++ programming" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" - -inherit autotools - -SRC_URI = "http://www.minisip.org/snapshots/libmnetutil-${PV}.tar.gz" -S="${WORKDIR}/libmnetutil-${PV}" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmnetutil - install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil -} diff --git a/packages/libmnetutil/libmnetutil0_svn.bb b/packages/libmnetutil/libmnetutil0_svn.bb deleted file mode 100644 index a8e156bc13..0000000000 --- a/packages/libmnetutil/libmnetutil0_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -PV = "0.2.2+svn${SRCDATE}" -LICENSE = "LGPL" - -DESCRIPTION = "Networking class library for C++ programming" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" -DEFAULT_PREFERENCE = "-1" - -inherit autotools - -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmnetutil" -S="${WORKDIR}/libmnetutil" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmnetutil - install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil -} diff --git a/packages/minisip/.mtn2git_empty b/packages/minisip/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb deleted file mode 100644 index 136f09e156..0000000000 --- a/packages/minisip/minisip-video_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -PV = "0.6.2+svn${SRCDATE}" -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" -CONFLICTS = "minisip" - -DESCRIPTION = "SIP user agent, with focus on security - video support" -DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0" -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" -S = "${WORKDIR}/minisip" - - - -FILES_${PN} += "${datadir}/minisip" - -inherit autotools - -EXTRA_OECONF = "--enable-ipaq --enable-video --with-avcodec=${STAGING_INCDIR}/ffmpeg" - -do_install_append () { - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/applications - install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png - install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop -} diff --git a/packages/minisip/minisip_0.6.2.bb b/packages/minisip/minisip_0.6.2.bb deleted file mode 100644 index b85007deef..0000000000 --- a/packages/minisip/minisip_0.6.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" - -DESCRIPTION = "SIP user agent, with focus on security" -DEPENDS = "libglademm libmsip0 libmikey0" -SRC_URI = "http://www.minisip.org/snapshots/minisip-${PV}.tar.gz" - - -FILES_${PN} += "${datadir}/minisip" - -inherit autotools - -EXTRA_OECONF = "--enable-ipaq" - -do_install_append () { - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/applications - install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png - install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop -} diff --git a/packages/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb deleted file mode 100644 index 6928387ad0..0000000000 --- a/packages/minisip/minisip_svn.bb +++ /dev/null @@ -1,28 +0,0 @@ -PV = "0.6.2+svn${SRCDATE}" -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" - -DESCRIPTION = "SIP user agent, with focus on security" -DEPENDS = "libglademm libmsip0 libmikey0" -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" -S = "${WORKDIR}/${PN}" - -DEFAULT_PREFERENCE="-1" - -FILES_${PN} += "${datadir}/minisip" - -inherit autotools - -EXTRA_OECONF = "--enable-ipaq" - -# do_configure_prepend() { -# ./bootstrap -#} - -do_install_append () { - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/applications - install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png - install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop -} diff --git a/packages/nonworking/libmnetutil/.mtn2git_empty b/packages/nonworking/libmnetutil/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb b/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb new file mode 100644 index 0000000000..a7866b35ec --- /dev/null +++ b/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL" + +DESCRIPTION = "Networking class library for C++ programming" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libmutil0 openssl" + +inherit autotools + +SRC_URI = "http://www.minisip.org/snapshots/libmnetutil-${PV}.tar.gz" +S="${WORKDIR}/libmnetutil-${PV}" + + +PACKAGES = "${PN}" + +FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " + +do_stage() { + oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libmnetutil + install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil +} diff --git a/packages/nonworking/libmnetutil/libmnetutil0_svn.bb b/packages/nonworking/libmnetutil/libmnetutil0_svn.bb new file mode 100644 index 0000000000..a8e156bc13 --- /dev/null +++ b/packages/nonworking/libmnetutil/libmnetutil0_svn.bb @@ -0,0 +1,25 @@ +PV = "0.2.2+svn${SRCDATE}" +LICENSE = "LGPL" + +DESCRIPTION = "Networking class library for C++ programming" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libmutil0 openssl" +DEFAULT_PREFERENCE = "-1" + +inherit autotools + +SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmnetutil" +S="${WORKDIR}/libmnetutil" + + +PACKAGES = "${PN}" + +FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " + +do_stage() { + oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libmnetutil + install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil +} diff --git a/packages/nonworking/minisip/minisip-video_svn.bb b/packages/nonworking/minisip/minisip-video_svn.bb new file mode 100644 index 0000000000..136f09e156 --- /dev/null +++ b/packages/nonworking/minisip/minisip-video_svn.bb @@ -0,0 +1,25 @@ +PV = "0.6.2+svn${SRCDATE}" +LICENSE = "GPL" +SECTION = "x11/utils" +PR = "r0" +CONFLICTS = "minisip" + +DESCRIPTION = "SIP user agent, with focus on security - video support" +DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0" +SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" +S = "${WORKDIR}/minisip" + + + +FILES_${PN} += "${datadir}/minisip" + +inherit autotools + +EXTRA_OECONF = "--enable-ipaq --enable-video --with-avcodec=${STAGING_INCDIR}/ffmpeg" + +do_install_append () { + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/applications + install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png + install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop +} diff --git a/packages/nonworking/minisip/minisip_0.6.2.bb b/packages/nonworking/minisip/minisip_0.6.2.bb new file mode 100644 index 0000000000..b85007deef --- /dev/null +++ b/packages/nonworking/minisip/minisip_0.6.2.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +SECTION = "x11/utils" +PR = "r0" + +DESCRIPTION = "SIP user agent, with focus on security" +DEPENDS = "libglademm libmsip0 libmikey0" +SRC_URI = "http://www.minisip.org/snapshots/minisip-${PV}.tar.gz" + + +FILES_${PN} += "${datadir}/minisip" + +inherit autotools + +EXTRA_OECONF = "--enable-ipaq" + +do_install_append () { + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/applications + install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png + install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop +} diff --git a/packages/nonworking/minisip/minisip_1.0a.bb b/packages/nonworking/minisip/minisip_1.0a.bb deleted file mode 100644 index 14ce425b0e..0000000000 --- a/packages/nonworking/minisip/minisip_1.0a.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Minisip is a SIP User Agent" -SECTION = "opie/network" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "libmikey libopie1" - -SRC_URI = "http://minisip.org/source/minisip-0.1a.tar.gz" -S = "${WORKDIR}/minisip-0.1" - -inherit autotools - -EXTRA_OECONF = "--enable-qte --enable-opie" - diff --git a/packages/nonworking/minisip/minisip_svn.bb b/packages/nonworking/minisip/minisip_svn.bb new file mode 100644 index 0000000000..6928387ad0 --- /dev/null +++ b/packages/nonworking/minisip/minisip_svn.bb @@ -0,0 +1,28 @@ +PV = "0.6.2+svn${SRCDATE}" +LICENSE = "GPL" +SECTION = "x11/utils" +PR = "r0" + +DESCRIPTION = "SIP user agent, with focus on security" +DEPENDS = "libglademm libmsip0 libmikey0" +SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" +S = "${WORKDIR}/${PN}" + +DEFAULT_PREFERENCE="-1" + +FILES_${PN} += "${datadir}/minisip" + +inherit autotools + +EXTRA_OECONF = "--enable-ipaq" + +# do_configure_prepend() { +# ./bootstrap +#} + +do_install_append () { + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/applications + install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png + install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop +} -- cgit v1.2.3 From 9a1485276b7fd3042f7095c76d81d61f8d90a6fe Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 04:40:18 +0000 Subject: minisip and related libraries: fix SRC_URI and bring svn versions back from nonworking --- packages/libmikey/.mtn2git_empty | 0 packages/libmikey/libmikey0_0.3.2.bb | 23 ------------------ packages/libmikey/libmikey0_svn.bb | 26 -------------------- packages/libmikey/libmikey_0.1a.bb | 23 ------------------ packages/libmsip/.mtn2git_empty | 0 packages/libmsip/libmsip0_0.2.2.bb | 23 ------------------ packages/libmsip/libmsip0_svn.bb | 25 ------------------- packages/libmutil/libmutil0_svn.bb | 20 ---------------- packages/minisip/.mtn2git_empty | 0 packages/minisip/libmikey_svn.bb | 17 +++++++++++++ packages/minisip/libmnetutil_svn.bb | 16 +++++++++++++ packages/minisip/libmsip_svn.bb | 16 +++++++++++++ packages/minisip/libmutil0_svn.bb | 16 +++++++++++++ packages/minisip/minisip-video_svn.bb | 23 ++++++++++++++++++ packages/minisip/minisip_svn.bb | 23 ++++++++++++++++++ packages/nonworking/libmikey/.mtn2git_empty | 0 packages/nonworking/libmikey/libmikey0_0.3.2.bb | 23 ++++++++++++++++++ packages/nonworking/libmikey/libmikey_0.1a.bb | 23 ++++++++++++++++++ .../nonworking/libmnetutil/libmnetutil0_svn.bb | 25 ------------------- packages/nonworking/libmsip/.mtn2git_empty | 0 packages/nonworking/libmsip/libmsip0_0.2.2.bb | 23 ++++++++++++++++++ packages/nonworking/minisip/minisip-video_svn.bb | 25 ------------------- packages/nonworking/minisip/minisip_svn.bb | 28 ---------------------- 23 files changed, 180 insertions(+), 218 deletions(-) delete mode 100644 packages/libmikey/.mtn2git_empty delete mode 100644 packages/libmikey/libmikey0_0.3.2.bb delete mode 100644 packages/libmikey/libmikey0_svn.bb delete mode 100644 packages/libmikey/libmikey_0.1a.bb delete mode 100644 packages/libmsip/.mtn2git_empty delete mode 100644 packages/libmsip/libmsip0_0.2.2.bb delete mode 100644 packages/libmsip/libmsip0_svn.bb delete mode 100644 packages/libmutil/libmutil0_svn.bb create mode 100644 packages/minisip/.mtn2git_empty create mode 100644 packages/minisip/libmikey_svn.bb create mode 100644 packages/minisip/libmnetutil_svn.bb create mode 100644 packages/minisip/libmsip_svn.bb create mode 100644 packages/minisip/libmutil0_svn.bb create mode 100644 packages/minisip/minisip-video_svn.bb create mode 100644 packages/minisip/minisip_svn.bb create mode 100644 packages/nonworking/libmikey/.mtn2git_empty create mode 100644 packages/nonworking/libmikey/libmikey0_0.3.2.bb create mode 100644 packages/nonworking/libmikey/libmikey_0.1a.bb delete mode 100644 packages/nonworking/libmnetutil/libmnetutil0_svn.bb create mode 100644 packages/nonworking/libmsip/.mtn2git_empty create mode 100644 packages/nonworking/libmsip/libmsip0_0.2.2.bb delete mode 100644 packages/nonworking/minisip/minisip-video_svn.bb delete mode 100644 packages/nonworking/minisip/minisip_svn.bb diff --git a/packages/libmikey/.mtn2git_empty b/packages/libmikey/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libmikey/libmikey0_0.3.2.bb b/packages/libmikey/libmikey0_0.3.2.bb deleted file mode 100644 index 214faef40f..0000000000 --- a/packages/libmikey/libmikey0_0.3.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "LGPL" - -DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" - -inherit autotools - -SRC_URI = "http://www.minisip.org/snapshots/libmikey-${PV}.tar.gz" -S="${WORKDIR}/libmikey-${PV}" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmikey ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmikey - install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey -} diff --git a/packages/libmikey/libmikey0_svn.bb b/packages/libmikey/libmikey0_svn.bb deleted file mode 100644 index 663b639b3d..0000000000 --- a/packages/libmikey/libmikey0_svn.bb +++ /dev/null @@ -1,26 +0,0 @@ -PV = "0.3.2+svn${SRCDATE}" -LICENSE = "LGPL" - -DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" -DEFAULT_PREFERENCE = "-1" - - -inherit autotools - -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmikey" -S = "${WORKDIR}/libmikey" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmikey ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmikey - install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey -} diff --git a/packages/libmikey/libmikey_0.1a.bb b/packages/libmikey/libmikey_0.1a.bb deleted file mode 100644 index e00ce25594..0000000000 --- a/packages/libmikey/libmikey_0.1a.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "libmikey is a C++ library that implements the IETF work-in-progress MIKEY protocol." -HOMEPAGE = "http://minisip.org/libmikey" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "openssl" - -SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz" -S = "${WORKDIR}/libmikey-0.1" - -inherit autotools - -do_configure() { - gnu-configize - oe_runconf -} - -do_stage() { - oe_libinstall -so libmikey ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmikey - install -m 0644 include/libmikey/*.h ${STAGING_INCDIR}/libmikey/ -} diff --git a/packages/libmsip/.mtn2git_empty b/packages/libmsip/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libmsip/libmsip0_0.2.2.bb b/packages/libmsip/libmsip0_0.2.2.bb deleted file mode 100644 index 8d8bb905db..0000000000 --- a/packages/libmsip/libmsip0_0.2.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "LGPL" - -DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmnetutil0 libmutil0" - -inherit autotools - -SRC_URI = "http://www.minisip.org/snapshots/libmsip-${PV}.tar.gz" -S="${WORKDIR}/libmsip-${PV}" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmsip ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmsip - install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip -} diff --git a/packages/libmsip/libmsip0_svn.bb b/packages/libmsip/libmsip0_svn.bb deleted file mode 100644 index 4418757ba2..0000000000 --- a/packages/libmsip/libmsip0_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -PV = "0.2.2+svn${SRCDATE}" -LICENSE = "LGPL" - -DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmnetutil0 libmutil0" -DEFAULT_PREFERENCE = "-1" - -inherit autotools - -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmsip" -S="${WORKDIR}/libmsip" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmsip ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmsip - install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip -} diff --git a/packages/libmutil/libmutil0_svn.bb b/packages/libmutil/libmutil0_svn.bb deleted file mode 100644 index 8766d623e3..0000000000 --- a/packages/libmutil/libmutil0_svn.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Class library implementing utilities for C++ programming" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "optional" - -DEPENDS = "openssl" - -PV = "0.3.1+svn${SRCDATE}" - -inherit autotools lib_package - -SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmutil" -S = "${WORKDIR}/libmutil" - -do_stage() { - oe_libinstall -a -so libmutil ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmutil - install -m 0644 ${S}/include/libmutil/* ${STAGING_INCDIR}/libmutil -} diff --git a/packages/minisip/.mtn2git_empty b/packages/minisip/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/minisip/libmikey_svn.bb b/packages/minisip/libmikey_svn.bb new file mode 100644 index 0000000000..c51e466f9c --- /dev/null +++ b/packages/minisip/libmikey_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" +HOMEPAGE = "http://www.minisip.org" +SECTION = "libs/network" +PRIORITY = "optional" +DEPENDS = "libmutil0 openssl" +PV = "0.3.2+svn${SRCDATE}" +LICENSE = "LGPL" + +inherit autotools + +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmikey" +S = "${WORKDIR}/libmikey" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/minisip/libmnetutil_svn.bb b/packages/minisip/libmnetutil_svn.bb new file mode 100644 index 0000000000..a2a60ba930 --- /dev/null +++ b/packages/minisip/libmnetutil_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Networking class library for C++ programming" +HOMEPAGE = "http://www.minisip.org" +SECTION = "libs/network" +PRIORITY = "optional" +DEPENDS = "libmutil0 openssl" +PV = "0.2.2+svn${SRCDATE}" +LICENSE = "LGPL" + +inherit autotools + +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmnetutil" +S = "${WORKDIR}/libmnetutil" + +do_stage() { + autotools_stage_all +} diff --git a/packages/minisip/libmsip_svn.bb b/packages/minisip/libmsip_svn.bb new file mode 100644 index 0000000000..747cc49f0e --- /dev/null +++ b/packages/minisip/libmsip_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" +HOMEPAGE = "http://www.minisip.org" +SECTION = "libs/network" +PRIORITY = "optional" +DEPENDS = "libmnetutil0 libmutil0" +PV = "0.2.2+svn${SRCDATE}" +LICENSE = "LGPL" + +inherit autotools + +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmsip" +S = "${WORKDIR}/libmsip" + +do_stage() { + autotools_stage_all +} diff --git a/packages/minisip/libmutil0_svn.bb b/packages/minisip/libmutil0_svn.bb new file mode 100644 index 0000000000..a7a20bdf00 --- /dev/null +++ b/packages/minisip/libmutil0_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Class library implementing utilities for C++ programming" +HOMEPAGE = "http://www.minisip.org" +LICENSE = "LGPL" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "openssl" +PV = "0.3.1+svn${SRCDATE}" + +inherit autotools lib_package + +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmutil" +S = "${WORKDIR}/libmutil" + +do_stage() { + autotools_stage_all +} diff --git a/packages/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb new file mode 100644 index 0000000000..ffd8f16e3d --- /dev/null +++ b/packages/minisip/minisip-video_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "SIP user agent, with focus on security - video support" +LICENSE = "GPL" +SECTION = "x11/utils" +DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0" +CONFLICTS = "minisip" +PV = "0.6.2+svn${SRCDATE}" + +SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" +S = "${WORKDIR}/minisip" + +inherit autotools + +EXTRA_OECONF = "--enable-ipaq --enable-video --with-avcodec=${STAGING_INCDIR}/ffmpeg" + +do_install_append () { + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/applications + install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png + install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop +} + +FILES_${PN} += "${datadir}/minisip" + diff --git a/packages/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb new file mode 100644 index 0000000000..9e9d426d84 --- /dev/null +++ b/packages/minisip/minisip_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "SIP user agent, with focus on security" +HOMEPAGE = "http://www.minisip.org" +DEPENDS = "libglademm libmsip0 libmikey0" +LICENSE = "GPL" +SECTION = "x11/utils" +PV = "0.6.2+svn${SRCDATE}" + +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=minisip" +S = "${WORKDIR}/${PN}" + +inherit autotools + +EXTRA_OECONF = "--enable-ipaq" + +do_install_append () { + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/applications + install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png + install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop +} + +FILES_${PN} += "${datadir}/minisip" + diff --git a/packages/nonworking/libmikey/.mtn2git_empty b/packages/nonworking/libmikey/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/libmikey/libmikey0_0.3.2.bb b/packages/nonworking/libmikey/libmikey0_0.3.2.bb new file mode 100644 index 0000000000..214faef40f --- /dev/null +++ b/packages/nonworking/libmikey/libmikey0_0.3.2.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL" + +DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libmutil0 openssl" + +inherit autotools + +SRC_URI = "http://www.minisip.org/snapshots/libmikey-${PV}.tar.gz" +S="${WORKDIR}/libmikey-${PV}" + + +PACKAGES = "${PN}" + +FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " + +do_stage() { + oe_libinstall -a -so libmikey ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libmikey + install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey +} diff --git a/packages/nonworking/libmikey/libmikey_0.1a.bb b/packages/nonworking/libmikey/libmikey_0.1a.bb new file mode 100644 index 0000000000..e00ce25594 --- /dev/null +++ b/packages/nonworking/libmikey/libmikey_0.1a.bb @@ -0,0 +1,23 @@ +LICENSE = "GPL" +DESCRIPTION = "libmikey is a C++ library that implements the IETF work-in-progress MIKEY protocol." +HOMEPAGE = "http://minisip.org/libmikey" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "openssl" + +SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz" +S = "${WORKDIR}/libmikey-0.1" + +inherit autotools + +do_configure() { + gnu-configize + oe_runconf +} + +do_stage() { + oe_libinstall -so libmikey ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libmikey + install -m 0644 include/libmikey/*.h ${STAGING_INCDIR}/libmikey/ +} diff --git a/packages/nonworking/libmnetutil/libmnetutil0_svn.bb b/packages/nonworking/libmnetutil/libmnetutil0_svn.bb deleted file mode 100644 index a8e156bc13..0000000000 --- a/packages/nonworking/libmnetutil/libmnetutil0_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -PV = "0.2.2+svn${SRCDATE}" -LICENSE = "LGPL" - -DESCRIPTION = "Networking class library for C++ programming" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libmutil0 openssl" -DEFAULT_PREFERENCE = "-1" - -inherit autotools - -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmnetutil" -S="${WORKDIR}/libmnetutil" - - -PACKAGES = "${PN}" - -FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " - -do_stage() { - oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libmnetutil - install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil -} diff --git a/packages/nonworking/libmsip/.mtn2git_empty b/packages/nonworking/libmsip/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/libmsip/libmsip0_0.2.2.bb b/packages/nonworking/libmsip/libmsip0_0.2.2.bb new file mode 100644 index 0000000000..8d8bb905db --- /dev/null +++ b/packages/nonworking/libmsip/libmsip0_0.2.2.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL" + +DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libmnetutil0 libmutil0" + +inherit autotools + +SRC_URI = "http://www.minisip.org/snapshots/libmsip-${PV}.tar.gz" +S="${WORKDIR}/libmsip-${PV}" + + +PACKAGES = "${PN}" + +FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " + +do_stage() { + oe_libinstall -a -so libmsip ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libmsip + install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip +} diff --git a/packages/nonworking/minisip/minisip-video_svn.bb b/packages/nonworking/minisip/minisip-video_svn.bb deleted file mode 100644 index 136f09e156..0000000000 --- a/packages/nonworking/minisip/minisip-video_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -PV = "0.6.2+svn${SRCDATE}" -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" -CONFLICTS = "minisip" - -DESCRIPTION = "SIP user agent, with focus on security - video support" -DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0" -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" -S = "${WORKDIR}/minisip" - - - -FILES_${PN} += "${datadir}/minisip" - -inherit autotools - -EXTRA_OECONF = "--enable-ipaq --enable-video --with-avcodec=${STAGING_INCDIR}/ffmpeg" - -do_install_append () { - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/applications - install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png - install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop -} diff --git a/packages/nonworking/minisip/minisip_svn.bb b/packages/nonworking/minisip/minisip_svn.bb deleted file mode 100644 index 6928387ad0..0000000000 --- a/packages/nonworking/minisip/minisip_svn.bb +++ /dev/null @@ -1,28 +0,0 @@ -PV = "0.6.2+svn${SRCDATE}" -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" - -DESCRIPTION = "SIP user agent, with focus on security" -DEPENDS = "libglademm libmsip0 libmikey0" -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" -S = "${WORKDIR}/${PN}" - -DEFAULT_PREFERENCE="-1" - -FILES_${PN} += "${datadir}/minisip" - -inherit autotools - -EXTRA_OECONF = "--enable-ipaq" - -# do_configure_prepend() { -# ./bootstrap -#} - -do_install_append () { - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/applications - install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png - install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop -} -- cgit v1.2.3 From 66aa93c67e012103866ef3f9cad1d46024788d09 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 04:43:57 +0000 Subject: minisip-video: fix SRC_URI --- packages/minisip/minisip-video_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb index ffd8f16e3d..137f29f2d8 100644 --- a/packages/minisip/minisip-video_svn.bb +++ b/packages/minisip/minisip-video_svn.bb @@ -5,7 +5,7 @@ DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmik CONFLICTS = "minisip" PV = "0.6.2+svn${SRCDATE}" -SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip" +SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=minisip" S = "${WORKDIR}/minisip" inherit autotools -- cgit v1.2.3 From 39cd6542bfea911aef688ebdf75d47fdf0867815 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 04:53:02 +0000 Subject: move simple-firewall to nonworking (unfetchable and no sign of alternate download location) --- packages/nonworking/simple-firewall.bb | 16 ++++++++++++++++ packages/nylon/simple-firewall.bb | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 packages/nonworking/simple-firewall.bb delete mode 100644 packages/nylon/simple-firewall.bb diff --git a/packages/nonworking/simple-firewall.bb b/packages/nonworking/simple-firewall.bb new file mode 100644 index 0000000000..fc7c3de6a3 --- /dev/null +++ b/packages/nonworking/simple-firewall.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "simple firewall configuratiopn script" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/kernel" +#SRCDATE = "20060114" +SRCDATE = "20070130" +#SRCDATE = "${TOMORROW}" +PV = "cvs${SRCDATE}" + +SRC_URI = "svn://gruen.4g/svn/trunk/application;module=${PN};proto=http" +S = "${WORKDIR}/${PN}" + +do_install() { + (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - +} diff --git a/packages/nylon/simple-firewall.bb b/packages/nylon/simple-firewall.bb deleted file mode 100644 index fc7c3de6a3..0000000000 --- a/packages/nylon/simple-firewall.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "simple firewall configuratiopn script" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/kernel" -#SRCDATE = "20060114" -SRCDATE = "20070130" -#SRCDATE = "${TOMORROW}" -PV = "cvs${SRCDATE}" - -SRC_URI = "svn://gruen.4g/svn/trunk/application;module=${PN};proto=http" -S = "${WORKDIR}/${PN}" - -do_install() { - (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - -} -- cgit v1.2.3 From c7c4d8a0532d27ed0a1b270ee8d5a89281106eaa Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 04:55:01 +0000 Subject: move fis to nonworking (unfetchable) --- packages/nonworking/fis_1.0.bb | 16 ++++++++++++++++ packages/redboot-utils/fis_1.0.bb | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 packages/nonworking/fis_1.0.bb delete mode 100644 packages/redboot-utils/fis_1.0.bb diff --git a/packages/nonworking/fis_1.0.bb b/packages/nonworking/fis_1.0.bb new file mode 100644 index 0000000000..d1170b6ba8 --- /dev/null +++ b/packages/nonworking/fis_1.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace" +PR = "r2" + +SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c \ + svn://svn.chezphil.org/;module=libpbe;proto=http" + +do_compile() { + ${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c +} + +do_install() { + ${STRIP} ${WORKDIR}/fis-${PV}/fis + + install -d ${D}/${sbindir} + install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir} +} diff --git a/packages/redboot-utils/fis_1.0.bb b/packages/redboot-utils/fis_1.0.bb deleted file mode 100644 index d1170b6ba8..0000000000 --- a/packages/redboot-utils/fis_1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace" -PR = "r2" - -SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c \ - svn://svn.chezphil.org/;module=libpbe;proto=http" - -do_compile() { - ${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c -} - -do_install() { - ${STRIP} ${WORKDIR}/fis-${PV}/fis - - install -d ${D}/${sbindir} - install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir} -} -- cgit v1.2.3 From c6c27ea7e56f933919b7b26582c4b3689238a0d9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 04:59:46 +0000 Subject: simple-firewall -> nylon/ --- packages/nonworking/nylon/.mtn2git_empty | 0 packages/nonworking/nylon/simple-firewall.bb | 16 ++++++++++++++++ packages/nonworking/simple-firewall.bb | 16 ---------------- 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 packages/nonworking/nylon/.mtn2git_empty create mode 100644 packages/nonworking/nylon/simple-firewall.bb delete mode 100644 packages/nonworking/simple-firewall.bb diff --git a/packages/nonworking/nylon/.mtn2git_empty b/packages/nonworking/nylon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/nylon/simple-firewall.bb b/packages/nonworking/nylon/simple-firewall.bb new file mode 100644 index 0000000000..fc7c3de6a3 --- /dev/null +++ b/packages/nonworking/nylon/simple-firewall.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "simple firewall configuratiopn script" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/kernel" +#SRCDATE = "20060114" +SRCDATE = "20070130" +#SRCDATE = "${TOMORROW}" +PV = "cvs${SRCDATE}" + +SRC_URI = "svn://gruen.4g/svn/trunk/application;module=${PN};proto=http" +S = "${WORKDIR}/${PN}" + +do_install() { + (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - +} diff --git a/packages/nonworking/simple-firewall.bb b/packages/nonworking/simple-firewall.bb deleted file mode 100644 index fc7c3de6a3..0000000000 --- a/packages/nonworking/simple-firewall.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "simple firewall configuratiopn script" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/kernel" -#SRCDATE = "20060114" -SRCDATE = "20070130" -#SRCDATE = "${TOMORROW}" -PV = "cvs${SRCDATE}" - -SRC_URI = "svn://gruen.4g/svn/trunk/application;module=${PN};proto=http" -S = "${WORKDIR}/${PN}" - -do_install() { - (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - -} -- cgit v1.2.3 From de6e70884f1c4c7c0177d48c6e64a02aa3063523 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 31 Jul 2007 05:00:25 +0000 Subject: fis -> redboot-utils --- packages/nonworking/fis_1.0.bb | 16 ---------------- packages/nonworking/redboot-utils/.mtn2git_empty | 0 packages/nonworking/redboot-utils/fis_1.0.bb | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 packages/nonworking/fis_1.0.bb create mode 100644 packages/nonworking/redboot-utils/.mtn2git_empty create mode 100644 packages/nonworking/redboot-utils/fis_1.0.bb diff --git a/packages/nonworking/fis_1.0.bb b/packages/nonworking/fis_1.0.bb deleted file mode 100644 index d1170b6ba8..0000000000 --- a/packages/nonworking/fis_1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace" -PR = "r2" - -SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c \ - svn://svn.chezphil.org/;module=libpbe;proto=http" - -do_compile() { - ${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c -} - -do_install() { - ${STRIP} ${WORKDIR}/fis-${PV}/fis - - install -d ${D}/${sbindir} - install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir} -} diff --git a/packages/nonworking/redboot-utils/.mtn2git_empty b/packages/nonworking/redboot-utils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/redboot-utils/fis_1.0.bb b/packages/nonworking/redboot-utils/fis_1.0.bb new file mode 100644 index 0000000000..d1170b6ba8 --- /dev/null +++ b/packages/nonworking/redboot-utils/fis_1.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace" +PR = "r2" + +SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c \ + svn://svn.chezphil.org/;module=libpbe;proto=http" + +do_compile() { + ${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c +} + +do_install() { + ${STRIP} ${WORKDIR}/fis-${PV}/fis + + install -d ${D}/${sbindir} + install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir} +} -- cgit v1.2.3 From b8bf7e6b8135bc0b2ed345488ffd6908a9ce9799 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 07:17:17 +0000 Subject: disapproval of revision '595f85835a210f4f204d60ffa60017c0d342736b' --- conf/distro/include/sane-srcdates.inc | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 9a5e2f330e..59e8b81fb1 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -1,5 +1,4 @@ -# Lock down some SRCDATEs -# (see http://svn.o-hand.com/view/poky/trunk/meta/conf/distro/poky.conf for wher it comes from) +# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version # Kernel modules SRCDATE_at76c503a-modules ?= "20060814" @@ -32,7 +31,6 @@ SRCDATE_matchbox-desktop ?= "20060612" SRCDATE_matchbox-keyboard ?= "20060725" SRCDATE_matchbox-panel ?= "20060612" SRCDATE_matchbox-panel-manager ?= "20060612" -SRCDATE_matchbox-panel-2 ?= "20070720" SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" @@ -52,7 +50,7 @@ SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" -# Enlightenment Foundation Libraries (EFL) +# Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. SRCDATE_edb-native = "20070721" @@ -140,20 +138,3 @@ SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" -# OpenMoko -SRCDATE_libgsmd ?= "now" -SRCDATE_libmokogsmd2 ?= "now" -SRCDATE_libmokoui2 ?= "now" -SRCDATE_libmokojournal2 ?= "now" -SRCDATE_libmokopanelui2 ?= "now" -SRCDATE_openmoko-today2 ?= "now" -SRCDATE_openmoko-dialer2 ?= "now" -SRCDATE_openmoko-contacts2 ?= "now" - -SRCDATE_openmoko-panel-battery ?= "now" -SRCDATE_openmoko-panel-clock ?= "now" -SRCDATE_openmoko-panel-gsm ?= "now" -SRCDATE_openmoko-panel-usb ?= "now" -SRCDATE_openmoko-panel-bt ?= "now" -SRCDATE_openmoko-panel-gps ?= "now" - -- cgit v1.2.3 From 0b7cddd799839c6fc82ae0dc25443835ce05faa2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 07:46:35 +0000 Subject: openmoko: move NOW srcdates to its own include file and only include it in the openmoko distro --- conf/distro/include/openmoko-srcdate-now.inc | 18 ++++++++++++++++++ conf/distro/openmoko.conf | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 conf/distro/include/openmoko-srcdate-now.inc diff --git a/conf/distro/include/openmoko-srcdate-now.inc b/conf/distro/include/openmoko-srcdate-now.inc new file mode 100644 index 0000000000..7ca0768819 --- /dev/null +++ b/conf/distro/include/openmoko-srcdate-now.inc @@ -0,0 +1,18 @@ +# Warning! Builds unupgradable packages! + +# OpenMoko +SRCDATE_libgsmd ?= "now" +SRCDATE_libmokogsmd2 ?= "now" +SRCDATE_libmokoui2 ?= "now" +SRCDATE_libmokojournal2 ?= "now" +SRCDATE_libmokopanelui2 ?= "now" +SRCDATE_openmoko-today2 ?= "now" +SRCDATE_openmoko-dialer2 ?= "now" +SRCDATE_openmoko-contacts2 ?= "now" + +SRCDATE_openmoko-panel-battery ?= "now" +SRCDATE_openmoko-panel-clock ?= "now" +SRCDATE_openmoko-panel-gsm ?= "now" +SRCDATE_openmoko-panel-usb ?= "now" +SRCDATE_openmoko-panel-bt ?= "now" +SRCDATE_openmoko-panel-gps ?= "now" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 3788b54637..bd4e2076ca 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -5,6 +5,8 @@ #----------------------------------------------------------------------------- require conf/distro/angstrom-2007.1.conf +require conf/distro/include/openmoko-srcdate-now.inc + # # Header -- cgit v1.2.3 From b5633c97047bf8145471048afb2d6021bee7c43b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 08:19:49 +0000 Subject: openmoko-rssreader: rename to openmoko-feedreader2 --- packages/openmoko-apps/openmoko-rssreader_svn.bb | 9 --------- packages/openmoko2/openmoko-feedreader2_svn.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 packages/openmoko-apps/openmoko-rssreader_svn.bb create mode 100644 packages/openmoko2/openmoko-feedreader2_svn.bb diff --git a/packages/openmoko-apps/openmoko-rssreader_svn.bb b/packages/openmoko-apps/openmoko-rssreader_svn.bb deleted file mode 100644 index ec52817b81..0000000000 --- a/packages/openmoko-apps/openmoko-rssreader_svn.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "The OpenMoko RSS Reader" -SECTION = "openmoko/applications" -DEPENDS += "libmrss check webkit" - -PV = "0.0.1+svn${SRCDATE}" -PR = "r1" - -inherit openmoko - diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb new file mode 100644 index 0000000000..41f28ed6a1 --- /dev/null +++ b/packages/openmoko2/openmoko-feedreader2_svn.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "The OpenMoko RSS Reader" +SECTION = "openmoko/applications" +DEPENDS += "libmrss check webkit" + +PV = "0.0.1+svn${SRCDATE}" +PR = "r0" + +inherit openmoko2 + -- cgit v1.2.3 From 647e8732863812b84585898daaefd2e1c092c294 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 08:42:07 +0000 Subject: openmoko-icon-theme: provide upgrade path --- packages/openmoko2/openmoko-icon-theme-standard_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb index 8029e1fbc9..2009d345f6 100644 --- a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb +++ b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.1.0+svn${SRCDATE}" +PV = "0.1+svn${SRCDATE}" PR = "r1" inherit openmoko-base autotools -- cgit v1.2.3 From e56210e856c7dc4030e685f7346e78604691e3d0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 08:46:42 +0000 Subject: openmoko-theme-standard: fix typo in PV --- packages/openmoko2/openmoko-theme-standard2_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb index 3af6dc78a9..ed707a9617 100644 --- a/packages/openmoko2/openmoko-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" -PV = "0.1.0+srvn${SRCDATE}" +PV = "0.1.0+svn${SRCDATE}" PR = "r1" inherit openmoko2 -- cgit v1.2.3 From 733d1379bea5062c7dfd096776d547ee5fa6c798 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 08:47:39 +0000 Subject: disapproval of revision 'f563ab05310af7faf00f83e7bebcae99a5ccb4d8' --- packages/openmoko2/openmoko-icon-theme-standard_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb index 2009d345f6..8029e1fbc9 100644 --- a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb +++ b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.1+svn${SRCDATE}" +PV = "0.1.0+svn${SRCDATE}" PR = "r1" inherit openmoko-base autotools -- cgit v1.2.3 From c9f23b0fbcde195ccf576aedee931663b6da0771 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Tue, 31 Jul 2007 08:51:59 +0000 Subject: task-openmoko.bb: Remove openmoko-panel-mainmenu as it depends on libmokoui(1) --- packages/tasks/task-openmoko.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 94836847d4..6ac888c55a 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -86,7 +86,6 @@ RDEPENDS_task-openmoko-base = "\ matchbox-keyboard \ matchbox-stroke \ openmoko-keyboard \ - openmoko-panel-mainmenu \ openmoko-panel-battery \ openmoko-panel-bt \ openmoko-panel-clock \ -- cgit v1.2.3 From 1d28b8f0f05e4a3b0a97a28e25027eb7e1203687 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 31 Jul 2007 09:56:27 +0000 Subject: libgsmd: update gsmd patches - alive-start-if-interpreter-ready.patch and vendor-qc-v0.patch went upstream - add mlbuf-static-bss.patch and Andrzej Zaborowski's sms-hacks.patch and libgsmd-tool-fix.patch --- .../files/alive-start-if-interpreter-ready.patch | 39 - packages/gsm/files/libgsmd-tool-fix.patch | 19 + packages/gsm/files/mlbuf-static-bss.patch | 21 + packages/gsm/files/sms-hacks.patch | 821 +++++++++++++++++++++ packages/gsm/files/vendor-qc-v0.patch | 38 - packages/gsm/libgsmd_svn.bb | 9 +- 6 files changed, 866 insertions(+), 81 deletions(-) delete mode 100644 packages/gsm/files/alive-start-if-interpreter-ready.patch create mode 100644 packages/gsm/files/libgsmd-tool-fix.patch create mode 100644 packages/gsm/files/mlbuf-static-bss.patch create mode 100644 packages/gsm/files/sms-hacks.patch delete mode 100644 packages/gsm/files/vendor-qc-v0.patch diff --git a/packages/gsm/files/alive-start-if-interpreter-ready.patch b/packages/gsm/files/alive-start-if-interpreter-ready.patch deleted file mode 100644 index 20104d2e3f..0000000000 --- a/packages/gsm/files/alive-start-if-interpreter-ready.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: gsm/src/gsmd/atcmd.c -=================================================================== ---- gsm.orig/src/gsmd/atcmd.c 2007-06-03 13:24:44.000000000 +0200 -+++ gsm/src/gsmd/atcmd.c 2007-06-03 13:24:46.000000000 +0200 -@@ -185,6 +185,7 @@ - !strcmp(buf, "AT-Command Interpreter ready")) { - g->interpreter_ready = 1; - gsmd_initsettings(g); -+ gmsd_alive_start(g); - return 0; - } - -Index: gsm/src/gsmd/gsmd.c -=================================================================== ---- gsm.orig/src/gsmd/gsmd.c 2007-06-03 13:22:02.000000000 +0200 -+++ gsm/src/gsmd/gsmd.c 2007-06-03 13:22:56.000000000 +0200 -@@ -128,7 +128,7 @@ - gsmd_timer_register(tmr); - } - --static int gmsd_alive_start(struct gsmd *gsmd) -+int gmsd_alive_start(struct gsmd *gsmd) - { - struct timeval tv; - -@@ -478,10 +478,11 @@ - /* select a vendor plugin */ - gsmd_vendor_plugin_find(&g); - -- if (g.interpreter_ready) -+ if (g.interpreter_ready) { - gsmd_initsettings(&g); - -- gmsd_alive_start(&g); -+ gmsd_alive_start(&g); -+ } - - gsmd_opname_init(&g); - diff --git a/packages/gsm/files/libgsmd-tool-fix.patch b/packages/gsm/files/libgsmd-tool-fix.patch new file mode 100644 index 0000000000..8938f5a682 --- /dev/null +++ b/packages/gsm/files/libgsmd-tool-fix.patch @@ -0,0 +1,19 @@ +Index: gsm/src/util/atcmd.c +=================================================================== +--- gsm.orig/src/util/atcmd.c 2007-07-31 11:44:32.000000000 +0200 ++++ gsm/src/util/atcmd.c 2007-07-31 11:46:44.000000000 +0200 +@@ -91,9 +91,11 @@ + continue; + } + printf("STR=`%s'\n", buf); ++ ++ /* this is a synchronous call for a passthrough ++ * command */ ++ lgsm_passthrough(lgsmh, buf, rbuf, &rlen); ++ printf("RSTR=`%s'\n", rbuf); + } +- /* this is a synchronous call for a passthrough command */ +- lgsm_passthrough(lgsmh, buf, rbuf, &rlen); +- printf("RSTR=`%s'\n", rbuf); + } + } diff --git a/packages/gsm/files/mlbuf-static-bss.patch b/packages/gsm/files/mlbuf-static-bss.patch new file mode 100644 index 0000000000..65b3449e55 --- /dev/null +++ b/packages/gsm/files/mlbuf-static-bss.patch @@ -0,0 +1,21 @@ +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-07-31 11:44:51.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-07-31 11:45:09.000000000 +0200 +@@ -171,13 +171,14 @@ + return -1; + } + ++static char mlbuf[MLPARSE_BUF_SIZE]; ++static int mlbuf_len; ++ + static int ml_parse(const char *buf, int len, void *ctx) + { + struct gsmd *g = ctx; + struct gsmd_atcmd *cmd = NULL; +- static char mlbuf[MLPARSE_BUF_SIZE]; + int rc = 0, final = 0; +- int mlbuf_len; + + DEBUGP("buf=`%s'(%d)\n", buf, len); + diff --git a/packages/gsm/files/sms-hacks.patch b/packages/gs