summaryrefslogtreecommitdiff
path: root/dev-libs/libusb
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/libusb')
-rw-r--r--dev-libs/libusb/Manifest8
-rw-r--r--dev-libs/libusb/files/libusb-1.0.24-multi_device_config_parsing.patch65
-rw-r--r--dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch32
-rw-r--r--dev-libs/libusb/libusb-1.0.24-r2.ebuild76
-rw-r--r--dev-libs/libusb/libusb-1.0.25.ebuild78
-rw-r--r--dev-libs/libusb/libusb-1.0.26.ebuild2
6 files changed, 2 insertions, 259 deletions
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 5474c9feb858..bf615589ff0e 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,9 +1,3 @@
-AUX libusb-1.0.24-multi_device_config_parsing.patch 2340 BLAKE2B 28e8f3916843599e3b2f03228d2366de29a9332fc0a147e32c61f8944bb0f77fe1b57b3f323f161bafd00f5ef8434c33afeb5c89ad4a0d658b54daf2ba5dc541 SHA512 78af84f9dc33589f89e6f97d5aa81ec11208dc65c3bd8b8c947837d0f70d68e5313ce3a68853d4d6cc8af4cc2f237b5c95ac2db563f0013652f88479dbcfdd68
-AUX libusb-1.0.25-fix-O3-warning.patch 1156 BLAKE2B 8bb4a8fd0edf73036439511c78c69ea9a022e01a1f1c6faa7963624faa1e59848ad91b0163d9c3b601eb31ec0251bcbb79e7e0ca64c7a35d66b8abe4b39ab98a SHA512 0547d439f9bf30b47df97227f03e9504a3b53b9a859505ebe17443380b923770812e684f76161cf1f3425af25502dbf8393c312ee7f3a6206f5a808b9bff2cdb
-DIST libusb-1.0.24.tar.bz2 606593 BLAKE2B f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018 SHA512 5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc
-DIST libusb-1.0.25.tar.bz2 609127 BLAKE2B 3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b SHA512 f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d
DIST libusb-1.0.26.tar.bz2 620534 BLAKE2B 0cc397ecf4de0066abbff9b286a9e4fcd48658698d5e0d6b736abf56b48c1b55a05f15fff7be53fd33f767621e0c25d87275a47e05a4bcb44c4b8ac9221cd081 SHA512 fcdb85c98f21639668693c2fd522814d440972d65883984c4ae53d0555bdbdb7e8c7a32199cd4b01113556a1eb5be7841b750cc73c9f6bda79bfe1af80914e71
-EBUILD libusb-1.0.24-r2.ebuild 1772 BLAKE2B 8ce1e44dc5838e83968a70c5a165468eb39bdccf1f818a8604fc0efacd8d1f0dbbeb222f65d3e4416ae988c7b327acfc46b060ba02bd580c418b897ec8f1b87b SHA512 0e851aac8a4012a6d89acb2f797ebc462f00c0c6b1dd9f1a673ade1a056ea802d2dc6204e83d20b606b0366f9562d7be0f5960240945e5acbe911232fbcda2c6
-EBUILD libusb-1.0.25.ebuild 1742 BLAKE2B 4b8b8529f03c7027d20549ffb8ff4b3380fe295ca6a915f9fe5ebea8faca1a3a865a3b7453650dea22a2c24faf0e28f892288cc1f6ff6c54edf0e9fcfa6a1be8 SHA512 8f6b87c28fc05e17be1877087e0fbf4bb5e6faec1f0c49b1c31dde56259b4159da6b802ab3ad86ffbcc69ea334b4c2af9667ef722f127211cea16d1d9e4aa249
-EBUILD libusb-1.0.26.ebuild 1695 BLAKE2B c2c6349651ed98682b8da2abf235fe6d7cf39f334246c77d7abc55b1f077b2a48ca1539cd8e3a687399da2947b5cc393cbb9ef72fe7451980abfb8162a97e5fb SHA512 84162738422fa2d6889e69861cfa4d6a64852660d6300c430f4b2777db52225135cf8f72495b134b826154d2f513cdfec4505b559d0beaf240fb14e5a0036871
+EBUILD libusb-1.0.26.ebuild 1687 BLAKE2B 87bb2999ce468e553d4e6e40027ece6eaf61313ab395e1448736b4dac2183df05dc2ae79cedba5540df5eee2c60d94995d03dca4c73772607c42d33680779911 SHA512 125e80cc6bb77c05c8b0b56d36c30c81d366173e1da3bd684c9035e2d2a068ccf1c144f09e998b8cc08f887ad65b132a79c3c61b8ee90ba96c53de8523ef0fda
MISC metadata.xml 336 BLAKE2B 8598a5e3d01ee5d7efb7ef2d48fcde99c13ee9e5915d3fe4fb2b16689482dfb31ea23d27d75e638aa7e429f725b876e834f3319eccc188f4af6704d3fed14c4f SHA512 8bfb8a1c4a2185393c1cc00b6ba17a9e04276e7708ab5c590209eb7c522212c8b45981dd935ef15421f5865ac7861c5dadfbc7d8f53ab4a42b3f0315696b3713
diff --git a/dev-libs/libusb/files/libusb-1.0.24-multi_device_config_parsing.patch b/dev-libs/libusb/files/libusb-1.0.24-multi_device_config_parsing.patch
deleted file mode 100644
index 739d41c404a7..000000000000
--- a/dev-libs/libusb/files/libusb-1.0.24-multi_device_config_parsing.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f6d2cb561402c3b6d3627c0eb89e009b503d9067 Mon Sep 17 00:00:00 2001
-From: Chris Dickens <christopher.a.dickens@gmail.com>
-Date: Sun, 13 Dec 2020 15:49:19 -0800
-Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for
- multi-configuration devices
-
-Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device
-initialization") introduced a regression for devices with multiple
-configurations. The logic that verifies the reported length of the
-configuration descriptors failed to count the length of the
-configuration descriptor itself and would truncate the actual length by
-9 bytes, leading to a parsing error for subsequent descriptors.
-
-Closes #825
-
-Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
----
- libusb/os/linux_usbfs.c | 12 ++++++++----
- libusb/version_nano.h | 2 +-
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
-index fb2ed53a..4d2dc8d6 100644
---- a/libusb/os/linux_usbfs.c
-+++ b/libusb/os/linux_usbfs.c
-@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx,
- uint8_t *buffer, size_t len)
- {
- struct usbi_descriptor_header *header;
-- int offset = 0;
-+ int offset;
-+
-+ /* Start seeking past the config descriptor */
-+ offset = LIBUSB_DT_CONFIG_SIZE;
-+ buffer += LIBUSB_DT_CONFIG_SIZE;
-+ len -= LIBUSB_DT_CONFIG_SIZE;
-
- while (len > 0) {
- if (len < 2) {
-@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
- }
-
- if (priv->sysfs_dir) {
-- /*
-+ /*
- * In sysfs wTotalLength is ignored, instead the kernel returns a
- * config descriptor with verified bLength fields, with descriptors
- * with an invalid bLength removed.
-@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev)
- int offset;
-
- if (num_configs > 1 && idx < num_configs - 1) {
-- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
-- remaining - LIBUSB_DT_CONFIG_SIZE);
-+ offset = seek_to_next_config(ctx, buffer, remaining);
- if (offset < 0)
- return offset;
- sysfs_config_len = (uint16_t)offset;
-diff --git a/libusb/version_nano.h b/libusb/version_nano.h
-index 61a0a700..578b0979 100644
---- a/libusb/version_nano.h
-+++ b/libusb/version_nano.h
-@@ -1 +1 @@
--#define LIBUSB_NANO 11584
-+#define LIBUSB_NANO 11586
diff --git a/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch b/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch
deleted file mode 100644
index 7270b057d172..000000000000
--- a/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/libusb/libusb/pull/1062
-https://github.com/libusb/libusb/issues/1063
-https://bugs.gentoo.org/832732
-
-From 8bb81fe72286cdcb782c7af4f0d7ef715b2e137c Mon Sep 17 00:00:00 2001
-From: Yegor Yefremov <yegorslists@googlemail.com>
-Date: Sun, 6 Feb 2022 07:12:14 +0100
-Subject: [PATCH] linux_usbfs: fix maybe-uninitialized error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Initialize active_config to an invalid value to avoid the following
-compilation error:
-
-os/linux_usbfs.c: In function ‘op_get_configuration’:
-os/linux_usbfs.c:1452:12: error: ‘active_config’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
- 1452 | *config = (uint8_t)active_config;
-
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---- a/libusb/os/linux_usbfs.c
-+++ b/libusb/os/linux_usbfs.c
-@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle,
- uint8_t *config)
- {
- struct linux_device_priv *priv = usbi_get_device_priv(handle->dev);
-- int active_config;
-+ int active_config = -1; /* to please compiler */
- int r;
-
- if (priv->sysfs_dir) {
-
diff --git a/dev-libs/libusb/libusb-1.0.24-r2.ebuild b/dev-libs/libusb/libusb-1.0.24-r2.ebuild
deleted file mode 100644
index c13d355add9e..000000000000
--- a/dev-libs/libusb/libusb-1.0.24-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Userspace access to USB devices"
-HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc examples static-libs test udev"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="static-libs? ( !udev )"
-
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- !udev? ( virtual/os-headers )"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${P}-multi_device_config_parsing.patch" #759814
-)
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable udev)
- $(use_enable debug debug-log)
- $(use_enable test tests-build)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi; then
- use doc && emake -C doc
- fi
-}
-
-multilib_src_test() {
- emake check
-
- # noinst_PROGRAMS from tests/Makefile.am
- if [[ -e /dev/bus/usb ]]; then
- tests/stress || die
- else
- # https://bugs.gentoo.org/824266
- ewarn "/dev/bus/usb does not exist, skipping stress test"
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi; then
- gen_usr_ldscript -a usb-1.0
-
- use doc && dodoc -r doc/api-1.0
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-
- dodoc AUTHORS ChangeLog NEWS PORTING README TODO
-
- if use examples; then
- docinto examples
- dodoc examples/*.{c,h}
- fi
-}
diff --git a/dev-libs/libusb/libusb-1.0.25.ebuild b/dev-libs/libusb/libusb-1.0.25.ebuild
deleted file mode 100644
index 71c8364d0b70..000000000000
--- a/dev-libs/libusb/libusb-1.0.25.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Userspace access to USB devices"
-HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc examples static-libs test udev"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="static-libs? ( !udev )"
-
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- !udev? ( virtual/os-headers )"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-O3-warning.patch
-)
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable udev)
- $(use_enable debug debug-log)
- $(use_enable test tests-build)
- )
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi; then
- use doc && emake -C doc
- fi
-}
-
-multilib_src_test() {
- emake check
-
- # noinst_PROGRAMS from tests/Makefile.am
- if [[ -e /dev/bus/usb ]]; then
- tests/stress || die
- else
- # bug #824266
- ewarn "/dev/bus/usb does not exist, skipping stress test"
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi; then
- gen_usr_ldscript -a usb-1.0
-
- use doc && dodoc -r doc/api-1.0
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-
- dodoc AUTHORS ChangeLog NEWS PORTING README TODO
-
- if use examples; then
- docinto examples
- dodoc examples/*.{c,h}
- fi
-}
diff --git a/dev-libs/libusb/libusb-1.0.26.ebuild b/dev-libs/libusb/libusb-1.0.26.ebuild
index 62e5552d1cf3..7fdc7c660181 100644
--- a/dev-libs/libusb/libusb-1.0.26.ebuild
+++ b/dev-libs/libusb/libusb-1.0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug doc examples static-libs test udev"
RESTRICT="!test? ( test )"
REQUIRED_USE="static-libs? ( !udev )"
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 08:56:27 +0000