From 7946db6bacf66b8632151912347e5f6e3018f1b1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 27 Mar 2006 14:22:30 +0000 Subject: openobex: add version 1.2, remove version 1.0.1 openobex-apps has been integrated into openobex --- packages/openobex/files/.mtn2git_empty | 0 packages/openobex/files/disable-cable-test.patch | 16 +++++++++ packages/openobex/openobex-1.0.1/.mtn2git_empty | 0 packages/openobex/openobex-1.0.1/syms.patch | 44 ------------------------ packages/openobex/openobex_1.0.1.bb | 24 ------------- packages/openobex/openobex_1.2.bb | 29 ++++++++++++++++ 6 files changed, 45 insertions(+), 68 deletions(-) create mode 100644 packages/openobex/files/.mtn2git_empty create mode 100644 packages/openobex/files/disable-cable-test.patch delete mode 100644 packages/openobex/openobex-1.0.1/.mtn2git_empty delete mode 100644 packages/openobex/openobex-1.0.1/syms.patch delete mode 100644 packages/openobex/openobex_1.0.1.bb create mode 100644 packages/openobex/openobex_1.2.bb (limited to 'packages/openobex') diff --git a/packages/openobex/files/.mtn2git_empty b/packages/openobex/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openobex/files/disable-cable-test.patch b/packages/openobex/files/disable-cable-test.patch new file mode 100644 index 0000000000..95b636dd8f --- /dev/null +++ b/packages/openobex/files/disable-cable-test.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- openobex-1.2/apps/Makefile.am~disable-cable-test ++++ openobex-1.2/apps/Makefile.am +@@ -6,7 +6,7 @@ + obex_io.c obex_io.h \ + obex_put_common.c obex_put_common.h + +-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test ++bin_PROGRAMS = irxfer obex_tcp irobex_palm3 + + obex_test_SOURCES = \ + obex_test.c obex_test.h \ diff --git a/packages/openobex/openobex-1.0.1/.mtn2git_empty b/packages/openobex/openobex-1.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openobex/openobex-1.0.1/syms.patch b/packages/openobex/openobex-1.0.1/syms.patch deleted file mode 100644 index 46eea177cf..0000000000 --- a/packages/openobex/openobex-1.0.1/syms.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: obex.sym -=================================================================== -RCS file: /cvsroot/openobex/openobex/lib/src/obex.sym,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -r1.7 -r1.8 ---- openobex/src/obex.sym 15 Nov 2002 09:14:11 -0000 1.7 -+++ openobex/src/obex.sym 30 Jan 2004 19:25:45 -0000 1.8 -@@ -1,27 +1,31 @@ - OBEX_Init - OBEX_Cleanup -+OBEX_SetUserData -+OBEX_GetUserData -+OBEX_SetUserCallBack -+OBEX_SetTransportMTU -+OBEX_GetFD - OBEX_RegisterCTransport - OBEX_SetCustomData - OBEX_GetCustomData - OBEX_TransportConnect - OBEX_TransportDisconnect - OBEX_CustomDataFeed --OBEX_GetFD - OBEX_HandleInput - OBEX_ServerRegister -+OBEX_ServerAccept - OBEX_Request - OBEX_CancelRequest --OBEX_SetUserData --OBEX_GetUserData - OBEX_ObjectNew - OBEX_ObjectDelete - OBEX_ObjectAddHeader - OBEX_ObjectGetNextHeader --OBEX_ObjectReadStream -+OBEX_ObjectReParseHeaders - OBEX_ObjectSetRsp - OBEX_ObjectGetNonHdrData - OBEX_ObjectSetNonHdrData - OBEX_ObjectSetHdrOffset -+OBEX_ObjectReadStream - OBEX_UnicodeToChar - OBEX_CharToUnicode - OBEX_ResponseToString diff --git a/packages/openobex/openobex_1.0.1.bb b/packages/openobex/openobex_1.0.1.bb deleted file mode 100644 index 221ea71d61..0000000000 --- a/packages/openobex/openobex_1.0.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "The Openobex project aims to make an \ -open source implementation of the Object Exchange \ -(OBEX) protocol." -SECTION = "libs" -PR = "r4" - -# put openobex-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ - file://syms.patch;patch=1" - -inherit autotools binconfig - -do_stage () { - oe_libinstall -so -C src libopenobex ${STAGING_LIBDIR} - ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.0.so - install -d ${STAGING_INCDIR}/openobex - install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/ - install -d ${STAGING_DIR}/aclocal - install -m 0644 m4macros/openobex.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb new file mode 100644 index 0000000000..61ce72663b --- /dev/null +++ b/packages/openobex/openobex_1.2.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "The Openobex project aims to make an \ +open source implementation of the Object Exchange \ +(OBEX) protocol." +HOMEPAGE = "http://openobex.triq.net" +SECTION = "libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ + file://disable-cable-test.patch;patch=1" + +inherit autotools binconfig pkgconfig + +EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump" + +do_stage() { + oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR} + ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.2.so + install -d ${STAGING_INCDIR}/openobex + install -m 0644 include/*.h ${STAGING_INCDIR}/openobex/ + install -d ${STAGING_DIR}/aclocal + install -m 0644 openobex.m4 ${STAGING_DATADIR}/aclocal/ +} + +# how to stop shlibrename from renaming -apps? +PACKAGES = "${PN} ${PN}-dev openobex-apps" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/openobex-config" +FILES_${PN}-apps = "${bindir}" -- cgit v1.2.3