From a26a3b34e65571dc2967876aee13049e5b2d46bf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 27 Mar 2006 14:44:26 +0000 Subject: obexftp: add 0.19 (openobex 1.1 and later), remove 0.10.3 (openobex 1.0) --- packages/obexftp/files/.mtn2git_empty | 0 packages/obexftp/files/m4.patch | 64 ++++++++++++++++++++++++++ packages/obexftp/obexftp-0.10.3/.mtn2git_empty | 0 packages/obexftp/obexftp-0.10.3/m4.patch | 64 -------------------------- packages/obexftp/obexftp_0.10.3.bb | 14 ------ packages/obexftp/obexftp_0.19.bb | 18 ++++++++ 6 files changed, 82 insertions(+), 78 deletions(-) create mode 100644 packages/obexftp/files/.mtn2git_empty create mode 100644 packages/obexftp/files/m4.patch delete mode 100644 packages/obexftp/obexftp-0.10.3/.mtn2git_empty delete mode 100644 packages/obexftp/obexftp-0.10.3/m4.patch delete mode 100644 packages/obexftp/obexftp_0.10.3.bb create mode 100644 packages/obexftp/obexftp_0.19.bb diff --git a/packages/obexftp/files/.mtn2git_empty b/packages/obexftp/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obexftp/files/m4.patch b/packages/obexftp/files/m4.patch new file mode 100644 index 0000000000..07c5eedcd7 --- /dev/null +++ b/packages/obexftp/files/m4.patch @@ -0,0 +1,64 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- /dev/null 2003-09-23 18:19:32.000000000 -0400 ++++ obexftp-0.10.3/m4/openobex.m4 2004-03-06 05:10:27.000000000 -0500 +@@ -0,0 +1,56 @@ ++dnl Check for openobex library ++dnl Written by Pontus Fuchs 2000-08-18 ++dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17 ++ ++AC_DEFUN([AM_PATH_OPENOBEX], [ ++ AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no) ++ ++ if test "$OPENOBEX_CONFIG" = "no" ; then ++ AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.) ++ fi ++ ++ min_obex_version=ifelse([$1], ,0.9.6,$1) ++ AC_MSG_CHECKING(for openobex - version >= $min_obex_version) ++ ++ OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags` ++ OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs` ++ ++ obex_config_version=`$OPENOBEX_CONFIG --version` ++ ++ obex_config_major_version=`$OPENOBEX_CONFIG --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ obex_config_minor_version=`$OPENOBEX_CONFIG --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ obex_config_micro_version=`$OPENOBEX_CONFIG --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ ++ obex_req_major_version=`echo $min_obex_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ obex_req_minor_version=`echo $min_obex_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ obex_req_micro_version=`echo $min_obex_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ ++ ++ if test $obex_req_major_version -lt $obex_config_major_version ; then ++ obex_config_version_ok="yes" ++ fi ++ if test $obex_req_major_version -eq $obex_config_major_version ; then ++ if test $obex_req_minor_version -lt $obex_config_minor_version ; then ++ obex_config_version_ok="yes" ++ fi ++ if test $obex_req_minor_version -eq $obex_config_minor_version ; then ++ if test $obex_req_micro_version -le $obex_config_micro_version ; then ++ obex_config_version_ok="yes" ++ fi ++ fi ++ fi ++ ++ if test "$obex_config_version_ok" != "yes" ; then ++ AC_MSG_ERROR(Installed openobex library too old ($obex_config_version)) ++ fi ++ ++ AC_SUBST(OPENOBEX_CFLAGS) ++ AC_SUBST(OPENOBEX_LIBS) ++ AC_MSG_RESULT(yes) ++]) diff --git a/packages/obexftp/obexftp-0.10.3/.mtn2git_empty b/packages/obexftp/obexftp-0.10.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obexftp/obexftp-0.10.3/m4.patch b/packages/obexftp/obexftp-0.10.3/m4.patch deleted file mode 100644 index 07c5eedcd7..0000000000 --- a/packages/obexftp/obexftp-0.10.3/m4.patch +++ /dev/null @@ -1,64 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null 2003-09-23 18:19:32.000000000 -0400 -+++ obexftp-0.10.3/m4/openobex.m4 2004-03-06 05:10:27.000000000 -0500 -@@ -0,0 +1,56 @@ -+dnl Check for openobex library -+dnl Written by Pontus Fuchs 2000-08-18 -+dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17 -+ -+AC_DEFUN([AM_PATH_OPENOBEX], [ -+ AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no) -+ -+ if test "$OPENOBEX_CONFIG" = "no" ; then -+ AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.) -+ fi -+ -+ min_obex_version=ifelse([$1], ,0.9.6,$1) -+ AC_MSG_CHECKING(for openobex - version >= $min_obex_version) -+ -+ OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags` -+ OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs` -+ -+ obex_config_version=`$OPENOBEX_CONFIG --version` -+ -+ obex_config_major_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ obex_config_minor_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ obex_config_micro_version=`$OPENOBEX_CONFIG --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ -+ obex_req_major_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ obex_req_minor_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ obex_req_micro_version=`echo $min_obex_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ -+ -+ if test $obex_req_major_version -lt $obex_config_major_version ; then -+ obex_config_version_ok="yes" -+ fi -+ if test $obex_req_major_version -eq $obex_config_major_version ; then -+ if test $obex_req_minor_version -lt $obex_config_minor_version ; then -+ obex_config_version_ok="yes" -+ fi -+ if test $obex_req_minor_version -eq $obex_config_minor_version ; then -+ if test $obex_req_micro_version -le $obex_config_micro_version ; then -+ obex_config_version_ok="yes" -+ fi -+ fi -+ fi -+ -+ if test "$obex_config_version_ok" != "yes" ; then -+ AC_MSG_ERROR(Installed openobex library too old ($obex_config_version)) -+ fi -+ -+ AC_SUBST(OPENOBEX_CFLAGS) -+ AC_SUBST(OPENOBEX_LIBS) -+ AC_MSG_RESULT(yes) -+]) diff --git a/packages/obexftp/obexftp_0.10.3.bb b/packages/obexftp/obexftp_0.10.3.bb deleted file mode 100644 index c4285c5c9c..0000000000 --- a/packages/obexftp/obexftp_0.10.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "OBEX Ftp Client" -SECTION = "console/network" -LICENSE = "GPL" -PRIORITY = "optional" -DEPENDS = "openobex libgsm" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \ - file://m4.patch;patch=1" - -inherit autotools - -#EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo doc'" -EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo'" diff --git a/packages/obexftp/obexftp_0.19.bb b/packages/obexftp/obexftp_0.19.bb new file mode 100644 index 0000000000..e5479c14de --- /dev/null +++ b/packages/obexftp/obexftp_0.19.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "OBEX Ftp Client based on openobex." +SECTION = "console/network" +HOMEPAGE = "http://openobex.triq.net" +LICENSE = "GPL" +DEPENDS = "openobex libgsm" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \ + file://m4.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = " --enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs" + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3