mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 00:46:58 +02:00
feat(dev-libs/libusb) remove as portage-stable has newer versions
This commit is contained in:
Greg Kroah-Hartman
parent
52b4d3e02c
commit
a89d45253d
@ -1 +0,0 @@
|
||||
DIST libusb-0.1.12.tar.gz 389343 SHA256 37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44 SHA512 08c10e899f93b5f8567d1a1e1ed87dd5631ad0a1463975404709c1d165e545e340afb474a66788efcfdd8193542e2a2eb9cf133f55cbbf76441244191d0bb825 WHIRLPOOL 1991590fd971229d4cb809ff3cd1844243edffd0500a710019836683f291b7187756409c137c8a5bbdc908f90ff5a06c4a1923a77ee04c56988fcb5d68433245
|
||||
@ -1,97 +0,0 @@
|
||||
Index: libusb-0.1.12/configure.in
|
||||
===================================================================
|
||||
--- libusb-0.1.12.orig/configure.in
|
||||
+++ libusb-0.1.12/configure.in
|
||||
@@ -90,6 +90,8 @@ LINUX_API=0
|
||||
DARWIN_API=0
|
||||
BSD_API=0
|
||||
|
||||
+DEFINE_USB_HID_DESCRIPTOR=1
|
||||
+
|
||||
AC_MSG_CHECKING(for what USB OS support)
|
||||
case $host in
|
||||
*-linux*)
|
||||
@@ -101,13 +103,40 @@ case $host in
|
||||
AC_MSG_RESULT(Linux)
|
||||
OSLIBS=""
|
||||
;;
|
||||
- *-freebsd*|*-kfreebsd*-gnu|*-openbsd*|*-netbsd*)
|
||||
+ *-freebsd*)
|
||||
+ AC_DEFINE(BSD_API, 1)
|
||||
+ AC_DEFINE(LINUX_API, 0)
|
||||
+ AC_DEFINE(DARWIN_API, 0)
|
||||
+ BSD_API=1
|
||||
+ os_support=bsd
|
||||
+ AC_MSG_RESULT(FreeBSD)
|
||||
+ OSLIBS=""
|
||||
+ AC_CHECK_HEADERS([dev/usb/usbhid.h])
|
||||
+ if test "x$ac_cv_header_dev_usb_hisbhid_h" = "xyes"; then
|
||||
+ AC_MSG_CHECKING([for usb_hid_descriptor])
|
||||
+ have_usb_hid_descriptor=no
|
||||
+ AC_TRY_COMPILE([
|
||||
+ #include <sys/types.h>
|
||||
+ #include <dev/usb/usb.h>
|
||||
+ #include <dev/usb/usbhid.h>
|
||||
+ ], [
|
||||
+ struct usb_hid_descriptor descr;
|
||||
+ ], [
|
||||
+ have_usb_hid_descriptor=yes
|
||||
+ ])
|
||||
+ AC_MSG_RESULT([$have_usb_hid_descriptor])
|
||||
+ if test "x$have_usb_hid_descriptor" = "xyes"; then
|
||||
+ DEFINE_USB_HID_DESCRIPTOR=0
|
||||
+ fi
|
||||
+ fi
|
||||
+ ;;
|
||||
+ *-dragonfly*|*-kfreebsd*-gnu|*-openbsd*|*-netbsd*)
|
||||
AC_DEFINE(BSD_API, 1)
|
||||
AC_DEFINE(LINUX_API, 0)
|
||||
AC_DEFINE(DARWIN_API, 0)
|
||||
BSD_API=1
|
||||
os_support=bsd
|
||||
- AC_MSG_RESULT(FreeBSD, OpenBSD and/or NetBSD)
|
||||
+ AC_MSG_RESULT(DragonFly, OpenBSD and/or NetBSD)
|
||||
OSLIBS=""
|
||||
;;
|
||||
*-darwin*)
|
||||
@@ -128,6 +157,7 @@ esac
|
||||
AC_SUBST(DARWIN_API)
|
||||
AC_SUBST(LINUX_API)
|
||||
AC_SUBST(BSD_API)
|
||||
+AC_SUBST(DEFINE_USB_HID_DESCRIPTOR)
|
||||
|
||||
AM_CONDITIONAL(LINUX_API, test "$os_support" = "linux")
|
||||
AM_CONDITIONAL(BSD_API, test "$os_support" = "bsd")
|
||||
Index: libusb-0.1.12/usb.h.in
|
||||
===================================================================
|
||||
--- libusb-0.1.12.orig/usb.h.in
|
||||
+++ libusb-0.1.12/usb.h.in
|
||||
@@ -17,6 +17,12 @@
|
||||
|
||||
#include <dirent.h>
|
||||
|
||||
+#if ! @DEFINE_USB_HID_DESCRIPTOR@ && defined(__FreeBSD__)
|
||||
+#include <sys/types.h>
|
||||
+#include <dev/usb/usb.h>
|
||||
+#include <dev/usb/usbhid.h>
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* USB spec information
|
||||
*
|
||||
@@ -75,6 +81,7 @@ struct usb_string_descriptor {
|
||||
u_int16_t wData[1];
|
||||
};
|
||||
|
||||
+#if ! @DEFINE_USB_HID_DESCRIPTOR@ && defined(__FreeBSD__)
|
||||
/* HID descriptor */
|
||||
struct usb_hid_descriptor {
|
||||
u_int8_t bLength;
|
||||
@@ -86,6 +93,7 @@ struct usb_hid_descriptor {
|
||||
/* u_int16_t wDescriptorLength; */
|
||||
/* ... */
|
||||
};
|
||||
+#endif
|
||||
|
||||
/* Endpoint descriptor */
|
||||
#define USB_MAXENDPOINTS 32
|
||||
@ -1,24 +0,0 @@
|
||||
Patch-from: http://bugs.gentoo.org/show_bug.cgi?id=225879
|
||||
Gentoo-Bug: 225879
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
|
||||
Prevents an infinite loop if device is removed during usb_bulk_read or
|
||||
usb_bulk_write.
|
||||
|
||||
diff -Naur libusb-0.1.12/linux.c libusb-0.1.12-new/linux.c
|
||||
--- libusb-0.1.12/linux.c 2006-03-04 04:52:46.000000000 +0200
|
||||
+++ libusb-0.1.12-new/linux.c 2008-06-11 14:22:20.000000000 +0300
|
||||
@@ -220,6 +220,13 @@
|
||||
waiting = 1;
|
||||
context = NULL;
|
||||
while (!urb.usercontext && ((ret = ioctl(dev->fd, IOCTL_USB_REAPURBNDELAY, &context)) == -1) && waiting) {
|
||||
+ if (ret == -1)
|
||||
+ {
|
||||
+ if (errno == ENODEV)
|
||||
+ {
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+ }
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 1000; // 1 msec
|
||||
select(dev->fd + 1, NULL, &writefds, NULL, &tv); //sub second wait
|
||||
@ -1,20 +0,0 @@
|
||||
--- libusb-0.1.12/Makefile.am 2006-03-04 13:52:46.000000000 +1100
|
||||
+++ libusb-0.1.12/Makefile.am.new 2007-11-08 16:25:38.000000000 +1100
|
||||
@@ -4,7 +4,7 @@
|
||||
# gnu strictness chokes on README being autogenerated
|
||||
AUTOMAKE_OPTIONS = 1.4 foreign
|
||||
|
||||
-SUBDIRS = . tests doc
|
||||
+SUBDIRS = . doc
|
||||
|
||||
AM_CFLAGS = -Werror
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png libusb.pc.in
|
||||
EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c
|
||||
|
||||
-lib_LTLIBRARIES = libusb.la libusbpp.la
|
||||
+lib_LTLIBRARIES = libusb.la
|
||||
|
||||
pkgconfig_DATA = libusb.pc
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r5.ebuild,v 1.9 2009/06/01 00:00:46 ranger Exp $
|
||||
|
||||
inherit eutils libtool autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Userspace access to USB devices"
|
||||
HOMEPAGE="http://libusb.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/libusb/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE="debug doc nocxx"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="!dev-libs/libusb-compat"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-text/openjade
|
||||
app-text/docbook-dsssl-stylesheets
|
||||
app-text/docbook-sgml-utils
|
||||
~app-text/docbook-sgml-dtd-4.2 )"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
sed -i -e 's:-Werror::' Makefile.am
|
||||
sed -i 's:AC_LANG_CPLUSPLUS:AC_PROG_CXX:' configure.in #213800
|
||||
epatch "${FILESDIR}"/${PV}-fbsd.patch
|
||||
use nocxx && epatch "${FILESDIR}"/${PN}-0.1.12-nocpp.patch
|
||||
epatch "${FILESDIR}"/${PN}-0.1.12-no-infinite-bulk.patch
|
||||
eautoreconf
|
||||
elibtoolize
|
||||
|
||||
# Ensure that the documentation actually finds the DTD it needs
|
||||
docbookdtd="/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd"
|
||||
sysid='"-//OASIS//DTD DocBook V4.2//EN"'
|
||||
sed -r -i -e \
|
||||
"s,(${sysid}) \[\$,\1 \"${docbookdtd}\" \[,g" \
|
||||
"${S}"/doc/manual.sgml
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf \
|
||||
$(use_enable debug debug all) \
|
||||
$(use_enable doc build-docs)
|
||||
emake || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -j1 DESTDIR="${D}" install || die "make install failed"
|
||||
dodoc AUTHORS NEWS README
|
||||
use doc && dohtml doc/html/*.html
|
||||
|
||||
use nocxx && rm -f "${D}"/usr/include/usbpp.h
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r5.ebuild,v 1.9 2009/06/01 00:00:46 ranger Exp $
|
||||
|
||||
inherit eutils libtool autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Userspace access to USB devices"
|
||||
HOMEPAGE="http://libusb.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/libusb/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE="debug doc nocxx"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="!dev-libs/libusb-compat"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-text/openjade
|
||||
app-text/docbook-dsssl-stylesheets
|
||||
app-text/docbook-sgml-utils
|
||||
~app-text/docbook-sgml-dtd-4.2 )"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
sed -i -e 's:-Werror::' Makefile.am
|
||||
sed -i 's:AC_LANG_CPLUSPLUS:AC_PROG_CXX:' configure.in #213800
|
||||
epatch "${FILESDIR}"/${PV}-fbsd.patch
|
||||
use nocxx && epatch "${FILESDIR}"/${PN}-0.1.12-nocpp.patch
|
||||
epatch "${FILESDIR}"/${PN}-0.1.12-no-infinite-bulk.patch
|
||||
eautoreconf
|
||||
elibtoolize
|
||||
|
||||
# Ensure that the documentation actually finds the DTD it needs
|
||||
docbookdtd="/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd"
|
||||
sysid='"-//OASIS//DTD DocBook V4.2//EN"'
|
||||
sed -r -i -e \
|
||||
"s,(${sysid}) \[\$,\1 \"${docbookdtd}\" \[,g" \
|
||||
"${S}"/doc/manual.sgml
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf \
|
||||
$(use_enable debug debug all) \
|
||||
$(use_enable doc build-docs)
|
||||
emake || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -j1 DESTDIR="${D}" install || die "make install failed"
|
||||
dodoc AUTHORS NEWS README
|
||||
use doc && dohtml doc/html/*.html
|
||||
|
||||
use nocxx && rm -f "${D}"/usr/include/usbpp.h
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user