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

Fix conflicts with #1078 and merge. Thanks to @amd343!

Browse source
This commit is contained in:
fewtarius 2023-02-21 05:50:40 -05:00
commit f89ea34106
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
6 changed files with 48 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/games/libretro/pcsx_rearmed/package.mk
View file

@ -3,12 +3,11 @@
# Copyright (C) 2022-present Fewtarius
PKG_NAME="pcsx_rearmed"
PKG_VERSION="aced3eb3fcaa0fe13c44c4dd196cdab42555fd98"
PKG_REV="1"
PKG_VERSION="4373e29de72c917dbcd04ec2a5fb685e69d9def3"
PKG_ARCH="arm aarch64"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/pcsx_rearmed"
PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_SHORTDESC="ARM optimized PCSX fork"
PKG_TOOLCHAIN="manual"
@ -16,12 +15,7 @@ PKG_PATCH_DIRS+="${TARGET_ARCH}/${DEVICE}"
make_target() {
cd ${PKG_BUILD}
if [[ "${DEVICE}" =~ RK3566 ]]
then
make -f Makefile.libretro GIT_VERSION=${PKG_VERSION} platform=RK3566
else
make -f Makefile.libretro GIT_VERSION=${PKG_VERSION} platform=${DEVICE}
fi
make -f Makefile.libretro GIT_VERSION=${PKG_VERSION} platform=${DEVICE}
}
makeinstall_target() {
@ -30,8 +24,6 @@ makeinstall_target() {
cp pcsx_rearmed_libretro.so ${INSTALL}/usr/lib/libretro/
if [ "${TARGET_ARCH}" = "aarch64" ]
then
## Install the 32bit core.
cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/pcsx_rearmed-*/.install_pkg/usr/lib/libretro/pcsx_rearmed_libretro.so ${INSTALL}/usr/lib/libretro/pcsx_rearmed32_libretro.so
fi
}

19
packages/games/libretro/pcsx_rearmed/patches/aarch64/pcsx_rearmed-add_platform.patch Normal file
View file

@ -0,0 +1,19 @@
diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
--- pcsx_rearmed.orig/Makefile.libretro 2022-08-16 15:19:42.928678600 +0200
+++ pcsx_rearmed/Makefile.libretro 2022-08-17 18:08:41.346728698 +0200
@@ -385,6 +385,15 @@ else ifeq ($(platform), rpi4_64)
fpic := -fPIC
CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a72 -ftree-vectorize
+else ifeq ($(platform), @DEVICE@)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ ARCH = arm64
+ DYNAREC = ari64
+ BUILTIN_GPU = neon
+ HAVE_NEON = 1
+ CFLAGS += -march=armv8-a+crc+simd -mtune=@TARGET_CPU@ -ftree-vectorize
+
# Classic Platforms ####################
# Platform affix = classic_<ISA>_<µARCH>
# Help at https://modmyclassic.com/comp

21
packages/games/libretro/pcsx_rearmed/patches/arm/pcsx_rearmed-add_platform.patch Normal file
View file

@ -0,0 +1,21 @@
diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
--- pcsx_rearmed.orig/Makefile.libretro 2022-08-16 15:19:42.928678600 +0200
+++ pcsx_rearmed/Makefile.libretro 2022-08-17 17:51:57.256712172 +0200
@@ -385,6 +385,17 @@ else ifeq ($(platform), rpi4_64)
fpic := -fPIC
CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a72 -ftree-vectorize
+else ifeq ($(platform), @DEVICE@)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ CFLAGS += -marm -mtune=@TARGET_CPU@ -mfpu=neon-fp-armv8 -mfloat-abi=hard
+ ASFLAGS += -mtune=@TARGET_CPU@ -mfpu=neon-fp-armv8 -mfloat-abi=hard
+ HAVE_NEON = 1
+ HAVE_NEON_ASM = 1
+ ARCH = arm
+ BUILTIN_GPU = neon
+ DYNAREC = ari64
+
# Classic Platforms ####################
# Platform affix = classic_<ISA>_<µARCH>
# Help at https://modmyclassic.com/comp

2
packages/games/libretro/yabasanshiro/patches/aarch64/01-optimization.patch
View file

@ -12,7 +12,7 @@ diff -rupN yabasanshiro.orig/yabause/src/libretro/Makefile yabasanshiro/yabause/
+ USE_AARCH64_DRC = 1
DYNAREC_DEVMIYAX = 1
- FLAGS += -march=armv8-a+crc -mcpu=cortex-a72 -mtune=cortex-a72.cortex-a53 -mfloat-abi=hard -mfpu=neon-vfpv4 -mvectorize-with-neon-quad
+ FLAGS += -march=armv8-a+crc -mcpu=cortex-a76 -mtune=@TARGET_CPU@
+ FLAGS += -march=armv8-a+crc -mtune=@TARGET_CPU@
# Rpi4 (64-bit)
else ifeq ($(platform), rpi4)

2
packages/ui/emulationstation/config/common/es_systems.cfg
View file

@ -1519,6 +1519,8 @@
<core>pcsx_rearmed</core>
<core>swanstation</core>
<core>duckstation</core>
<core>pcsx_rearmed32</core>
<core>pcsx_rearmed</core>
</cores>
</emulator>
<emulator name="Duckstation">

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

@ -33,10 +33,10 @@ case "${DEVICE}" in
pcsx2sa play primehack rpcs3sa xemu yuzusa"
;;
RK3588)
PKG_DEPENDS_TARGET+=" dolphin dolphinsa aethersx2 mame"
PKG_DEPENDS_TARGET+=" dolphin dolphinsa aethersx2 mame pcsx_rearmed"
;;
RK3566)
PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders"
PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders pcsx_rearmed"
PKG_EMUS="moonlight openbor pico-8 PPSSPPSDL vicesa dolphinsa"
;;
esac