commit:     b089271d263ab38925cc448ea7b2c674f616017e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 20:10:38 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat May 21 20:26:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b089271d

games-util/joystick: add 1.8.1

Reworked ebuild a bit and removed USE=udev which only exists because
jscal-* scripts use udevadm (rules installed either way), but it's tiny
scripts that will themselves warn that they need udev if used.

Upstream also fixed clang issues wrt bug #830626

Closes: https://bugs.gentoo.org/830626
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-util/joystick/Manifest                       |  1 +
 .../files/joystick-1.8.1-optional-ffmvforce.patch  | 22 +++++++++++
 games-util/joystick/joystick-1.8.1.ebuild          | 46 ++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 8eff0bee1478..e8f84bd806b1 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1 +1,2 @@
 DIST linuxconsoletools-1.7.1.tar.bz2 53153 BLAKE2B 
e05d04454fefdd4009d0c75f1caf2e6675a8e5f494f6f2f491f4de3c57101a6323b4de5795fccb9fd6a557a1e7bf4befa312661b022ed0503da83ac4dd3ab7c5
 SHA512 
2ba97e6c5b57aa5d6b08369bae050256f4d039f5b8479ad03cef4a7c43bf772db312de54d9e70a8a92c9ed7933b524715f1ce5448ccf508e6ffe8646a9dbd349
+DIST linuxconsoletools-1.8.1.tar.bz2 53715 BLAKE2B 
a0fab44762d9f4edcc1e85037efada2dac617873548579a83c3e7791e5a047e1c88243978fee562992f363102a0cb415c75d1286a3eb46a42dfe6afc7e9a0594
 SHA512 
407fcba552a3e45c60fb4f08217fe17106bedd6fde2fbce84aa6f4fa68ffc032f1683c6154f79daacaf1dcaf484fe943dd7391e787f0290d5bf42c7089c7c20c

diff --git a/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch 
b/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch
new file mode 100644
index 000000000000..62f85aea6054
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch
@@ -0,0 +1,22 @@
+Keep ffmvforce separately optional given it's the only one
+with an additional dependency (sdl)
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -31,3 +31,6 @@
+ ifndef DISABLE_FORCEFEEDBACK
+-MANPAGES      += fftest.1 ffmvforce.1 ffset.1 ffcfstress.1
++MANPAGES      += fftest.1 ffset.1 ffcfstress.1
++ifndef DISABLE_FFMVFORCE
++MANPAGES      += ffmvforce.1
++endif
+ endif
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -39,3 +39,6 @@
+ ifndef DISABLE_FORCEFEEDBACK
+-PROGRAMS      += fftest ffmvforce ffset ffcfstress
++PROGRAMS      += fftest ffset ffcfstress
++ifndef DISABLE_FFMVFORCE
++PROGRAMS      += ffmvforce
++endif
+ endif

diff --git a/games-util/joystick/joystick-1.8.1.ebuild 
b/games-util/joystick/joystick-1.8.1.ebuild
new file mode 100644
index 000000000000..95bfe6728687
--- /dev/null
+++ b/games-util/joystick/joystick-1.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs udev
+
+MY_P="linuxconsoletools-${PV}"
+
+DESCRIPTION="Joystick testing utilities"
+HOMEPAGE="https://sourceforge.net/projects/linuxconsole/";
+SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="sdl"
+
+RDEPEND="sdl? ( media-libs/libsdl2[video] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.8.1-optional-ffmvforce.patch
+)
+
+src_configure() {
+       tc-export CC PKG_CONFIG
+       export PREFIX="${EPREFIX}"/usr
+       use sdl || export DISABLE_FFMVFORCE=1
+}
+
+src_install() {
+       default
+
+       [[ ! ${EPREFIX} ]] || mv {"${D}","${ED}"}/lib || die
+}
+
+pkg_postinst() {
+       udev_reload
+}
+
+pkg_postrm() {
+       udev_reload
+}

Reply via email to