merge of '1aa9d5d2291a43dd7550da56fed4507af7db2c81'

     and 'e36bd25beb3708ad700892730953005d81ac203b'

4 files changed, 33 insertions, 163 deletions

diff --git a/packages/gammu/gammu_1.10.0.bb b/packages/gammu/gammu_1.10.0.bb
deleted file mode 100644
index bba0fa8deb..0000000000
--- a/packages/gammu/gammu_1.10.0.bb
+++ /dev/null
@@ -1,78 +0,0 @@
-DESCRIPTION = "GNU All Mobile Managment Utilities"
-SECTION = "console/network"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gammu.org/"
-PR = "r1"
-
-SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \
-           file://ldflags-again.patch;patch=1"
-
-EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}"
-
-EXTRA_LDFLAGS = "-lbluetooth2"
-
-inherit autotools pkgconfig
-
-do_compile () {
-        oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth'
-}
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
-                   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
-                   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
-                   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \
-                   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
-                   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
-                   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
-                   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
-                   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
-                   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
-                   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
-                   ${STAGING_INCDIR}/gammu/protocol/alcatel
-
-        oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
-
-        install -m 0644 common/*.h                      ${STAGING_INCDIR}/gammu/
-        install -m 0644 common/misc/*.h                 ${STAGING_INCDIR}/gammu/misc
-        install -m 0644 common/misc/coding/*.h          ${STAGING_INCDIR}/gammu/misc/coding
-        install -m 0644 common/phone/*.h                ${STAGING_INCDIR}/gammu/phone
-        install -m 0644 common/phone/at/*.h             ${STAGING_INCDIR}/gammu/phone/at
-        install -m 0644 common/phone/obex/*.h           ${STAGING_INCDIR}/gammu/phone/obex
-        install -m 0644 common/phone/nokia/*.h          ${STAGING_INCDIR}/gammu/phone/nokia
-        install -m 0644 common/phone/nokia/dct3/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct3
-        install -m 0644 common/phone/nokia/dct4s40/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40
-        install -m 0644 common/phone/symbian/*.h        ${STAGING_INCDIR}/gammu/phone/symbian
-        install -m 0644 common/phone/alcatel/*.h        ${STAGING_INCDIR}/gammu/phone/alcatel
-        install -m 0644 common/service/*.h              ${STAGING_INCDIR}/gammu/service
-        install -m 0644 common/service/sms/*.h          ${STAGING_INCDIR}/gammu/service/sms
-        install -m 0644 common/service/backup/*.h       ${STAGING_INCDIR}/gammu/service/backup
-        install -m 0644 common/device/*.h               ${STAGING_INCDIR}/gammu/device
-        install -m 0644 common/device/irda/*.h          ${STAGING_INCDIR}/gammu/device/irda
-        install -m 0644 common/device/bluetoth/*.h      ${STAGING_INCDIR}/gammu/device/bluetoth
-        install -m 0644 common/device/serial/*.h        ${STAGING_INCDIR}/gammu/device/serial
-        install -m 0644 common/protocol/*.h             ${STAGING_INCDIR}/gammu/protocol
-        install -m 0644 common/protocol/at/*.h          ${STAGING_INCDIR}/gammu/protocol/at
-        install -m 0644 common/protocol/obex/*.h        ${STAGING_INCDIR}/gammu/protocol/obex
-        install -m 0644 common/protocol/nokia/*.h       ${STAGING_INCDIR}/gammu/protocol/nokia
-        install -m 0644 common/protocol/symbian/*.h     ${STAGING_INCDIR}/gammu/protocol/symbian
-        install -m 0644 common/protocol/alcatel/*.h     ${STAGING_INCDIR}/gammu/protocol/alcatel
-}
-
-do_install () {
-        oe_runmake 'DESTDIR=${D}' installshared
-}
-
-PACKAGES =+ "libgammu"
-
-FILES_${PN} = "${bindir}/gammu"
-FILES_libgammu = "${libdir}/libGammu.so*"
-
-PACKAGES_DYNAMIC = "gammu-locale-*"
-
-python populate_packages_prepend () {
-        help_dir = bb.data.expand('${datadir}/gammu/', d)
-
-        do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
-}
diff --git a/packages/gammu/gammu_1.12.94.bb b/packages/gammu/gammu_1.12.94.bb
deleted file mode 100644
index 5453b01833..0000000000
--- a/packages/gammu/gammu_1.12.94.bb
+++ /dev/null
@@ -1,81 +0,0 @@
-DESCRIPTION = "GNU All Mobile Managment Utilities"
-SECTION = "console/network"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gammu.org/"
-PR = "r0"
-
-SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \
-           file://ldflags-again.patch;patch=1"
-
-EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}"
-
-EXTRA_LDFLAGS = "-lbluetooth2"
-
-DEFAULT_PREFERENCE = "-1"
-BROKEN = "1"
-# TODO we don't have cmake yet
-# inherit cmake pkgconfig
-
-do_compile () {
-        oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth'
-}
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
-                   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
-                   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
-                   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \
-                   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
-                   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
-                   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
-                   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
-                   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
-                   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
-                   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
-                   ${STAGING_INCDIR}/gammu/protocol/alcatel
-
-        oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
-
-        install -m 0644 common/*.h                      ${STAGING_INCDIR}/gammu/
-        install -m 0644 common/misc/*.h                 ${STAGING_INCDIR}/gammu/misc
-        install -m 0644 common/misc/coding/*.h          ${STAGING_INCDIR}/gammu/misc/coding
-        install -m 0644 common/phone/*.h                ${STAGING_INCDIR}/gammu/phone
-        install -m 0644 common/phone/at/*.h             ${STAGING_INCDIR}/gammu/phone/at
-        install -m 0644 common/phone/obex/*.h           ${STAGING_INCDIR}/gammu/phone/obex
-        install -m 0644 common/phone/nokia/*.h          ${STAGING_INCDIR}/gammu/phone/nokia
-        install -m 0644 common/phone/nokia/dct3/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct3
-        install -m 0644 common/phone/nokia/dct4s40/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40
-        install -m 0644 common/phone/symbian/*.h        ${STAGING_INCDIR}/gammu/phone/symbian
-        install -m 0644 common/phone/alcatel/*.h        ${STAGING_INCDIR}/gammu/phone/alcatel
-        install -m 0644 common/service/*.h              ${STAGING_INCDIR}/gammu/service
-        install -m 0644 common/service/sms/*.h          ${STAGING_INCDIR}/gammu/service/sms
-        install -m 0644 common/service/backup/*.h       ${STAGING_INCDIR}/gammu/service/backup
-        install -m 0644 common/device/*.h               ${STAGING_INCDIR}/gammu/device
-        install -m 0644 common/device/irda/*.h          ${STAGING_INCDIR}/gammu/device/irda
-        install -m 0644 common/device/bluetoth/*.h      ${STAGING_INCDIR}/gammu/device/bluetoth
-        install -m 0644 common/device/serial/*.h        ${STAGING_INCDIR}/gammu/device/serial
-        install -m 0644 common/protocol/*.h             ${STAGING_INCDIR}/gammu/protocol
-        install -m 0644 common/protocol/at/*.h          ${STAGING_INCDIR}/gammu/protocol/at
-        install -m 0644 common/protocol/obex/*.h        ${STAGING_INCDIR}/gammu/protocol/obex
-        install -m 0644 common/protocol/nokia/*.h       ${STAGING_INCDIR}/gammu/protocol/nokia
-        install -m 0644 common/protocol/symbian/*.h     ${STAGING_INCDIR}/gammu/protocol/symbian
-        install -m 0644 common/protocol/alcatel/*.h     ${STAGING_INCDIR}/gammu/protocol/alcatel
-}
-
-do_install () {
-        oe_runmake 'DESTDIR=${D}' installshared
-}
-
-PACKAGES =+ "libgammu"
-
-FILES_${PN} = "${bindir}/gammu"
-FILES_libgammu = "${libdir}/libGammu.so*"
-
-PACKAGES_DYNAMIC = "gammu-locale-*"
-
-python populate_packages_prepend () {
-        help_dir = bb.data.expand('${datadir}/gammu/', d)
-
-        do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
-}
diff --git a/packages/gammu/gammu_1.13.0.bb b/packages/gammu/gammu_1.13.0.bb
new file mode 100644
index 0000000000..fc7adb1b79
--- /dev/null
+++ b/packages/gammu/gammu_1.13.0.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+SECTION = "console/network"
+DEPENDS = "bluez-libs cmake-native"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gammu.org/"
+
+SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 "
+
+inherit pkgconfig
+
+do_configure() {
+    cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup
+}
+
+do_compile () {
+        oe_runmake
+}
+
+do_install () {
+        oe_runmake install DESTDIR=${D}
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/gammu/
+        install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/
+
+        oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "libgammu"
+
+FILES_${PN} = "${bindir}/gammu"
+FILES_libgammu = "${libdir}/libGammu.so*"
diff --git a/packages/python/python-gammu_0.21.bb b/packages/python/python-gammu_0.21.bb
index 0994a9d92b..f8989d9181 100644
--- a/packages/python/python-gammu_0.21.bb
+++ b/packages/python/python-gammu_0.21.bb
@@ -1,6 +1,3 @@
-#TODO needs recent gammu, which in turn needs cmake which we don't have yet
-BROKEN = "1"
-
 DESCRIPTION = "Python bindings for the gammu GSM phone communication library."
 HOMEPAGE = "http://cihar.com/gammu/python"
 SECTION = "devel/python"
@@ -11,4 +8,3 @@ PR = "ml0"
 SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2"
 
 inherit distutils
-