diff --git a/package/batocera/audio/zmusic/zmusic.mk b/package/batocera/audio/zmusic/zmusic.mk
index b2d575ed108..642507e70d7 100644
--- a/package/batocera/audio/zmusic/zmusic.mk
+++ b/package/batocera/audio/zmusic/zmusic.mk
@@ -7,7 +7,7 @@ ZMUSIC_VERSION = 1.1.12
 ZMUSIC_SITE = $(call github,coelckers,ZMusic,$(ZMUSIC_VERSION))
 ZMUSIC_LICENSE = GPLv3
 ZMUSIC_INSTALL_STAGING = YES
-ZMUSIC_DEPENDENCIES = zlib mpg123 libsndfile alsa-lib
+ZMUSIC_DEPENDENCIES = zlib mpg123 libsndfile alsa-lib libglib2
 
 ZMUSIC_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release
 
@@ -15,4 +15,4 @@ define ZMUSIC_INSTALL_TARGET_CMDS
     cp -d $(@D)/source/libzmusic* $(TARGET_DIR)/usr/lib/
 endef
 
-$(eval $(cmake-package))
\ No newline at end of file
+$(eval $(cmake-package))
diff --git a/package/batocera/boot/batocera-initramfs/Config.in b/package/batocera/boot/batocera-initramfs/Config.in
index 6a528b1d726..85b00e5a190 100644
--- a/package/batocera/boot/batocera-initramfs/Config.in
+++ b/package/batocera/boot/batocera-initramfs/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_BATOCERA_INITRAMFS
 	select BR2_PACKAGE_HOST_LZ4  if !BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY && \
 					!BR2_PACKAGE_BATOCERA_TARGET_A3GEN2     && \
 					!BR2_PACKAGE_BATOCERA_TARGET_S9GEN4
+	select BR2_PACKAGE_LIBXCRYPT
 
 	default n
 	help
diff --git a/package/batocera/boot/batocera-initramfs/batocera-initramfs.mk b/package/batocera/boot/batocera-initramfs/batocera-initramfs.mk
index d561da5b80d..e25bcf6780d 100644
--- a/package/batocera/boot/batocera-initramfs/batocera-initramfs.mk
+++ b/package/batocera/boot/batocera-initramfs/batocera-initramfs.mk
@@ -10,7 +10,7 @@ BATOCERA_INITRAMFS_SOURCE = busybox-$(BATOCERA_INITRAMFS_VERSION).tar.bz2
 BATOCERA_INITRAMFS_LICENSE = GPLv2
 BATOCERA_INITRAMFS_LICENSE_FILES = LICENSE
 
-BATOCERA_INITRAMFS_DEPENDENCIES += host-uboot-tools
+BATOCERA_INITRAMFS_DEPENDENCIES += host-uboot-tools libxcrypt
 BATOCERA_INITRAMFS_CFLAGS = $(TARGET_CFLAGS)
 BATOCERA_INITRAMFS_LDFLAGS = $(TARGET_LDFLAGS)
 
diff --git a/package/batocera/emulators/cemu/cemu.mk b/package/batocera/emulators/cemu/cemu.mk
index d827b89a442..cdfb19b1b65 100644
--- a/package/batocera/emulators/cemu/cemu.mk
+++ b/package/batocera/emulators/cemu/cemu.mk
@@ -16,7 +16,7 @@ CEMU_SITE = https://github.com/cemu-project/Cemu
 CEMU_LICENSE = GPLv2
 CEMU_SITE_METHOD=git
 CEMU_GIT_SUBMODULES=YES
-CEMU_DEPENDENCIES = sdl2 host-libcurl host-pugixml pugixml rapidjson boost libpng \
+CEMU_DEPENDENCIES = sdl2 host-libcurl libcurl host-pugixml pugixml rapidjson boost libpng \
                     libzip host-glslang glslang zlib zstd wxwidgets fmt glm \
 					host-nasm host-zstd host-libusb
 
diff --git a/package/batocera/emulators/dosbox/dosbox.mk b/package/batocera/emulators/dosbox/dosbox.mk
index 1e275c99b9c..d96992a5677 100644
--- a/package/batocera/emulators/dosbox/dosbox.mk
+++ b/package/batocera/emulators/dosbox/dosbox.mk
@@ -6,7 +6,7 @@
 # Version.: Commits on Jan 12, 2020
 DOSBOX_VERSION = e6b88ad03202d1f74e329f54f213d3b070bd6202
 DOSBOX_SITE = $(call github,duganchen,dosbox,$(DOSBOX_VERSION))
-DOSBOX_DEPENDENCIES = sdl2 sdl2_net fluidsynth zlib libpng libogg libvorbis
+DOSBOX_DEPENDENCIES = sdl2 sdl2_net fluidsynth zlib libpng libogg libvorbis libglew
 DOSBOX_LICENSE = GPLv2
 
 define DOSBOX_CONFIGURE_CMDS
diff --git a/package/batocera/emulators/fsuae/fsuae.mk b/package/batocera/emulators/fsuae/fsuae.mk
index ff29f78a879..b4cfa94d2f6 100644
--- a/package/batocera/emulators/fsuae/fsuae.mk
+++ b/package/batocera/emulators/fsuae/fsuae.mk
@@ -7,7 +7,7 @@
 FSUAE_VERSION = bfa0c7522c6c5f73cceb340d677491d056febd01
 FSUAE_SITE = $(call github,FrodeSolheim,fs-uae,$(FSUAE_VERSION))
 FSUAE_LICENSE = GPLv2
-FSUAE_DEPENDENCIES = xserver_xorg-server openal libpng sdl2 zlib libmpeg2 libglib2 libcapsimage
+FSUAE_DEPENDENCIES = xserver_xorg-server openal libpng sdl2 sdl2_ttf zlib libmpeg2 libglib2 libcapsimage
 
 FSUAE_CONF_OPTS += --disable-codegen
 
diff --git a/package/batocera/emulators/lightspark/Config.in b/package/batocera/emulators/lightspark/Config.in
index 697cf6cb915..05f7760bcef 100644
--- a/package/batocera/emulators/lightspark/Config.in
+++ b/package/batocera/emulators/lightspark/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_LIGHTSPARK
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_RTMPDUMP
+	select BR2_PACKAGE_LIBGLEW    if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
 	help
           LightSpark
           Flash emulator for windows / mac / linux.
diff --git a/package/batocera/emulators/lightspark/lightspark.mk b/package/batocera/emulators/lightspark/lightspark.mk
index bc1414238bc..51ae94d049d 100644
--- a/package/batocera/emulators/lightspark/lightspark.mk
+++ b/package/batocera/emulators/lightspark/lightspark.mk
@@ -9,6 +9,10 @@ LIGHTSPARK_SITE = $(call github,lightspark,lightspark,$(LIGHTSPARK_VERSION))
 LIGHTSPARK_LICENSE = LGPLv3
 LIGHTSPARK_DEPENDENCIES = sdl2 freetype pcre jpeg libpng cairo pango ffmpeg libcurl rtmpdump
 
+ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
+LIGHTSPARK_DEPENDENCIES += libglew
+endif
+
 LIGHTSPARK_CONF_OPTS += -DCOMPILE_NPAPI_PLUGIN=FALSE -DCOMPILE_PPAPI_PLUGIN=FALSE
 ifneq ($(BR2_x86_64),y)
 LIGHTSPARK_CONF_OPTS += -DENABLE_GLES2=TRUE -DCMAKE_C_FLAGS=-DEGL_NO_X11 -DCMAKE_CXX_FLAGS=-DEGL_NO_X11
diff --git a/package/batocera/emulators/mame/mame.mk b/package/batocera/emulators/mame/mame.mk
index 2e3b50e7408..bc26abd2471 100644
--- a/package/batocera/emulators/mame/mame.mk
+++ b/package/batocera/emulators/mame/mame.mk
@@ -6,7 +6,7 @@
 # Version: GroovyMAME 0.268 - Switchres 2.21d
 MAME_VERSION = gm0268sr221d
 MAME_SITE = $(call github,antonioginer,GroovyMAME,$(MAME_VERSION))
-MAME_DEPENDENCIES = sdl2 sdl2_ttf zlib libpng fontconfig sqlite jpeg flac rapidjson expat glm
+MAME_DEPENDENCIES = sdl2 sdl2_ttf zlib libpng fontconfig sqlite jpeg flac rapidjson expat glm pulseaudio
 MAME_LICENSE = MAME
 
 MAME_CROSS_ARCH = unknown
diff --git a/package/batocera/emulators/melonds/melonds.mk b/package/batocera/emulators/melonds/melonds.mk
index c8a6b57cfe7..966228fb743 100644
--- a/package/batocera/emulators/melonds/melonds.mk
+++ b/package/batocera/emulators/melonds/melonds.mk
@@ -9,7 +9,7 @@ MELONDS_SITE = https://github.com/Arisotura/melonDS.git
 MELONDS_SITE_METHOD=git
 MELONDS_GIT_SUBMODULES=YES
 MELONDS_LICENSE = GPLv2
-MELONDS_DEPENDENCIES = sdl2 qt6base qt6multimedia slirp libepoxy libarchive
+MELONDS_DEPENDENCIES = sdl2 qt6base qt6multimedia slirp libepoxy libarchive ecm libegl
 
 MELONDS_SUPPORTS_IN_SOURCE_BUILD = NO
 
diff --git a/package/batocera/emulators/mupen64plus/mupen64plus-core/mupen64plus-core.mk b/package/batocera/emulators/mupen64plus/mupen64plus-core/mupen64plus-core.mk
index 5e20babd28c..b586fb51120 100644
--- a/package/batocera/emulators/mupen64plus/mupen64plus-core/mupen64plus-core.mk
+++ b/package/batocera/emulators/mupen64plus/mupen64plus-core/mupen64plus-core.mk
@@ -7,7 +7,7 @@
 MUPEN64PLUS_CORE_VERSION = 860fac3fbae94194a392c1d9857e185eda6d083e
 MUPEN64PLUS_CORE_SITE = $(call github,mupen64plus,mupen64plus-core,$(MUPEN64PLUS_CORE_VERSION))
 MUPEN64PLUS_CORE_LICENSE = GPLv2
-MUPEN64PLUS_CORE_DEPENDENCIES = sdl2 alsa-lib freetype dejavu
+MUPEN64PLUS_CORE_DEPENDENCIES = sdl2 alsa-lib freetype dejavu host-nasm
 MUPEN64PLUS_CORE_INSTALL_STAGING = YES
 
 MUPEN64PLUS_GL_CFLAGS = -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib
diff --git a/package/batocera/emulators/pcsx2/pcsx2.mk b/package/batocera/emulators/pcsx2/pcsx2.mk
index 8b4bae0af6b..5a6dae48a6c 100644
--- a/package/batocera/emulators/pcsx2/pcsx2.mk
+++ b/package/batocera/emulators/pcsx2/pcsx2.mk
@@ -16,6 +16,7 @@ PCSX2_SUPPORTS_IN_SOURCE_BUILD = NO
 PCSX2_DEPENDENCIES += xorgproto alsa-lib freetype zlib libpng stenzek-shaderc
 PCSX2_DEPENDENCIES += libaio portaudio libsoundtouch sdl2 libpcap yaml-cpp
 PCSX2_DEPENDENCIES += libsamplerate fmt wxwidgets libgtk3 qt6base qt6tools qt6svg
+PCSX2_DEPENDENCIES += host-libcurl libcurl libbacktrace webp
 
 PCSX2_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release
 PCSX2_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF
diff --git a/package/batocera/emulators/play/play.mk b/package/batocera/emulators/play/play.mk
index 85dcc0e700e..e0e1962d7ca 100644
--- a/package/batocera/emulators/play/play.mk
+++ b/package/batocera/emulators/play/play.mk
@@ -10,7 +10,7 @@ PLAY_SITE_METHOD = git
 PLAY_GIT_SUBMODULES = YES
 PLAY_LICENSE = BSD
 
-PLAY_DEPENDENCIES = openal qt6base sqlite ecm
+PLAY_DEPENDENCIES = openal qt6base sqlite ecm libglu
 
 PLAY_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release
 PLAY_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF
diff --git a/package/batocera/emulators/python-pyxel/python-pyxel.mk b/package/batocera/emulators/python-pyxel/python-pyxel.mk
index 96bf206e863..5f16014a5c1 100644
--- a/package/batocera/emulators/python-pyxel/python-pyxel.mk
+++ b/package/batocera/emulators/python-pyxel/python-pyxel.mk
@@ -10,7 +10,7 @@ PYTHON_PYXEL_SETUP_TYPE = setuptools
 PYTHON_PYXEL_LICENSE = MIT
 PYTHON_PYXEL_SETUP_TYPE = maturin
 PYTHON_PYXEL_CARGO_MANIFEST_PATH = crates/pyxel-extension/Cargo.toml
-PYTHON_PYXEL_DEPENDENCIES = host-rust-bin sdl2
+PYTHON_PYXEL_DEPENDENCIES = host-rust-bin sdl2 evmapy
 
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
 	PYXEL_CARGO_TARGET=x86_64-unknown-linux-gnu
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/libretro-beetle-psx.mk b/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/libretro-beetle-psx.mk
index e182e1f3748..9cbaf52573d 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/libretro-beetle-psx.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/libretro-beetle-psx.mk
@@ -8,6 +8,10 @@ LIBRETRO_BEETLE_PSX_VERSION = 99a46bdb949a33ea1f827a1c6dfdd324e26486bf
 LIBRETRO_BEETLE_PSX_SITE = $(call github,libretro,beetle-psx-libretro,$(LIBRETRO_BEETLE_PSX_VERSION))
 LIBRETRO_BEETLE_PSX_LICENSE = GPLv2
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_BEETLE_PSX_DEPENDENCIES += libglvnd
+endif
+
 LIBRETRO_BEETLE_PSX_PLATFORM = $(LIBRETRO_PLATFORM)
 
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2711),y)
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-desmume/libretro-desmume.mk b/package/batocera/emulators/retroarch/libretro/libretro-desmume/libretro-desmume.mk
index b1f706d43b6..673558ac28f 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-desmume/libretro-desmume.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-desmume/libretro-desmume.mk
@@ -9,6 +9,10 @@ LIBRETRO_DESMUME_SITE = $(call github,libretro,desmume,$(LIBRETRO_DESMUME_VERSIO
 LIBRETRO_DESMUME_LICENSE = GPLv2
 LIBRETRO_DESMUME_DEPENDENCIES = libpcap
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_DESMUME_DEPENDENCIES += libglvnd
+endif
+
 define LIBRETRO_DESMUME_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" \
 	    -C $(@D)/desmume/src/frontend/libretro \
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-kronos/libretro-kronos.mk b/package/batocera/emulators/retroarch/libretro/libretro-kronos/libretro-kronos.mk
index f641d67cd99..fa6303a83b1 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-kronos/libretro-kronos.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-kronos/libretro-kronos.mk
@@ -10,6 +10,10 @@ LIBRETRO_KRONOS_LICENSE = BSD-3-Clause
 
 LIBRETRO_KRONOS_PLATFORM = $(LIBRETRO_PLATFORM)
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_KRONOS_DEPENDENCIES += libglvnd
+endif
+
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_XU4),y)
 LIBRETRO_KRONOS_PLATFORM = odroid
 LIBRETRO_KRONOS_EXTRA_ARGS += BOARD=ODROID-XU4 FORCE_GLES=1
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-melonds/libretro-melonds.mk b/package/batocera/emulators/retroarch/libretro/libretro-melonds/libretro-melonds.mk
index fe590ec5040..d1d2b0f7ffa 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-melonds/libretro-melonds.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-melonds/libretro-melonds.mk
@@ -9,6 +9,10 @@ LIBRETRO_MELONDS_SITE = $(call github,libretro,melonds,$(LIBRETRO_MELONDS_VERSIO
 LIBRETRO_MELONDS_LICENSE = GPLv2
 LIBRETRO_MELONDS_DEPENDENCIES = libpcap
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_MELONDS_DEPENDENCIES += libglvnd
+endif
+
 LIBRETRO_MELONDS_PLATFORM = $(LIBRETRO_PLATFORM)
 LIBRETRO_MELONDS_EXTRA_ARGS =
 
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk b/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk
index 7aa12b93bde..42b7179079f 100755
--- a/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk
@@ -39,6 +39,8 @@ ifneq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
     else
         LIBRETRO_MUPEN64PLUS_NEXT_DEPENDENCIES += libgl
     endif
+else
+	LIBRETRO_MUPEN64PLUS_NEXT_DEPENDENCIES += libglvnd
 endif
 
 # PLATFORM
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-openlara/libretro-openlara.mk b/package/batocera/emulators/retroarch/libretro/libretro-openlara/libretro-openlara.mk
index 60d0a192c1c..ee47d12fd4d 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-openlara/libretro-openlara.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-openlara/libretro-openlara.mk
@@ -20,6 +20,8 @@ ifneq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_ANY),y)
 	else ifeq ($(BR2_PACKAGE_BATOCERA_GLES2),y)
 	    LIBRETRO_OPENLARA_EXTRA_ARGS += GLES=1
 	endif
+else
+	LIBRETRO_OPENLARA_DEPENDENCIES += libglvnd
 endif
 
 define LIBRETRO_OPENLARA_BUILD_CMDS
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk b/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk
index e21d9c33896..2823672b8fd 100755
--- a/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/libretro-parallel-n64.mk
@@ -11,6 +11,10 @@ LIBRETRO_PARALLEL_N64_LICENSE = GPLv2
 LIBRETRO_PARALLEL_N64_EXTRA_ARGS=FORCE_GLES=1
 LIBRETRO_PARALLEL_N64_BOARD=
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_PARALLEL_N64_DEPENDENCIES += libglvnd
+endif
+
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBRETRO_PARALLEL_N64_DEPENDENCIES += rpi-userland
 endif
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-pcsx2/libretro-pcsx2.mk b/package/batocera/emulators/retroarch/libretro/libretro-pcsx2/libretro-pcsx2.mk
index d84e21f4eba..da95f58fa9f 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-pcsx2/libretro-pcsx2.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-pcsx2/libretro-pcsx2.mk
@@ -11,6 +11,10 @@ LIBRETRO_PCSX2_GIT_SUBMODULES = YES
 LIBRETRO_PCSX2_LICENSE = GPLv2
 LIBRETRO_PCSX2_DEPENDENCIES = libaio xz host-xxd
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_PCSX2_DEPENDENCIES += libglvnd
+endif
+
 LIBRETRO_PCSX2_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release -DSDL2_API=ON \
     -DDISABLE_PCSX2_WRAPPER=ON -DPACKAGE_MODE=OFF -DBUILD_SHARED_LIBS=OFF \
 	-DENABLE_TESTS=OFF -DENABLE_QT=OFF -DLIBRETRO=ON -DDISABLE_ADVANCE_SIMD=ON \
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-play/libretro-play.mk b/package/batocera/emulators/retroarch/libretro/libretro-play/libretro-play.mk
index 19b37e30de9..48319bd1637 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-play/libretro-play.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-play/libretro-play.mk
@@ -19,7 +19,7 @@ LIBRETRO_PLAY_CONF_OPTS += -DBUILD_PLAY=OFF
 LIBRETRO_PLAY_CONF_OPTS += -DENABLE_AMAZON_S3=ON
 
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
-LIBRETRO_PLAY_DEPENDENCIES = libglew
+LIBRETRO_PLAY_DEPENDENCIES = libglew libglvnd
 endif
 
 # Force to use GLES on ARM
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-vitaquake2/libretro-vitaquake2.mk b/package/batocera/emulators/retroarch/libretro/libretro-vitaquake2/libretro-vitaquake2.mk
index 66479b6fe2e..7dfc56c3594 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-vitaquake2/libretro-vitaquake2.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-vitaquake2/libretro-vitaquake2.mk
@@ -11,6 +11,10 @@ LIBRETRO_VITAQUAKE2_LICENSE = GPL-2.0
 LIBRETRO_VITAQUAKE2_PLATFORM = $(LIBRETRO_PLATFORM)
 LIBRETRO_VITAQUAKE2_CONF_OPTS =
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_VITAQUAKE2_DEPENDENCIES = libglvnd
+endif
+
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2711),y)
 LIBRETRO_VITAQUAKE2_PLATFORM=rpi4_64
 
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk b/package/batocera/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk
index 7474d416f02..147a4ed1de5 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-wasm4/libretro-wasm4.mk
@@ -14,6 +14,10 @@ LIBRETRO_WASM4_SUBDIR = runtimes/native
 
 LIBRETRO_WASM4_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_WASM4_DEPENDENCIES = libglvnd
+endif
+
 define LIBRETRO_WASM4_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/runtimes/native/wasm4_libretro.so \
 	    $(TARGET_DIR)/usr/lib/libretro/wasm4_libretro.so
diff --git a/package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/libretro-yabasanshiro.mk b/package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/libretro-yabasanshiro.mk
index a399eca5379..d5e95e1e02f 100644
--- a/package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/libretro-yabasanshiro.mk
+++ b/package/batocera/emulators/retroarch/libretro/libretro-yabasanshiro/libretro-yabasanshiro.mk
@@ -13,6 +13,10 @@ LIBRETRO_YABASANSHIRO_LICENSE = GPLv2
 LIBRETRO_YABASANSHIRO_PLATFORM = $(LIBRETRO_PLATFORM)
 LIBRETRO_YABASANSHIRO_TARGET_LDFLAGS = $(TARGET_LDFLAGS)
 
+ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
+LIBRETRO_YABASANSHIRO_DEPENDENCIES = libglvnd
+endif
+
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_XU4),y)
 LIBRETRO_YABASANSHIRO_PLATFORM = odroid
 LIBRETRO_YABASANSHIRO_EXTRA_ARGS += BOARD=ODROID-XU4
diff --git a/package/batocera/emulators/rpcs3/rpcs3.mk b/package/batocera/emulators/rpcs3/rpcs3.mk
index 5320e651b05..4afebce0926 100644
--- a/package/batocera/emulators/rpcs3/rpcs3.mk
+++ b/package/batocera/emulators/rpcs3/rpcs3.mk
@@ -9,7 +9,7 @@ RPCS3_SITE = https://github.com/RPCS3/rpcs3.git
 RPCS3_SITE_METHOD=git
 RPCS3_GIT_SUBMODULES=YES
 RPCS3_LICENSE = GPLv2
-RPCS3_DEPENDENCIES += alsa-lib llvm faudio ffmpeg libevdev libxml2
+RPCS3_DEPENDENCIES += alsa-lib llvm faudio ffmpeg libevdev libxml2 libcurl
 RPCS3_DEPENDENCIES += libglew libglu libpng libusb mesa3d ncurses openal rtmpdump
 RPCS3_DEPENDENCIES += qt6base qt6declarative qt6multimedia qt6svg wolfssl 
 
diff --git a/package/batocera/emulators/supermodel/supermodel.mk b/package/batocera/emulators/supermodel/supermodel.mk
index 03f0d96c312..795ab626837 100644
--- a/package/batocera/emulators/supermodel/supermodel.mk
+++ b/package/batocera/emulators/supermodel/supermodel.mk
@@ -6,7 +6,7 @@
 # Version: Commits on May 8, 2023
 SUPERMODEL_VERSION = ac0e6407b414d05e55efa4cafe1644c899d62d66
 SUPERMODEL_SITE = $(call github,trzy,Supermodel,$(SUPERMODEL_VERSION))
-SUPERMODEL_DEPENDENCIES = sdl2 zlib libzip sdl2_net
+SUPERMODEL_DEPENDENCIES = sdl2 zlib libzip sdl2_net libglu
 SUPERMODEL_LICENSE = GPLv3
 
 ifeq ($(BR2_PACKAGE_LIBGLEW),y)
diff --git a/package/batocera/emulators/vita3k/vita3k.mk b/package/batocera/emulators/vita3k/vita3k.mk
index e9b09e7d9af..bf7a5985608 100644
--- a/package/batocera/emulators/vita3k/vita3k.mk
+++ b/package/batocera/emulators/vita3k/vita3k.mk
@@ -9,7 +9,7 @@ VITA3K_SITE = https://github.com/vita3k/vita3k
 VITA3K_SITE_METHOD=git
 VITA3K_GIT_SUBMODULES=YES
 VITA3K_LICENSE = GPLv3
-VITA3K_DEPENDENCIES = sdl2 sdl2_image sdl2_ttf zlib libogg libvorbis python-ruamel-yaml
+VITA3K_DEPENDENCIES = sdl2 sdl2_image sdl2_ttf zlib libogg libvorbis python-ruamel-yaml boost libgtk3
 VITA3K_EXTRACT_DEPENDENCIES = host-libcurl
 
 VITA3K_SUPPORTS_IN_SOURCE_BUILD = NO
diff --git a/package/batocera/emulators/xemu/xemu.mk b/package/batocera/emulators/xemu/xemu.mk
index 0aa42ccaca2..eb5d6037364 100644
--- a/package/batocera/emulators/xemu/xemu.mk
+++ b/package/batocera/emulators/xemu/xemu.mk
@@ -9,7 +9,7 @@ XEMU_SITE = https://github.com/xemu-project/xemu.git
 XEMU_SITE_METHOD=git
 XEMU_GIT_SUBMODULES=YES
 XEMU_LICENSE = GPLv2
-XEMU_DEPENDENCIES = sdl2 libsamplerate slirp
+XEMU_DEPENDENCIES = sdl2 libsamplerate slirp libepoxy libgtk3 libpcap pixman
 
 XEMU_EXTRA_DOWNLOADS = https://github.com/mborgerson/xemu-hdd-image/releases/download/1.0/xbox_hdd.qcow2.zip
 
diff --git a/package/batocera/gpu/batocera-amd/batocera-amd.mk b/package/batocera/gpu/batocera-amd/batocera-amd.mk
index 465a0a2418d..5ecd28d1084 100755
--- a/package/batocera/gpu/batocera-amd/batocera-amd.mk
+++ b/package/batocera/gpu/batocera-amd/batocera-amd.mk
@@ -8,6 +8,7 @@ BATOCERA_AMD_VERSION = 1.0
 BATOCERA_AMD_SOURCE =
 
 define BATOCERA_AMD_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/etc/init.d/
 	install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/gpu/batocera-amd/S05amd-check \
 	    $(TARGET_DIR)/etc/init.d/S05amd-check
 	# List
@@ -15,6 +16,7 @@ define BATOCERA_AMD_INSTALL_TARGET_CMDS
 	install -m 0644 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/gpu/batocera-amd/islands.list \
 	    $(TARGET_DIR)/usr/share/amd
 	# Modules
+	mkdir -p $(TARGET_DIR)/etc/modprobe.d/
 	ln -sf /var/run/amd/modprobe/amdgpu.conf $(TARGET_DIR)/etc/modprobe.d/amdgpu.conf
 	ln -sf /var/run/amd/modprobe/radeon.conf $(TARGET_DIR)/etc/modprobe.d/radeon.conf
 endef
diff --git a/package/batocera/gpu/batocera-nvidia/batocera-nvidia.mk b/package/batocera/gpu/batocera-nvidia/batocera-nvidia.mk
index c4c62721e27..cf397375c01 100755
--- a/package/batocera/gpu/batocera-nvidia/batocera-nvidia.mk
+++ b/package/batocera/gpu/batocera-nvidia/batocera-nvidia.mk
@@ -13,9 +13,11 @@ define BATOCERA_NVIDIA_INSTALL_TARGET_CMDS
 	    $(TARGET_DIR)/usr/bin/
 	
 	# [Xorg]
+	mkdir -p $(TARGET_DIR)/etc/X11/xorg.conf.d/
 	ln -sf /userdata/system/99-nvidia.conf $(TARGET_DIR)/etc/X11/xorg.conf.d/99-nvidia.conf
 
 	# [Blacklist & Modprobe]
+	mkdir -p $(TARGET_DIR)/etc/modprobe.d/
 	ln -sf /var/run/nvidia/modprobe/blacklist-nouveau.conf $(TARGET_DIR)/etc/modprobe.d/blacklist-nouveau.conf
 	ln -sf /var/run/nvidia/modprobe/nvidia-drm.conf        $(TARGET_DIR)/etc/modprobe.d/nvidia-drm.conf
 endef
diff --git a/package/batocera/kodi/kodi21-pvr-freebox/kodi21-pvr-freebox.mk b/package/batocera/kodi/kodi21-pvr-freebox/kodi21-pvr-freebox.mk
index 63a3d3ca7ef..b0a9593e152 100644
--- a/package/batocera/kodi/kodi21-pvr-freebox/kodi21-pvr-freebox.mk
+++ b/package/batocera/kodi/kodi21-pvr-freebox/kodi21-pvr-freebox.mk
@@ -7,6 +7,6 @@
 KODI21_PVR_FREEBOX_VERSION = 21.0.0-Omega
 KODI21_PVR_FREEBOX_SITE = $(call github,aassif,pvr.freebox,$(KODI21_PVR_FREEBOX_VERSION))
 KODI21_PVR_FREEBOX_LICENSE = MIT
-KODI21_PVR_FREEBOX_DEPENDENCIES = kodi
+KODI21_PVR_FREEBOX_DEPENDENCIES = kodi json-for-modern-cpp
 
 $(eval $(cmake-package))
diff --git a/package/batocera/libraries/appstream-glib/appstream-glib.mk b/package/batocera/libraries/appstream-glib/appstream-glib.mk
index aa1335b158b..541dee66ee0 100644
--- a/package/batocera/libraries/appstream-glib/appstream-glib.mk
+++ b/package/batocera/libraries/appstream-glib/appstream-glib.mk
@@ -7,7 +7,7 @@ APPSTREAM_GLIB_VERSION = appstream_glib_0_8_1
 APPSTREAM_GLIB_SITE = $(call github,hughsie,appstream-glib,$(APPSTREAM_GLIB_VERSION))
 APPSTREAM_GLIB_INSTALL_STAGING = YES
 
-APPSTREAM_GLIB_DEPENDENCIES = libgtk3 libyaml json-glib
+APPSTREAM_GLIB_DEPENDENCIES = libgtk3 libyaml json-glib libarchive libcurl
 
 APPSTREAM_GLIB_CONF_OPTS = -Dstemmer=false -Dintrospection=false -Dbuilder=false -Dman=false -Dgtk-doc=false -Drpm=false
 
diff --git a/package/batocera/libraries/faudio/faudio.mk b/package/batocera/libraries/faudio/faudio.mk
index 82fdd4e7541..9af639380c3 100644
--- a/package/batocera/libraries/faudio/faudio.mk
+++ b/package/batocera/libraries/faudio/faudio.mk
@@ -9,7 +9,7 @@ FAUDIO_SITE = $(call github,FNA-XNA,FAudio,$(FAUDIO_VERSION))
 
 FAUDIO_LICENSE = ZLIB
 FAUDIO_LICENSE_FILES = LICENSE
-FAUDIO_DEPENDENCIES = host-bison host-flex host-libtool gstreamer1 gst1-plugins-base
+FAUDIO_DEPENDENCIES = host-bison host-flex host-libtool gstreamer1 gst1-plugins-base sdl2
 
 ifeq ($(BR2_PACKAGE_WINE_GE_CUSTOM),y)
 FAUDIO_DEPENDENCIES += host-wine-ge-custom
diff --git a/package/batocera/libraries/pywebview/pywebview.mk b/package/batocera/libraries/pywebview/pywebview.mk
index d77b45c6a5c..be43e634be0 100644
--- a/package/batocera/libraries/pywebview/pywebview.mk
+++ b/package/batocera/libraries/pywebview/pywebview.mk
@@ -9,7 +9,8 @@ PYWEBVIEW_SITE = $(call github,r0x0r,pywebview,$(PYWEBVIEW_VERSION))
 PYWEBVIEW_LICENSE = BSD
 
 define PYWEBVIEW_INSTALL_TARGET_CMDS
-	cp -pr $(@D)/webview $(TARGET_DIR)/usr/lib/python*/site-packages/
+	mkdir -p $(TARGET_DIR)/usr/lib/python3.11/site-packages/
+	cp -pr $(@D)/webview $(TARGET_DIR)/usr/lib/python3.11/site-packages/
 endef
 
 $(eval $(generic-package))
diff --git a/package/batocera/ports/dxx-rebirth/dxx-rebirth.mk b/package/batocera/ports/dxx-rebirth/dxx-rebirth.mk
index 33ad66b307b..c06fab6fe08 100644
--- a/package/batocera/ports/dxx-rebirth/dxx-rebirth.mk
+++ b/package/batocera/ports/dxx-rebirth/dxx-rebirth.mk
@@ -9,7 +9,7 @@ DXX_REBIRTH_SITE = https://github.com/dxx-rebirth/dxx-rebirth
 DXX_REBIRTH_SITE_METHOD=git
 DXX_REBIRTH_LICENSE = GPLv3
 DXX_REBIRTH_LICENSE_FILE = COPYING.txt
-DXX_REBIRTH_DEPENDENCIES = host-scons sdl2 sdl2_image sdl2_mixer libpng physfs
+DXX_REBIRTH_DEPENDENCIES = host-scons sdl2 sdl2_image sdl2_mixer libpng physfs libglu
 
 DXX_REBIRTH_LDFLAGS   = $(TARGET_LDFLAGS)
 DXX_REBIRTH_CFLAGS    = $(TARGET_CFLAGS)
diff --git a/package/batocera/ports/etlegacy/etlegacy.mk b/package/batocera/ports/etlegacy/etlegacy.mk
index 5b8a12fe7a9..e0f299bddbe 100644
--- a/package/batocera/ports/etlegacy/etlegacy.mk
+++ b/package/batocera/ports/etlegacy/etlegacy.mk
@@ -11,7 +11,7 @@ ETLEGACY_GIT_SUBMODULES = YES
 ETLEGACY_LICENSE = GPL-3.0
 ETLEGACY_LICENSE_FILE = COPYING.txt
 
-ETLEGACY_DEPENDENCIES += freetype libcurl libglew libpng libtheora
+ETLEGACY_DEPENDENCIES += freetype libcurl libglew libpng libtheora libglu
 ETLEGACY_DEPENDENCIES += libvorbis lua openal openssl sdl2
 
 ETLEGACY_SUPPORTS_IN_SOURCE_BUILD = NO
diff --git a/package/batocera/ports/raze/raze.mk b/package/batocera/ports/raze/raze.mk
index 1f4d7c41688..cfcfdbda548 100644
--- a/package/batocera/ports/raze/raze.mk
+++ b/package/batocera/ports/raze/raze.mk
@@ -7,7 +7,7 @@
 RAZE_VERSION = 1.10.2
 RAZE_SITE = $(call github,coelckers,Raze,$(RAZE_VERSION))
 RAZE_LICENSE = GPLv2
-RAZE_DEPENDENCIES = host-raze sdl2 bzip2 fluidsynth openal zmusic webp
+RAZE_DEPENDENCIES = host-raze sdl2 bzip2 fluidsynth openal zmusic webp libvpx
 RAZE_SUPPORTS_IN_SOURCE_BUILD = NO
 
 # We need the tools from the host package to build the target package
diff --git a/package/batocera/ports/sonic2013/Config.in b/package/batocera/ports/sonic2013/Config.in
index db787f9e52f..7d9d5cfafa3 100755
--- a/package/batocera/ports/sonic2013/Config.in
+++ b/package/batocera/ports/sonic2013/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_SONIC2013
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_LIBVORBIS
 	select BR2_PACKAGE_LIBGLEW    if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
+	select BR2_PACKAGE_LIBGLU     if BR2_PACKAGE_HAS_LIBGLU
     help
       The Sonic 2013 decompilation is for the Android & iOS ports of Sonic 1 and 2
 
diff --git a/package/batocera/ports/sonic2013/sonic2013.mk b/package/batocera/ports/sonic2013/sonic2013.mk
index 52b7d1cbd08..05e81384e7e 100755
--- a/package/batocera/ports/sonic2013/sonic2013.mk
+++ b/package/batocera/ports/sonic2013/sonic2013.mk
@@ -19,6 +19,10 @@ else
     SONIC2013_DEPENDENCIES += libglew
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGLU),y)
+SONIC2013_DEPENDENCIES += libglu
+endif
+
 define SONIC2013_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -f Makefile VERBOSE=1
 endef
diff --git a/package/batocera/ports/soniccd/soniccd.mk b/package/batocera/ports/soniccd/soniccd.mk
index 8d1237d3893..ccb920cb7bf 100755
--- a/package/batocera/ports/soniccd/soniccd.mk
+++ b/package/batocera/ports/soniccd/soniccd.mk
@@ -9,7 +9,7 @@ SONICCD_SITE_METHOD = git
 SONICCD_GIT_SUBMODULES = YES
 SONICCD_LICENSE = Custom
 
-SONICCD_DEPENDENCIES = sdl2 libogg libvorbis libtheora
+SONICCD_DEPENDENCIES = sdl2 libogg libvorbis libtheora libglu
 
 ifneq ($(BR2_PACKAGE_LIBGLEW),y)
     SONICCD_VERSION = 222caf6
diff --git a/package/batocera/ports/theforceengine/theforceengine.mk b/package/batocera/ports/theforceengine/theforceengine.mk
index 704d12d2895..51bb6da2ae8 100644
--- a/package/batocera/ports/theforceengine/theforceengine.mk
+++ b/package/batocera/ports/theforceengine/theforceengine.mk
@@ -19,7 +19,7 @@ THEFORCEENGINE_EXTRA_DOWNLOADS = \
     https://df-21.net/downloads/patches/$(THEFORCEENGINE_PATCH_VERSION)/,\
     $(THEFORCEENGINE_PATCH_SOURCE))
 
-THEFORCEENGINE_DEPENDENCIES = libglew sdl2
+THEFORCEENGINE_DEPENDENCIES = libglew sdl2 sdl2_image
 
 THEFORCEENGINE_SUPPORTS_IN_SOURCE_BUILD = NO
 
diff --git a/package/batocera/utils/ledspicer/ledspicer.mk b/package/batocera/utils/ledspicer/ledspicer.mk
index 24a2d83d569..29088d55346 100644
--- a/package/batocera/utils/ledspicer/ledspicer.mk
+++ b/package/batocera/utils/ledspicer/ledspicer.mk
@@ -7,7 +7,7 @@
 LEDSPICER_VERSION = 7e8957edebe9fd6e209ac824dfe109edb3de36d9
 LEDSPICER_SITE = $(call github,meduzapat,LEDSpicer,$(LEDSPICER_VERSION))
 LEDSPICER_LICENSE = GPLv3
-LEDSPICER_DEPENDENCIES = tinyxml2 libusb libtool udev
+LEDSPICER_DEPENDENCIES = tinyxml2 libusb libtool udev libpthread-stubs
 LEDSPICER_AUTORECONF = YES
 LEDSPICER_CONF_OPTS = CXXFLAGS='-g0 -O3' --enable-nanoled --enable-pacdrive --enable-pacled64
 LEDSPICER_CONF_OPTS += --enable-ultimateio --enable-ledwiz32 --enable-howler --enable-adalight