add missing dependencies (https://pastebin.com/cLynrDqZ plus below):

- fix mangohud dep
- fix python-pyxel to create evmapy dir if it doesn't exist
- vkd3d-proton: host-zstd
-- force buildroot to build host-zstd before extracting vkd3d-proton
- cabextract: dep libmspack
- batocera-wine: create xorg.conf.d path
- libretro-wasm4: dep on libxkbcommon (x86_64)
- libretro-play: dep libglu (x86_64)
- snes9x: dep sdl2 (x86_64)
- libglvnd if BR_PACKAGE_XORG7
- ensure Config.in and .mk are in sync
- grim: dep jpeg-turbo (bcm2836)

.gitignore

@@ -28,3 +28,4 @@ package/batocera/emulationstation/batocera-emulationstation/keys.txt
 .directory
 *.po~
 batocera-mok.key
+*~

package/batocera/audio/zmusic/Config.in

@@ -5,6 +5,7 @@ config BR2_PACKAGE_ZMUSIC
     select BR2_PACKAGE_LIBSNDFILE
     select BR2_PACKAGE_MPG123
     select BR2_PACKAGE_ZLIB
+    select BR2_PACKAGE_LIBGLIB2
     help
       ZMusic is a music system as a standalone library.
 

package/batocera/audio/zmusic/zmusic.mk

@@ -7,12 +7,12 @@ 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
 
 define ZMUSIC_INSTALL_TARGET_CMDS
     cp -d $(@D)/source/libzmusic* $(TARGET_DIR)/usr/lib/
 endef
 
-$(eval $(cmake-package))
+$(eval $(cmake-package))

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

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)
 

package/batocera/cases/gpicase/gpicase.mk

@@ -9,6 +9,7 @@ GPICASE_SOURCE =
 define GPICASE_INSTALL_TARGET_CMDS
 	mkdir -p $(BINARIES_DIR)/rpi-firmware/overlays
 	cp -rf $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/gpicase/overlays/*			$(BINARIES_DIR)/rpi-firmware/overlays/
+	mkdir -p $(TARGET_DIR)/etc/udev/rules.d/
 	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/gpicase/99-gpicase.rules		$(TARGET_DIR)/etc/udev/rules.d/
 
 	install -m 0755 $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/cases/gpicase/batocera-gpicase-install	$(TARGET_DIR)/usr/bin/batocera-gpicase-install

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
 

package/batocera/emulators/dosbox/Config.in

@@ -9,6 +9,7 @@ config BR2_PACKAGE_DOSBOX
         select BR2_PACKAGE_LIBPNG
         select BR2_PACKAGE_LIBOGG
         select BR2_PACKAGE_LIBVORBIS
+	select BR2_PACKAGE_LIBGLEW
 
 	help
 	  DOSBox is a DOS-emulator that uses the SDL-library

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

package/batocera/emulators/fsuae/Config.in

@@ -5,6 +5,7 @@ config BR2_PACKAGE_FSUAE
 	select BR2_PACKAGE_OPENAL
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_SDL2
+	select BR2_PACKAGE_SDL2_TTF
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBMPEG2
 	select BR2_PACKAGE_LIBCAPSIMAGE

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
 

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.

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

package/batocera/emulators/mame/Config.in

@@ -11,6 +11,7 @@ config BR2_PACKAGE_MAME
 	select BR2_PACKAGE_RAPIDJSON
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_GLM
+	select BR2_PACKAGE_PULSEAUDIO
 
 	help
 	  MAME emulator standalone package

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

package/batocera/emulators/melonds/Config.in

@@ -5,6 +5,9 @@ config BR2_PACKAGE_MELONDS
     select BR2_PACKAGE_SDL2
     select BR2_PACKAGE_SLIRP
     select BR2_PACKAGE_BATOCERA_QT6
+    select BR2_PACKAGE_ECM
+    select BR2_PACKAGE_LIBEGL
+
     help
       Ninteno DS emulator, sorta
       http://melonds.kuribo64.net/

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
 

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

package/batocera/emulators/pcsx2/Config.in

@@ -21,6 +21,9 @@ config BR2_PACKAGE_PCSX2
     select BR2_PACKAGE_BATOCERA_QT6
     select BR2_PACKAGE_WXWIDGETS
     select BR2_PACKAGE_STENZEK_SHADERC
+    select BR2_PACKAGE_LIBCURL
+    select BR2_PACKAGE_LIBBACKTRACE
+    select BR2_PACKAGE_WEBP
     help
       PCSX2 is a free and open-source PlayStation 2 (PS2) emulator.
 

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

package/batocera/emulators/play/Config.in

@@ -10,6 +10,7 @@ config BR2_PACKAGE_PLAY
     select BR2_PACKAGE_VULKAN_HEADERS	           if BR2_PACKAGE_BATOCERA_VULKAN
     select BR2_PACKAGE_VULKAN_LOADER	           if BR2_PACKAGE_BATOCERA_VULKAN
     select BR2_PACKAGE_ECM
+    select BR2_PACKAGE_LIBGLU
 
     help
       Play! is a PlayStation2 emulator.

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

package/batocera/emulators/python-pyxel/python-pyxel.mk

@@ -30,6 +30,7 @@ define PYTHON_PYXEL_SAMPLE_AND_KEYS
 	cp -rf $(@D)/python/pyxel $(TARGET_DIR)/usr/lib/python*/site-packages/
 	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pyxel/examples
 	cd $(TARGET_DIR)/usr/lib/python*/site-packages/pyxel && ln -sf ../pyxel_extension .
+	mkdir -p $(TARGET_DIR)/usr/share/evmapy/
 	cp -f $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/python-pyxel/pyxel.keys $(TARGET_DIR)/usr/share/evmapy/
 endef
 

package/batocera/emulators/retroarch/libretro/libretro-beetle-psx/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBRETRO_BEETLE_PSX
     bool "libretro-beetle-psx"
 	depends on BR2_PACKAGE_RETROARCH
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBGLVND	if BR2_PACKAGE_XORG7
       help
         A libretro psx emulator core.
 

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_XORG7),y)
+LIBRETRO_BEETLE_PSX_DEPENDENCIES += libglvnd
+endif
+
 LIBRETRO_BEETLE_PSX_PLATFORM = $(LIBRETRO_PLATFORM)
 
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2711),y)

package/batocera/emulators/retroarch/libretro/libretro-desmume/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBRETRO_DESMUME
 	depends on BR2_PACKAGE_RETROARCH
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBGLVND     if BR2_PACKAGE_XORG7
       help
         A libretro nintendo ds emulator core.
 

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_XORG7),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 \

package/batocera/emulators/retroarch/libretro/libretro-flycastvl/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBRETRO_FLYCASTVL
 	depends on BR2_PACKAGE_RETROARCH
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_GCC_ENABLE_OPENMP
+	select BR2_PACKAGE_GL4ES
         help
           A libretro dreamcast emulator core.
 

package/batocera/emulators/retroarch/libretro/libretro-flycastvl/libretro-flycastvl.mk

@@ -8,6 +8,8 @@ LIBRETRO_FLYCASTVL_VERSION = 4a913e063c95d1fae98afc64645831de0bcad57e
 LIBRETRO_FLYCASTVL_SITE = $(call github,libretro,flycast,$(LIBRETRO_FLYCASTVL_VERSION))
 LIBRETRO_FLYCASTVL_LICENSE = GPLv2
 
+LIBRETRO_FLYCASTVL_DEPENDENCIES = gl4es
+
 LIBRETRO_FLYCASTVL_PLATFORM = $(LIBRETRO_PLATFORM)
 LIBRETRO_FLYCASTVL_EXTRA_ARGS = HAVE_OPENMP=1
 
@@ -50,6 +52,7 @@ define LIBRETRO_FLYCASTVL_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/flycast_libretro.so \
 		$(TARGET_DIR)/usr/lib/libretro/flycastvl_libretro.so
 
+    mkdir -p $(TARGET_DIR)/usr/share/libretro/info/
     cp "$(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/emulators/retroarch/libretro/libretro-flycastvl/flycastvl_libretro.info" \
         "$(TARGET_DIR)/usr/share/libretro/info/"
 endef

package/batocera/emulators/retroarch/libretro/libretro-kronos/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBRETRO_KRONOS
 	bool "libretro-kronos"
 	depends on BR2_PACKAGE_RETROARCH
 	depends on BR2_INSTALL_LIBSTDCPP
+        select BR2_PACKAGE_LIBGLVND     if BR2_PACKAGE_XORG7
       help
         A libretro saturn emulator core.
 

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_XORG7),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

package/batocera/emulators/retroarch/libretro/libretro-melonds/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBRETRO_MELONDS
 	depends on BR2_PACKAGE_RETROARCH
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBGLVND     if BR2_PACKAGE_XORG7
       help
         A libretro nintendo ds emulator core.
 

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_XORG7),y)
+LIBRETRO_MELONDS_DEPENDENCIES += libglvnd
+endif
+
 LIBRETRO_MELONDS_PLATFORM = $(LIBRETRO_PLATFORM)
 LIBRETRO_MELONDS_EXTRA_ARGS =
 

package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBRETRO_MUPEN64PLUS_NEXT
 	depends on BR2_PACKAGE_RETROARCH
 	depends on (BR2_PACKAGE_HAS_LIBGLES  && !BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY) || \
 		   (BR2_PACKAGE_HAS_LIBGL && BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY)
+	select BR2_PACKAGE_LIBGLVND     if BR2_PACKAGE_XORG7
 	  help
 	    Improved mupen64plus libretro core reimplementation
 

package/batocera/emulators/retroarch/libretro/libretro-mupen64plus-next/libretro-mupen64plus-next.mk

@@ -41,6 +41,10 @@ ifneq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY),y)
     endif
 endif
 
+ifeq ($(BR2_PACKAGE_XORG7),y)
+	LIBRETRO_MUPEN64PLUS_NEXT_DEPENDENCIES += libglvnd
+endif
+
 # PLATFORM
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_BCM2711),y)
 LIBRETRO_MUPEN64PLUS_NEXT_PLATFORM = rpi4_64

package/batocera/emulators/retroarch/libretro/libretro-openlara/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBRETRO_OPENLARA
     bool "libretro-openlara"
     depends on BR2_PACKAGE_RETROARCH
     depends on BR2_INSTALL_LIBSTDCPP
+    select BR2_PACKAGE_LIBGLVND     if BR2_PACKAGE_XORG7
     help
       A libretro core using the classic Tomb Raider open-source engine.
 

package/batocera/emulators/retroarch/libretro/libretro-openlara/libretro-openlara.mk

@@ -22,6 +22,10 @@ ifneq ($(BR2_PACKAGE_BATOCERA_TARGET_X86_ANY),y)
 	endif
 endif
 
+ifeq ($(BR2_PACKAGE_XORG7), y)
+	LIBRETRO_OPENLARA_DEPENDENCIES += libglvnd
+endif
+
 define LIBRETRO_OPENLARA_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" \
 	    -C $(@D)/src/platform/libretro -f Makefile $(LIBRETRO_OPENLARA_EXTRA_ARGS) \

package/batocera/emulators/retroarch/libretro/libretro-parallel-n64/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBRETRO_PARALLEL_N64
     bool "libretro-parallel-n64"
     depends on BR2_PACKAGE_RETROARCH
     depends on BR2_INSTALL_LIBSTDCPP
+    select BR2_PACKAGE_LIBGLVND     if BR2_PACKAGE_XORG7
       help
         Optimized/rewritten Nintendo 64 emulator made specifically for Libretro.
         Originally based on Mupen64 Plus.

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_XORG7),y)
+LIBRETRO_PARALLEL_N64_DEPENDENCIES += libglvnd
+endif
+
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBRETRO_PARALLEL_N64_DEPENDENCIES += rpi-userland
 endif

package/batocera/emulators/retroarch/libretro/libretro-pcsx2/Config.in

@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBRETRO_PCSX2
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBAIO
 	select BR2_PACKAGE_XZ
+	select BR2_PACKAGE_LIBGLVND     if BR2_PACKAGE_XORG7
       help
         A libretro core for PS2
 

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_XORG2),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 \

package/batocera/emulators/retroarch/libretro/libretro-play/Config.in

@@ -1,6 +1,8 @@
 config BR2_PACKAGE_LIBRETRO_PLAY
     bool "libretro-play"
     select BR2_PACKAGE_LIBGLEW              if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY
+    select BR2_PACKAGE_LIBGLU               if BR2_PACKAGE_BATOCERA_TARGET_X86_64_ANY
+    select BR2_PACKAGE_LIBGLVND             if BR2_PACKAGE_XORG7
     select BR2_PACKAGE_VULKAN_HEADERS       if BR2_PACKAGE_BATOCERA_VULKAN
     select BR2_PACKAGE_VULKAN_LOADER        if BR2_PACKAGE_BATOCERA_VULKAN