From 437da8398b206c3f3130f747c8bf776da58fc340 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 13 Jun 2015 21:24:44 +0200 Subject: update openobex to latest stable version --- package/openobex/Makefile | 7 ++- package/openobex/patches/patch-configure | 73 -------------------------------- package/openobex/patches/patch-ltmain_sh | 11 ----- 3 files changed, 6 insertions(+), 85 deletions(-) delete mode 100644 package/openobex/patches/patch-configure delete mode 100644 package/openobex/patches/patch-ltmain_sh (limited to 'package') diff --git a/package/openobex/Makefile b/package/openobex/Makefile index 3b4711a67..df5d8e27e 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -6,19 +6,24 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openobex PKG_VERSION:= 1.7.1 PKG_RELEASE:= 1 -PKG_HASH:= e602047570799a47ecb028420bda8f2cef41310e5a99d084de10aa9422935e65 +PKG_HASH:= 3b264665d90901ea4ff720332ffb9b6d1d8f67187463d3a3279caddc7205ea57 PKG_DESCR:= implementation of the obex protocol PKG_SECTION:= sys/misc +PKG_BUILDDEP:= eudev PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/} PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-Source.tar.gz +WRKDIST= $(WRKDIR)/${PKG_NAME}-${PKG_VERSION}-Source include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENOBEX,openobex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CONFIG_STYLE:= cmake +CMAKE_FLAGS:= -DBUILD_DOCUMENTATION=off + openobex-install: ${INSTALL_DIR} ${IDIR_OPENOBEX}/usr/lib ${CP} ${WRKINST}/usr/lib/libopenobex.so* ${IDIR_OPENOBEX}/usr/lib/ diff --git a/package/openobex/patches/patch-configure b/package/openobex/patches/patch-configure deleted file mode 100644 index 4d288e003..000000000 --- a/package/openobex/patches/patch-configure +++ /dev/null @@ -1,73 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openobex-1.5.orig/configure 2009-02-08 19:32:25.000000000 +0100 -+++ openobex-1.5/configure 2009-06-04 21:43:21.000000000 +0200 -@@ -10943,7 +10943,7 @@ $as_echo "no" >&6; } - fi - - case $host in -- *-*-linux*) -+ *) - - - pkg_failed=no -@@ -11270,60 +11270,6 @@ fi - - - --if test $pkg_failed = yes; then -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb" 2>&1` -- else -- USB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$USB_PKG_ERRORS" >&5 -- -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --else -- USB_CFLAGS=$pkg_cv_USB_CFLAGS -- USB_LIBS=$pkg_cv_USB_LIBS -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- usb_lib_found=yes --fi -- as_ac_File=`$as_echo "ac_cv_file_${prefix}/lib/pkgconfig/libusb.pc" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for ${prefix}/lib/pkgconfig/libusb.pc" >&5 --$as_echo_n "checking for ${prefix}/lib/pkgconfig/libusb.pc... " >&6; } --if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- test "$cross_compiling" = yes && -- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 --$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -- { (exit 1); exit 1; }; } --if test -r "${prefix}/lib/pkgconfig/libusb.pc"; then -- eval "$as_ac_File=yes" --else -- eval "$as_ac_File=no" --fi --fi --ac_res=`eval 'as_val=${'$as_ac_File'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_File'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- REQUIRES="libusb" --fi - - ;; - esac diff --git a/package/openobex/patches/patch-ltmain_sh b/package/openobex/patches/patch-ltmain_sh deleted file mode 100644 index 7772f428f..000000000 --- a/package/openobex/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- openobex-1.5.orig/ltmain.sh 2008-08-30 00:29:24.000000000 +0200 -+++ openobex-1.5/ltmain.sh 2011-01-16 01:11:57.000000000 +0100 -@@ -1676,7 +1676,7 @@ EOF - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. -- cgit v1.2.3