From 41251a4f016b979b6a89f04a523166fe5af9a919 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Tue, 20 Mar 2018 15:40:27 -0700 Subject: [PATCH] bump(dev-libs/libusb-compat): sync with upstream --- .../dev-libs/libusb-compat/Manifest | 1 + .../libusb-compat/files/libusb-0.1-ansi.patch | 190 ++++++++++++++++++ .../libusb-compat-0.1.5-r2.ebuild | 52 +++++ .../libusb-compat-0.1.5-r3.ebuild | 56 ++++++ .../dev-libs/libusb-compat/metadata.xml | 19 ++ .../md5-cache/dev-libs/libusb-compat-0.1.5-r2 | 13 ++ .../md5-cache/dev-libs/libusb-compat-0.1.5-r3 | 13 ++ 7 files changed, 344 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/Manifest new file mode 100644 index 0000000000..ab3d9e661b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/Manifest @@ -0,0 +1 @@ +DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch new file mode 100644 index 0000000000..ba3436f6d7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch @@ -0,0 +1,190 @@ +diff --git a/libusb/usb.h b/libusb/usb.h +index b7af749..c9726ed 100644 +--- a/libusb/usb.h ++++ b/libusb/usb.h +@@ -27,8 +27,10 @@ + + #include + #include ++#include + #include + ++#include + #include + + /* +@@ -78,40 +80,40 @@ + + /* All standard descriptors have these 2 fields in common */ + struct usb_descriptor_header { +- u_int8_t bLength; +- u_int8_t bDescriptorType; ++ uint8_t bLength; ++ uint8_t bDescriptorType; + }; + + /* String descriptor */ + struct usb_string_descriptor { +- u_int8_t bLength; +- u_int8_t bDescriptorType; +- u_int16_t wData[1]; ++ uint8_t bLength; ++ uint8_t bDescriptorType; ++ uint16_t wData[1]; + }; + + /* HID descriptor */ + struct usb_hid_descriptor { +- u_int8_t bLength; +- u_int8_t bDescriptorType; +- u_int16_t bcdHID; +- u_int8_t bCountryCode; +- u_int8_t bNumDescriptors; +- /* u_int8_t bReportDescriptorType; */ +- /* u_int16_t wDescriptorLength; */ ++ uint8_t bLength; ++ uint8_t bDescriptorType; ++ uint16_t bcdHID; ++ uint8_t bCountryCode; ++ uint8_t bNumDescriptors; ++ /* uint8_t bReportDescriptorType; */ ++ /* uint16_t wDescriptorLength; */ + /* ... */ + }; + + /* Endpoint descriptor */ + #define USB_MAXENDPOINTS 32 + struct usb_endpoint_descriptor { +- u_int8_t bLength; +- u_int8_t bDescriptorType; +- u_int8_t bEndpointAddress; +- u_int8_t bmAttributes; +- u_int16_t wMaxPacketSize; +- u_int8_t bInterval; +- u_int8_t bRefresh; +- u_int8_t bSynchAddress; ++ uint8_t bLength; ++ uint8_t bDescriptorType; ++ uint8_t bEndpointAddress; ++ uint8_t bmAttributes; ++ uint16_t wMaxPacketSize; ++ uint8_t bInterval; ++ uint8_t bRefresh; ++ uint8_t bSynchAddress; + + unsigned char *extra; /* Extra descriptors */ + int extralen; +@@ -129,15 +131,15 @@ struct usb_endpoint_descriptor { + /* Interface descriptor */ + #define USB_MAXINTERFACES 32 + struct usb_interface_descriptor { +- u_int8_t bLength; +- u_int8_t bDescriptorType; +- u_int8_t bInterfaceNumber; +- u_int8_t bAlternateSetting; +- u_int8_t bNumEndpoints; +- u_int8_t bInterfaceClass; +- u_int8_t bInterfaceSubClass; +- u_int8_t bInterfaceProtocol; +- u_int8_t iInterface; ++ uint8_t bLength; ++ uint8_t bDescriptorType; ++ uint8_t bInterfaceNumber; ++ uint8_t bAlternateSetting; ++ uint8_t bNumEndpoints; ++ uint8_t bInterfaceClass; ++ uint8_t bInterfaceSubClass; ++ uint8_t bInterfaceProtocol; ++ uint8_t iInterface; + + struct usb_endpoint_descriptor *endpoint; + +@@ -155,14 +157,14 @@ struct usb_interface { + /* Configuration descriptor information.. */ + #define USB_MAXCONFIG 8 + struct usb_config_descriptor { +- u_int8_t bLength; +- u_int8_t bDescriptorType; +- u_int16_t wTotalLength; +- u_int8_t bNumInterfaces; +- u_int8_t bConfigurationValue; +- u_int8_t iConfiguration; +- u_int8_t bmAttributes; +- u_int8_t MaxPower; ++ uint8_t bLength; ++ uint8_t bDescriptorType; ++ uint16_t wTotalLength; ++ uint8_t bNumInterfaces; ++ uint8_t bConfigurationValue; ++ uint8_t iConfiguration; ++ uint8_t bmAttributes; ++ uint8_t MaxPower; + + struct usb_interface *interface; + +@@ -172,28 +174,28 @@ struct usb_config_descriptor { + + /* Device descriptor */ + struct usb_device_descriptor { +- u_int8_t bLength; +- u_int8_t bDescriptorType; +- u_int16_t bcdUSB; +- u_int8_t bDeviceClass; +- u_int8_t bDeviceSubClass; +- u_int8_t bDeviceProtocol; +- u_int8_t bMaxPacketSize0; +- u_int16_t idVendor; +- u_int16_t idProduct; +- u_int16_t bcdDevice; +- u_int8_t iManufacturer; +- u_int8_t iProduct; +- u_int8_t iSerialNumber; +- u_int8_t bNumConfigurations; ++ uint8_t bLength; ++ uint8_t bDescriptorType; ++ uint16_t bcdUSB; ++ uint8_t bDeviceClass; ++ uint8_t bDeviceSubClass; ++ uint8_t bDeviceProtocol; ++ uint8_t bMaxPacketSize0; ++ uint16_t idVendor; ++ uint16_t idProduct; ++ uint16_t bcdDevice; ++ uint8_t iManufacturer; ++ uint8_t iProduct; ++ uint8_t iSerialNumber; ++ uint8_t bNumConfigurations; + }; + + struct usb_ctrl_setup { +- u_int8_t bRequestType; +- u_int8_t bRequest; +- u_int16_t wValue; +- u_int16_t wIndex; +- u_int16_t wLength; ++ uint8_t bRequestType; ++ uint8_t bRequest; ++ uint16_t wValue; ++ uint16_t wIndex; ++ uint16_t wLength; + }; + + /* +@@ -254,7 +256,7 @@ struct usb_device { + + void *dev; /* Darwin support */ + +- u_int8_t devnum; ++ uint8_t devnum; + + unsigned char num_children; + struct usb_device **children; +@@ -266,7 +268,7 @@ struct usb_bus { + char dirname[PATH_MAX + 1]; + + struct usb_device *devices; +- u_int32_t location; ++ uint32_t location; + + struct usb_device *root_dev; + }; diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild new file mode 100644 index 0000000000..cdb691d5ac --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils toolchain-funcs multilib-minimal + +DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)" +HOMEPAGE="http://libusb.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug examples static-libs" + +RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] + !dev-libs/libusb:0 + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS="AUTHORS ChangeLog NEWS README" + +src_prepare() { + epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + $(use_enable debug debug-log) +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + gen_usr_ldscript -a usb +} + +multilib_src_install_all() { + prune_libtool_files + einstalldocs + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/*.c + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild new file mode 100644 index 0000000000..0fb988759d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils toolchain-funcs multilib-minimal + +DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)" +HOMEPAGE="http://libusb.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug examples static-libs" + +RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] + !dev-libs/libusb:0 + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS="AUTHORS ChangeLog NEWS README" + +src_prepare() { + epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch +} + +MULTILIB_CHOST_TOOLS=( + /usr/bin/libusb-config +) + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + $(use_enable debug debug-log) +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + gen_usr_ldscript -a usb +} + +multilib_src_install_all() { + prune_libtool_files + einstalldocs + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/*.c + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/metadata.xml new file mode 100644 index 0000000000..66a6901dc0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libusb-compat/metadata.xml @@ -0,0 +1,19 @@ + + + + + peter@stuge.se + Peter Stuge + + + base-system@gentoo.org + Gentoo Base System + + + proxy-maint@gentoo.org + Proxy Maintainers + + + libusb + + diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2 new file mode 100644 index 0000000000..8df65c5a90 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) virtual/pkgconfig +DESCRIPTION=Userspace access to USB devices (libusb-0.1 compat wrapper) +EAPI=5 +HOMEPAGE=http://libusb.sourceforge.net/ +IUSE=debug examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +LICENSE=LGPL-2.1 +RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) +SLOT=0 +SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2 +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=519d5e7d015f84df2f5fc93c7817df68 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3 new file mode 100644 index 0000000000..3a27909bb2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) virtual/pkgconfig +DESCRIPTION=Userspace access to USB devices (libusb-0.1 compat wrapper) +EAPI=5 +HOMEPAGE=http://libusb.sourceforge.net/ +IUSE=debug examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +LICENSE=LGPL-2.1 +RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) +SLOT=0 +SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2 +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=42846d069d9753389f5ea4e328e9364f