From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Wed, 9 Feb 2011 15:20:59 +0000 (+0100)
Subject: fsogsmd: bump; we rely on libgisi / gisicomm now instead of libisi
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64dc157ca83f29cbed6eab121f8a1708478301b9;p=openembedded.git

fsogsmd: bump; we rely on libgisi / gisicomm now instead of libisi
---

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 5340b58967..275f598060 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -22,7 +22,7 @@ SRCREV_pn-libfso-glib = "${AUTOREV}"
 # SRCREV_pn-libgee-native = "${AUTOREV}"
 # SRCREV_pn-libgee = "${AUTOREV}"
 SRCREV_pn-libgsm0710 = "${AUTOREV}"
-SRCREV_pn-libisi = "${AUTOREV}"
+SRCREV_pn-libgisi = "${AUTOREV}"
 SRCREV_pn-libmsmcomm = "${AUTOREV}"
 SRCREV_pn-libpersistence = "${AUTOREV}"
 SRCREV_pn-misc-vapi = "${AUTOREV}"
diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc
index 4c2d60cc11..f5ff735ecc 100644
--- a/recipes/freesmartphone/cornucopia.inc
+++ b/recipes/freesmartphone/cornucopia.inc
@@ -7,8 +7,8 @@ DEPENDS = "vala-native glib-2.0 libfso-glib libgee"
 DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}"
 PV = "invalid, please override"
 
-FSO_CORNUCOPIA_SRCREV ?= "0940eb264361038cc00c45a1ba15b4ccb8fa7dae"
-INC_PR = "r4"
+FSO_CORNUCOPIA_SRCREV ?= "97d25ab71816be21b8d46be71f4a90f3f5707d8c"
+INC_PR = "r5"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master"
 S = "${WORKDIR}/git/${PN}"
diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb
index 70f64bdbe2..17c1ad8979 100644
--- a/recipes/freesmartphone/fsogsmd_git.bb
+++ b/recipes/freesmartphone/fsogsmd_git.bb
@@ -1,11 +1,11 @@
 require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PR = "${INC_PR}.6"
+PR = "${INC_PR}.0"
 PV = "0.5.0+gitr${SRCPV}"
 PE = "1"
 
-DEPENDS += "libfsoresource libgsm0710mux libisi ppp"
+DEPENDS += "libfsoresource libgsm0710mux libgisi ppp"
 
 EXTRA_OECONF_append = "\
   --enable-libgsm0710mux \
diff --git a/recipes/freesmartphone/libgisi_git.bb b/recipes/freesmartphone/libgisi_git.bb
new file mode 100644
index 0000000000..0d0fdaaf57
--- /dev/null
+++ b/recipes/freesmartphone/libgisi_git.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "libgisi / gisicomm is a library implementing the Nokia ISI protocol"
+SECTION = "libs/network"
+AUTHOR = "Sebastian Reichel, Michael Lauer, Klaus Kurzmann"
+LICENSE = "GPLv2"
+DEPENDS = "glib-2.0"
+SRC_URI = "${FREESMARTPHONE_GIT}/libgisi.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+SRCREV = "75a7ed8b3776e5b515c9d03a20dc45bc233a61bc"
+PV = "0.0.0+gitr${SRCPV}"
+
+inherit vala autotools
diff --git a/recipes/freesmartphone/libisi_git.bb b/recipes/freesmartphone/libisi_git.bb
deleted file mode 100644
index 91d42a35cd..0000000000
--- a/recipes/freesmartphone/libisi_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "libisi is a library implementing the Nokia ISI protocol"
-SECTION = "libs/network"
-AUTHOR = "Sebastian Reichel <sre@ring0.de>"
-LICENSE = "GPLv2"
-DEPENDS = "glib-2.0"
-SRC_URI = "${FREESMARTPHONE_GIT}/libisi.git;protocol=git;branch=master"
-S = "${WORKDIR}/git"
-
-SRCREV = "04f40b06bc8398715c53aa11ebf16799d4da6c6e"
-PV = "0.0.1+gitr${SRCPV}"
-
-inherit vala autotools
-
-EXTRA_OECONF = "--enable-tests"
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${sbindir}/*"
-DESCRIPTION_${PN}-tests = "${PN} runtime tests"