added blink2 patch thanks to xiando (#52932)

4 files changed, 60 insertions, 5 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/Manifest b/media-libs/libgphoto2/Manifest
index d82ab7f2c5f2..80dc5e792589 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,14 +1,15 @@
-MD5 1f9e19a59b5aea0ceab95f42c9748654 libgphoto2-2.1.4.ebuild 3761
+MD5 ffc359e6146b63ec467c022aa5fa337f libgphoto2-2.1.4.ebuild 3830
 MD5 5486abc5e535376eed3bd94b7d947b8b libgphoto2-2.1.3-r1.ebuild 3622
 MD5 fc1930ea73a0f210a1f9c2cd7bcd5127 libgphoto2-2.1.1-r2.ebuild 1394
 MD5 06c4ff496bc33f08b921b85a7116bb0f libgphoto2-2.1.2-r1.ebuild 2270
 MD5 d3f331af2da98e5de2b587d4c4fe97ed libgphoto2-2.1.3.ebuild 2870
-MD5 4de54acc13cb7cc09e769a20e5531548 ChangeLog 5556
+MD5 9d35367ff9f2783a0f3a63315272babf ChangeLog 5655
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 ba2eb5dbe5b2b2214d41dafc6ec6993d files/digest-libgphoto2-2.1.3 70
 MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4 70
 MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
 MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
+MD5 d9f7cf4aab81ea4981c30a5e313f3f8e files/libgphoto2-2.1.4-blink2.patch 1655
 MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929
 MD5 1a200bb63548924b958987cd87c45dda files/libgphoto2-2.1.3-canon.patch 8487
 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r2 70
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
 }