Skip to content

Commit

Permalink
add missing dependencies (https://pastebin.com/cLynrDqZ)
Browse files Browse the repository at this point in the history
- validated on x86_64 build
- validated on bcm2836 build
  • Loading branch information
udance4ever committed Sep 13, 2024
1 parent 783a7a7 commit 25814bb
Show file tree
Hide file tree
Showing 44 changed files with 83 additions and 26 deletions.
4 changes: 2 additions & 2 deletions package/batocera/audio/zmusic/zmusic.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
1 change: 1 addition & 0 deletions package/batocera/boot/batocera-initramfs/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/cemu/cemu.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/dosbox/dosbox.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/fsuae/fsuae.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions package/batocera/emulators/lightspark/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions package/batocera/emulators/lightspark/lightspark.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/mame/mame.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/melonds/melonds.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions package/batocera/emulators/pcsx2/pcsx2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/play/play.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/python-pyxel/python-pyxel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 =

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/rpcs3/rpcs3.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/supermodel/supermodel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/vita3k/vita3k.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/emulators/xemu/xemu.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions package/batocera/gpu/batocera-amd/batocera-amd.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ 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
mkdir -p $(TARGET_DIR)/usr/share/amd
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
Expand Down
2 changes: 2 additions & 0 deletions package/batocera/gpu/batocera-nvidia/batocera-nvidia.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion package/batocera/libraries/faudio/faudio.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion package/batocera/libraries/pywebview/pywebview.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
2 changes: 1 addition & 1 deletion package/batocera/ports/dxx-rebirth/dxx-rebirth.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/ports/etlegacy/etlegacy.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/batocera/ports/raze/raze.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions package/batocera/ports/sonic2013/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 25814bb

Please sign in to comment.