[oe-commits] org.oe.dev libopieobex: supposedly fixes irda send/receive by

[polyonymous commit]

libopieobex: supposedly fixes irda send/receive by
- applying patch from Marek from opie bug 1854
- linking against openobex

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: d982229f54ad86fa9296acab3704fc829cd11592
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d982229f54ad86fa9296acab3704fc829cd11592
Files:
1
packages/libopieobex/files
packages/libopieobex/files/obex-fixes.patch
packages/libopieobex/libopieobex0_cvs.bb
Diffs:

#
# mt diff -r63d1daebec3166129419b50f299f0b62149eb1e7 -rd982229f54ad86fa9296acab3704fc829cd11592
#
# 
# 
# add_dir "packages/libopieobex/files"
# 
# add_file "packages/libopieobex/files/obex-fixes.patch"
#  content [f260522e1a1995d0c1b62fb67cfd12e634571a8a]
# 
# patch "packages/libopieobex/libopieobex0_cvs.bb"
#  from [fca11ff837f5e69c3d87b6228da92173160e205f]
#    to [aa3648a5aa5f6950f93d337e29c5cc0aad73ae48]
# 
============================================================
--- packages/libopieobex/files/obex-fixes.patch	f260522e1a1995d0c1b62fb67cfd12e634571a8a
+++ packages/libopieobex/files/obex-fixes.patch	f260522e1a1995d0c1b62fb67cfd12e634571a8a
@@ -0,0 +1,68 @@
+diff --git a/obex.pro b/obex.pro
+index 05118ab..2372d12 100644
+--- a/obex.pro
++++ b/obex.pro
+@@ -7,7 +7,7 @@ DESTDIR		= $(OPIEDIR)/plugins/obex
+ INTERFACES  = obexsendbase.ui
+ INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher 
+ DEPENDPATH  += 
+-LIBS        += -lqpe -lopiecore2 
++LIBS        += -lqpe -lopiecore2 -lopenobex
+ VERSION		= 0.0.4
+ 
+ include( $(OPIEDIR)/include.pro )
+@@ -19,6 +19,6 @@ contains( CONFTEST, y ){
+ HEADERS     += btobex.h
+ SOURCES     += btobex.cpp
+ INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
+-LIBS        += -lopietooth1 -lbluetooth -lopenobex
++LIBS        += -lopietooth1 -lbluetooth
+ DEFINES     += BLUETOOTH
+ }
+diff --git a/obexserver.cpp b/obexserver.cpp
+index f1fb205..786e9f7 100644
+--- a/obexserver.cpp
++++ b/obexserver.cpp
+@@ -207,7 +207,18 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object,
+             /* Comes when a server-request has been received. */
+             handle_request (handle, object, event, obex_cmd);
+             break;
+-
++	case OBEX_EV_REQDONE:
++	    switch(obex_cmd) {
++		case OBEX_CMD_PUT:
++		case OBEX_CMD_CONNECT:
++		    break;
++		case OBEX_CMD_DISCONNECT:
++		    OBEX_TransportDisconnect(handle);
++		    break;
++		default:
++		    break;
++	    }
++	    break;
+         case OBEX_EV_LINKERR:
+             break;
+     }
+@@ -424,20 +435,12 @@ bool ObexServer::start(RunMode runmode, Communication comm)
+ 
+         if (initObex() == 0) {
+             do {
+-                int result; //Connection result
+                 if ( fd[ 1 ] ) {
+                     ::close(fd[1]);
+                     fd[1] = 0;
+                 }
+-                if ((result = OBEX_HandleInput(m_obex, 60)) < 0) {
+-                    if (errno != ECONNRESET) {
+-                        printf("OBEX_HandleInput error %d\n", errno);
+-                        fflush(stdout);
+-                        _exit(-1);
+-                    }
+-                    else
+-                        _exit(0);
+-                }
++                if (OBEX_HandleInput(m_obex, 10) < 0)
++                    _exit(0);
+             } while(1);
+         }
+         char resultByte = 1;
============================================================
--- packages/libopieobex/libopieobex0_cvs.bb	fca11ff837f5e69c3d87b6228da92173160e205f
+++ packages/libopieobex/libopieobex0_cvs.bb	aa3648a5aa5f6950f93d337e29c5cc0aad73ae48
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require libopieobex0.inc
 PV = "${OPIE_CVS_PV}"
-PR = r1
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
+           ${HANDHELDS_CVS};module=opie/pics \
+	   file://obex-fixes.patch;patch=1"
-           ${HANDHELDS_CVS};module=opie/pics"