From 08ae3dd7a8aee2c1f5914792ba9c6054d3283cc3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcelo=20G=C3=B3es?= Date: Sat, 24 Sep 2005 19:11:41 +0000 Subject: [PATCH] hacked usbdevfs_ctrltransfer struct to fix compilation issue, bug 107065 Package-Manager: portage-2.0.52-r1 --- app-misc/nomadii-utils/ChangeLog | 11 +++- app-misc/nomadii-utils/Manifest | 6 +- .../files/digest-nomadii-utils-0.8-r1 | 1 + .../files/nomadii-utils-0.8-struct.diff | 33 +++++++++++ app-misc/nomadii-utils/metadata.xml | 9 +++ .../nomadii-utils/nomadii-utils-0.8-r1.ebuild | 57 +++++++++++++++++++ 6 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 app-misc/nomadii-utils/files/digest-nomadii-utils-0.8-r1 create mode 100644 app-misc/nomadii-utils/files/nomadii-utils-0.8-struct.diff create mode 100644 app-misc/nomadii-utils/metadata.xml create mode 100644 app-misc/nomadii-utils/nomadii-utils-0.8-r1.ebuild diff --git a/app-misc/nomadii-utils/ChangeLog b/app-misc/nomadii-utils/ChangeLog index 2d3011d88ea9..c7def1516dce 100644 --- a/app-misc/nomadii-utils/ChangeLog +++ b/app-misc/nomadii-utils/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-misc/nomadii-utils # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/nomadii-utils/ChangeLog,v 1.6 2005/08/16 18:10:55 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/nomadii-utils/ChangeLog,v 1.7 2005/09/24 19:11:41 vanquirius Exp $ + +*nomadii-utils-0.8-r1 (24 Sep 2005) + + 24 Sep 2005; Marcelo Goes + +files/nomadii-utils-0.8-struct.diff, +metadata.xml, + +nomadii-utils-0.8-r1.ebuild: + Use hacked usbdevfs_ctrltransfer struct to fix compilation issue. Attempting + to fix bug 107065, thanks to Marquez LaMaistres . 16 Aug 2005; Seemant Kulleen nomadii-utils-0.8.ebuild: diff --git a/app-misc/nomadii-utils/Manifest b/app-misc/nomadii-utils/Manifest index c662c9b867d3..d34f990ad45d 100644 --- a/app-misc/nomadii-utils/Manifest +++ b/app-misc/nomadii-utils/Manifest @@ -1,3 +1,7 @@ -MD5 f7f3b3dbc7ff7b6cd95243953be26132 ChangeLog 703 +MD5 390265b783c4d1b6da3d4b787ed9ba9d ChangeLog 1049 +MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310 +MD5 2754c9fa5ddb18c9111db9c6bbc7ea9c nomadii-utils-0.8-r1.ebuild 1535 MD5 deb1a561b30f34aa5c8e2eabc018a6c2 nomadii-utils-0.8.ebuild 1428 +MD5 282c7694de28329ace49de28cf586ee6 files/digest-nomadii-utils-0.8-r1 65 MD5 282c7694de28329ace49de28cf586ee6 files/digest-nomadii-utils-0.8 65 +MD5 aeba2df545b8a3b93a9eeb102ba4ecf3 files/nomadii-utils-0.8-struct.diff 744 diff --git a/app-misc/nomadii-utils/files/digest-nomadii-utils-0.8-r1 b/app-misc/nomadii-utils/files/digest-nomadii-utils-0.8-r1 new file mode 100644 index 000000000000..6b7ca960d0b0 --- /dev/null +++ b/app-misc/nomadii-utils/files/digest-nomadii-utils-0.8-r1 @@ -0,0 +1 @@ +MD5 023ed7f92ca168483b0533185c81d21f nomadII-utils-0.8.tgz 87551 diff --git a/app-misc/nomadii-utils/files/nomadii-utils-0.8-struct.diff b/app-misc/nomadii-utils/files/nomadii-utils-0.8-struct.diff new file mode 100644 index 000000000000..bd203b11cc34 --- /dev/null +++ b/app-misc/nomadii-utils/files/nomadii-utils-0.8-struct.diff @@ -0,0 +1,33 @@ +--- nomadII-utils-0.8.orig/libnomadII/low_level.c 2005-09-24 15:42:39.000000000 -0300 ++++ nomadII-utils-0.8/libnomadII/low_level.c 2005-09-24 15:59:15.000000000 -0300 +@@ -31,6 +31,21 @@ + #include + #include + ++struct usbdevfs_ctrltransfer_hack { ++ __u8 bRequestType; ++ __u8 bRequest; ++ __u16 wValue; ++ __u16 wIndex; ++ __u16 wLength; ++ __u32 timeout; /* in milliseconds */ ++ void __user *data; ++ short length; ++ int request; ++ int requesttype; ++ int value; ++ int index; ++}; ++ + typedef struct { + __u8 requesttype; + __u8 request; +@@ -312,7 +327,7 @@ + { + int result; + #ifdef WITH_USBDEVFS +- struct usbdevfs_ctrltransfer msg; ++ struct usbdevfs_ctrltransfer_hack msg; + #else + struct NomadII_cmd msg; + #endif diff --git a/app-misc/nomadii-utils/metadata.xml b/app-misc/nomadii-utils/metadata.xml new file mode 100644 index 000000000000..d8b96be3c5cd --- /dev/null +++ b/app-misc/nomadii-utils/metadata.xml @@ -0,0 +1,9 @@ + + + + no-herd + + bug-wranglers@gentoo.org + This package lacks a primary herd or maintainer. + + diff --git a/app-misc/nomadii-utils/nomadii-utils-0.8-r1.ebuild b/app-misc/nomadii-utils/nomadii-utils-0.8-r1.ebuild new file mode 100644 index 000000000000..1f0a676f4b7d --- /dev/null +++ b/app-misc/nomadii-utils/nomadii-utils-0.8-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/nomadii-utils/nomadii-utils-0.8-r1.ebuild,v 1.1 2005/09/24 19:11:41 vanquirius Exp $ + +inherit eutils + +IUSE="readline" + +MY_P="${P/ii/II}" +S="${WORKDIR}/${MY_P}" +DESCRIPTION="Supports for Creative Nomad II, IIc and II MG under Linux running USB for file transfers and other operations." +HOMEPAGE="http://nomadii.sourceforge.net/" +SRC_URI="mirror://sourceforge/nomadii/${MY_P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86" + +DEPEND=">=sys-libs/ncurses-5.2 + readline? ( >=sys-libs/readline-4.1 )" + +src_unpack() { + unpack ${A}; cd "${S}" + epatch "${FILESDIR}/${P}-struct.diff" + + sed -i \ + -e "s:^LIBTERMCAP=-ltermcap$:LIBTERMCAP=-lncurses:" \ + -e "s:^OPTIMIZER= -O2$:OPTIMIZER= ${CFLAGS}:" \ + Makefile + + if ! use readline ; then + sed -i -e "s:^USE_READLINE=1$:USE_READLINE=0:" \ + Makefile + fi +} + +src_compile() { + emake || die "compile failure" +} + +src_install() { + dodir /usr/bin /usr/share/man/man1 + dobin nomadii + newman nomadii.man nomadii.1 +} + +pkg_postinst() { + echo + einfo "To use nomadii, you need to have usbdevfs compiled in your kernel" + einfo "Look for: CONFIG_USB_DEVICEFS or Preliminary USB device filesystem" + echo + einfo "To use nomadii as a regular user, add the following to /etc/fstab" + einfo " usbdevfs /proc/bus/usb usbdevfs devmode=0660,devgid=85 0 0" + einfo "Remount it, then add the regular user to the usb group" + einfo " usermod -G usb " + echo +} -- 2.26.2