[oe-commits] org.oe.dev gammu: updated to 1.10.0

[hrw commit]

gammu: updated to 1.10.0

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: f90c9d0f1288b060a8c57b9eb3c70e06353fe93a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f90c9d0f1288b060a8c57b9eb3c70e06353fe93a
Files:
1
packages/gammu/gammu_1.07.00.bb
packages/gammu/gammu_1.10.0.bb
packages/gammu/files
packages/gammu/files/ldflags-again.patch
Diffs:

#
# mt diff -rfb872b5eddde4be0bc44abec949610d89cadb232 -rf90c9d0f1288b060a8c57b9eb3c70e06353fe93a
#
# 
# 
# rename "packages/gammu/gammu_1.07.00.bb"
#     to "packages/gammu/gammu_1.10.0.bb"
# 
# add_dir "packages/gammu/files"
# 
# add_file "packages/gammu/files/ldflags-again.patch"
#  content [a0cde2465382c7b4afe5eb285f52e3c3a9cd57dc]
# 
# patch "packages/gammu/gammu_1.10.0.bb"
#  from [9c6e0481837c3024a914639680b0804508c9f4f5]
#    to [ac673fa23341fb510b8835153438ca5379c3823c]
# 
============================================================
--- packages/gammu/files/ldflags-again.patch	a0cde2465382c7b4afe5eb285f52e3c3a9cd57dc
+++ packages/gammu/files/ldflags-again.patch	a0cde2465382c7b4afe5eb285f52e3c3a9cd57dc
@@ -0,0 +1,13 @@
+Index: gammu-1.10.0/cfg/Makefile.glo
+===================================================================
+--- gammu-1.10.0.orig/cfg/Makefile.glo	2007-03-30 17:55:18.000000000 +0200
++++ gammu-1.10.0/cfg/Makefile.glo	2007-03-30 17:55:46.000000000 +0200
+@@ -152,7 +152,7 @@
+  
+ $(TOPDIR)/gammu/gammu-shared: $(COMMON) $(GAMMU) $(TOPDIR)/common/$(LIBGAMMU_FULLNAME)
+ 	@echo Linking gammu-shared
+-	@$(CC) -L$(TOPDIR)/common -lGammu $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared
++	@$(CC) -L$(TOPDIR)/common -lGammu $(LDLIBS) $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared
+ 
+ shared: $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(TOPDIR)/common/$(LIBGAMMU_STATIC) $(TOPDIR)/gammu/gammu-shared
+  
============================================================
--- packages/gammu/gammu_1.07.00.bb	9c6e0481837c3024a914639680b0804508c9f4f5
+++ packages/gammu/gammu_1.10.0.bb	ac673fa23341fb510b8835153438ca5379c3823c
@@ -1,25 +1,27 @@ LICENSE = "GPL"
 DESCRIPTION = "GNU All Mobile Managment Utilities"
 SECTION = "console/network"
 DEPENDS = "bluez-libs"
 LICENSE = "GPL"
-HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
-AUTHOR = "Marcin Wiacek <marcin at mwiacek.com>"
+HOMEPAGE = "http://www.gammu.org/"
 
-SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
+SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \
+           file://ldflags-again.patch;patch=1"
 
-EXTRA_OECONF = "--disable-mysql"
+EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}"
 
+EXTRA_LDFLAGS = "-lbluetooth2"
+
 inherit autotools
 
 do_compile () {
-        oe_runmake shared
+        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/dct4tiku \
+                   ${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 \
@@ -39,7 +41,7 @@ do_stage() {
         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/dct4tiku/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku
+        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