disable mir as compilation fails on current ubuntu (and not needed for retropie).

This reverts commit f0a9a82149.

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.

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-shared \
-            --disable-x11-shared
+            --disable-x11-shared --disable-video-mir
 
 %:
 	dh $@ --parallel

src/audio/alsa/SDL_alsa_audio.c

@@ -314,20 +314,9 @@ ALSA_PlayDevice(_THIS)
     swizzle_alsa_channels(this, this->hidden->mixbuf, frames_left);
 
     while ( frames_left > 0 && SDL_AtomicGet(&this->enabled) ) {
-        int status;
-
-        /* This wait is a work-around for a hang when USB devices are
-           unplugged.  Normally it should not result in any waiting,
-           but in the case of a USB unplug, it serves as a way to
-           join the playback thread after the timeout occurs */
-        status = ALSA_snd_pcm_wait(this->hidden->pcm_handle, 1000);
-        if (status == 0) {
-            /*fprintf(stderr, "ALSA timeout waiting for available buffer space\n");*/
-            SDL_OpenedAudioDeviceDisconnected(this);
-            return;
-        }
-
-        status = ALSA_snd_pcm_writei(this->hidden->pcm_handle,
+        /* !!! FIXME: This works, but needs more testing before going live */
+        /* ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1); */
+        int status = ALSA_snd_pcm_writei(this->hidden->pcm_handle,
                                          sample_buf, frames_left);
 
         if (status < 0) {

src/joystick/linux/SDL_sysjoystick.c

@@ -459,7 +459,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;
@@ -720,6 +720,10 @@ HandleInputEvents(SDL_Joystick * joystick)
                 }
                 break;
             case EV_ABS:
+                if (code >= ABS_MISC) {
+                    break;
+                }
+
                 switch (code) {
                 case ABS_HAT0X:
                 case ABS_HAT0Y: