Merge branch 'dev'

british-choi · Oct 5, 2020 · 18f7f1b · 18f7f1b
2 parents afdccec + ecc536b
commit 18f7f1b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git 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"

diff --git 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/"
 

diff --git 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/
+}