From 9f4a8ede71136814c196069168c72e6e2f76226d Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 22 Oct 2024 19:47:48 -0700 Subject: [PATCH] Switch joycond to git snapshot, pull in some patches (#2296) (#2299) (cherry picked from commit 36c9358d44a1ac0e8cd893c3f248ac4e85ecf89c) Co-authored-by: Cappy Ishihara --- anda/games/joycond/joycond.spec | 16 +++++++++------- anda/games/joycond/update.rhai | 1 - 2 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 anda/games/joycond/update.rhai diff --git a/anda/games/joycond/joycond.spec b/anda/games/joycond/joycond.spec index 55ee73d98c..41bce51cca 100644 --- a/anda/games/joycond/joycond.spec +++ b/anda/games/joycond/joycond.spec @@ -1,11 +1,15 @@ +%global commit 9d1f5098b716681d087cca695ad714218a18d4e8 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date %(date '+%Y%m%d') Name: joycond -Version: 0.1.0 +Version: %{commit_date}.git~%{shortcommit} Release: 1%?dist Summary: Userspace daemon to combine joy-cons from the hid-nintendo kernel driver License: GPL-3.0-or-later URL: https://github.com/DanielOgorchock/joycond -Source0: %url/archive/refs/tags/v%version.tar.gz -Packager: madonuko +Source0: %url/archive/%{commit}/%{commit}.tar.gz#/%{name}-%{commit_date}.git~%{shortcommit}.tar.gz +Patch0: https://github.com/terrapkg/pkg-joycond/raw/refs/heads/main/0001-Revert-virt_ctrlr_passthrough-send-uevent-change-eve.patch +Packager: Cappy Ishihara BuildRequires: libevdev-devel libudev-devel BuildRequires: cmake make systemd-rpm-macros gcc-c++ @@ -14,16 +18,14 @@ joycond is a linux daemon which uses the evdev devices provided by hid-nintendo (formerly known as hid-joycon) to implement joycon pairing. %prep -%autosetup +%autosetup -n %{name}-%{commit} -p1 %build %cmake . %cmake_build %install -cd redhat-linux-build/ -cp joycond .. -%make_install +%cmake_install mkdir -p %buildroot%_unitdir %buildroot%_prefix mv %buildroot%_sysconfdir/systemd/system/joycond.service %buildroot%_unitdir/joycond.service diff --git a/anda/games/joycond/update.rhai b/anda/games/joycond/update.rhai deleted file mode 100644 index 9f93983624..0000000000 --- a/anda/games/joycond/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("DanielOgorchock/joycond"));