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(-) (limited to 'packages') 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(-) (limited to 'packages') 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 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 (limited to 'packages') 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(-) (limited to 'packages') 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 (limited to 'packages') 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 (limited to 'packages') 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(-) (limited to 'packages') 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 (limited to 'packages') 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 (limited to 'packages') 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 (limited to 'packages') 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 (limited to 'packages') 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 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 (limited to 'packages') 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(-) (limited to 'packages') 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(-) (limited to 'packages') 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(-) (limited to 'packages') 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(-) (limited to 'packages') 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 (limited to 'packages') 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/gsm/files/sms-hacks.patch new file mode 100644 index 0000000000..e94386ae39 --- /dev/null +++ b/packages/gsm/files/sms-hacks.patch @@ -0,0 +1,821 @@ +From 3e5832569d3b29a90b29b5d5ac0ffad4765bcff3 Mon Sep 17 00:00:00 2001 +From: Andrzej Zaborowski +Date: Fri, 6 Jul 2007 06:55:12 +0200 +Subject: [PATCH] SMS hacks 2 + +--- + include/gsmd/gsmd.h | 8 ++- + include/gsmd/usock.h | 35 ++++++++- + include/gsmd/vendorplugin.h | 2 +- + include/libgsmd/sms.h | 2 +- + src/gsmd/atcmd.c | 130 +++++++++++++++++++------------- + src/gsmd/sms_cb.c | 19 ++++- + src/gsmd/usock.c | 175 +++++++++++++++++++++++++++++++++++++----- + src/gsmd/vendor_ti.c | 2 +- + src/libgsmd/libgsmd_sms.c | 26 +++++-- + 11 files changed, 320 insertions(+), 91 deletions(-) + +Index: gsm/include/gsmd/gsmd.h +=================================================================== +--- gsm.orig/include/gsmd/gsmd.h 2007-07-31 11:44:32.000000000 +0200 ++++ gsm/include/gsmd/gsmd.h 2007-07-31 11:46:44.000000000 +0200 +@@ -27,6 +27,7 @@ + u_int32_t buflen; + u_int16_t id; + u_int8_t flags; ++ char *cur; + char buf[]; + }; + +@@ -36,6 +37,8 @@ + LLPARSE_STATE_IDLE_LF, /* LF before response (V1) */ + LLPARSE_STATE_RESULT, /* within result payload */ + LLPARSE_STATE_RESULT_CR, /* CR after result */ ++ LLPARSE_STATE_PROMPT, /* within a "> " prompt */ ++ LLPARSE_STATE_PROMPT_SPC, /* a complete "> " prompt */ + LLPARSE_STATE_ERROR, /* something went wrong */ + /* ... idle again */ + }; +@@ -52,6 +55,7 @@ + unsigned int flags; + void *ctx; + int (*cb)(const char *buf, int len, void *ctx); ++ int (*prompt_cb)(void *ctx); + char *cur; + char buf[LLPARSE_BUF_SIZE]; + }; +@@ -59,6 +63,7 @@ + struct gsmd; + + #define GSMD_FLAG_V0 0x0001 /* V0 responses to be expected from TA */ ++#define GSMD_FLAG_SMS_FMT 0x0002 /* Use TEXT rather than PDU mode */ + + struct gsmd { + unsigned int flags; +@@ -92,7 +97,8 @@ + + extern int gsmdlog_init(const char *path); + /* write a message to the daemons' logfile */ +-void __gsmd_log(int level, const char *file, int line, const char *function, const char *message, ...); ++void __gsmd_log(int level, const char *file, int line, const char *function, const char *message, ...) ++ __attribute__ ((__format__ (__printf__, 5, 6))); + /* macro for logging including filename and line number */ + #define gsmd_log(level, format, args ...) \ + __gsmd_log(level, __FILE__, __LINE__, __FUNCTION__, format, ## args) +Index: gsm/include/gsmd/usock.h +=================================================================== +--- gsm.orig/include/gsmd/usock.h 2007-07-31 11:44:32.000000000 +0200 ++++ gsm/include/gsmd/usock.h 2007-07-31 11:46:44.000000000 +0200 +@@ -139,7 +139,7 @@ + /* for SMS-SUBMIT, SMS-DELIVER */ + enum gsmd_sms_tp_udhi { + GSMD_SMS_TP_UDHI_NO_HEADER = (0<<6), +- GSMD_SMS_TP_UDHI_WTIH_HEADER = (1<<6), ++ GSMD_SMS_TP_UDHI_WITH_HEADER = (1<<6), + }; + + /* SMS delflg from 3GPP TS 07.05, Clause 3.5.4 */ +@@ -160,6 +160,34 @@ + GSMD_PHONEBOOK_GET_SUPPORT = 6, + }; + ++/* Type-of-Address, Numbering Plan Identification field */ ++enum gsmd_toa_npi { ++ GSMD_TOA_NPI_UNKNOWN = 0x0, ++ GSMD_TOA_NPI_ISDN = 0x1, ++ GSMD_TOA_NPI_DATA = 0x3, ++ GSMD_TOA_NPI_TELEX = 0x4, ++ GSMD_TOA_NPI_NATIONAL = 0x8, ++ GSMD_TOA_NPI_PRIVATE = 0x9, ++ GSMD_TOA_NPI_ERMES = 0xa, ++ GSMD_TOA_NPI_RESERVED = 0xf, ++}; ++ ++/* Type-of-Address, Type-of-Number field */ ++enum gsmd_toa_ton { ++ GSMD_TOA_TON_UNKNOWN = (0<<4), ++ GSMD_TOA_TON_INTERNATIONAL = (1<<4), ++ GSMD_TOA_TON_NATIONAL = (2<<4), ++ GSMD_TOA_TON_NETWORK = (3<<4), ++ GSMD_TOA_TON_SUBSCRIBER = (4<<4), ++ GSMD_TOA_TON_ALPHANUMERIC = (5<<4), ++ GSMD_TOA_TON_ABBREVIATED = (6<<4), ++}; ++ ++/* Type-of-Address, bit 7 always 1 */ ++enum gsmd_toa_reserved { ++ GSMD_TOA_RESERVED = (1<<7), ++}; ++ + /* Length from 3GPP TS 04.08, Clause 10.5.4.7 */ + + #define GSMD_ADDR_MAXLEN 32 +@@ -269,6 +297,11 @@ + char user_data[140]; + } __attribute__ ((packed)); + ++struct gsmd_sms_send { ++ struct gsmd_addr addr; ++ struct gsmd_sms payload; ++}; ++ + /* Refer to GSM 07.07 subclause 8.12 */ + struct gsmd_phonebook_readrg { + u_int8_t index1; +Index: gsm/include/gsmd/vendorplugin.h +=================================================================== +--- gsm.orig/include/gsmd/vendorplugin.h 2007-07-31 11:46:28.000000000 +0200 ++++ gsm/include/gsmd/vendorplugin.h 2007-07-31 11:46:44.000000000 +0200 +@@ -12,7 +12,7 @@ + struct gsmd_vendor_plugin { + struct llist_head list; + unsigned char *name; +- unsigned char *ext_chars; ++ char *ext_chars; + unsigned int num_unsolicit; + const struct gsmd_unsolicit *unsolicit; + int (*detect)(struct gsmd *g); +Index: gsm/include/libgsmd/sms.h +=================================================================== +--- gsm.orig/include/libgsmd/sms.h 2007-07-31 11:44:32.000000000 +0200 ++++ gsm/include/libgsmd/sms.h 2007-07-31 11:46:44.000000000 +0200 +@@ -83,7 +83,7 @@ + extern int lgsmd_sms_send(struct lgsm_handle *lh, const struct lgsm_sms *sms); + + /* Write Message to Memory */ +-extern int lgsmd_sms_write(struct lgsm_handle *lh, ++extern int lgsmd_sms_write(struct lgsm_handle *lh, + const struct lgsm_sms_write *sms_write); + + /* Packing of 7-bit characters, refer to GSM 03.38 subclause 6.1.2.1.1 */ +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-07-31 11:46:42.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-07-31 11:47:03.000000000 +0200 +@@ -82,9 +82,12 @@ + + switch (llp->state) { + case LLPARSE_STATE_IDLE: ++ case LLPARSE_STATE_PROMPT_SPC: + if (llp->flags & LGSM_ATCMD_F_EXTENDED) { + if (byte == '\r') + llp->state = LLPARSE_STATE_IDLE_CR; ++ else if (byte == '>') ++ llp->state = LLPARSE_STATE_PROMPT; + else { + #ifdef STRICT + llp->state = LLPARSE_STATE_ERROR; +@@ -108,6 +111,8 @@ + /* can we really go directly into result_cr ? */ + if (byte == '\r') + llp->state = LLPARSE_STATE_RESULT_CR; ++ else if (byte == '>') ++ llp->state = LLPARSE_STATE_PROMPT; + else { + llp->state = LLPARSE_STATE_RESULT; + ret = llparse_append(llp, byte); +@@ -127,6 +132,16 @@ + memset(llp->buf, 0, LLPARSE_BUF_SIZE); + } + break; ++ case LLPARSE_STATE_PROMPT: ++ if (byte == ' ') ++ llp->state = LLPARSE_STATE_PROMPT_SPC; ++ else { ++ /* this was not a real "> " prompt */ ++ llparse_append(llp, '>'); ++ ret = llparse_append(llp, byte); ++ llp->state = LLPARSE_STATE_RESULT; ++ } ++ break; + case LLPARSE_STATE_ERROR: + break; + } +@@ -147,6 +162,10 @@ + /* FIXME: what to do with return value ? */ + llp->cb(llp->buf, llp->cur - llp->buf, llp->ctx); + } ++ ++ /* if a full SMS-style prompt was received, poke the select */ ++ if (llp->state == LLPARSE_STATE_PROMPT_SPC) ++ llp->prompt_cb(llp->ctx); + } + + return 0; +@@ -178,7 +197,7 @@ + { + struct gsmd *g = ctx; + struct gsmd_atcmd *cmd = NULL; +- int rc = 0, final = 0; ++ int rc = 0; + + DEBUGP("buf=`%s'(%d)\n", buf, len); + +@@ -232,7 +251,6 @@ + DEBUGP("error number %lu\n", err_nr); + if (cmd) + cmd->ret = err_nr; +- final = 1; + goto final_cb; + } + if (!strncmp(buf+1, "CMS ERROR", 9)) { +@@ -242,7 +260,6 @@ + DEBUGP("error number %lu\n", err_nr); + if (cmd) + cmd->ret = err_nr; +- final = 1; + goto final_cb; + } + +@@ -274,7 +291,7 @@ + + /* it might be a multiline response, so if there's a previous + response, send out mlbuf and start afresh with an empty buffer */ +- if (mlbuf[0] != 0) { ++ if (mlbuf_len) { + if (!cmd->cb) { + gsmd_log(GSMD_NOTICE, "command without cb!!!\n"); + } else { +@@ -282,8 +299,8 @@ + cmd->resp = mlbuf; + rc = cmd->cb(cmd, cmd->ctx, cmd->resp); + DEBUGP("Clearing mlbuf\n"); +- mlbuf[0] = 0; + } ++ mlbuf_len = 0; + } + + /* the current buf will be appended to mlbuf below */ +@@ -302,7 +319,6 @@ + DEBUGP("unspecified error\n"); + if (cmd) + cmd->ret = 4; +- final = 1; + goto final_cb; + } + +@@ -311,7 +327,6 @@ + /* Part of Case 'C' */ + if (cmd) + cmd->ret = 0; +- fin