diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-28 14:43:52 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-28 14:43:52 +0000 |
| commit | d867bd15e41111695bce2a29d337050fefc4a37c (patch) | |
| tree | f83b129fa87f71fd7d5e7fa12a3e43537fc2c9fa | |
| parent | 53dff68f614a79253a8a98c49e9f746159fdbdd0 (diff) | |
| download | ports-d867bd15e41111695bce2a29d337050fefc4a37c.tar.gz ports-d867bd15e41111695bce2a29d337050fefc4a37c.zip | |
- Detect RC-S310 automatically
- Build shared library
PR: ports/108473
Submitted by: <mistral@imasy.or.jp> (maintainer)
Notes
Notes:
svn path=/head/; revision=183540
| -rw-r--r-- | devel/libpasori/Makefile | 2 | ||||
| -rw-r--r-- | devel/libpasori/files/Makefile.lib | 1 | ||||
| -rw-r--r-- | devel/libpasori/files/patch-libpasori_com_bsdugen.c | 17 | ||||
| -rw-r--r-- | devel/libpasori/pkg-plist | 2 |
4 files changed, 15 insertions, 7 deletions
diff --git a/devel/libpasori/Makefile b/devel/libpasori/Makefile index c01c48f00929..adcace2c8991 100644 --- a/devel/libpasori/Makefile +++ b/devel/libpasori/Makefile @@ -6,6 +6,7 @@ PORTNAME= libpasori PORTVERSION= 02 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= ${PORTNAME}/20457 @@ -15,6 +16,7 @@ MAINTAINER= mistral@imasy.or.jp COMMENT= FeliCa read/write library for Sony RC-S320 USB FeliCa R/W(PaSoRi) USE_BZIP2= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} post-extract: diff --git a/devel/libpasori/files/Makefile.lib b/devel/libpasori/files/Makefile.lib index faf16f93e3f3..2996eee3d9cc 100644 --- a/devel/libpasori/files/Makefile.lib +++ b/devel/libpasori/files/Makefile.lib @@ -11,6 +11,7 @@ INCS= libpasori.h libpasori_com.h libpasori_command.h \ LIBDIR= ${LOCALBASE}/lib INCLUDEDIR= ${LOCALBASE}/include NO_PROFILE= +SHLIB_MAJOR= 1 CFLAGS+= -D__LIBPASORI_WITH_BSDUGEN CFLAGS+= -Wall -W diff --git a/devel/libpasori/files/patch-libpasori_com_bsdugen.c b/devel/libpasori/files/patch-libpasori_com_bsdugen.c index 8b699002fdb2..ea5e8c5fb2e0 100644 --- a/devel/libpasori/files/patch-libpasori_com_bsdugen.c +++ b/devel/libpasori/files/patch-libpasori_com_bsdugen.c @@ -1,6 +1,6 @@ --- src/libpasori_com_bsdugen.c.orig Mon Mar 20 09:12:58 2006 -+++ src/libpasori_com_bsdugen.c Sat Jan 20 23:13:12 2007 -@@ -6,7 +6,16 @@ ++++ src/libpasori_com_bsdugen.c Fri Jan 26 23:25:58 2007 +@@ -6,7 +6,17 @@ #include <sys/ioctl.h> #include <errno.h> @@ -13,11 +13,12 @@ +#include "libpasori.h" + +#define VENDOR_SONY 0x054c ++#define PRODUCT_RC_S310 0x006c +#define PRODUCT_RC_S320 0x01bb void dbg_dump(uint8* d,int size){ int i; -@@ -16,25 +25,86 @@ +@@ -16,25 +26,88 @@ Log("\n"); } @@ -37,7 +38,9 @@ + di.udi_addr = devnum; + if (ioctl(busfd, USB_DEVICEINFO, &di) != -1) { + if ((di.udi_vendorNo == VENDOR_SONY) && -+ (di.udi_productNo == PRODUCT_RC_S320)) { ++ ((di.udi_productNo == PRODUCT_RC_S310) || ++ (di.udi_productNo == PRODUCT_RC_S320))) { ++ + int i; + for (i=0; i<USB_MAX_DEVNAMES; i++) { + if (strncmp(di.udi_devnames[i], "ugen", 4) == 0) { @@ -114,7 +117,7 @@ if( (pp->fd_cntl < 0) || (pp->fd_intr < 0) ){ Log("error opening pasori.%d %d",pp->fd_cntl,pp->fd_intr); close(pp->fd_cntl); -@@ -47,7 +117,6 @@ +@@ -47,7 +120,6 @@ int pasori_send(pasori* pp,uint8 *cmd,uint8 size,int timeout){ struct usb_ctl_request req; @@ -122,7 +125,7 @@ uint8 resp[256]; signed int i; int t; -@@ -90,11 +159,12 @@ +@@ -90,11 +162,12 @@ int pasori_recv(pasori* pp,uint8* buf,uint8 bufsize,int timeout){ signed int i; int state; @@ -137,7 +140,7 @@ uint8 resp; state = STATE_UNKNOWN; -@@ -156,5 +226,7 @@ +@@ -156,5 +229,7 @@ void pasori_close(pasori* p){ close(p->fd_intr); close(p->fd_cntl); diff --git a/devel/libpasori/pkg-plist b/devel/libpasori/pkg-plist index 43ae94c4a986..f1bd293e629a 100644 --- a/devel/libpasori/pkg-plist +++ b/devel/libpasori/pkg-plist @@ -6,3 +6,5 @@ include/libpasori_liblocal.h include/libpasori_com.h include/libpasori_config.h lib/libpasori.a +lib/libpasori.so +lib/libpasori.so.1 |