diff --git a/packages/addons/addon-depends/moonlight-embedded/package.mk b/packages/addons/addon-depends/moonlight-embedded/package.mk
index 9f28d12670..3f9ac4b1ef 100644
--- a/packages/addons/addon-depends/moonlight-embedded/package.mk
+++ b/packages/addons/addon-depends/moonlight-embedded/package.mk
@@ -19,7 +19,7 @@
 PKG_NAME="moonlight-embedded"
 PKG_VERSION="2.2.0"
 PKG_REV="1"
-PKG_ARCH="arm aarch64"
+PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/irtimmer/moonlight-embedded"
 PKG_URL="https://github.com/irtimmer/moonlight-embedded/archive/v$PKG_VERSION.tar.gz"
@@ -38,6 +38,8 @@ elif [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx-gpu-viv"
 elif [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libamcodec"
+elif [ "$DISPLAYSERVER" = "x11" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau SDL2 ffmpeg libxcb"
 fi
 
 pre_build_target() {
diff --git a/packages/addons/addon-depends/opus/package.mk b/packages/addons/addon-depends/opus/package.mk
index ceed50dbb5..fc7a7cc500 100644
--- a/packages/addons/addon-depends/opus/package.mk
+++ b/packages/addons/addon-depends/opus/package.mk
@@ -32,5 +32,12 @@ PKG_LONGDESC="Codec designed for interactive speech and audio transmission over
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
+if [ "$TARGET_ARCH" = "arm" ]; then
+  FIXED_POINT="--enable-fixed-point"
+else
+  FIXED_POINT="--disable-fixed-point"
+fi
+
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
-                           --disable-shared"
+                           --disable-shared \
+                           $FIXED_POINT"
diff --git a/packages/addons/script/moonlight/package.mk b/packages/addons/script/moonlight/package.mk
index 82dfcdd1c0..6082f4fc08 100644
--- a/packages/addons/script/moonlight/package.mk
+++ b/packages/addons/script/moonlight/package.mk
@@ -18,8 +18,8 @@
 
 PKG_NAME="moonlight"
 PKG_VERSION="c371ff8"
-PKG_REV="0"
-PKG_ARCH="arm aarch64"
+PKG_REV="1"
+PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/dead/moonlight-openelec-rpi2"
 PKG_URL="https://github.com/dead/moonlight-openelec-rpi2/archive/$PKG_VERSION.tar.gz"
diff --git a/packages/multimedia/SDL2/package.mk b/packages/multimedia/SDL2/package.mk
index ec496325c8..f2f8b05d30 100644
--- a/packages/multimedia/SDL2/package.mk
+++ b/packages/multimedia/SDL2/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="SDL2"
-PKG_VERSION="2.0.3"
+PKG_VERSION="2.0.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/multimedia/SDL2/patches/SDL2-0001-fix-missing-axes.patch b/packages/multimedia/SDL2/patches/SDL2-0001-fix-missing-axes.patch
deleted file mode 100644
index 47e2abfb56..0000000000
--- a/packages/multimedia/SDL2/patches/SDL2-0001-fix-missing-axes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/joystick/linux/SDL_sysjoystick.c	2014-03-16 03:31:41.000000000 +0100
-+++ b/src/joystick/linux/SDL_sysjoystick.c	2014-09-08 01:42:32.987502340 +0200
-@@ -500,7 +500,7 @@
-                 ++joystick->nbuttons;
-             }
-         }
--        for (i = 0; i < ABS_MISC; ++i) {
-+        for (i = 0; i < ABS_MAX; ++i) {
-             /* Skip hats */
-             if (i == ABS_HAT0X) {
-                 i = ABS_HAT3Y;
-@@ -761,10 +761,6 @@
-                 }
-                 break;
-             case EV_ABS:
--                if (code >= ABS_MISC) {
--                    break;
--                }
--
-                 switch (code) {
-                 case ABS_HAT0X:
-                 case ABS_HAT0Y: