kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update openobex to 1.6

Browse source 
- Update project home page url
- Bump PORTREVISION on obexapp due to shlib version change
- While I'm here, remove ABI version numbers from LIB_DEPENDS

Requested by:	Dru Lavigne <dru.lavigne@gmail.com>
Approved by:	crees (mentor)
This commit is contained in:
Guido Falsi 2012-08-30 17:12:30 +00:00
parent 8a38fa5219
commit dda08cefbb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303386
7 changed files with 10 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
comms/obexapp/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= obexapp PORTNAME= obexapp
PORTVERSION= 1.4.15 PORTVERSION= 1.4.15
PORTREVISION= 1
CATEGORIES= comms net CATEGORIES= comms net
MASTER_SITES= http://people.freebsd.org/~emax/obexapp/ MASTER_SITES= http://people.freebsd.org/~emax/obexapp/
@ -14,7 +15,7 @@ MAINTAINER= madpilot@FreeBSD.org
COMMENT= Obex application to transfer objects to mobile equipment COMMENT= Obex application to transfer objects to mobile equipment
LIB_DEPENDS= openobex:${PORTSDIR}/comms/openobex \ LIB_DEPENDS= openobex:${PORTSDIR}/comms/openobex \
expat.6:${PORTSDIR}/textproc/expat2 expat:${PORTSDIR}/textproc/expat2
WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}

8
comms/openobex/Makefile
View file

@ -6,10 +6,10 @@
# #
PORTNAME= openobex PORTNAME= openobex
PORTVERSION= 1.4 PORTVERSION= 1.6
CATEGORIES= comms net CATEGORIES= comms net
MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} MASTER_SITES= http://www.hendrik-sattler.de/downloads/${PORTNAME}/${PORTVERSION}/
MASTER_SITE_SUBDIR= linux/bluetooth DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
MAINTAINER= madpilot@FreeBSD.org MAINTAINER= madpilot@FreeBSD.org
COMMENT= Open source implementation of the OBEX protocol COMMENT= Open source implementation of the OBEX protocol
@ -28,7 +28,7 @@ USB_DESC= Enable OBEX over USB
.if ${PORT_OPTIONS:MUSB} .if ${PORT_OPTIONS:MUSB}
. if ${OSVERSION} < 800069 . if ${OSVERSION} < 800069
LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
CFLAGS+= -I${PREFIX}/include CFLAGS+= -I${PREFIX}/include
. else . else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure

4
comms/openobex/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (openobex-1.4.tar.gz) = 79265309e2320beb03910fccf27fd04aefb18ba47a900947d2de8e88fae05cd8 SHA256 (openobex-1.6-Source.tar.gz) = 3dde9deaba9881c45da3dfea69765fdfaec9e1e0e2114bf0add997a688c615f8
SIZE (openobex-1.4.tar.gz) = 393756 SIZE (openobex-1.6-Source.tar.gz) = 712415

12
comms/openobex/files/patch-bt
View file

@ -1,12 +0,0 @@
diff -ur lib/bluez_compat.h work.2/openobex-1.4/lib/bluez_compat.h
--- lib/bluez_compat.h 2008-11-07 14:36:09.000000000 +0200
+++ lib/bluez_compat.h 2008-11-19 02:34:53.000000000 +0200
@@ -53,6 +53,8 @@
#define rc_family rfcomm_family
#define rc_bdaddr rfcomm_bdaddr
#define rc_channel rfcomm_channel
+#define BDADDR_ANY NG_HCI_BDADDR_ANY
+#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
#elif defined(HAVE_BLUETOOTH_NETBSD)
#include <bluetooth.h>

65
comms/openobex/files/patch-usb
View file

@ -1,65 +0,0 @@
--- lib/usbobex.c 2008-11-07 14:36:09.000000000 +0200
+++ lib/usbobex.c 2008-11-19 02:47:39.000000000 +0200
@@ -392,25 +392,8 @@
DEBUG(4, "\n");
- self->trans.self.usb.dev_control = usb_open(self->trans.self.usb.device);
self->trans.self.usb.dev_data = usb_open(self->trans.self.usb.device);
- ret = usb_set_configuration(self->trans.self.usb.dev_control, self->trans.self.usb.configuration);
- if (ret < 0)
- DEBUG(4, "Can't set configuration %d", ret);
-
- ret = usb_claim_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
- if (ret < 0) {
- DEBUG(4, "Can't claim control interface %d", ret);
- goto err1;
- }
-
- ret = usb_set_altinterface(self->trans.self.usb.dev_control, self->trans.self.usb.control_setting);
- if (ret < 0) {
- DEBUG(4, "Can't set control setting %d", ret);
- goto err2;
- }
-
ret = usb_claim_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);
if (ret < 0) {
DEBUG(4, "Can't claim data interface %d", ret);
@@ -430,10 +413,8 @@
err3:
usb_release_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);
err2:
- usb_release_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
err1:
usb_close(self->trans.self.usb.dev_data);
- usb_close(self->trans.self.usb.dev_control);
return ret;
}
@@ -450,21 +431,19 @@
return 0;
DEBUG(4, "\n");
+
+ usb_clear_halt(self->trans.self.usb.dev_data, self->trans.self.usb.data_endpoint_read);
+ usb_clear_halt(self->trans.self.usb.dev_data, self->trans.self.usb.data_endpoint_write);
+
ret = usb_set_altinterface(self->trans.self.usb.dev_data, self->trans.self.usb.data_idle_setting);
if (ret < 0)
DEBUG(4, "Can't set data idle setting %d", ret);
ret = usb_release_interface(self->trans.self.usb.dev_data, self->trans.self.usb.data_interface);
if (ret < 0)
DEBUG(4, "Can't release data interface %d", ret);
- ret = usb_release_interface(self->trans.self.usb.dev_control, self->trans.self.usb.control_interface);
- if (ret < 0)
- DEBUG(4, "Can't release control interface %d", ret);
ret = usb_close(self->trans.self.usb.dev_data);
if (ret < 0)
DEBUG(4, "Can't close data interface %d", ret);
- ret = usb_close(self->trans.self.usb.dev_control);
- if (ret < 0)
- DEBUG(4, "Can't close control interface %d", ret);
return ret;
}

2
comms/openobex/pkg-descr
View file

@ -3,4 +3,4 @@ implementation of the Object Exchange (OBEX) protocol. OBEX is a
session protocol and can best be described as a binary HTTP protocol. session protocol and can best be described as a binary HTTP protocol.
It's used mainly for Infrared and Bluetooth communication. It's used mainly for Infrared and Bluetooth communication.
WWW: http://www.bluez.org/openobex/ WWW: http://gitorious.org/openobex/pages/Home

2
comms/openobex/pkg-plist
View file

@ -1,6 +1,6 @@
include/openobex/obex.h include/openobex/obex.h
include/openobex/obex_const.h include/openobex/obex_const.h
lib/libopenobex.so.5 lib/libopenobex.so.2
lib/libopenobex.a lib/libopenobex.a
lib/libopenobex.la lib/libopenobex.la
lib/libopenobex.so lib/libopenobex.so