From 40a44ede7927eedb5d88c3f0cb101bde50ad8c7e Mon Sep 17 00:00:00 2001
From: DrUm78 <cruau.david@gmail.com>
Date: Sun, 11 Jun 2023 09:59:42 +0200
Subject: [PATCH] Added PicoArch as a package Removed package script that is
 now useless

---
 FunKey/Config.in                              |   1 +
 FunKey/package/picoarch/Config.in             |  11 ++++
 .../picoarch/opk/picoarch.funkey-s.desktop    |   7 +++
 FunKey/package/picoarch/opk/picoarch.png      | Bin 0 -> 1121 bytes
 FunKey/package/picoarch/picoarch.mk           |  50 ++++++++++++++++++
 package                                       |  18 -------
 6 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 FunKey/package/picoarch/Config.in
 create mode 100644 FunKey/package/picoarch/opk/picoarch.funkey-s.desktop
 create mode 100644 FunKey/package/picoarch/opk/picoarch.png
 create mode 100644 FunKey/package/picoarch/picoarch.mk
 delete mode 100755 package

diff --git a/FunKey/Config.in b/FunKey/Config.in
index 989b968..73b49b4 100644
--- a/FunKey/Config.in
+++ b/FunKey/Config.in
@@ -18,3 +18,4 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/fluidlite/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/libmikmod/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/commander/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/bibi/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/picoarch/Config.in"
diff --git a/FunKey/package/picoarch/Config.in b/FunKey/package/picoarch/Config.in
new file mode 100644
index 0000000..bb5ec15
--- /dev/null
+++ b/FunKey/package/picoarch/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PICOARCH
+	bool "picoarch"
+	default y
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_IMAGE
+	select BR2_PACKAGE_SDL_TTF
+	help
+	A Libretro frontend designed for small screens and low power
+
+
+	  https://git.crowdedwood.com/picoarch
diff --git a/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop b/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop
new file mode 100644
index 0000000..b5bb420
--- /dev/null
+++ b/FunKey/package/picoarch/opk/picoarch.funkey-s.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=PicoArch
+Comment=SDL Libretro frontend
+Exec=/usr/games/picoarch %f
+Icon=picoarch
+Categories=games
+SelectorFilter=so
diff --git a/FunKey/package/picoarch/opk/picoarch.png b/FunKey/package/picoarch/opk/picoarch.png
new file mode 100644
index 0000000000000000000000000000000000000000..f748798470b5ae4f8809271a51b83f747b326633
GIT binary patch
literal 1121
zcmV-n1fKheP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1NKQoK~z{r#g{!u
z98nO*^-cvXM6fY%Dk|yxgha3q{6Znfsg1U35ye7_2qH*~tt5>Wegu!?a(;pa1wm{T
zOFIz+v5Y7v7^8UW-DLj5&a(I68O>cX@Z;^iH#_rxv+upzOR|}RaVC%yv;FUeiH4YV
zyk)*KUd9(^=9y2-D+U%KLd)`vA;vJ<coMW-_cJg{gbMI5aJXe4BHs8J2njH+8JOh8
z;(&c+AOOy)Hr_x4+K&uOa{o&K_hySV0ee~nl9Q9k>2yjPZ9LYPiN=1q00ee89CEF#
z9qof(3=xkD;6O%7N{ST(ZE9+&Tu)3)(89ukB?kTQ1sI>4oRo1?0)2L&=Kb?3pn>x8
z^62X7ie_hLt$rlK_2}p*1%pAVsHm{U!Yje|4+~(0BA~ju+E`m#qk@70d8n|kki1^6
z%xrpkn)dhi3AVnzPIGf}<nefDWo1SBj*gCKYHEt+=jUm0agoZ)%Oys3b~Y_7Em3Q0
zs|es+kpj}v(nP?_%#49xIXOA<aCdjN1i!htq1)SAy1cxkySqE-vzuWUba8PZKG)aR
z(l;_PA~7;DGU)vLoVK>M9u~kR0*;T5jqUAic@Uu7u)e-NxzEkbrL(g$>GS*jLLd+j
zQ6(iM;?vgFCgYo%n^qiDi-j3HQQSut;BvX}oUyaBLjwZ?G(0>^CnqNotf!|(0%c`o
z(dp@_^x>TY7-p`ot+}~b`Y>y(jsE_A+Su4Ymtnq^=mJ_=TEyx8{vNHEUN0{%Q&(3P
z4Gj&+LWF5@7+%5H*cf$oc3M?KWz;Z^rnk2@Q~<A5OThT}xHzG#NQ|=DlRU=|1IZDS
z&G7krmVos1^iTo$`T0~<R%S4=<*?FW`koO80U-|e;b<~kn=_`py*(-_Dx%WTQefbk
zbBO?650Q&d_bT@B;o+eKu_uXD5sZcVVZmbE*kd!%*8mO<K3K$w%R{xbwbazqB>S1S
zrv%*H-Nji!_4V~sS63%AG&E3ERh2F@T3ub01F5mGQN}VeGerPmn}<_W0r(QapsKV^
zKm<p5vHJ0v>|?+TDl<JeI1mwTw_E!3q%?_Hfe-<j05e2#l(nX&M*6Uq5!jCYUKAG>
z%V7m;Z*P}An~2!2fU%r(R@l?ndYar8ECL;?tgNKL!9nWi=m_`ua{=K%kiF~=0Us3~
zg{KQZK>U=(nt3=eo{1^oGh=s31RDDb1C!h;0H4bk)DOo*pt0XEFv+do=P#Haj5<PX
zJkjK5jEjL;{|)rw4fB(Mqy5js-=eX8F>VGH^6v<y9YxH025VwAP9W9?<|PA*NUrwa
nKpgGS9B{zmNCaWYlahV|gyqqoTAZ?800000NkvXXu0mjfaLNw%

literal 0
HcmV?d00001

diff --git a/FunKey/package/picoarch/picoarch.mk b/FunKey/package/picoarch/picoarch.mk
new file mode 100644
index 0000000..0227fbe
--- /dev/null
+++ b/FunKey/package/picoarch/picoarch.mk
@@ -0,0 +1,50 @@
+################################################################################
+#
+# picoarch
+#
+################################################################################
+
+PICOARCH_VERSION = v1.0-funkey-s
+PICOARCH_SITE_METHOD = git
+PICOARCH_SITE = https://github.com/DrUm78/picoarch.git
+PICOARCH_LICENSE = MAME
+PICOARCH_LICENSE_FILES = LICENSE
+
+PICOARCH_DEPENDENCIES = sdl sdl_image sdl_ttf
+
+PICOARCH_SDL_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
+PICOARCH_SDL_LIBS   += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
+
+PICOARCH_CFLAGS += $(PICOARCH_SDL_CFLAGS)
+PICOARCH_CFLAGS += -DFUNKEY_S -Ofast -DNDEBUG  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+PICOARCH_CFLAGS += -Wall -fdata-sections -ffunction-sections -flto
+PICOARCH_CFLAGS += -I./ -I./libretro-common/include/
+
+PICOARCH_LIBS += $(PICOARCH_SDL_LIBS)
+PICOARCH_LIBS += -lc -ldl -lgcc -lm -lSDL -lasound -lpng -lz -Wl,--gc-sections -flto -lSDL_image -lSDL_ttf
+
+define PICOARCH_BUILD_CMDS
+	(cd $(@D); \
+	make picoarch platform=funkey-s \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	CFLAGS='$(PICOARCH_CFLAGS)' \
+	LDFLAGS='$(PICOARCH_LIBS)' \
+	SDL_INCLUDES='$(PICOARCH_SDL_CFLAGS)' \
+	SDL_LIBS='$(PICOARCH_SDL_LIBS)' \
+	)
+endef
+
+PICOARCH_GIT_SUBMODULES = YES
+
+define PICOARCH_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
+	$(INSTALL) -m 0755 $(@D)/picoarch $(TARGET_DIR)/usr/games/
+endef
+
+define PICOARCH_CREATE_OPK
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Libretro
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk $(TARGET_DIR)/usr/local/share/OPKs/Libretro/picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+endef
+PICOARCH_POST_INSTALL_TARGET_HOOKS += PICOARCH_CREATE_OPK
+
+$(eval $(generic-package))
diff --git a/package b/package
deleted file mode 100755
index 63a0cbd..0000000
--- a/package
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-rm -rf FunKey/output/build/picoarch
-mkdir -p FunKey/output/build/picoarch
-cd FunKey/output/build/picoarch
-git clone https://github.com/DrUm78/picoarch .
-git submodule update --init
-make picoarch platform=funkey-s
-cp README.funkey-s.md opk/
-mksquashfs opk/ picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-cp picoarch ../../../board/funkey/rootfs-overlay/usr/games/
-cp picoarch_funkey-s.opk ../../../board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/
-
-cd -
-make
-
-rm -f FunKey/board/funkey/rootfs-overlay/usr/games/picoarch
-rm -f FunKey/board/funkey/rootfs-overlay/usr/local/share/OPKs/Libretro/picoarch_funkey-s.opk