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

* Re-add pcsx_rearmed 32bit alongside the 64bit core.

Browse source
This commit is contained in:
fewtarius 2022-04-20 17:25:52 -04:00
parent 8ce7d8436d
commit 5383063aea
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
12 changed files with 58 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2020 Trond Haugland (trondah@gmail.com)
# Copyright (C) 2022-present Fewtarius
PKG_NAME="pcsx_rearmed"
PKG_VERSION="e24732050e902bd5402b2b7da7c391d2ca8fa799"
@ -12,7 +13,7 @@ PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_SHORTDESC="ARM optimized PCSX fork"
PKG_TOOLCHAIN="manual"
PKG_PATCH_DIRS+="${DEVICE}"
PKG_PATCH_DIRS+="${TARGET_ARCH}/${DEVICE}"
make_target() {
cd ${PKG_BUILD}
@ -25,6 +26,9 @@ make_target() {
}
makeinstall_target() {
mkdir -p $INSTALL/usr/lib/libretro
cp pcsx_rearmed_libretro.so $INSTALL/usr/lib/libretro/
## Install the 64bit core.
mkdir -p ${INSTALL}/usr/lib/libretro
cp pcsx_rearmed_libretro.so ${INSTALL}/usr/lib/libretro/
## Install the 32bit core.
cp -vP ${PKG_BUILD}/../../build.${DISTRO}-${DEVICE}.arm/pcsx_rearmed-*/.install_pkg/usr/lib/libretro/pcsx_rearmed_libretro.so ${INSTALL}/usr/lib/libretro/pcsx_rearmed32_libretro.so
}

0
packages/games/libretro/pcsx_rearmed/patches/RG351MP → packages/games/libretro/pcsx_rearmed/patches/aarch64/RG351MP
View file

3
packages/games/libretro/pcsx_rearmed/patches/RG351P/pcsx_rearmed-add_platform.patch → packages/games/libretro/pcsx_rearmed/patches/aarch64/RG351P/pcsx_rearmed-add_platform.patch
View file

@ -1,7 +1,7 @@
diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
--- pcsx_rearmed.orig/Makefile.libretro 2022-04-20 07:57:13.327886544 -0400
+++ pcsx_rearmed/Makefile.libretro 2022-04-20 08:01:22.194100092 -0400
@@ -70,6 +70,15 @@ else ifneq (,$(findstring CortexA73_G12B
@@ -70,6 +70,16 @@ else ifneq (,$(findstring CortexA73_G12B
CFLAGS += -fomit-frame-pointer -ffast-math -DARM
CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
@ -11,6 +11,7 @@ diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
+ SHARED := -shared -Wl,-version-script=link.T
+ ARCH = arm64
+ DYNAREC = ari64
+ BUILTIN_GPU = peops
+ CFLAGS += -fomit-frame-pointer -ffast-math -Ofast -DARM
+ CPUFLAGS += -march=armv8-a+crc -mcpu=cortex-a35 -mtune=cortex-a35
+

0
packages/games/libretro/pcsx_rearmed/patches/RG351V → packages/games/libretro/pcsx_rearmed/patches/aarch64/RG351V
View file

3
packages/games/libretro/pcsx_rearmed/patches/RG552/pcsx_rearmed-add_platform.patch → packages/games/libretro/pcsx_rearmed/patches/aarch64/RG552/pcsx_rearmed-add_platform.patch
View file

@ -1,7 +1,7 @@
diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
--- pcsx_rearmed.orig/Makefile.libretro 2022-04-20 07:57:13.327886544 -0400
+++ pcsx_rearmed/Makefile.libretro 2022-04-20 07:59:40.302828388 -0400
@@ -70,6 +70,15 @@ else ifneq (,$(findstring CortexA73_G12B
@@ -70,6 +70,16 @@ else ifneq (,$(findstring CortexA73_G12B
CFLAGS += -fomit-frame-pointer -ffast-math -DARM
CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
@ -11,6 +11,7 @@ diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
+ SHARED := -shared -Wl,-version-script=link.T
+ ARCH = arm64
+ DYNAREC = ari64
+ BUILTIN_GPU = peops
+ CFLAGS += -fomit-frame-pointer -ffast-math -Ofast -DARM
+ CPUFLAGS += -march=armv8-a+crc -mcpu=cortex-a72 -mtune=cortex-a72.cortex-a53
+

1
packages/games/libretro/pcsx_rearmed/patches/arm/RG351MP Symbolic link
View file

@ -0,0 +1 @@
RG351P

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

@ -0,0 +1,20 @@
diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
--- pcsx_rearmed.orig/Makefile.libretro 2022-04-20 07:57:13.327886544 -0400
+++ pcsx_rearmed/Makefile.libretro 2022-04-20 08:01:22.194100092 -0400
@@ -70,6 +70,16 @@ else ifneq (,$(findstring CortexA73_G12B
CFLAGS += -fomit-frame-pointer -ffast-math -DARM
CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
+else ifeq ($(platform), RG351x)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,-version-script=link.T
+ ARCH = arm
+ DYNAREC = ari64
+ BUILTIN_GPU = neon
+ CFLAGS += -march=armv8-a+crc -mcpu=cortex-a35 -mtune=cortex-a35 -Ofast
+ CPUFLAGS += -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+
# ALLWINNER H5
else ifneq (,$(findstring h5,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so

1
packages/games/libretro/pcsx_rearmed/patches/arm/RG351V Symbolic link
View file

@ -0,0 +1 @@
RG351P

21
packages/games/libretro/pcsx_rearmed/patches/arm/RG552/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-04-20 07:57:13.327886544 -0400
+++ pcsx_rearmed/Makefile.libretro 2022-04-20 07:59:40.302828388 -0400
@@ -70,6 +70,17 @@ else ifneq (,$(findstring CortexA73_G12B
CFLAGS += -fomit-frame-pointer -ffast-math -DARM
CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
+else ifeq ($(platform), RG552)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,-version-script=link.T
+ ARCH = arm
+ DYNAREC = ari64
+ BUILTIN_GPU = neon
+ CFLAGS += -marm -mtune=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+ ASFLAGS += -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+ CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
+
# ALLWINNER H5
else ifneq (,$(findstring h5,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so

2
packages/jelos/sources/scripts/runemu.sh
View file

@ -300,7 +300,7 @@ else
### Check if we need retroarch 32 bits or 64 bits
RABIN="retroarch"
if [[ "${CORE}" =~ "parallel_n64" ]] || [[ "${CORE}" =~ "gpsp" ]]
if [[ "${CORE}" =~ "pcsx_rearmed32" ]] || [[ "${CORE}" =~ "parallel_n64" ]] || [[ "${CORE}" =~ "gpsp" ]]
then
export LD_LIBRARY_PATH="/usr/lib32"
RABIN="retroarch32"

3
packages/ui/emulationstation/config/es_systems.cfg
View file

@ -1357,7 +1357,8 @@
<emulators>
<emulator name="retroarch">
<cores>
<core default="true">pcsx_rearmed</core>
<core default="true">pcsx_rearmed32</core>
<core>pcsx_rearmed</core>
<core>swanstation</core>
<core>duckstation</core>
</cores>

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

@ -4,6 +4,6 @@
PKG_NAME="arm32"
PKG_LICENSE="GPL"
PKG_SITE="www.jelos.org"
PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware libusb unzip socat p7zip file ${OPENGLES} SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf libgo2 retroarch parallel-n64_rice parallel-n64_gln64 parallel-n64_glide64 gpsp"
PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware libusb unzip socat p7zip file ${OPENGLES} SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf libgo2 retroarch pcsx_rearmed parallel-n64_rice parallel-n64_gln64 parallel-n64_glide64 gpsp"
PKG_SECTION="virtual"
PKG_LONGDESC="Root package used to build and create 32-bit userland"