From 2973c3f8b811e5d1a12a654ea3e31d3b98bc89b6 Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sat, 9 Apr 2016 22:07:12 +0100 Subject: [PATCH 1/5] Revert "Linux joystick: Look at entire axis namespace for controls (thanks, "spaz16"!)." This reverts commit 4cb7923f251543c1175c1702f8cf8b4201ce9054. see https://github.com/RetroPie/RetroPie-Setup/issues/1297 --- src/joystick/linux/SDL_sysjoystick.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c index 06a2d9a21..81be5d843 100644 --- a/src/joystick/linux/SDL_sysjoystick.c +++ b/src/joystick/linux/SDL_sysjoystick.c @@ -670,7 +670,7 @@ ConfigJoystick(SDL_Joystick * joystick, int fd) ++joystick->nbuttons; } } - for (i = 0; i < ABS_MAX; ++i) { + for (i = 0; i < ABS_MISC; ++i) { /* Skip hats */ if (i == ABS_HAT0X) { i = ABS_HAT3Y; @@ -976,6 +976,10 @@ HandleInputEvents(SDL_Joystick * joystick) events[i].value); break; case EV_ABS: + if (code >= ABS_MISC) { + break; + } + switch (code) { case ABS_HAT0X: case ABS_HAT0Y: From d69111440960db12dc57e1529222755eeee3798a Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Fri, 17 Feb 2017 17:16:05 +0000 Subject: [PATCH 2/5] packaging fixes - * updated debian/control to match debian/ubuntu package names * fix libudev dependency * rename libsdl2.install -> libsdl2-2.0-0.install --- debian/control | 12 ++++++------ debian/{libsdl2.install => libsdl2-2.0-0.install} | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename debian/{libsdl2.install => libsdl2-2.0-0.install} (100%) diff --git a/debian/control b/debian/control index a3411335a..a6b9b5e32 100644 --- a/debian/control +++ b/debian/control @@ -30,16 +30,16 @@ Build-Depends: debhelper (>= 9), libxxf86vm-dev Homepage: http://www.libsdl.org/ -Package: libsdl2 +Package: libsdl2-2.0-0 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, - libudev0 [linux-any], + libudev0 | libudev1 [linux-any], libdbus-1-3 [linux-any] -Conflicts: libsdl-1.3-0 -Replaces: libsdl-1.3-0 +Conflicts: libsdl-1.3-0, libsdl2 +Replaces: libsdl-1.3-0, libsdl2 Description: Simple DirectMedia Layer SDL is a library that allows programs portable low level access to a video framebuffer, audio output, mouse, and keyboard. @@ -51,7 +51,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libsdl2 (= ${binary:Version}), + libsdl2-2.0-0 (= ${binary:Version}), libc6-dev, libgl1-mesa-dev Conflicts: libsdl-1.3-dev @@ -68,7 +68,7 @@ Section: debug Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libsdl2 (= ${binary:Version}), + libsdl2-2.0-0 (= ${binary:Version}), Description: Simple DirectMedia Layer debug files SDL is a library that allows programs portable low level access to a video framebuffer, audio output, mouse, and keyboard. diff --git a/debian/libsdl2.install b/debian/libsdl2-2.0-0.install similarity index 100% rename from debian/libsdl2.install rename to debian/libsdl2-2.0-0.install From 8ec46a9d869b468216a2d8f5103f53fc2ff11243 Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sat, 28 Oct 2017 22:06:33 +0100 Subject: [PATCH 3/5] use kmsdrm / disable opengl & rpi drivver --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 4bde8f325..3d2526f5d 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,8 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) confflags = --disable-rpath --disable-video-directfb \ --disable-nas --disable-esd --disable-arts \ --disable-alsa-shared --disable-pulseaudio-shared \ - --disable-x11-shared + --disable-x11-shared --disable-video-opengl --disable-video-rpi \ + --enable-video-kmsdrm %: dh $@ --parallel From 00f005e9620c22f29c0493f5946dd7aac244081a Mon Sep 17 00:00:00 2001 From: Jools Wills Date: Sun, 19 Nov 2017 10:09:24 +0000 Subject: [PATCH 4/5] disable pulseaudio --- debian/control | 1 - debian/rules | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index a6b9b5e32..8833224cc 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9), fcitx-libs-dev [linux-any], libasound2-dev [linux-any], libgl1-mesa-dev, - libpulse-dev, libudev-dev [linux-any], libdbus-1-dev [linux-any], libibus-1.0-dev[linux-any], diff --git a/debian/rules b/debian/rules index 3d2526f5d..7679373ee 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) confflags = --disable-rpath --disable-video-directfb \ --disable-nas --disable-esd --disable-arts \ - --disable-alsa-shared --disable-pulseaudio-shared \ + --disable-alsa-shared --disable-pulseaudio \ --disable-x11-shared --disable-video-opengl --disable-video-rpi \ - --enable-video-kmsdrm + --enable-video-kmsdrm %: dh $@ --parallel From 346edf2db5cc95de0c774f44ed7ca925b59f3e89 Mon Sep 17 00:00:00 2001 From: Conn O'Griofa Date: Thu, 27 Jun 2019 00:56:52 +0100 Subject: [PATCH 5/5] rules: enable opengl support --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 7679373ee..291a70387 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) confflags = --disable-rpath --disable-video-directfb \ --disable-nas --disable-esd --disable-arts \ --disable-alsa-shared --disable-pulseaudio \ - --disable-x11-shared --disable-video-opengl --disable-video-rpi \ + --disable-x11-shared --enable-video-opengl --disable-video-rpi \ --enable-video-kmsdrm %: