1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00

testing/xone-src: upgrade to 3.1 and update urls

This commit is contained in:
Struan Robertson 2025-06-21 02:27:29 +01:00 committed by mio
parent b90d0d8636
commit 0a884ff15e
2 changed files with 71 additions and 9 deletions

View file

@ -1,20 +1,21 @@
# Contributor: Umar Getagazov <umar@handlerug.me>
# Contributor: Struan Robertson <contact@struan.tech>
# Maintainer: Umar Getagazov <umar@handlerug.me>
pkgname=xone-src
_modname=${pkgname%-src}
pkgver=0.3_git20230517
pkgver=0.3.1
pkgrel=0
_gitrev=bbf0dcc484c3f5611f4e375da43e0e0ef08f3d18
pkgdesc="Linux kernel driver for Xbox One and Xbox Series X|S accessories (sources)"
url="https://github.com/medusalix/xone"
url="https://github.com/dlundqvist/xone"
arch="noarch"
license="GPL-2.0-or-later"
install="$pkgname.post-install"
provides="xone=$pkgver"
source="$_modname-$pkgver.tar.gz::https://github.com/medusalix/xone/archive/$_gitrev.tar.gz
modules-load.conf"
source="https://github.com/dlundqvist/xone/archive/v$pkgver/xone-v$pkgver.tar.gz
modules-load.conf
remove_redundant_if.patch"
options="!check" # no tests
builddir="$srcdir/$_modname-$_gitrev"
builddir="$srcdir/xone-$pkgver"
package() {
install -Dm644 "$srcdir"/modules-load.conf \
@ -24,7 +25,7 @@ package() {
install -Dm755 "$builddir"/install/firmware.sh \
"$pkgdir"/usr/bin/xone-get-firmware.sh
install -Dm644 "$builddir"/Kbuild "$pkgdir"/usr/src/$_modname-$pkgver/Kbuild
cp -r "$builddir"/bus "$builddir"/driver "$builddir"/transport \
cp -r "$builddir/auth" "$builddir"/bus "$builddir"/driver "$builddir"/transport \
"$pkgdir"/usr/src/$_modname-$pkgver/
cat >"$pkgdir"/usr/src/$_modname-$pkgver/AKMBUILD <<-EOF
@ -32,11 +33,12 @@ package() {
modver=$pkgver-r$pkgrel
built_modules="$_modname-wired.ko $_modname-dongle.ko $_modname-gip.ko "\\
"$_modname-gip-gamepad.ko $_modname-gip-headset.ko $_modname-gip-chatpad.ko "\\
"$_modname-gip-guitar.ko"
"$_modname-gip-madcatz-strat.ko $_modname-gip-madcatz-glam.ko $_modname-gip-pdp-jaguar.ko"
EOF
}
sha512sums="
78cd605a5d56c8230e8800dd43f9f423da52d896625242669480211a4105bbce3364669b742f678b6b48ecd3bc42ad2982d46fe0c6e99ec8e05b69a47c5c88ab xone-0.3_git20230517.tar.gz
1d693b2b883029698188d286f0a6042f7672ed2713f7d0a09c15a7d2b124183434b2013693f3be32555b502f347621af7441cc29dc8864ba4d05a95112b79514 xone-v0.3.1.tar.gz
838de6003c723dc3955986b9cde883cae6e29c90995798110f285b1b1b362116f9e3a065f541e8d5d132dc460d245b37ce7479e9189b63e5fe9adf0c5f37529f modules-load.conf
b7f6edd2c4aa65af85c92862ac3eba9d43378cdc3cb4ec80eae7f2f3666eb6b9f459e5af1f422056a91cdd1a782b0fc3ef0033db0b77687b6476b64b0f4213ec remove_redundant_if.patch
"

View file

@ -0,0 +1,60 @@
From e5863102bde02c729bf5bd176393b5ef583a2885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Paku=C5=82a?= <tomasz.pakula.oficjalny@gmail.com>
Date: Mon, 16 Jun 2025 21:00:50 +0200
Subject: [PATCH 1/2] Remove redundant if
---
transport/dongle.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/transport/dongle.c b/transport/dongle.c
index 1a24a54..0fc6824 100644
--- a/transport/dongle.c
+++ b/transport/dongle.c
@@ -887,15 +887,12 @@ static int xone_dongle_init(struct xone_dongle *dongle,
dev_dbg(dongle->mt.dev, "%s: trying to load firmware %s\n",
__func__, fwname);
err = request_firmware(&fw, fwname, mt->dev);
- if (err) {
- if (err == -ENOENT) {
- snprintf(fwname, 25, "xow_dongle.bin",
- id->idVendor, id->idProduct);
- dev_dbg(dongle->mt.dev, "%s: trying to load firmware %s\n",
- __func__, fwname);
- err = request_firmware(&fw, fwname, mt->dev);
-
- }
+ if (err == -ENOENT) {
+ snprintf(fwname, 25, "xow_dongle.bin",
+ id->idVendor, id->idProduct);
+ dev_dbg(dongle->mt.dev, "%s: trying to load firmware %s\n",
+ __func__, fwname);
+ err = request_firmware(&fw, fwname, mt->dev);
}
if (err) {
From dba5d3425eafef1a48454c4fc48cd639164f3148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Paku=C5=82a?= <tomasz.pakula.oficjalny@gmail.com>
Date: Mon, 16 Jun 2025 21:04:12 +0200
Subject: [PATCH 2/2] Fix warning: too many arguments for format
Seems like this was a copy-paste of snprintf form line 885.
---
transport/dongle.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/transport/dongle.c b/transport/dongle.c
index 0fc6824..a98858d 100644
--- a/transport/dongle.c
+++ b/transport/dongle.c
@@ -888,8 +888,7 @@ static int xone_dongle_init(struct xone_dongle *dongle,
__func__, fwname);
err = request_firmware(&fw, fwname, mt->dev);
if (err == -ENOENT) {
- snprintf(fwname, 25, "xow_dongle.bin",
- id->idVendor, id->idProduct);
+ snprintf(fwname, 15, "xow_dongle.bin");
dev_dbg(dongle->mt.dev, "%s: trying to load firmware %s\n",
__func__, fwname);
err = request_firmware(&fw, fwname, mt->dev);