From: skmpz <skmpz@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libusb: update to 1.0.25.
Date: Sat, 05 Feb 2022 15:41:25 +0100 [thread overview]
Message-ID: <20220205144125.S7ngvQ2hHkihyy3wYTxOFEyKqix_dTm0aHqRhfS8lHM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35415@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]
There is an updated pull request by skmpz against master on the void-packages repository
https://github.com/skmpz/void-packages libusb-1.0.25
https://github.com/void-linux/void-packages/pull/35415
libusb: update to 1.0.25.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35415.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libusb-1.0.25-35415.patch --]
[-- Type: text/x-diff, Size: 3655 bytes --]
From 67b89ec87ace90c918994964aa7281f74021ced1 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 5 Feb 2022 10:01:27 +0400
Subject: [PATCH] libusb: update to 1.0.25.
---
.../patches/fix-descriptor-parsing.patch | 35 -------------------
.../libusb/patches/portability-fixes.patch | 16 ---------
srcpkgs/libusb/template | 9 ++---
3 files changed, 5 insertions(+), 55 deletions(-)
delete mode 100644 srcpkgs/libusb/patches/fix-descriptor-parsing.patch
delete mode 100644 srcpkgs/libusb/patches/portability-fixes.patch
diff --git a/srcpkgs/libusb/patches/fix-descriptor-parsing.patch b/srcpkgs/libusb/patches/fix-descriptor-parsing.patch
deleted file mode 100644
index b891a79ba5fa..000000000000
--- a/srcpkgs/libusb/patches/fix-descriptor-parsing.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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/srcpkgs/libusb/patches/portability-fixes.patch b/srcpkgs/libusb/patches/portability-fixes.patch
deleted file mode 100644
index 39ff1e37722f..000000000000
--- a/srcpkgs/libusb/patches/portability-fixes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/libusb/io.c 2014-01-11 16:34:55.811463881 +0100
-+++ b/libusb/io.c 2014-01-11 16:35:26.138281377 +0100
-@@ -34,6 +34,13 @@
- #include <sys/timerfd.h>
- #endif
-
-+#ifndef TIMESPEC_TO_TIMEVAL
-+#define TIMESPEC_TO_TIMEVAL(tv, ts) { \
-+ (tv)->tv_sec = (ts)->tv_sec; \
-+ (tv)->tv_usec = (ts)->tv_nsec / 1000; \
-+}
-+#endif
-+
- #include "libusbi.h"
-
- /**
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 8c5ff6054eed..7b63b401f2a6 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,16 +1,17 @@
# Template file for 'libusb'
pkgname=libusb
-version=1.0.24
-revision=2
+version=1.0.25
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="eudev-libudev-devel"
short_desc="Library which allows userspace access to USB devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://libusb.info"
+changelog="https://raw.githubusercontent.com/libusb/libusb/master/ChangeLog"
distfiles="https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2"
-checksum=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
+checksum=8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849
libusb-devel_package() {
short_desc+=" - development files"
next prev parent reply other threads:[~2022-02-05 14:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-05 6:02 [PR PATCH] " skmpz
2022-02-05 14:36 ` [PR REVIEW] " paper42
2022-02-05 14:41 ` skmpz [this message]
2022-02-05 14:42 ` skmpz
2022-02-05 14:47 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220205144125.S7ngvQ2hHkihyy3wYTxOFEyKqix_dTm0aHqRhfS8lHM@z \
--to=skmpz@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).