[oe-commits] org.oe.oz354x openobex: update to 1.2 which also replace openobex-apps (from .dev)

[hrw commit]

openobex: update to 1.2 which also replace openobex-apps (from .dev)

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 553d3d3d6e7bf8424c8ad87c0d29b50f52ebe53b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=553d3d3d6e7bf8424c8ad87c0d29b50f52ebe53b
Files:
1
packages/openobex/openobex-1.0.1
packages/openobex/openobex-1.0.1/syms.patch
packages/openobex/openobex_1.0.1.bb
packages/openobex/files
packages/openobex/files/disable-cable-test.patch
packages/openobex/files/libusb_crosscompile_check.patch
packages/openobex/openobex_1.2.bb
Diffs:

#
# mt diff -r0069664c24b777a24fbb01af1537173c4122deaf -r553d3d3d6e7bf8424c8ad87c0d29b50f52ebe53b
#
# 
# 
# delete "packages/openobex/openobex-1.0.1"
# 
# delete "packages/openobex/openobex-1.0.1/syms.patch"
# 
# delete "packages/openobex/openobex_1.0.1.bb"
# 
# add_dir "packages/openobex/files"
# 
# add_file "packages/openobex/files/disable-cable-test.patch"
#  content [9dc51449b1c384b876009cabce74637cb8436eef]
# 
# add_file "packages/openobex/files/libusb_crosscompile_check.patch"
#  content [55a1a25f3b072f41b50df798cbf4bab737cd6601]
# 
# add_file "packages/openobex/openobex_1.2.bb"
#  content [448db4a0dd1629bd6e3890fb7e90394b9ce66614]
# 
============================================================
--- packages/openobex/files/disable-cable-test.patch	9dc51449b1c384b876009cabce74637cb8436eef
+++ packages/openobex/files/disable-cable-test.patch	9dc51449b1c384b876009cabce74637cb8436eef
@@ -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 \
============================================================
--- packages/openobex/files/libusb_crosscompile_check.patch	55a1a25f3b072f41b50df798cbf4bab737cd6601
+++ packages/openobex/files/libusb_crosscompile_check.patch	55a1a25f3b072f41b50df798cbf4bab737cd6601
@@ -0,0 +1,12 @@
+diff -Naur openobex-1.2_old/acinclude.m4 openobex-1.2/acinclude.m4
+--- openobex-1.2_old/acinclude.m4	2006-03-07 19:57:49.000000000 +0200
++++ openobex-1.2/acinclude.m4	2006-04-18 23:07:25.000000000 +0300
+@@ -195,7 +195,7 @@
+ 
+ 	if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
+ 		AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
+-		AC_CHECK_FILE(${usb_prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
++		REQUIRES="libusb"
+ 	fi
+ 
+ 	AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
============================================================
--- packages/openobex/openobex_1.2.bb	448db4a0dd1629bd6e3890fb7e90394b9ce66614
+++ packages/openobex/openobex_1.2.bb	448db4a0dd1629bd6e3890fb7e90394b9ce66614
@@ -0,0 +1,32 @@
+DESCRIPTION = "The Openobex project is an open source implementation of the \
+Object Exchange (OBEX) protocol."
+HOMEPAGE = "http://openobex.triq.net"
+SECTION = "libs"
+PROVIDES = "openobex-apps"
+DEPENDS = "libusb bluez-libs"
+LICENSE = "GPL"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
+           file://disable-cable-test.patch;patch=1" \
+	   file://libusb_crosscompile_check.patch;patch=1"
+
+inherit autotools binconfig pkgconfig
+
+EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
+                --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
+
+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 += "openobex-apps"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}/openobex-config"
+FILES_${PN}-apps = "${bindir}/*"