Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Commit

Permalink
Merge pull request #2510 from JustEnoughLinuxOS/dev
Browse files Browse the repository at this point in the history
PR for release
  • Loading branch information
fewtarius authored Dec 11, 2023
2 parents 16179c6 + 4998763 commit d338cdd
Show file tree
Hide file tree
Showing 102 changed files with 593 additions and 172,639 deletions.
2 changes: 1 addition & 1 deletion config/emulators/dreamcast.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SYSTEM_MANUFACTURER="Sega"
SYSTEM_RELEASE="1998"
SYSTEM_HARDWARE="console"
SYSTEM_PATH="/storage/roms/dreamcast"
SYSTEM_EXTENSION=".cdi .gdi .chd .m3u"
SYSTEM_EXTENSION=".cdi .gdi .chd .m3u .cue"
SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
SYSTEM_PLATFORM="dreamcast"
SYSTEM_THEME="dreamcast"
Expand Down
2 changes: 1 addition & 1 deletion config/functions
Original file line number Diff line number Diff line change
Expand Up @@ -1879,7 +1879,7 @@ add_system_dir() {
then
mkdir -p "${ESTMP}"
fi
cat <<EOF >>${ESTMP}/${DISTRO}-system-dirs.conf
cat <<EOF >>${ESTMP}/system-dirs.conf
d ${1} 0777 root root - -
EOF
}
Expand Down
4 changes: 2 additions & 2 deletions config/optimize
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ LDFLAGS_OPTIM_LINKER_GOLD="-fuse-ld=gold"
LDFLAGS_OPTIM_LINKER_MOLD="-fuse-ld=mold"

# default compiler optimization
CFLAGS_OPTIM_DEFAULT="-Ofast -fomit-frame-pointer -DNDEBUG"
CFLAGS_OPTIM_DEFAULT="-O3 -fomit-frame-pointer -DNDEBUG"
CXXFLAGS_OPTIM_DEFAULT="${CFLAGS_OPTIM_DEFAULT}"
# speed flag
CFLAGS_OPTIM_SPEED="-Ofast -fomit-frame-pointer -DNDEBUG"
CFLAGS_OPTIM_SPEED="-O3 -fomit-frame-pointer -DNDEBUG"
CXXFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED}"
# size flag
CFLAGS_OPTIM_SIZE="-Os -fomit-frame-pointer -DNDEBUG"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**retroarch:** flycast32 (default)<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ This document describes all available systems emulators and cores available for
|Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
|Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
|Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**flycast:** flycast-sa (default)<br>**retroarch:** flycast<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**flycast:** flycast-sa (default)<br>**retroarch:** flycast<br>|
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**flycast:** flycast-sa (default)<br>**retroarch:** flycast<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/portmaster/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

PKG_NAME="portmaster"
PKG_VERSION="8.5.2_0811"
PKG_VERSION="8.5.13_1130"
PKG_SITE="https://github.com/PortsMaster/PortMaster-GUI"
PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/PortMaster.zip"
COMPAT_URL="https://github.com/brooksytech/JelosAddOns/raw/main/compat.zip"
Expand Down
17 changes: 13 additions & 4 deletions packages/apps/portmaster/scripts/portmaster_compatibility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@

. /etc/profile

PORTPLATFORM=$(tr -d '\0' </sys/firmware/devicetree/base/model 2>/dev/null)

if [[ "${UI_SERVICE}" =~ weston.service ]]; then
case ${PORTPLATFORM} in
case "${QUIRK_DEVICE}" in
"Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3"|"Hardkernel ODROID-N2*")
#Fixing ports on S922X, exclude FNA games
for port in /storage/roms/ports/*.sh; do
Expand All @@ -19,9 +17,20 @@ case ${PORTPLATFORM} in
done;
;;
*)
#Remove gl4es libs on devices that support OpenGL
#Remove gl4es libs on devices that support OpenGL and sed any port that refrences it
rm -rf /storage/roms/ports/*/lib*/libEGL*
rm -rf /storage/roms/ports/*/lib*/libGL*
for port in /storage/roms/ports/*.sh; do
sed -i '/^export SDL_VIDEO_GL_DRIVER/c\#export SDL_VIDEO_GL_DRIVER"' "$port"
sed -i '/^export SDL_VIDEO_EGL_DRIVER/c\#export SDL_VIDEO_EGL_DRIVER' "$port"
echo Fixing: "$port";
done;

#Remove S922X fix if exists
for port in /storage/roms/ports/*.sh; do
sed -i '/get_controls && export/c\get_controls' "$port"
echo Fixing: "$port";
done;
;;
esac
fi
5 changes: 4 additions & 1 deletion packages/apps/portmaster/scripts/start_portmaster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ else
fi

#Make sure permissions are correct in the PortMaster folder
chmod 755 /storage/roms/ports/PortMaster/* -R
find /storage/roms/ports/ -not -perm 755 -exec chmod 755 {} \;

#Fix compatability for some portmaster ports
/usr/bin/portmaster_compatibility.sh

#Start PortMaster
@LIBEGL@
Expand Down
8 changes: 3 additions & 5 deletions packages/apps/portmaster/sources/control.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2023-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

# This file can and should be sourced by ports for various parameters to
# This file can and should be sourced by ports for various parameters to
# minimize script customizations and allow for easier future updates
# like adding additional supported devices.
# Thanks to JohnnyonFlame, dhwz, romadu, and shantigilbert for the
# Thanks to JohnnyonFlame, dhwz, romadu, and shantigilbert for the
# suggestion and assistance with this.
# Source used for gptokeyb available at
# https://github.com/christianhaitian/gptokeyb
Expand All @@ -23,9 +23,8 @@ SDLDBUSERFILE="/storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt"
clibs="/usr/lib/compat/"
raloc="/usr/bin"
raconf="--config /storage/.config/retroarch/retroarch.cfg"
pdevice=$(tr -d '\0' </sys/firmware/devicetree/base/model 2>/dev/null)

case ${pdevice} in
case "${QUIRK_DEVICE}" in
"Anbernic RG552")
profile="rg552"
lres="N"
Expand Down Expand Up @@ -90,7 +89,6 @@ get_controls() {

# Set compatability libs and run compatability script
export LD_LIBRARY_PATH=${clibs}
/usr/bin/portmaster_compatibility.sh

# Now find any controller mapped on emulationstation...
/storage/.config/PortMaster/mapper.txt SDL_GAMECONTROLLERCONFIG_FILE > /dev/null 2>&1
Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/libretro/dolphin-lr/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
fi

if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
PKG_CONFIGURE_OPTS_TARGET+=" -DENABLE_X11=ON \
-DENABLE_EGL=ON"
fi
Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/libretro/gambatte-lr/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
################################################################################

PKG_NAME="gambatte-lr"
PKG_VERSION="327137ec04d514b6c06c30c8b1d0b5da4267af6c"
PKG_VERSION="9b232311f4f462a5dc26187b511ea361d30c5959"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"
Expand Down
4 changes: 2 additions & 2 deletions packages/emulators/standalone/cemu-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

PKG_NAME="cemu-sa"
PKG_VERSION="f3c95f72e74d8a5f5873061fbb994643c63ec9c5"
PKG_VERSION="dee764473db26462a898aae8ea73c65a9cbafda1"
PKG_ARCH="x86_64"
PKG_LICENSE="MPL-2.0"
PKG_SITE="https://github.com/cemu-project/Cemu"
Expand All @@ -18,7 +18,7 @@ PKG_BUILD_FLAGS="+lto"
configure_package() {
# Displayserver Support
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET+=" xorg-server"
PKG_DEPENDS_TARGET+=" xwayland"
elif [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland"
fi
Expand Down
13 changes: 11 additions & 2 deletions packages/emulators/standalone/citra-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,25 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

PKG_NAME="citra-sa"
PKG_VERSION="9b2a592"
PKG_LICENSE="MPLv2"
PKG_SITE="https://github.com/citra-emu/citra"
PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="toolchain ffmpeg mesa SDL2 boost zlib libusb boost zstd control-gen"
PKG_LONGDESC="Citra 3DS emulator"
PKG_TOOLCHAIN="cmake"
GET_HANDLER_SUPPORT="git"
PKG_PATCH_DIRS+="${DEVICE}"

case ${DEVICE} in
S922X)
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="9b2a592"
;;
*)
PKG_URL="${PKG_SITE}.git"
PKG_VERSION="60584e861d15f5cf1f64890c03e8090460d3f7c4"
;;
esac

if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
fi
Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/standalone/dolphin-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
fi

if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
PKG_CMAKE_OPTS_TARGET+=" -DENABLE_WAYLAND=ON \
-DENABLE_X11=ON"
else
Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/standalone/duckstation-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
fi

if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND=ON"
fi

Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/standalone/flycast-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

PKG_NAME="flycast-sa"
PKG_VERSION="ea83b08f89d75e45b11a8c7f5d8607c6a7270e86"
PKG_VERSION="5fde889d7ca30cc0059eaf64816878df2cb9f898"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/flyinghead/flycast"
PKG_URL="${PKG_SITE}.git"
Expand Down
1 change: 0 additions & 1 deletion packages/emulators/standalone/gzdoom-sa/package.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
# Copyright (C) 2023-present brooksytech (https://github.com/brookstech)

PKG_NAME="gzdoom-sa"
PKG_VERSION="d05ea1965ad1f070859806a3a67aaf5ea6c46234"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ GUID1="$(mednafen --list-joysticks | grep ID | awk 'NR==1 {print $2}')"
sed -e "s/@GUID1@/${GUID1}/g" ${MEDNAFEN_CONFIG} >> $MEDNAFEN_HOME/mednafen.cfg

NAME="$(mednafen --list-joysticks | grep ID | awk 'NR==1 {print $5$6}')"

if [[ "$(mednafen --list-joysticks | grep ID | awk 'NR==1 {print $4}')" = "8BitDo" ]]
then
NAME="X-Box360"
fi

# Controller config for 360 and GPIO handled separately
if [[ "${NAME}" = "X-Box360" ]]
Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/standalone/melonds-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
fi

if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
fi

if [ "${VULKAN_SUPPORT}" = "yes" ]
Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/standalone/primehack/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
fi

if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
PKG_CMAKE_OPTS_TARGET+=" -DENABLE_WAYLAND=ON \
-DENABLE_X11=OFF"
fi
Expand Down
2 changes: 1 addition & 1 deletion packages/emulators/standalone/rpcs3-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PKG_LICENSE="GPL-2.0-or-later"
PKG_SITE="https://rpcs3.net"
PKG_URL="https://github.com/RPCS3/rpcs3.git"
PKG_DEPENDS_HOST="toolchain:host"
PKG_DEPENDS_TARGET="toolchain linux glibc systemd pulseaudio mesa xorg-server libevdev curl ffmpeg libpng zlib glew-cmake libSM SDL2 enet qt5 rpcs3-sa:host vulkan-headers vulkan-loader vulkan-tools libp11-kit yamlcpp openal-soft soundtouch"
PKG_DEPENDS_TARGET="toolchain linux glibc systemd pulseaudio mesa xwayland libevdev curl ffmpeg libpng zlib glew-cmake libSM SDL2 enet qt5 rpcs3-sa:host vulkan-headers vulkan-loader vulkan-tools libp11-kit yamlcpp openal-soft soundtouch"
PKG_LONGDESC="RPCS3 is an experimental open-source Sony PlayStation 3 emulator and debugger."
GET_HANDLER_SUPPORT="git"
PKG_GIT_CLONE_BRANCH="master"
Expand Down
4 changes: 2 additions & 2 deletions packages/emulators/standalone/yuzu-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

PKG_NAME="yuzu-sa"
PKG_VERSION="767c4b5a992bfeeae9194bc9f5a3dc63996645df"
PKG_VERSION="875568bb3e34725578f7fa3661c8bad89f23a173"
PKG_ARCH="x86_64"
PKG_LICENSE="GPLv3"
PKG_SITE="https://github.com/yuzu-emu/yuzu"
Expand All @@ -22,7 +22,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
fi

if [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
fi

if [ "${VULKAN_SUPPORT}" = "yes" ]
Expand Down
Loading

0 comments on commit d338cdd

Please sign in to comment.