Added a patch for users with 2.6 headers; bug #44609.

4 files changed, 70 insertions, 16 deletions

diff --git a/app-misc/rioutil/ChangeLog b/app-misc/rioutil/ChangeLog
index 07364464b9ea..a53bbd3a1d4c 100644
--- a/app-misc/rioutil/ChangeLog
+++ b/app-misc/rioutil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/rioutil
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/ChangeLog,v 1.14 2004/06/24 22:30:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/ChangeLog,v 1.15 2004/07/20 17:08:52 plasmaroo Exp $
+
+  20 Jul 2004; <plasmaroo@gentoo.org> rioutil-1.4.4.ebuild,
+  +files/rioutil-1.4.4-26headers.patch:
+  Added a patch for users with 2.6 headers; bug #44609.
 
   20 Jun 2004; Daniel Black <dragonheart@gentoo.org> rioutil-1.4.4.ebuild:
   added depend on linuxheaders-2.4. It fails against linuxheaders-2.6. Bug
diff --git a/app-misc/rioutil/Manifest b/app-misc/rioutil/Manifest
index bde689778dfc..b3727b2892d7 100644
--- a/app-misc/rioutil/Manifest
+++ b/app-misc/rioutil/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 06754f9514db76f678e1e3f17ac25fd9 ChangeLog 1782
-MD5 edc993cd27a49091d6d1f0cd61b3d29a rioutil-1.3.3.ebuild 758
+MD5 d9c5d07374fdbdd8c9158e1ab1bcad48 ChangeLog 1940
 MD5 997385b9ff403f19685cb754a0497a1c rioutil-1.4.2b.ebuild 681
-MD5 0604856ca33827ca7d441e67bb664aa0 rioutil-1.4.4.ebuild 730
+MD5 edc993cd27a49091d6d1f0cd61b3d29a rioutil-1.3.3.ebuild 758
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 5ee48e799aa00b49be596ec320e35402 rioutil-1.4.4.ebuild 901
 MD5 72a43d60ff9736ade5cf03ea35853db7 files/digest-rioutil-1.4.4 66
-MD5 dc3c89c8600c99e61efa4bbd65876b22 files/digest-rioutil-1.3.3 66
+MD5 980de0f7000d1b646ff0ce96a4f795b2 files/rioutil-1.4.4-26headers.patch 2266
 MD5 59927df6017f718328d0f7ce6eaeb2d3 files/digest-rioutil-1.4.2b 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA35pYHTu7gpaalycRAhslAJ9Pc9q8bq0/jx8o4IMWu6SxVRlHmQCg6zJn
-akEHxV/vzsIvjOgRT8nquX4=
-=kh3N
------END PGP SIGNATURE-----
+MD5 dc3c89c8600c99e61efa4bbd65876b22 files/digest-rioutil-1.3.3 66
diff --git a/app-misc/rioutil/files/rioutil-1.4.4-26headers.patch b/app-misc/rioutil/files/rioutil-1.4.4-26headers.patch
new file mode 100644
index 000000000000..d76de6c5b4ae
--- /dev/null
+++ b/app-misc/rioutil/files/rioutil-1.4.4-26headers.patch
@@ -0,0 +1,51 @@
+diff -ur rioutil-1.4.2b/include/usbdrv.h rioutil-1.4.2b.plasmaroo/include/usbdrv.h
+--- rioutil-1.4.2b/include/usbdrv.h	2003-08-06 16:56:25.000000000 +0100
++++ rioutil-1.4.2b.plasmaroo/include/usbdrv.h	2004-04-02 22:22:51.802629528 +0100
+@@ -63,6 +63,7 @@
+ 
+ /* --------------------------------------------------------------------- */
+ 
++#ifndef __LINUX_USB_CH9_H
+ struct usb_device_descriptor {
+         u_int8_t  bLength;
+         u_int8_t  bDescriptorType;
+@@ -79,8 +80,7 @@
+         u_int8_t  iSerialNumber;
+         u_int8_t  bNumConfigurations;
+ };
+-
+-//#define USB_DT_DEVICE_SIZE sizeof(struct usb_device_descriptor)
++#endif /* __LINUX_USB_CH9_H */
+ 
+ /* --------------------------------------------------------------------- */
+ 
+diff -ur rioutil-1.4.2b/librioutil/usbdrvlinux.c rioutil-1.4.2b.plasmaroo/librioutil/usbdrvlinux.c
+--- rioutil-1.4.2b/librioutil/usbdrvlinux.c	2003-08-06 16:56:25.000000000 +0100
++++ rioutil-1.4.2b.plasmaroo/librioutil/usbdrvlinux.c	2004-04-02 22:25:26.820063296 +0100
+@@ -84,14 +84,26 @@
+         fprintf(f, "  Length              = %2d%s\n", desc->bLength,
+ 		desc->bLength == USB_DT_DEVICE_SIZE ? "" : " (!!!)");
+         fprintf(f, "  DescriptorType      = %02x\n", desc->bDescriptorType);
++	#ifdef __LINUX_USB_CH9_H
++        fprintf(f, "  USB version         = %x\n",
++	       desc->bcdUSB);
++        fprintf(f, "  Vendor:Product      = %04x:%04x\n",
++	       desc->idVendor, desc->idProduct);
++	#else
+         fprintf(f, "  USB version         = %x.%02x\n",
+ 	       desc->bcdUSB[1], desc->bcdUSB[0]);
+         fprintf(f, "  Vendor:Product      = %02x%02x:%02x%02x\n",
+ 	       desc->idVendor[1], desc->idVendor[0], desc->idProduct[1], desc->idProduct[0]);
++	#endif
+         fprintf(f, "  MaxPacketSize0      = %d\n", desc->bMaxPacketSize0);
+         fprintf(f, "  NumConfigurations   = %d\n", desc->bNumConfigurations);
++	#ifdef __LINUX_USB_CH9_H
++        fprintf(f, "  Device version      = %x\n",
++		desc->bcdDevice);	
++	#else
+         fprintf(f, "  Device version      = %x.%02x\n",
+ 		desc->bcdDevice[1], desc->bcdDevice[0]);
++	#endif
+         fprintf(f, "  Device Class:SubClass:Protocol = %02x:%02x:%02x\n",
+ 		desc->bDeviceClass, desc->bDeviceSubClass, desc->bDeviceProtocol);
+         switch (desc->bDeviceClass) {
diff --git a/app-misc/rioutil/rioutil-1.4.4.ebuild b/app-misc/rioutil/rioutil-1.4.4.ebuild
index cf1e46604b2b..44583ee68381 100644
--- a/app-misc/rioutil/rioutil-1.4.4.ebuild
+++ b/app-misc/rioutil/rioutil-1.4.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/app-misc/rioutil/rioutil-1.4.4.ebuild,v 1.6 2004/06/28 04:10:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/rioutil-1.4.4.ebuild,v 1.7 2004/07/20 17:08:52 plasmaroo Exp $
 
 DESCRIPTION="Command line tool for transfering mp3s to and from a Rio 600, 800, Rio Riot, and Nike PSA/Play"
 HOMEPAGE="http://rioutil.sourceforge.net/"
@@ -14,6 +14,14 @@ IUSE=""
 DEPEND="sys-libs/zlib
 	virtual/libc"
 
+inherit eutils
+
+src_unpack() {
+	unpack ${A} || die 'Failed to unpack!'
+	cd ${S}
+	epatch ${FILESDIR}/${P}-26headers.patch || die 'Failed to apply 2.6 headers patch!'
+}
+
 src_compile() {
 	local myconf="--with-usbdevfs"