Merge pull request #595 from JustEnoughLinuxOS/dev

PR for release
This commit is contained in:
fewtarius 2022-10-05 14:17:21 -04:00 committed by GitHub
commit b42432527b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 129 additions and 177 deletions

View file

@ -27,7 +27,7 @@ jobs:
steps: steps:
- uses: hmarr/debug-action@v2 - uses: hmarr/debug-action@v2
name: debug name: debug
- name: get current branch as it may not be 'default branch; - name: get current branch as it may not be default branch;
id: branch id: branch
run: | run: |
branch_arg="${{ github.event.client_payload.branch }}" branch_arg="${{ github.event.client_payload.branch }}"
@ -43,9 +43,6 @@ jobs:
- name: Get date for artifacts - name: Get date for artifacts
id: date id: date
run: echo "::set-output name=date::$(date +'%Y%m%d')" run: echo "::set-output name=date::$(date +'%Y%m%d')"
- name: Get short SHA for artifacts
id: sha
run: echo "::set-output name=sha::$(git rev-parse --short HEAD)"
- name: Get version - name: Get version
id: version id: version
run: | run: |
@ -54,7 +51,7 @@ jobs:
if [[ "${{ github.event.client_payload.release_tag }}" != "" ]]; then if [[ "${{ github.event.client_payload.release_tag }}" != "" ]]; then
echo "::set-output name=version::${{ github.event.client_payload.release_tag }}" echo "::set-output name=version::${{ github.event.client_payload.release_tag }}"
else else
echo "::set-output name=version::${{ steps.date.outputs.date }}-${{ steps.sha.outputs.sha }}" echo "::set-output name=version::${{ steps.date.outputs.date }}"
fi fi
- name: Build World - name: Build World
run: | run: |

View file

@ -6,17 +6,6 @@
name: release-main name: release-main
on: on:
push:
paths-ignore:
- '.github/**'
- '*.md'
- 'Dockerfile'
- '.dockerignore'
- '.gitignore'
- 'licenses/**'
- 'tools/**'
branches:
- main
workflow_dispatch: workflow_dispatch:
env: env:
@ -42,16 +31,6 @@ jobs:
run: | run: |
echo "::set-output name=full_name::$(git config --get remote.origin.url | sed 's|^.*github.com/||g' | sed 's/.git$//g')" echo "::set-output name=full_name::$(git config --get remote.origin.url | sed 's|^.*github.com/||g' | sed 's/.git$//g')"
- name: changes
id: changes
run: |
prevrelcommit="$(git rev-list --tags --max-count=1)"
release_notes="$(git log ${prevrelcommit}..HEAD --pretty=format:"* %h: %s")"
release_notes="${release_notes//'%'/'%25'}"
release_notes="${release_notes//$'\n'/'%0A'}"
release_notes="${release_notes//$'\r'/'%0D'}"
echo "::set-output name=changes::$(echo ${release_notes} | wc -l)"
echo "::set-output name=release_notes::${release_notes}"
- name: Get date for artifacts - name: Get date for artifacts
id: date id: date
run: echo "::set-output name=date::$(date +'%Y%m%d')" run: echo "::set-output name=date::$(date +'%Y%m%d')"
@ -67,6 +46,5 @@ jobs:
{ {
"branch" : "${{ env.BRANCH }}", "branch" : "${{ env.BRANCH }}",
"release_tag" : "${{steps.date.outputs.date}}", "release_tag" : "${{steps.date.outputs.date}}",
"release_notes" : ${{toJSON(steps.changes.outputs.release_notes)}}
} }

View file

@ -1,6 +1,4 @@
np2kai # Last major commit before hiatus is broken np2kai # Last major commit before hiatus is broken
vicesa # Doesn't support updating with the script. vicesa # Doesn't support updating with the script.
hatari # Broken include - need to fix
duckstationsa # Latest commits break device patching. Need to research. duckstationsa # Latest commits break device patching. Need to research.
stella ecwolf
ewolf

View file

@ -3,14 +3,14 @@
PKG_NAME="dolphinsa" PKG_NAME="dolphinsa"
PKG_LICENSE="GPLv2" PKG_LICENSE="GPLv2"
PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb" PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb zstd"
PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games for these two platforms on PC with improvements. " PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games for these two platforms on PC with improvements. "
case ${DEVICE} in case ${DEVICE} in
RG552|handheld) RG552|handheld)
PKG_SITE="https://github.com/dolphin-emu/dolphin" PKG_SITE="https://github.com/dolphin-emu/dolphin"
PKG_URL="${PKG_SITE}.git" PKG_URL="${PKG_SITE}.git"
PKG_VERSION="d9cd819a76d4f1c171c47cdc81dc2ef7c0adb07f" PKG_VERSION="5479f0e776009d85c509fc6f9874aceeaed9b85b"
PKG_PATCH_DIRS+=" new" PKG_PATCH_DIRS+=" new"
;; ;;
*) *)

View file

@ -1,24 +1,37 @@
diff --git a/Source/Core/Core/HW/GCPadEmu.h b/Source/Core/Core/HW/GCPadEmu.h
index 66a1aee4e4..a03eaebcd3 100644
--- a/Source/Core/Core/HW/GCPadEmu.h
+++ b/Source/Core/Core/HW/GCPadEmu.h
@@ -65,6 +65,7 @@ public:
static constexpr const char* X_BUTTON = "X";
static constexpr const char* Y_BUTTON = "Y";
static constexpr const char* Z_BUTTON = "Z";
+ static constexpr const char* HOTKEY_BUTTON = "Hotkey";
static constexpr const char* START_BUTTON = "Start";
// i18n: The left trigger button (labeled L on real controllers)
diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp
index c8e7016..fb089c4 100644 index 470d2b8c2f..97818b5b67 100644
--- a/Source/Core/Core/HW/GCPadEmu.cpp --- a/Source/Core/Core/HW/GCPadEmu.cpp
+++ b/Source/Core/Core/HW/GCPadEmu.cpp +++ b/Source/Core/Core/HW/GCPadEmu.cpp
@@ -26,6 +26,7 @@ static const u16 button_bitmasks[] = { @@ -25,6 +25,7 @@ static const u16 button_bitmasks[] = {
PAD_BUTTON_Y, PAD_BUTTON_Y,
PAD_TRIGGER_Z, PAD_TRIGGER_Z,
PAD_BUTTON_START, PAD_BUTTON_START,
+ PAD_BUTTON_HOTKEY, + PAD_BUTTON_HOTKEY,
0 // MIC HAX 0 // MIC HAX
}; };
@@ -37,7 +38,7 @@ static const u16 trigger_bitmasks[] = { @@ -47,6 +48,9 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
static const u16 dpad_bitmasks[] = {PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_LEFT, // i18n: The START/PAUSE button on GameCube controllers
PAD_BUTTON_RIGHT}; m_buttons->AddInput(ControllerEmu::Translate, START_BUTTON, _trans("START"));
-static const char* const named_buttons[] = {"A", "B", "X", "Y", "Z", "Start"}; + // Hotkey Button
+static const char* const named_buttons[] = {"A", "B", "X", "Y", "Z", "Start", "Hotkey"}; + m_buttons->AddInput(ControllerEmu::Translate, HOTKEY_BUTTON, _trans("HOTKEY"));
+
static const char* const named_triggers[] = { // sticks
// i18n: The left trigger button (labeled L on real controllers) groups.emplace_back(m_main_stick = new ControllerEmu::OctagonAnalogStick(
MAIN_STICK_GROUP, _trans("Control Stick"), MAIN_STICK_GATE_RADIUS));
diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp
index 8dcd93bf52..5d7386da38 100644 index 8dcd93bf52..5d7386da38 100644
--- a/Source/Core/DolphinNoGUI/PlatformX11.cpp --- a/Source/Core/DolphinNoGUI/PlatformX11.cpp

View file

@ -48,8 +48,9 @@ index 11bbf55da1..71d8960652 100644
return 0; return 0;
} }
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 913c9956e9..dd09e980cb 100644 index 8a02534c57..00d8ac09e8 100644
--- a/Source/Core/Core/Core.cpp --- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp
@@ -470,14 +470,26 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi @@ -470,14 +470,26 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
@ -87,7 +88,7 @@ index 913c9956e9..dd09e980cb 100644
BootSessionData boot_session_data = std::move(boot->boot_session_data); BootSessionData boot_session_data = std::move(boot->boot_session_data);
const std::optional<std::string>& savestate_path = boot_session_data.GetSavestatePath(); const std::optional<std::string>& savestate_path = boot_session_data.GetSavestatePath();
@@ -494,16 +506,53 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi @@ -494,13 +506,50 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
Common::SyncSDImageToSDFolder(); Common::SyncSDImageToSDFolder();
}}; }};
@ -107,9 +108,6 @@ index 913c9956e9..dd09e980cb 100644
+ { + {
+ Wiimote::LoadConfig(); + Wiimote::LoadConfig();
+ } + }
if (NetPlay::IsNetPlayRunning())
NetPlay::SetupWiimotes();
} }
- FreeLook::LoadInputConfig(); - FreeLook::LoadInputConfig();

View file

@ -10,7 +10,7 @@ PKG_SHORTDESC="Fast PlayStation 1 emulator for x86-64/AArch32/AArch64 "
case ${DEVICE} in case ${DEVICE} in
RG552|handheld) RG552|handheld)
PKG_VERSION="ef3ad91ad0969013bc29ad1276c13aa2842ecc2b" PKG_VERSION="ab1422b69026befb96b8cef9748c8ec2017c6aa1"
PKG_PATCH_DIRS+=" new" PKG_PATCH_DIRS+=" new"
;; ;;
*) *)

View file

@ -8,24 +8,31 @@ PKG_VERSION="b821ece0527188d51475fdbaa9d8e0d21ccb3d5a"
PKG_LICENSE="GPLv2" PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/flyinghead/flycast" PKG_SITE="https://github.com/flyinghead/flycast"
PKG_URL="${PKG_SITE}.git" PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="toolchain alsa SDL2 libzip zip" PKG_DEPENDS_TARGET="toolchain alsa SDL2 libzip zip curl"
PKG_LONGDESC="Flycast is a multiplatform Sega Dreamcast, Naomi and Atomiswave emulator" PKG_LONGDESC="Flycast is a multiplatform Sega Dreamcast, Naomi and Atomiswave emulator"
PKG_TOOLCHAIN="cmake" PKG_TOOLCHAIN="cmake"
PKG_PATCH_DIRS+="${DEVICE}" PKG_PATCH_DIRS+="${DEVICE}"
if [ ! "${OPENGL}" = "no" ]; then if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
PKG_CMAKE_OPTS_TARGET+=" USE_OPENGL=ON"
else
PKG_CMAKE_OPTS_TARGET+=" USE_OPENGL=OFF"
fi fi
if [ "${OPENGLES_SUPPORT}" = yes ]; then if [ "${OPENGLES_SUPPORT}" = yes ]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}" PKG_DEPENDS_TARGET+=" ${OPENGLES}"
PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=ON" PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=ON"
else
PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=OFF"
fi fi
if [ "${VULKAN_SUPPORT}" = "yes" ] if [ "${VULKAN_SUPPORT}" = "yes" ]
then then
PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers" PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=ON" PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=ON"
else
PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=OFF"
fi fi
pre_configure_target() { pre_configure_target() {

View file

@ -12,18 +12,24 @@ PKG_TOOLCHAIN="cmake"
if [ ! "${OPENGL}" = "no" ]; then if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
PKG_CMAKE_OPTS_TARGET+=" USE_OPENGL=ON"
else
PKG_CMAKE_OPTS_TARGET+=" USE_OPENGL=OFF"
fi fi
if [ "${OPENGLES_SUPPORT}" = yes ]; then if [ "${OPENGLES_SUPPORT}" = yes ]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}" PKG_DEPENDS_TARGET+=" ${OPENGLES}"
PKG_CMAKE_OPTS_TARGET+="-DUSE_VULKAN=OFF \ PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=ON"
-DUSE_GLES=ON" else
PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=OFF"
fi fi
if [ "${VULKAN_SUPPORT}" = "yes" ] if [ "${VULKAN_SUPPORT}" = "yes" ]
then then
PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers" PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=ON" PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=ON"
else
PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=OFF"
fi fi
pre_configure_target() { pre_configure_target() {

View file

@ -20,13 +20,13 @@
################################################################################ ################################################################################
PKG_NAME="hatari" PKG_NAME="hatari"
PKG_VERSION="e5e36a5262cfeadc3d1c7b411b7a70719c4f293c" PKG_VERSION="1ebf0a0488580ef95c0b28f02223b31813c867c5"
PKG_SHA256="e1cc4f96d5ddedc70dcf59a73f05a6c6da476bbe7b2a9672fa3f8d09f4743925" PKG_SHA256="520b3666a8cf795a89f8bf322dc77749cf8b1994a1f613f098cd6d4ed5382011"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPLv2" PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/hatari" PKG_SITE="https://github.com/libretro/hatari"
PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain capsimg" PKG_DEPENDS_TARGET="toolchain capsimg"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="libretro" PKG_SECTION="libretro"
@ -43,17 +43,12 @@ configure_target() {
} }
make_target() { make_target() {
if [ "$ARCH" == "arm" ]; then
CFLAGS="$CFLAGS -DNO_ASM -DARM -D__arm__ -DARM_ASM -DNOSSE -DARM_HARDFP"
fi
CFLAGS="$CFLAGS -I$(get_build_dir capsimg)/Core -I$(get_build_dir capsimg)/.install_pkg/usr/local/include -L$(get_build_dir capsimg)/.install_pkg/usr/lib -lcapsimage -DHAVE_CAPSIMAGE=1 -DCAPSIMAGE_VERSION=5"
LDFLAGS="$LDFLAGS -I$(get_build_dir capsimg)/LibIPF -DHAVE_CAPSIMAGE=1"
make -C .. -f Makefile.libretro make -C .. -f Makefile.libretro
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/libretro mkdir -p ${INSTALL}/usr/lib/libretro
mkdir -p $INSTALL/usr/config/game/configs/hatari mkdir -p ${INSTALL}/usr/config/game/configs/hatari
cp ../hatari_libretro.so $INSTALL/usr/lib/libretro/ cp ../hatari_libretro.so ${INSTALL}/usr/lib/libretro/
cp -rf ${PKG_DIR}/config/* $INSTALL/usr/config/game/configs/hatari/ cp -rf ${PKG_DIR}/config/* ${INSTALL}/usr/config/game/configs/hatari/
} }

View file

@ -1,48 +0,0 @@
diff --git a/cmake/FindCapsImage.cmake b/cmake/FindCapsImage.cmake
index 982e5285..94ada2fe 100644
--- a/cmake/FindCapsImage.cmake
+++ b/cmake/FindCapsImage.cmake
@@ -6,7 +6,7 @@ ENDIF (CAPSIMAGE_INCLUDE_DIR)
# Choose the library version to use : 4 or 5
-SET(CAPSIMAGE_VERSION 4)
+SET(CAPSIMAGE_VERSION 5)
if(CAPSIMAGE_VERSION STREQUAL 4)
diff --git a/src/floppy_ipf.c b/src/floppy_ipf.c
index c615b755..8e52b712 100644
--- a/src/floppy_ipf.c
+++ b/src/floppy_ipf.c
@@ -24,10 +24,16 @@ const char floppy_ipf_fileid[] = "Hatari floppy_ipf.c : " __DATE__ " " __TIME__;
#include "screen.h"
#include "video.h"
#include "cycles.h"
+#include <stdint.h>
#ifdef HAVE_CAPSIMAGE
+#ifndef __cdecl
+#define __cdecl /* CAPS headers need this, but do not define it on their own */
+#endif
#if CAPSIMAGE_VERSION == 5
#include <caps5/CapsLibAll.h>
+#define CapsLong SDWORD
+#define CapsULong UDWORD
#else
#include <caps/fdc.h>
#define CAPS_LIB_RELEASE 4
diff --git a/src/uae-cpu/newcpu.c b/src/uae-cpu/newcpu.c
index e752e83d..91cf41cf 100644
--- a/src/uae-cpu/newcpu.c
+++ b/src/uae-cpu/newcpu.c
@@ -162,6 +162,9 @@ const char NewCpu_fileid[] = "Hatari newcpu.c : " __DATE__ " " __TIME__;
#include "68kDisass.h"
#ifdef HAVE_CAPSIMAGE
+#ifndef __cdecl
+#define __cdecl /* CAPS headers need this, but do not define it on their own */
+#endif
#if CAPSIMAGE_VERSION == 5
#include <caps5/CapsLibAll.h>
#endif

View file

@ -1,6 +1,7 @@
################################################################################ ################################################################################
# This file is part of OpenELEC - http://www.openelec.tv # This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2022-present Fewtarius
# #
# This Program is free software; you can redistribute it and/or modify # This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -19,12 +20,12 @@
################################################################################ ################################################################################
PKG_NAME="stella" PKG_NAME="stella"
PKG_VERSION="4fecd8fc97ab7786610a5ae4e665e4fe4d5d1374" PKG_VERSION="d8ed1d1d13a2a45214b1a8dd6ee6e9d4971d5cdd"
PKG_SHA256="1107c815d1ff1779202d78ff3b89cf643185274a8acbbdbe2c4115e8db74bb29" PKG_SHA256="eb9bb65dbe97bc03ca6ffdaf51c36847e14d41874d6d39c64a24ea11c0bbe6b1"
PKG_REV="1" PKG_REV="1"
PKG_LICENSE="GPL2" PKG_LICENSE="GPL2"
PKG_SITE="https://github.com/stella-emu/stella" PKG_SITE="https://github.com/stella-emu/stella"
PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="libretro" PKG_SECTION="libretro"
@ -33,14 +34,17 @@ PKG_LONGDESC="Stella is a multi-platform Atari 2600 VCS emulator released under
PKG_TOOLCHAIN="make" PKG_TOOLCHAIN="make"
pre_configure_target() { pre_configure_target() {
if [ "$ARCH" == "arm" ]; then case ${TARGET_ARCH} in
PKG_MAKE_OPTS_TARGET=" -C $PKG_BUILD/src/libretro -f Makefile platform=emuelec" aarch64)
else PKG_MAKE_OPTS_TARGET=" -C ${PKG_BUILD}/src/os/libretro -f Makefile platform=aarch64"
PKG_MAKE_OPTS_TARGET=" -C $PKG_BUILD/src/libretro -f Makefile platform=emuelec-arm64" ;;
fi *)
PKG_MAKE_OPTS_TARGET=" -C ${PKG_BUILD}/src/os/libretro -f Makefile"
;;
esac
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/libretro mkdir -p ${INSTALL}/usr/lib/libretro
cp $PKG_BUILD/src/libretro/stella_libretro.so $INSTALL/usr/lib/libretro/ cp ${PKG_BUILD}/src/os/libretro/stella_libretro.so ${INSTALL}/usr/lib/libretro/
} }

View file

@ -0,0 +1,20 @@
diff -rupN stella.orig/src/os/libretro/Makefile stella/src/os/libretro/Makefile
--- stella.orig/src/os/libretro/Makefile 2022-10-02 14:39:47.954719313 -0400
+++ stella/src/os/libretro/Makefile 2022-10-03 19:19:12.544824555 -0400
@@ -114,6 +114,16 @@ else ifeq ($(platform), osx)
CXXFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
+else ifeq ($(platform), aarch64)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+ CXXFLAGS += -lpthread -DARM64
+ LDFLAGS += -lpthread -static-libgcc -lstdc++
+ ARCH = arm64
+ USE_DYNAREC = 1
+
+
# iOS
else ifneq (,$(findstring ios,$(platform)))
CXXFLAGS += $(LTO) -stdlib=libc++

View file

@ -1,30 +0,0 @@
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -137,6 +137,27 @@
endif
endif
+# EmuELEC for Amlogic devices
+else ifeq ($(platform), emuelec)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+ CXXFLAGS += -lpthread -marm -mtune=cortex-a53 -mfpu=neon-vfpv4 -mfloat-abi=hard -march=armv7ve -DARM
+ LDFLAGS += -lpthread -static-libgcc -lstdc++
+ HAVE_NEON = 1
+ ARCH = arm
+ BUILTIN_GPU = neon
+ USE_DYNAREC = 1
+else ifeq ($(platform), emuelec-arm64)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+ CXXFLAGS += -lpthread -DARM64
+ LDFLAGS += -lpthread -static-libgcc -lstdc++
+ ARCH = arm64
+ USE_DYNAREC = 1
+
+
# iOS
else ifneq (,$(findstring ios,$(platform)))
CXXFLAGS += $(LTO) $(PTHREAD_FLAGS) -stdlib=libc++

View file

@ -8,38 +8,58 @@
set_cpu_gov() { set_cpu_gov() {
for POLICY in ${CPU_FREQ[@]} for POLICY in ${CPU_FREQ[@]}
do do
echo $1 >${POLICY}/scaling_governor 2>/dev/null if [ -e "${POLICY}/scaling_governor" ]
then
echo $1 >${POLICY}/scaling_governor 2>/dev/null
fi
done done
} }
set_dmc_gov() { set_dmc_gov() {
echo $1 >${DMC_FREQ}/governor 2>/dev/null || echo dmc_$1 >${DMC_FREQ}/governor 2>/dev/null if [ -e "${DMC_FREQ}/governor" ]
then
echo $1 >${DMC_FREQ}/governor 2>/dev/null || echo dmc_$1 >${DMC_FREQ}/governor 2>/dev/null
fi
} }
set_gpu_gov() { set_gpu_gov() {
echo $1 >${GPU_FREQ}/governor 2>/dev/null || echo dmc_$1 >${GPU_FREQ}/governor 2>/dev/null if [ -e "${GPU_FREQ}/governor" ]
then
echo $1 >${GPU_FREQ}/governor 2>/dev/null || echo dmc_$1 >${GPU_FREQ}/governor 2>/dev/null
fi
}
set_amdgpu_perf() {
if [ -e "${AMDGPU_PERF}" ]
then
echo $1 >${AMDGPU_PERF} 2>/dev/null
fi
} }
performance() { performance() {
set_cpu_gov performance set_cpu_gov performance
set_amdgpu_perf profile_peak
set_gpu_gov performance set_gpu_gov performance
set_dmc_gov performance set_dmc_gov performance
} }
ondemand() { ondemand() {
set_cpu_gov ondemand set_cpu_gov ondemand
set_amdgpu_perf auto
set_gpu_gov ondemand set_gpu_gov ondemand
set_dmc_gov ondemand set_dmc_gov ondemand
} }
interactive() { interactive() {
set_cpu_gov interactive set_cpu_gov interactive
set_amdgpu_perf auto
set_gpu_gov ondemand set_gpu_gov ondemand
set_dmc_gov ondemand set_dmc_gov ondemand
} }
powersave() { powersave() {
set_cpu_gov powersave set_cpu_gov powersave
set_amdgpu_perf low
set_gpu_gov powersave set_gpu_gov powersave
set_dmc_gov powersave set_dmc_gov powersave
} }

View file

@ -7,12 +7,3 @@ sysctl kernel.nmi_watchdog=0
sysctl vm.laptop_mode=5 sysctl vm.laptop_mode=5
sysctl vm.dirty_writeback_centisecs=1500 sysctl vm.dirty_writeback_centisecs=1500
for device in $(find /sys -name power_save | grep -v wifi) /sys/bus/usb/devices/*/power/autosuspend
do
echo 1 >${device} 2>/dev/null
done
for device in /sys/bus/*/devices/*/power/control
do
echo auto > ${device} 2>/dev/null
done

View file

@ -1,8 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
. /etc/profile
HOSTNAME=$(get_setting system.hostname)
hostname ${HOSTNAME}

View file

@ -4,6 +4,8 @@
. /etc/profile . /etc/profile
HOSTNAME=$(get_setting system.hostname)
hostname ${HOSTNAME}
if [ "$(get_setting internal.wifi)" == 0 ] && [ "${DEVICE_INTERNAL_WIFI}" = true ] if [ "$(get_setting internal.wifi)" == 0 ] && [ "${DEVICE_INTERNAL_WIFI}" = true ]
then then

View file

@ -105,3 +105,9 @@ if [[ "${HW_DEVICE}" =~ RG552 ]]
then then
sed -i 's#video_driver = "gl"#video_driver = "glcore"#g' /storage/.config/retroarch/retroarch.cfg sed -i 's#video_driver = "gl"#video_driver = "glcore"#g' /storage/.config/retroarch/retroarch.cfg
fi fi
# If smb.conf doesn't exist in ~/.config, add it.
if [ ! -e "/storage/.config/smb.conf" ]
then
cp -f /usr/config/smb.conf /storage/.config
fi

View file

@ -174,12 +174,13 @@ post_makeinstall_target() {
rm -rf ${INSTALL}/usr/lib64 rm -rf ${INSTALL}/usr/lib64
if find_file_path config/smb.conf; then if find_file_path config/smb.conf; then
mkdir -p ${INSTALL}/etc/samba
cp ${FOUND_PATH} ${INSTALL}/etc/samba
mkdir -p ${INSTALL}/usr/config mkdir -p ${INSTALL}/usr/config
cp ${INSTALL}/etc/samba/smb.conf ${INSTALL}/usr/config/samba.conf.sample cp ${FOUND_PATH} ${INSTALL}/usr/config
fi fi
mkdir -p ${INSTALL}/etc/samba
ln -s /storage/.config/smb.conf ${INSTALL}/etc/samba/smb.conf
mkdir -p ${INSTALL}/usr/bin mkdir -p ${INSTALL}/usr/bin
cp -PR bin/default/source3/client/smbclient ${INSTALL}/usr/bin cp -PR bin/default/source3/client/smbclient ${INSTALL}/usr/bin
cp -PR bin/default/source3/utils/smbtree ${INSTALL}/usr/bin cp -PR bin/default/source3/utils/smbtree ${INSTALL}/usr/bin

View file

@ -3,7 +3,7 @@
# Copyright (C) 2020-present Fewtarius # Copyright (C) 2020-present Fewtarius
PKG_NAME="emulationstation" PKG_NAME="emulationstation"
PKG_VERSION="de608a3" PKG_VERSION="448ace5"
PKG_GIT_CLONE_BRANCH="main" PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"

View file

@ -12,6 +12,8 @@ CPU_FREQ=("/sys/devices/system/cpu/cpufreq/policy0" \
"/sys/devices/system/cpu/cpufreq/policy2" \ "/sys/devices/system/cpu/cpufreq/policy2" \
"/sys/devices/system/cpu/cpufreq/policy3") "/sys/devices/system/cpu/cpufreq/policy3")
AMDGPU_PERF="/sys/class/drm/card0/device/power_dpm_force_performance_level"
# Affinity # Affinity
SLOW_CORES="taskset -c 0-3" SLOW_CORES="taskset -c 0-3"
FAST_CORES="${SLOW_CORES}" FAST_CORES="${SLOW_CORES}"