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

Merge branch 'dev' of github.com:JustEnoughLinuxOS/distribution into dev

Browse source
This commit is contained in:
fewtarius 2023-04-30 01:08:57 +00:00
commit 5ae9ac152c
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
22 changed files with 140 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/emulators/libretro/parallel-n64-lr/package.mk
View file

@ -22,7 +22,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
fi
case ${DEVICE} in
RK35*|S922X)
RK35*|S922X*)
PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}"
;;
esac

33
packages/emulators/libretro/tyrquake-lr/config/common/games/_Scan Quake Games.sh
View file

@ -1,33 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-3.0-or-later
# Copyright (C) 2022-present travis134
. /etc/profile
QUAKEPATH="/storage/roms/quake"
clear
echo "Scanning for games..."
pak_files=$(find "${QUAKEPATH}" -mindepth 1 -type f -iname pak0.pak)
echo "Adding games..."
while read -r pak_file; do
abs_path=$(dirname "${pak_file}")
path=${abs_path#"$QUAKEPATH/"}
filename="${path##*/}"
if [[ "${path,,}" == *"id1"* ]]; then
filename="Quake"
elif [[ "${path,,}" == *"hipnotic"* ]]; then
filename="Quake Mission Pack 1 - Scourge of Armagon"
elif [[ "${path,,}h" == *"rogue"* ]]; then
filename="Quake Mission Pack 2 - Dissolution of Eternity"
elif [[ "${path,,}" == *"dopa"* ]]; then
filename="Quake - Dimension of the Past"
fi
file="${QUAKEPATH}/${filename}.quake"
cat >"${file}" <<-EOM
PAK=${pak_file}
-- end --
EOM
done <<<"${pak_files}"
clear

6
packages/emulators/libretro/tyrquake-lr/package.mk
View file

@ -44,11 +44,5 @@ pre_configure_target() {
makeinstall_target() {
mkdir -p ${INSTALL}/usr/lib/libretro
mkdir -p ${INSTALL}/usr/config/game/tyrquake
mkdir -p ${INSTALL}/usr/lib/autostart/common
cp tyrquake_libretro.so ${INSTALL}/usr/lib/libretro/
cp -rf ${PKG_DIR}/config/common/* ${INSTALL}/usr/config/game/tyrquake
chmod 0755 ${INSTALL}/usr/config/game/tyrquake/games/*sh
cp ${PKG_DIR}/sources/autostart/common/* ${INSTALL}/usr/lib/autostart/common
chmod 0755 ${INSTALL}/usr/lib/autostart/common/*
}

9
packages/emulators/libretro/tyrquake-lr/sources/autostart/common/011-tyrquake
View file

@ -1,9 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-3.0-or-later
# Copyright (C) 2022-present travis134
if [ ! -e "/storage/roms/quake/_Scan Quake Games.sh" ]; then
cp "/usr/config/game/tyrquake/games/_Scan Quake Games.sh" "/storage/roms/quake/_Scan Quake Games.sh"
chmod +x "/storage/roms/quake/_Scan Quake Games.sh"
fi

2
packages/emulators/libretro/yabasanshiro-lr/package.mk
View file

@ -46,7 +46,7 @@ fi
pre_configure_target() {
case ${DEVICE} in
RK35*|S922X)
RK35*|S922X*)
PKG_MAKE_OPTS_TARGET+=" -C yabause/src/libretro platform=rockpro64 HAVE_NEON=0 FORCE_GLES=1"
;;
*)

10
packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini
View file

@ -224,16 +224,16 @@ HddSizeSectors = 83886080
[EmuCore/Gamefixes]
VuAddSubHack = false
FpuMulHack = false
VuAddSubHack = true
FpuMulHack = true
FpuNegDivHack = false
XgKickHack = false
EETimingHack = false
EETimingHack = true
SoftwareRendererFMVHack = false
SkipMPEGHack = false
OPHFlagHack = false
DMABusyHack = false
VIFFIFOHack = false
DMABusyHack = true
VIFFIFOHack = true
VIF1StallHack = false
GIFFIFOHack = false
GoemonTlbHack = false

19
packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh
View file

@ -40,6 +40,7 @@ fi
#Emulation Station Features
GAME=$(echo "${1}"| sed "s#^/.*/##")
ASPECT=$(get_setting aspect_ratio ps2 "${GAME}")
FILTER=$(get_setting bilinear_filtering ps2 "${GAME}")
FPS=$(get_setting show_fps ps2 "${GAME}")
RATE=$(get_setting ee_cycle_rate ps2 "${GAME}")
SKIP=$(get_setting ee_cycle_skip ps2 "${GAME}")
@ -61,6 +62,24 @@ fi
sed -i '/^AspectRatio =/c\AspectRatio = Stretch' /storage/.config/aethersx2/inis/PCSX2.ini
fi
#Bilinear Filtering
if [ "$FILTER" = "0" ]
then
sed -i '/^filter =/c\filter = 0' /storage/.config/aethersx2/inis/PCSX2.ini
fi
if [ "$FILTER" = "1" ]
then
sed -i '/^filter =/c\filter = 1' /storage/.config/aethersx2/inis/PCSX2.ini
fi
if [ "$FILTER" = "2" ]
then
sed -i '/^filter =/c\filter = 2' /storage/.config/aethersx2/inis/PCSX2.ini
fi
if [ "$FILTER" = "3" ]
then
sed -i '/^filter =/c\filter = 3' /storage/.config/aethersx2/inis/PCSX2.ini
fi
#Graphics Backend
if [ "$GRENDERER" = "0" ]
then

5
packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini
View file

@ -77,7 +77,7 @@ Fastmem = True
CPUThread = True
DSPHLE = True
SkipIdle = True
SyncOnSkipIdle = True
SyncOnSkipIdle = False
SyncGPU = False
SyncGpuMaxDistance = 200000
SyncGpuMinDistance = -200000
@ -120,7 +120,7 @@ RunCompareServer = False
RunCompareClient = False
EmulationSpeed = 1.00000000
FrameSkip = 0x00000003
Overclock = 4.00000000
Overclock = 1.0
OverclockEnable = False
GFXBackend = Vulkan
GPUDeterminismMode = auto
@ -138,6 +138,7 @@ DumpUCode = False
Backend = ALSA
Volume = 100
CaptureLog = False
DSPThread = True
[Input]
BackgroundInput = False
[FifoPlayer]

29
packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh
View file

@ -41,6 +41,7 @@ fi
GAME=$(echo "${1}"| sed "s#^/.*/##")
AA=$(get_setting anti_aliasing gamecube "${GAME}")
ASPECT=$(get_setting aspect_ratio gamecube "${GAME}")
CLOCK=$(get_setting clock_speed gamecube "${GAME}")
RENDERER=$(get_setting graphics_backend gamecube "${GAME}")
IRES=$(get_setting internal_resolution gamecube "${GAME}")
FPS=$(get_setting show_fps gamecube "${GAME}")
@ -102,6 +103,34 @@ fi
sed -i '/AspectRatio/c\AspectRatio = 3' /storage/.config/dolphin-emu/GFX.ini
fi
#Clock Speed
sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini
if [ "$CLOCK" = "0" ]
then
sed -i '/^Overclock =/c\Overclock = 0.5' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
fi
if [ "$CLOCK" = "1" ]
then
sed -i '/^Overclock =/c\Overclock = 0.75' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
fi
if [ "$CLOCK" = "2" ]
then
sed -i '/^Overclock =/c\Overclock = 1.0' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini
fi
if [ "$CLOCK" = "3" ]
then
sed -i '/^Overclock =/c\Overclock = 1.25' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
fi
if [ "$CLOCK" = "4" ]
then
sed -i '/^Overclock =/c\Overclock = 1.5' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
fi
#Video Backend
if [ "$RENDERER" = "opengl" ]
then

29
packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh
View file

@ -44,6 +44,7 @@ ln -sf /storage/roms/savestates/wii /storage/.config/dolphin-emu/StateSaves
GAME=$(echo "${1}"| sed "s#^/.*/##")
AA=$(get_setting anti_aliasing wii "${GAME}")
ASPECT=$(get_setting aspect_ratio wii "${GAME}")
CLOCK=$(get_setting clock_speed wii "${GAME}")
RENDERER=$(get_setting graphics_backend wii "${GAME}")
IRES=$(get_setting internal_resolution wii "${GAME}")
FPS=$(get_setting show_fps wii "${GAME}")
@ -105,6 +106,34 @@ ln -sf /storage/roms/savestates/wii /storage/.config/dolphin-emu/StateSaves
sed -i '/AspectRatio/c\AspectRatio = 3' /storage/.config/dolphin-emu/GFX.ini
fi
#Clock Speed
sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini
if [ "$CLOCK" = "0" ]
then
sed -i '/^Overclock =/c\Overclock = 0.5' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
fi
if [ "$CLOCK" = "1" ]
then
sed -i '/^Overclock =/c\Overclock = 0.75' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
fi
if [ "$CLOCK" = "2" ]
then
sed -i '/^Overclock =/c\Overclock = 1.0' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini
fi
if [ "$CLOCK" = "3" ]
then
sed -i '/^Overclock =/c\Overclock = 1.25' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
fi
if [ "$CLOCK" = "4" ]
then
sed -i '/^Overclock =/c\Overclock = 1.5' /storage/.config/dolphin-emu/Dolphin.ini
sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini
fi
#Video Backend
if [ "$RENDERER" = "opengl" ]
then

4
packages/emulators/standalone/drastic-sa/package.mk
View file

@ -18,8 +18,8 @@ makeinstall_target() {
mkdir -p ${INSTALL}/usr/bin
case ${DEVICE} in
S922X)
cp -rf ${PKG_DIR}/scripts/${DEVICE}/* ${INSTALL}/usr/bin
S922X*)
cp -rf ${PKG_DIR}/scripts/S922X/* ${INSTALL}/usr/bin
;;
*)
cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin

4
packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit
View file

@ -4,10 +4,6 @@
. /etc/profile
### Set GPU Govorner to powersave during boot
echo powersave > /sys/devices/platform/soc/ffe40000.gpu/devfreq/ffe40000.gpu/governor
### Disable blue blinking led
echo none > /sys/class/leds/blue\:/trigger

4
packages/jelos/profile.d/99-freqfunctions
View file

@ -88,14 +88,14 @@ performance() {
ondemand() {
set_cpu_gov ondemand
set_amdgpu_perf auto
set_gpu_gov ondemand
set_gpu_gov simple_ondemand
set_dmc_gov ondemand
}
schedutil() {
set_cpu_gov schedutil
set_amdgpu_perf auto
set_gpu_gov ondemand
set_gpu_gov simple_ondemand
set_dmc_gov ondemand
}

2
packages/multimedia/gstreamer/gst-plugins-base/package.mk
View file

@ -21,7 +21,7 @@ pre_configure_target() {
# Fix missing dispmanx
case ${DEVICE} in
RK35*|S922X)
RK35*|S922X*)
PKG_MESON_OPTS_TARGET+=" -Dgl-graphene=disabled"
;;
esac

20
packages/ui/emulationstation/config/common/es_features.cfg
View file

@ -62,6 +62,13 @@
<choice name="4/3" value="2"/>
<choice name="stretch" value="3"/>
</feature>
<feature name="clock speed">
<choice name="50%" value="0"/>
<choice name="75%" value="1"/>
<choice name="100% (default)" value="2"/>
<choice name="125%" value="3"/>
<choice name="150%" value="4"/>
</feature>
<feature name="graphics backend">
<choice name="opengl" value="opengl"/>
<choice name="vulkan" value="vulkan"/>
@ -103,6 +110,13 @@
<choice name="4/3" value="2"/>
<choice name="stretch" value="3"/>
</feature>
<feature name="clock speed">
<choice name="50%" value="0"/>
<choice name="75%" value="1"/>
<choice name="100% (default)" value="2"/>
<choice name="125%" value="3"/>
<choice name="150%" value="4"/>
</feature>
<feature name="graphics backend">
<choice name="opengl" value="opengl"/>
<choice name="vulkan" value="vulkan"/>
@ -310,6 +324,12 @@
<choice name="16/9" value="1"/>
<choice name="stretch" value="2"/>
</feature>
<feature name="bilinear filtering">
<choice name="nearest" value="0"/>
<choice name="forced" value="1"/>
<choice name="ps2" value="2"/>
<choice name="forced exc. srpite" value="3"/>
</feature>
<feature name="ee cycle rate">
<choice name="50% speed" value="0"/>
<choice name="60% speed" value="1"/>

2
packages/virtual/emulators/package.mk
View file

@ -49,7 +49,7 @@ case "${DEVICE}" in
PKG_EMUS+=" dolphin-sa drastic-sa yabasanshiro-sa"
PKG_RETROARCH+=" retropie-shaders"
;;
S922X)
S922X*)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr"
PKG_EMUS+=" aethersx2-sa dolphin-sa drastic-sa duckstation-sa mupen64plus-sa yabasanshiro-sa box64"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr flycast-lr dolphin-lr yabasanshiro-sa"

2
projects/Amlogic/packages/linux/package.mk
View file

@ -18,7 +18,7 @@ PKG_STAMP="${KERNEL_TARGET} ${KERNEL_MAKE_EXTRACMD}"
PKG_PATCH_DIRS+="${DEVICE}"
case ${DEVICE} in
S922X)
S922X*)
PKG_VERSION="6.1.26"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
;;

62
projects/Amlogic/packages/linux/patches/000-ogu-linux.patch
View file

@ -14,47 +14,23 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/Makefile linux/arch/arm64/boot
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-03-22 12:34:07.000000000 +0000
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-04-20 18:02:52.949549828 +0000
@@ -63,31 +63,31 @@
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-04-28 02:33:08.360181317 +0000
@@ -61,14 +61,6 @@
gpu_opp_table: opp-table-gpu {
compatible = "operating-points-v2";
opp-124999998 {
opp-hz = /bits/ 64 <124999998>;
- opp-124999998 {
- opp-hz = /bits/ 64 <124999998>;
- opp-microvolt = <800000>;
+ opp-microvolt = <1150000>;
};
opp-249999996 {
opp-hz = /bits/ 64 <249999996>;
- };
- opp-249999996 {
- opp-hz = /bits/ 64 <249999996>;
- opp-microvolt = <800000>;
+ opp-microvolt = <1150000>;
};
- };
opp-285714281 {
opp-hz = /bits/ 64 <285714281>;
- opp-microvolt = <800000>;
+ opp-microvolt = <1150000>;
};
opp-399999994 {
opp-hz = /bits/ 64 <399999994>;
- opp-microvolt = <800000>;
+ opp-microvolt = <1150000>;
};
opp-499999992 {
opp-hz = /bits/ 64 <499999992>;
- opp-microvolt = <800000>;
+ opp-microvolt = <1150000>;
};
opp-666666656 {
opp-hz = /bits/ 64 <666666656>;
- opp-microvolt = <800000>;
+ opp-microvolt = <1150000>;
};
opp-799999987 {
opp-hz = /bits/ 64 <799999987>;
- opp-microvolt = <800000>;
+ opp-microvolt = <1150000>;
};
};
@@ -1694,7 +1694,7 @@
opp-microvolt = <800000>;
@@ -1694,7 +1686,7 @@
#address-cells = <1>;
#size-cells = <0>;
@ -63,7 +39,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
compatible = "ethernet-phy-id0180.3301",
"ethernet-phy-ieee802.3-c22";
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
@@ -1885,6 +1885,15 @@
@@ -1885,6 +1877,15 @@
};
};
@ -79,7 +55,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
uart_ao_a_pins: uart-a-ao {
mux {
groups = "uart_ao_a_tx",
@@ -2395,14 +2404,19 @@
@@ -2395,14 +2396,20 @@
};
mali: gpu@ffe40000 {
@ -91,6 +67,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
+ <0 0xFF800000 0 0x01000>,
+ <0 0xFF63c000 0 0x01000>,
+ <0 0xFFD01000 0 0x01000>;
+
interrupt-parent = <&gic>;
- interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
+ interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
@ -106,7 +83,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
#cooling-cells = <2>;
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-04-20 19:22:00.692778406 +0000
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-04-27 13:36:34.610877356 +0000
@@ -0,0 +1,932 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@ -1112,13 +1089,14 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts linu
+};
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-03-22 12:34:07.000000000 +0000
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-03-31 19:19:37.633541167 +0000
@@ -137,5 +137,5 @@
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-04-28 16:33:01.398687793 +0000
@@ -137,5 +137,6 @@
};
&mali {
- dma-coherent;
+ system-coherency=<0>;
+ system-coherency = <0>;
+ power_policy = "always_on";
};
diff -rupN linux.orig/drivers/Kconfig linux/drivers/Kconfig
--- linux.orig/drivers/Kconfig 2023-03-22 12:34:07.000000000 +0000

4
projects/Amlogic/packages/u-boot/package.mk
View file

@ -18,6 +18,10 @@ case ${DEVICE} in
PKG_VERSION="9235942906216dc529c1e96f67dd2364a94d0738"
PKG_GIT_CLONE_BRANCH="odroidgoU-v2015.01"
;;
*)
PKG_URL="https://github.com/u-boot/u-boot.git"
PKG_VERSION="10f8eec3e0f948005b208869a9ec26b1bf896f86"
;;
esac
PKG_IS_KERNEL_PKG="yes"

0
projects/Amlogic/packages/u-boot/patches/001-fix-build.patch → projects/Amlogic/packages/u-boot/patches/S922X/001-fix-build.patch
View file

0
projects/Amlogic/packages/u-boot/patches/002-build-fixes.patch → projects/Amlogic/packages/u-boot/patches/S922X/002-build-fixes.patch
View file

0
projects/Amlogic/packages/u-boot/patches/003-disable-bl301.patch → projects/Amlogic/packages/u-boot/patches/S922X/003-disable-bl301.patch
View file