From 6226977612bb74f6d411d9d2a4b192eeaa7fa7df Mon Sep 17 00:00:00 2001 From: shantigilbert Date: Sun, 27 Sep 2020 22:51:51 -0500 Subject: [PATCH 1/4] OdroidGoAdvance: fix ee_backup --- packages/sx05re/emuelec/config/emuelec/scripts/emuelec-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sx05re/emuelec/config/emuelec/scripts/emuelec-utils b/packages/sx05re/emuelec/config/emuelec/scripts/emuelec-utils index 18de4cdf2ae..881408f2d82 100755 --- a/packages/sx05re/emuelec/config/emuelec/scripts/emuelec-utils +++ b/packages/sx05re/emuelec/config/emuelec/scripts/emuelec-utils @@ -52,7 +52,7 @@ function clearconfig() { esac } -function backup() { +function ee_backup() { BACKUPFILE="/storage/downloads/ee_backup_config.zip" mkdir -p "/storage/downloads/" From 5a286225e03e34c9e42be8314175b592771d1500 Mon Sep 17 00:00:00 2001 From: shantigilbert Date: Sun, 27 Sep 2020 22:52:30 -0500 Subject: [PATCH 2/4] librga: revert to 72e7764 Fixes black screen --- .../packages/libgo2/librga/package.mk | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/projects/Rockchip/devices/OdroidGoAdvance/packages/libgo2/librga/package.mk b/projects/Rockchip/devices/OdroidGoAdvance/packages/libgo2/librga/package.mk index 67b5fd69339..2a9382ccedb 100644 --- a/projects/Rockchip/devices/OdroidGoAdvance/packages/libgo2/librga/package.mk +++ b/projects/Rockchip/devices/OdroidGoAdvance/packages/libgo2/librga/package.mk @@ -2,12 +2,36 @@ # Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert) PKG_NAME="librga" -PKG_VERSION="261c7ba851930865806a6473c5f58e7144e96762" -PKG_SHA256="efc9957efc866f7cc353b1e020f8f2fa339fa96e9802f2980e11d51adec58693" +PKG_VERSION="72e7764a9fe358e6ad50eb1b21176cc95802c7fb" +PKG_SHA256="3d4caa9513d12f9533b0e35dad1801e1454258b4ab6a75c30f0c42904b9c54da" PKG_ARCH="arm aarch64" PKG_LICENSE="GNU" PKG_DEPENDS_TARGET="toolchain" -PKG_SITE="https://github.com/Caesar-github/linux-rga" +PKG_SITE="https://github.com/shantigilbert/linux-rga" PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz" PKG_LONGDESC="The RGA driver userspace " PKG_TOOLCHAIN="auto" + +PKG_MAKE_OPTS_TARGET=" CFLAGS=-fPIC PROJECT_DIR=./build" + +pre_make_target() { +mkdir -p $PKG_BUILD/build/include +cd $PKG_BUILD +sed -i "s|DEBUG := y|DEBUG := n|g" $PKG_BUILD/Makefile +} + +makeinstall_target() { +mkdir -p $INSTALL/usr/lib +cp build/lib/librga.so $INSTALL/usr/lib + +cd $PKG_BUILD +mkdir -p $SYSROOT_PREFIX/usr/include/rga/ +# Library +cp build/lib/librga.so $SYSROOT_PREFIX/usr/lib/ + +# Headers +cp drmrga.h $SYSROOT_PREFIX/usr/include/rga/ +cp rga.h $SYSROOT_PREFIX/usr/include/rga/ +cp RgaApi.h $SYSROOT_PREFIX/usr//include/rga/ +cp RockchipRgaMacro.h $SYSROOT_PREFIX/usr/include/rga/ +} From 4184d41cdd5030d32ccca660859a0cb79bfe9568 Mon Sep 17 00:00:00 2001 From: "Youngjun, Choi" Date: Sat, 3 Oct 2020 18:21:24 +0900 Subject: [PATCH 3/4] EmuELEC-Emulationstation: Bump to 4f1dde5 --- packages/sx05re/emuelec-emulationstation/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sx05re/emuelec-emulationstation/package.mk b/packages/sx05re/emuelec-emulationstation/package.mk index 7b021c6be12..b3030d85628 100644 --- a/packages/sx05re/emuelec-emulationstation/package.mk +++ b/packages/sx05re/emuelec-emulationstation/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert) PKG_NAME="emuelec-emulationstation" -PKG_VERSION="0ed9a45bfc2e184fee69ef04718dff5460a62012" +PKG_VERSION="4f1dde57a38d2be4356118109dde08b1935d44b5" PKG_GIT_CLONE_BRANCH="EmuELEC" PKG_REV="1" PKG_ARCH="any" From 740c6c966485e446e5f8942cc12d486d8b7fb6c2 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sat, 3 Oct 2020 20:27:22 +0200 Subject: [PATCH 4/4] Fix DOOM location (#308) --- packages/sx05re/emuelec-ports/sources/ports.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sx05re/emuelec-ports/sources/ports.yaml b/packages/sx05re/emuelec-ports/sources/ports.yaml index b706e58eed7..54e4c173bb5 100644 --- a/packages/sx05re/emuelec-ports/sources/ports.yaml +++ b/packages/sx05re/emuelec-ports/sources/ports.yaml @@ -83,7 +83,7 @@ Doom: check_bios: DOOM1 commands: - - /emuelec/scripts/emuelecRunEmu.sh "/storage/roms/ports/doom2/doom1.wad" -Pports "${2}" -Cprboom "-SC${0}" + - /emuelec/scripts/emuelecRunEmu.sh "/storage/roms/ports/doom/doom1.wad" -Pports "${2}" -Cprboom "-SC${0}" Doom 2: description: A first-person shooter video game, the second title of id Software's Doom franchise. It was originally released for MS-DOS computers in 1994 and Macintosh computers in 1995.