Bug#912171: pcsxr: Cannot configure/use 2nd joypad

[Tim Small]

Package: pcsxr
Version: 1.9.94-5
Followup-For: Bug #912171
X-Debbugs-Cc: tim at buttersideup.com

This bug is still present.  I independently found it, and can confirm that the
previous fix should work.

An alternative fix is to call SDL_JoystickNameForIndex()

The patch below lacks a guarding ifdef (for SDL1 users), but I doubt
anyone is using SDL1 these days (SDL2 being just a little under 10 years
old at time of writing). 

--- pcsxr-1.9.94.orig/plugins/dfinput/cfg-gtk.c
+++ pcsxr-1.9.94/plugins/dfinput/cfg-gtk.c
@@ -607,7 +607,7 @@ static void PopulateDevList() {
 
 		n = SDL_NumJoysticks();
 		for (j = 0; j < n; j++) {
-			sprintf(buf, "%d: %s", j + 1, SDL_JoystickName(j));
+			sprintf(buf, "%d: %s", j + 1, SDL_JoystickNameForIndex(j));
 			gtk_list_store_append(store, &iter);
 			gtk_list_store_set(store, &iter, 0, buf, -1);
 		}

It would be super-cool if we could get one of these patches merged...

Thanks!

Tim.

-- System Information:
Debian Release: 12.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf

Kernel: Linux 6.1.0-11-amd64 (SMP w/4 CPU threads; PREEMPT)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages pcsxr depends on:
ii  libc6                2.36-9+deb12u1
ii  libgdk-pixbuf-2.0-0  2.42.10+dfsg-1+b1
ii  libgl1               1.6.0-1
ii  libglib2.0-0         2.74.6-2
ii  libgtk-3-0           3.24.37-2
ii  libpango-1.0-0       1.50.12+ds-1
ii  libsdl2-2.0-0        2.26.5+dfsg-1
ii  libx11-6             2:1.8.4-2+deb12u1
ii  libxext6             2:1.3.4-1+b1
ii  libxtst6             2:1.2.3-1.1
ii  libxv1               2:1.0.11-1.1
ii  libxxf86vm1          1:1.1.4-1+b2
ii  zlib1g               1:1.2.13.dfsg-1

pcsxr recommends no packages.

pcsxr suggests no packages.

-- no debconf information