Merge pull request #645 from brooksytech/dev

Remove JelosAddOns and duckstation custom.
This commit is contained in:
Brooksytech 2022-10-21 14:54:24 -07:00 committed by GitHub
commit d89d4d270e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 1 additions and 112 deletions

View file

@ -36,5 +36,4 @@ makeinstall_target() {
cp ${PKG_BUILD}/pcsx_rearmed_libretro.info ${INSTALL}/usr/lib/libretro/pcsx_rearmed32_libretro.info
cp ${PKG_BUILD}/flycast_libretro.info ${INSTALL}/usr/lib/libretro/flycast_libretro_libretro.info
cp ${PKG_BUILD}/flycast_libretro.info ${INSTALL}/usr/lib/libretro/flycast32_libretro.info
cp ${PKG_BUILD}/duckstation_libretro.info ${INSTALL}/usr/lib/libretro/duckstation_custom_libretro.info
}

View file

@ -1,25 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
PKG_NAME="jelosaddons"
PKG_VERSION="56a4ada71dcd0d0cf1c6ba5c2058449f4ae4fcb2"
PKG_ARCH="any"
PKG_SITE="https://github.com/brooksytech/JelosAddOns"
PKG_URL="${PKG_SITE}/raw/${PKG_VERSION}/JelosAddOns.zip"
PKG_PRIORITY="optional"
PKG_SECTION="tools"
PKG_SHORTDESC="Additonal game ports and add ons not included with default install"
PKG_TOOLCHAIN="manual"
pre_unpack() {
unzip sources/jelosaddons/jelosaddons-${PKG_VERSION}.zip -d ${PKG_BUILD}
}
makeinstall_target() {
mkdir -p $INSTALL/usr/share/
cp -r ${PKG_BUILD}/JelosAddOns ${INSTALL}/usr/share/
chmod 0755 $INSTALL/usr/share/JelosAddOns
mkdir -p ${INSTALL}/usr/lib/autostart/common
cp ${PKG_DIR}/sources/autostart/common/* ${INSTALL}/usr/lib/autostart/common
}

View file

@ -1,43 +0,0 @@
#!/bin/sh
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
#If JelosAddOns does not exist copy JelosAddOns folder to roms/ports
if [ ! -d "/storage/roms/ports/JelosAddOns" ]
then
mkdir -p /storage/roms/ports/JelosAddOns
rsync -a /usr/share/JelosAddOns/* /storage/roms/ports/JelosAddOns/
chmod -R 755 /storage/roms/ports/JelosAddOns
fi
#Check if gamelist.xml exists, if not create gamelist.xml to hide JelosAddOns by default.
if [[ ! -e /storage/roms/ports/gamelist.xml ]];
then
touch /storage/roms/ports/gamelist.xml
cat > /storage/roms/ports/gamelist.xml <<EOF
<?xml version="1.0"?>
<gameList>
<game>
<path>/storage/roms/ports/JelosAddOns/JelosAddOns.sh</path>
<name>JelosAddOns</name>
<hidden>true</hidden>
</game>
</gameList>
EOF
#If gamelist.xml exists and no JelosAddOns entry exists then add JelosAddOns entry & set to hidden.
else
if ! grep -R "JelosAddOns" "/storage/roms/ports/gamelist.xml"
then
sed -i 's|<gameList>|& \
<game>\
<path>/storage/roms/ports/JelosAddOns/JelosAddOns.sh</path>\
<name>JelosAddOns</name>\
<hidden>true</hidden>\
</game>|' /storage/roms/ports/gamelist.xml
fi
fi
mv /storage/roms/ports/JelosAddOns/JelosAddOns.sh /storage/roms/ports/JelosAddOns.sh
chmod +x /storage/roms/ports/JelosAddOns/JelosAddOns.sh
chmod +x /storage/roms/ports/JelosAddOns -R

View file

@ -74,19 +74,6 @@ fi
rsync -a --delete /usr/share/PortMaster/* /storage/roms/ports/PortMaster/
chmod +x /storage/roms/ports/PortMaster -R
# Ensure JelosAddOns is in sync
if [ ! -d "/storage/roms/ports/JelosAddOns" ]
then
mkdir -p /storage/roms/ports/JelosAddOns
else
rm -rf /storage/roms/ports/JelosAddOns
mkdir -p /storage/roms/ports/JelosAddOns
rm -f /storage/roms/ports/JelosAddOns.sh ||:
fi
rsync -a /usr/share/JelosAddOns/* /storage/roms/ports/JelosAddOns/
chmod -R 755 /storage/roms/ports/JelosAddOns
# Make sure ThemeMaster is in sync
if [ ! -d "/storage/roms/ports/ThemeMaster" ]
then

View file

@ -1,13 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright 2022-present BrooksyTech (https://github.com/brooksytech)
. /etc/profile
if [ "${UI_SERVICE}" = "weston.service" ]
then
sed -i -e "s#/dev/tty0#/dev/tty#" /storage/roms/ports/JelosAddOns.sh
fi
cd /storage/roms/ports/JelosAddOns
./JelosAddOns.sh

View file

@ -40,19 +40,6 @@
<image>./downloaded_images/rclone-back.png</image>
</game>
<game>
<path>./JelosAddOns.sh</path>
<name>JelosAddOns</name>
<desc>Game port installer</desc>
<developer>brooksytech</developer>
<publisher>Jelos</publisher>
<rating>1.0</rating>
<releasedate>2021</releasedate>
<genre>Script</genre>
<thumbnail>./downloaded_images/jelos-thumb.png</thumbnail>
<image>./downloaded_images/jelos-image.png</image>
</game>
<game>
<path>./PortMaster.sh</path>
<name>PortMaster</name>

View file

@ -85,7 +85,6 @@
<core name="beetle_vb" features="netplay, rewind, autosave, cheevos" />
<core name="beetle_wswan" features="decoration, netplay, rewind, autosave, cheevos" />
<core name="duckstation" features="netplay, rewind, autosave" />
<core name="duckstation_custom" features="netplay, rewind, autosave" />
<core name="mesen-s" features="netplay, rewind, autosave, cheevos" />
<core name="mesen" features="netplay, rewind, autosave, cheevos" />
<core name="mgba" features="decoration, netplay, rewind, autosave, cheevos" />

View file

@ -1431,7 +1431,6 @@
<core>pcsx_rearmed</core>
<core>swanstation</core>
<core>duckstation</core>
<core>duckstation_custom</core>
</cores>
</emulator>
<emulator name="Duckstation">

View file

@ -1466,7 +1466,6 @@
<cores>
<core default="true">swanstation</core>
<core>duckstation</core>
<core>duckstation_custom</core>
</cores>
</emulator>
<emulator name="Duckstation">

View file

@ -7,7 +7,7 @@ PKG_SITE="www.jelos.org"
PKG_SECTION="virtual"
PKG_LONGDESC="Game support software metapackage."
PKG_GAMESUPPORT="sixaxis rg351p-js2xbox gptokeyb jstest-sdl gamecontrollerdb jelosaddons sdljoytest doomscan wolfscan"
PKG_GAMESUPPORT="sixaxis rg351p-js2xbox gptokeyb jstest-sdl gamecontrollerdb sdljoytest doomscan wolfscan"
PKG_DEPENDS_TARGET="${PKG_GAMESUPPORT}"