summaryrefslogtreecommitdiff
path: root/games-util/joystick/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
commit0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree037df795519468a25d9362b4e95cdaeb84eb1cf9 /games-util/joystick/files
parent752d6256e5204b958b0ef7905675a940b5e9172f (diff)
gentoo resync : 29.12.2022
Diffstat (limited to 'games-util/joystick/files')
-rw-r--r--games-util/joystick/files/joystick-1.6.0-build.patch34
-rw-r--r--games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch22
2 files changed, 22 insertions, 34 deletions
diff --git a/games-util/joystick/files/joystick-1.6.0-build.patch b/games-util/joystick/files/joystick-1.6.0-build.patch
deleted file mode 100644
index fa60ec719917..000000000000
--- a/games-util/joystick/files/joystick-1.6.0-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- linuxconsoletools-1.6.0/docs/Makefile
-+++ linuxconsoletools-1.6.0/docs/Makefile
-@@ -20,9 +20,13 @@
- # 02110-1301 USA.
-
- MANPAGES = inputattach.1 jstest.1 jscal.1 fftest.1 \
-- ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
-+ ffset.1 ffcfstress.1 jscal-store.1 \
- jscal-restore.1 evdev-joystick.1
-
-+ifneq ($(USE_SDL),no)
-+MANPAGES += ffmvforce.1
-+endif
-+
- PREFIX ?= /usr/local
-
- install:
---- linuxconsoletools-1.6.0/utils/Makefile
-+++ linuxconsoletools-1.6.0/utils/Makefile
-@@ -27,9 +27,13 @@
-
- CFLAGS ?= -g -O2 -Wall
-
--PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS = inputattach jstest jscal fftest ffset \
- ffcfstress jscal-restore jscal-store evdev-joystick
-
-+ifneq ($(USE_SDL),no)
-+PROGRAMS += ffmvforce
-+endif
-+
- PREFIX ?= /usr/local
-
- compile: $(PROGRAMS)
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