wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #145 from JustEnoughLinuxOS/dev

Browse source 
Merge to main for release staging
This commit is contained in:
fewtarius 2022-05-27 08:52:32 -04:00 committed by GitHub
commit 8284420d38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 86 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/games/emulators/retroarch/sources/RG351MP/retroarch-core-options.cfg
View file

@ -87,3 +87,5 @@ melonds_swapscreen_mode = "Toggle"
melonds_threaded_renderer = "enabled"
melonds_touch_mode = "Joystick"
duckstation_GPU.Renderer = "Software"
virtualjaguar_bios = "enabled"
virtualjaguar_usefastblitter = "enabled"

2
packages/games/emulators/retroarch/sources/RG351P/retroarch-core-options.cfg
View file

@ -87,3 +87,5 @@ melonds_swapscreen_mode = "Toggle"
melonds_threaded_renderer = "enabled"
melonds_touch_mode = "Joystick"
duckstation_GPU.Renderer = "Software"
virtualjaguar_bios = "enabled"
virtualjaguar_usefastblitter = "enabled"

2
packages/games/emulators/retroarch/sources/RG351V/retroarch-core-options.cfg
View file

@ -87,3 +87,5 @@ melonds_swapscreen_mode = "Toggle"
melonds_threaded_renderer = "enabled"
melonds_touch_mode = "Joystick"
duckstation_GPU.Renderer = "Software"
virtualjaguar_bios = "enabled"
virtualjaguar_usefastblitter = "enabled"

2
packages/games/emulators/retroarch/sources/RG552/retroarch-core-options.cfg
View file

@ -87,3 +87,5 @@ melonds_swapscreen_mode = "Toggle"
melonds_threaded_renderer = "enabled"
melonds_touch_mode = "Joystick"
duckstation_GPU.Renderer = "Software"
virtualjaguar_bios = "enabled"
virtualjaguar_usefastblitter = "enabled"

3
packages/games/libretro/virtualjaguar/package.mk
View file

@ -19,8 +19,7 @@
################################################################################
PKG_NAME="virtualjaguar"
PKG_VERSION="5a293de747823dc0a9ceba0dd878ef75e9a9d920"
PKG_SHA256="9435674689c48e7ac61c0c49a972c84410e4e07dc65be487ccf2d1ae302cd3a8"
PKG_VERSION="263c979be4ca757c43fb525bd6f0887998e57041"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv3"

1
packages/jelos/config/system/configs/system.cfg
View file

@ -22,6 +22,7 @@ atari7800.integerscale=1
atari7800.rgascale=0
atari800.integerscale=1
atari800.rgascale=0
atarijaguar.maxperf=1
atarilynx.integerscale=1
atarilynx.ratio=core
atarist.integerscale=1

2
packages/jelos/package.mk
View file

@ -39,7 +39,7 @@ LIBRETRO_CORES="2048 81 a5200 atari800 beetle-gba beetle-lynx beetle-ngp beetle-
ppsspp prboom prosystem puae px68k quasi88 quicknes race reminiscence sameboy \
sameduck scummvm smsplus-gx snes9x snes9x2002 snes9x2005_plus snes9x2010 stella \
stella-2014 swanstation TIC-80 tgbdual tyrquake xrick uae4arm uzem vba-next vbam \
vecx vice yabasanshiro xmil mesen"
vecx vice yabasanshiro xmil mesen virtualjaguar"
PKG_COMPAT="lib32"

10
packages/jelos/sources/autostart/common/098-wireguard Normal file
View file

@ -0,0 +1,10 @@
#!/bin/bash
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) 2021-present kkoshelev (https://github.com/kkoshelev)
. /etc/profile
if [ "$(get_setting wireguard.up)" == "1" ]
then
nohup wg-quick up /storage/.config/wireguard/wg0.conf &
fi

1
packages/jelos/tmpfiles.d/jelos-dirs.conf
View file

@ -12,6 +12,7 @@ d /storage/roms/atari800 0755 root root - -
d /storage/roms/atari2600 0755 root root - -
d /storage/roms/atari5200 0755 root root - -
d /storage/roms/atari7800 0755 root root - -
d /storage/roms/atarijaguar 0755 root root - -
d /storage/roms/atarilynx 0755 root root - -
d /storage/roms/atarist 0755 root root - -
d /storage/roms/atomiswave 0755 root root - -

2
packages/sysutils/rclone/sources/rclonectl
View file

@ -19,7 +19,7 @@ fi
for CONFIG in rsync.conf rsync-rules.conf
do
if [ ! -d "${CONFIGPATH}/${CONFIG}" ]
if [ ! -e "${CONFIGPATH}/${CONFIG}" ]
then
cp -rf /usr/config/${CONFIG} ${CONFIGPATH}/${CONFIG}
fi

2
packages/ui/emulationstation/config/es_features.cfg
View file

@ -114,7 +114,7 @@
<core name="vice_xplus4" features="netplay, rewind, autosave" />
<core name="vice_xvic" features="netplay, rewind, autosave" />
<core name="vice_xpet" features="netplay, rewind, autosave"/>
<core name="virtualjaguar" features="netplay, rewind, autosave, cheevos" />
<core name="virtualjaguar" features="netplay, cheevos" />
<core name="x1" features="netplay, rewind, autosave" />
<core name="xrick" features="netplay, rewind, autosave" />
<core name="yabasanshiro" features="netplay, rewind, autosave" />

19
packages/ui/emulationstation/config/es_systems.cfg
View file

@ -852,6 +852,25 @@
</emulator>
</emulators>
</system>
<system>
<name>atarijaguar</name>
<fullname>Jaguar</fullname>
<manufacturer>Atari</manufacturer>
<release>1993</release>
<hardware>console</hardware>
<path>/storage/roms/atarijaguar</path>
<extension>.j64 .jag .J64 .JAG</extension>
<command>/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%"</command>
<platform>atarijaguar</platform>
<theme>atarijaguar</theme>
<emulators>
<emulator name="retroarch">
<cores>
<core default="true">virtualjaguar</core>
</cores>
</emulator>
</emulators>
</system>
<system>
<name>atarilynx</name>
<fullname>Lynx</fullname>

44
packages/ui/emulationstation/package.mk
View file

@ -3,7 +3,7 @@
# Copyright (C) 2020-present Fewtarius
PKG_NAME="emulationstation"
PKG_VERSION="481a471"
PKG_VERSION="6d3fd4b"
PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1"
PKG_ARCH="any"
@ -23,6 +23,48 @@ PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} es-theme-art-book-next"
PKG_CMAKE_OPTS_TARGET=" -DENABLE_EMUELEC=1 -DGLES2=1 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0"
##########################################################################################################
# The following allows building Emulation station from local copy by using EMULATIONSTATION_SRC.
# The built makes symlinks to a local repository.
#
# One time setup:
# ---------------
# cd ~
# git clone https://github.com/JustEnoughLinuxOS/emulationstation.git
# cd emulationstation
# git submodule update --init
#
# Cleanup old files:
# ------------------
# DEVICE=RG351V ARCH=aarch64 ./scripts/clean emulationstation
#
# Build from local copy:
# ----------------------
# EMULATIONSTATION_SRC=~/emulationstation DEVICE=RG351V ARCH=aarch64 ./scripts/build emulationstation
#
# Run from the device:
# --------------------
# Copy ./emulationstation binary found in build.JELOS-<device>.aarch64/emulationstation-*/.install_pkg/usr/bin/
# Via ssh, run emulationstation with
# systemctl stop emustation
# chmod +x ./emulationstation
# ./emulationstation
##########################################################################################################
if [ -n "$EMULATIONSTATION_SRC" ]; then
unpack() {
echo cp -PRf ${EMULATIONSTATION_SRC} ${PKG_BUILD}
cp -PRf ${EMULATIONSTATION_SRC} ${PKG_BUILD}
}
# add some symbolic links to point to a code in local source folder
post_unpack() {
rm -rf "${PKG_BUILD}/es-app"
ln -sf "${EMULATIONSTATION_SRC}/es-app" "${PKG_BUILD}"
rm -rf "${PKG_BUILD}/es-core"
ln -sf "${EMULATIONSTATION_SRC}/es-core" "${PKG_BUILD}"
}
fi
pre_configure_target() {
if [ -f ~/developer_settings.conf ]; then
. ~/developer_settings.conf