Merge pull request #64 from fewtarius/dev

Dev
This commit is contained in:
fewtarius 2022-04-16 16:50:59 -04:00 committed by GitHub
commit 363f9b4209
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 91 additions and 61 deletions

View file

@ -11,16 +11,16 @@ PKG_LONGDESC="Amiberry is an optimized Amiga emulator for ARM-based boards."
GET_HANDLER_SUPPORT="git"
PKG_TOOLCHAIN="make"
PKG_GIT_CLONE_BRANCH="master"
PKG_PATCH_DIRS+="${DEVICE}"
pre_configure_target() {
cd ${PKG_BUILD}
export SYSROOT_PREFIX=${SYSROOT_PREFIX}
if [[ "${DEVICE}" =~ RG552 ]]
if [[ "${DEVICE}" =~ RG351 ]]
then
AMIBERRY_PLATFORM="PLATFORM=n2"
elif [[ "${DEVICE}" =~ RG351 ]]
then
AMIBERRY_PLATFORM="PLATFORM=oga"
AMIBERRY_PLATFORM="PLATFORM=RG351x"
else
AMIBERRY_PLATFORM="PLATFORM=${DEVICE}"
fi
sed -i "s|AS = as|AS \?= as|" Makefile

View file

@ -0,0 +1 @@
RG351P

View file

@ -0,0 +1,40 @@
diff -rupN amiberry.orig/Makefile amiberry/Makefile
--- amiberry.orig/Makefile 2022-04-16 16:23:12.481980516 -0400
+++ amiberry/Makefile 2022-04-16 16:43:06.900834913 -0400
@@ -228,30 +228,14 @@ else ifeq ($(PLATFORM),a64)
else ifeq ($(PLATFORM),x86-64)
CPPFLAGS += -DUSE_RENDER_THREAD
-# RK3288 e.g. Asus Tinker Board
-# RK3328 e.g. PINE64 Rock64
-# RK3399 e.g. PINE64 RockPro64
-# RK3326 e.g. Odroid Go Advance - 32-bit userspace
-else ifneq (,$(findstring RK,$(PLATFORM)))
- CPPFLAGS += $(CPPFLAGS32) $(NEON_FLAGS)
+# Anbernic RG351x
+else ifeq ($(PLATFORM),RG351x)
+ CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers
+ CFLAGS += -mcpu=cortex-a35 -mtune=cortex-a35 -Ofast -ffast-math $(CPUFLAGS)
+ CPPFLAGS = -mcpu=cortex-a35 -mtune=cortex-a35 -Ofast -ffast-math $(CPUFLAGS) -DUSE_RENDER_THREAD
+ AARCH64 = 1
HAVE_NEON = 1
- ifneq (,$(findstring RK33,$(PLATFORM)))
- CPUFLAGS = -mfloat-abi=hard -mfpu=neon-fp-armv8
- ifneq (,$(findstring RK3399,$(PLATFORM)))
- CPUFLAGS += -mcpu=cortex-a72
- else ifneq (,$(findstring RK3328,$(PLATFORM)))
- CPUFLAGS += -mcpu=cortex-a53
- CPPFLAGS += -DUSE_RENDER_THREAD
- else ifneq (,$(findstring RK3326,$(PLATFORM)))
- CPUFLAGS += -mcpu=cortex-a35
- CPPFLAGS += -DUSE_RENDER_THREAD
- endif
- else ifneq (,$(findstring RK3288,$(PLATFORM)))
- CPUFLAGS = -mcpu=cortex-a17 -mfloat-abi=hard -mfpu=neon-vfpv4
- CPPFLAGS += -DUSE_RENDER_THREAD
- endif
-
# sun8i Allwinner H2+ / H3 like Orange PI, Nano PI, Banana PI, Tritium, AlphaCore2, MPCORE-HUB
else ifeq ($(PLATFORM),sun8i)
CPUFLAGS = -mcpu=cortex-a7 -mfpu=neon-vfpv4

View file

@ -0,0 +1 @@
RG351P

View file

@ -0,0 +1,40 @@
diff -rupN amiberry.orig/Makefile amiberry/Makefile
--- amiberry.orig/Makefile 2022-04-16 16:23:12.481980516 -0400
+++ amiberry/Makefile 2022-04-16 16:40:16.168972077 -0400
@@ -228,30 +228,14 @@ else ifeq ($(PLATFORM),a64)
else ifeq ($(PLATFORM),x86-64)
CPPFLAGS += -DUSE_RENDER_THREAD
-# RK3288 e.g. Asus Tinker Board
-# RK3328 e.g. PINE64 Rock64
-# RK3399 e.g. PINE64 RockPro64
-# RK3326 e.g. Odroid Go Advance - 32-bit userspace
-else ifneq (,$(findstring RK,$(PLATFORM)))
- CPPFLAGS += $(CPPFLAGS32) $(NEON_FLAGS)
+# Anbernic RG552
+else ifeq ($(PLATFORM),RG552)
+ CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers
+ CFLAGS += -march=armv8-a+crc -mcpu=cortex-a72 -mtune=cortex-a72 $(CPUFLAGS)
+ CPPFLAGS = -march=armv8-a+crc -mcpu=cortex-a72 -mtune=cortex-a72 $(CPUFLAGS) -DUSE_RENDER_THREAD
+ AARCH64 = 1
HAVE_NEON = 1
- ifneq (,$(findstring RK33,$(PLATFORM)))
- CPUFLAGS = -mfloat-abi=hard -mfpu=neon-fp-armv8
- ifneq (,$(findstring RK3399,$(PLATFORM)))
- CPUFLAGS += -mcpu=cortex-a72
- else ifneq (,$(findstring RK3328,$(PLATFORM)))
- CPUFLAGS += -mcpu=cortex-a53
- CPPFLAGS += -DUSE_RENDER_THREAD
- else ifneq (,$(findstring RK3326,$(PLATFORM)))
- CPUFLAGS += -mcpu=cortex-a35
- CPPFLAGS += -DUSE_RENDER_THREAD
- endif
- else ifneq (,$(findstring RK3288,$(PLATFORM)))
- CPUFLAGS = -mcpu=cortex-a17 -mfloat-abi=hard -mfpu=neon-vfpv4
- CPPFLAGS += -DUSE_RENDER_THREAD
- endif
-
# sun8i Allwinner H2+ / H3 like Orange PI, Nano PI, Banana PI, Tritium, AlphaCore2, MPCORE-HUB
else ifeq ($(PLATFORM),sun8i)
CPUFLAGS = -mcpu=cortex-a7 -mfpu=neon-vfpv4

View file

@ -23,16 +23,9 @@ then
fi
find_gamepad() {
# Search for connected gamepads based s0 and extract the name to $GAMEPAD
for file in /tmp/joypads/*.cfg; do
EE_GAMEPAD=$(cat "$file" | grep input_device| cut -d'"' -f 2)
ES_EE_GAMEPAD=$(printf %q "$EE_GAMEPAD")
if cat /proc/bus/input/devices | grep -Ew -A 4 -B 1 "Name=\"${ES_EE_GAMEPAD}" | grep "js0" > /dev/null; then
sed -i "s|joyport1_friendlyname=.*|joyport1_friendlyname=${EE_GAMEPAD}|" "$AMIBERRY_TMP_CONFIG"
echo "Gamepad used $EE_GAMEPAD" >> "$AMIBERRY_LOG"
break;
fi
done
GAMEPAD=$(grep -b4 $(readlink ${DEVICE_CONTROLLER_DEV} | sed "s#^.*/##") /proc/bus/input/devices | awk 'BEGIN {FS="\""}; /Name/ {printf $2}')
sed -i "s|joyport1_friendlyname=.*|joyport1_friendlyname=${GAMEPAD}|" "$AMIBERRY_TMP_CONFIG"
echo "Gamepad used $GAMEPAD" >> "$AMIBERRY_LOG"
}
# Set SDL audio driver to alsa

View file

@ -1,23 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert)
# Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)
PKG_NAME="box64"
PKG_VERSION="06bbf93bf876c107ff41593a75fe6fa8a6d6a779"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/ptitSeb/box64"
PKG_URL="$PKG_SITE.git"
PKG_DEPENDS_TARGET="toolchain gl4es"
PKG_LONGDESC="Box64 - Linux Userspace x86_64 Emulator with a twist, targeted at ARM64 Linux devices"
PKG_TOOLCHAIN="cmake"
GET_HANDLER_SUPPORT="git"
PKG_CMAKE_OPTS_TARGET=" -DRK3326=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo"
makeinstall_target() {
mkdir -p $INSTALL/usr/share/box64/lib
cp $PKG_BUILD/x64lib/* $INSTALL/usr/share/box64/lib
cp $PKG_BUILD/.${TARGET_NAME}/box64 $INSTALL/usr/share/box64/
}

View file

@ -1,22 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert)
# Copyright (C) 2020-present 351ELEC (https://github.com/351ELEC)
PKG_NAME="box86"
PKG_VERSION="844566a78ae3c995c3c575d5822616e5e783fe39"
PKG_REV="1"
PKG_ARCH="arm"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/ptitSeb/box86"
PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain gl4es"
PKG_LONGDESC="Box86 - Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices"
PKG_TOOLCHAIN="cmake"
PKG_CMAKE_OPTS_TARGET=" -DGOA_CLONE=1 -DCMAKE_BUILD_TYPE=Release"
makeinstall_target() {
mkdir -p $INSTALL/usr/share/box86/lib
cp $PKG_BUILD/x86lib/* $INSTALL/usr/share/box86/lib
cp $PKG_BUILD/.${TARGET_NAME}/box86 $INSTALL/usr/share/box86/
}

View file

@ -3,7 +3,7 @@
# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
PKG_NAME="thememaster"
PKG_VERSION="f8c17f05d74babc79fb50dd948270f732f573e37"
PKG_VERSION="3bee9dab9cbf87f28a0eef5c3104c46dd5820f50"
PKG_ARCH="any"
PKG_SITE="https://github.com/JohnIrvine1433/ThemeMaster"
PKG_URL="${PKG_SITE}.git"