diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2004-07-24 19:06:51 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2004-07-24 19:06:51 +0000 |
| commit | 0fa279f5d2a4077621046f6533ac08f9fac4080e (patch) | |
| tree | 39f711654d8434ae1dd86d2860cee0eb6ff1e5a2 /media-libs/libgphoto2 | |
| parent | add macos keyword to pwgen-2.03-r1 (diff) | |
| download | gentoo-2-0fa279f5d2a4077621046f6533ac08f9fac4080e.tar.gz gentoo-2-0fa279f5d2a4077621046f6533ac08f9fac4080e.tar.bz2 gentoo-2-0fa279f5d2a4077621046f6533ac08f9fac4080e.zip | |
added blink2 patch thanks to xiando (#52932)
Diffstat (limited to 'media-libs/libgphoto2')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.1.4-blink2.patch | 48 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.1.4.ebuild | 7 |
3 files changed, 57 insertions, 3 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 5543d180ab10..031ae51cb3a6 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.31 2004/07/16 19:57:22 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.32 2004/07/24 19:06:51 liquidx Exp $ + + 24 Jul 2004; Alastair Tse <liquidx@gentoo.org> : + added blink2 patch thanks to xiando (#52932) 16 Jul 2004; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.4.ebuild: fix 'no drivers compiled' bug introduced because of IUSE_* migration (#57158) diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.4-blink2.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.4-blink2.patch new file mode 100644 index 000000000000..1b286303e5ea --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.1.4-blink2.patch @@ -0,0 +1,48 @@ +--- libgphoto2-2.1.4-orig/camlibs/sipix/blink2.c 2004-03-26 12:16:13.000000000 +0100 ++++ libgphoto2-2.1.4/camlibs/sipix/blink2.c 2004-04-01 13:28:45.000000000 +0200 +@@ -55,8 +55,10 @@ + ) { + char buf[6]; + int ret; +- +- ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 6); ++ ++ ret = gp_port_usb_msg_read(port, 0x18, 0x03, 0, buf, 6); ++ ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 2); ++ ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 2); + if (ret<GP_OK) + return ret; + *numpics = (buf[0]<<8) | buf[1]; +@@ -95,7 +97,7 @@ + if (ret < GP_OK) return ret; + + xbuf = malloc(8*(1+numpics)); +- ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,8 ); ++ ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,1 ); + if (ret < GP_OK) { + free(xbuf); + return ret; +@@ -142,7 +144,7 @@ + free(xbuf); + return GP_ERROR_NO_MEMORY; + } +- ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,8 ); ++ ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,1 ); + if (ret < GP_OK) { + free(addrs); + free(xbuf); +@@ -375,10 +377,12 @@ + settings.usb.interface = 0; + ret = gp_port_set_settings( camera->port, settings); + if (ret < GP_OK) return ret; +- ret = gp_port_usb_msg_read( camera->port, 0x18, 0x0300, 0x0000, buf, 6); ++ ++ ret = gp_port_usb_msg_read( camera->port, 0x18, 0x03, 0, buf, 6); + if (ret < GP_OK) + return ret; +- ret = gp_port_usb_msg_read( camera->port, 0x04, 0x0300, 0x0000, buf, 8); ++ ++ ret = gp_port_usb_msg_read( camera->port, 0x04, 0x03, 0, buf, 1); + if (ret < GP_OK) + return ret; + return GP_OK; diff --git a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild index 197a4e29ca75..0de634814c80 100644 --- a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild,v 1.12 2004/07/16 19:57:22 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild,v 1.13 2004/07/24 19:06:51 liquidx Exp $ inherit libtool eutils @@ -41,7 +41,10 @@ pkg_setup() { src_unpack() { unpack ${A} - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch + cd ${S} + epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch + # add stylcam snap support (#52932) + epatch ${FILESDIR}/${PN}-2.1.4-blink2.patch # Fix compilation under gcc-2. epatch ${FILESDIR}/${P}-gcc2_fixes.patch } |