Replaced default emulators by Libretro cores in RetroFE and GMenu2X frontends

FunKey/Config.in

@@ -1,12 +1,5 @@
-source "$BR2_EXTERNAL_FUNKEY_PATH/package/mednafen/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/fkgpiod/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/retrofe/Config.in"
-source "$BR2_EXTERNAL_FUNKEY_PATH/package/PCSX-ReARMed/Config.in"
-source "$BR2_EXTERNAL_FUNKEY_PATH/package/FCEUX/Config.in"
-source "$BR2_EXTERNAL_FUNKEY_PATH/package/gnuboy/Config.in"
-source "$BR2_EXTERNAL_FUNKEY_PATH/package/picodrive/Config.in"
-source "$BR2_EXTERNAL_FUNKEY_PATH/package/PocketSNES/Config.in"
-source "$BR2_EXTERNAL_FUNKEY_PATH/package/gpsp/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/dmtx-utils/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/ProdScreens/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/fonts-droid/Config.in"

FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Color/settings.conf

@@ -1,7 +1,7 @@
 # Uncomment and edit the following line to use a different ROM path.
 list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
 list.includeMissingItems = false
-list.extensions = gbc,GBC
+list.extensions = gbc,GBC,zip,ZIP
 list.menuSort = yes
 list.romHierarchy = true
 

FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy/settings.conf

@@ -1,7 +1,7 @@
 # Uncomment and edit the following line to use a different ROM path.
 list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
 list.includeMissingItems = false
-list.extensions = gb,GB
+list.extensions = gb,GB,zip,ZIP
 list.menuSort = yes
 list.romHierarchy = true
 

FunKey/board/funkey/rootfs-overlay/usr/games/collections/PCE-TurboGrafx/settings.conf

@@ -1,7 +1,7 @@
 # Uncomment and edit the following line to use a different ROM path.
 list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME%
 list.includeMissingItems = false
-list.extensions = zip,ZIP,pce,PCE,sgx,SGX,cue,CUE
+list.extensions = zip,ZIP,pce,PCE,sgx,SGX,cue,CUE,chd,CHD
 list.menuSort = yes
 list.romHierarchy = true
 

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gamegear_launch.sh

@@ -2,7 +2,7 @@
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-PicoDrive "$1"&
+picoarch /mnt/Libretro/cores/picodrive_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gb_launch.sh

@@ -2,7 +2,7 @@
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-sdlgnuboy --syncrtc "$1"&
+picoarch /mnt/Libretro/cores/gambatte_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_gpsp.sh

@@ -6,7 +6,7 @@
 rw
 mv -f /etc/asound.conf /etc/asound.conf.BAK
 cd ${HOME}
-gpsp "$1"&
+picoarch /mnt/Libretro/cores/gpsp_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/gba_launch_mednafen.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Launch the process in background, record the PID into a file, wait
-# for the process to terminate and erase the recorded PID
-gpsp "$1"&
-pid record $!
-wait $!
-pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/lynx_launch.sh

@@ -1,10 +1,15 @@
 #!/bin/sh
 
-cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
+if [ ! -e /mnt/FunKey/.picoarch/system/lynxboot.img ]; then
+	if [ ! -d /mnt/FunKey/.picoarch/system ]; then
+		mkdir -p /mnt/FunKey/.picoarch/system
+	fi
+	cp /usr/games/lynxboot.img /mnt/FunKey/.picoarch/system
+fi
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-mednafen -fs 1 -lynx.stretch full "$1"&
+picoarch /mnt/Libretro/cores/mednafen_lynx_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/mame.conf

@@ -1,2 +0,0 @@
-executable = %RETROFE_PATH%/launchers/mame_launch_mednafen.sh
-arguments = "%ITEM_FILEPATH%"

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/mame_launch_mednafen.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-
-# Launch the process in background, record the PID into a file, wait
-# for the process to terminate and erase the recorded PID
-mednafen -sound 1 -soundrate 22050 -soundbufsize 100 -vdriver sdl -frameskip 1  -fs 0 "$1"&
-pid record $!
-wait $!
-pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/megadrive_launch.sh

@@ -2,7 +2,7 @@
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-PicoDrive "$1"&
+picoarch /mnt/Libretro/cores/picodrive_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/nes_launch.sh

@@ -2,7 +2,7 @@
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-fceux "$1"&
+picoarch /mnt/Libretro/cores/fceumm_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/ngp_launch.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
 
-cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-mednafen -fs 1 -ngp.stretch full "$1"&
+picoarch /mnt/Libretro/cores/mednafen_ngp_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/pce_launch.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
 
-cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-mednafen -fs 1 -force_module pce_fast -pce_fast.stretch full "$1"&
+picoarch /mnt/Libretro/cores/mednafen_supergrafx_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_mednafen.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Launch the process in background, record the PID into a file, wait
-# for the process to terminate and erase the recorded PID
-pcsx -frameskip -cdfile "$1"&
-pid record $!
-wait $!
-pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/psone_launch_pcsx.sh

@@ -2,7 +2,7 @@
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-pcsx -cdfile "$1"&
+picoarch /mnt/Libretro/cores/pcsx_rearmed_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/sms_launch.sh

@@ -2,7 +2,7 @@
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-PicoDrive "$1"&
+picoarch /mnt/Libretro/cores/picodrive_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch.sh

@@ -2,7 +2,7 @@
 
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-psnes "$1"&
+picoarch /mnt/Libretro/cores/snes9x2005_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/snes_launch_mednafen.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Launch the process in background, record the PID into a file, wait
-# for the process to terminate and erase the recorded PID
-psnes "$1"&
-pid record $!
-wait $!
-pid erase

FunKey/board/funkey/rootfs-overlay/usr/games/launchers/wonderswan_launch.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
 
-cp /usr/games/mednafen-09x.cfg ${MEDNAFEN_HOME}/
-
 # Launch the process in background, record the PID into a file, wait
 # for the process to terminate and erase the recorded PID
-mednafen -fs 1 -wswan.stretch full "$1"&
+picoarch /mnt/Libretro/cores/mednafen_wswan_libretro.so "$1"&
 pid record $!
 wait $!
 pid erase

FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share

@@ -49,7 +49,7 @@ mount_share () {
 
     # Create the directory structure if required
     #(cd /mnt; mkdir -p "Applications" "Emulators" "Games" "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "PS1/bios" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx")
-    (cd /mnt; mkdir -p "Libretro/cores" "Native games" "Applications" "Emulators" "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx")
+    (cd /mnt; mkdir -p "Libretro/cores" "FunKey/.picoarch/system" "Native games" "Applications" "Emulators" "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx")
     (mkdir -p "/mnt/FunKey/.retrofe/collections"; cd /mnt/FunKey/.retrofe/collections; mkdir "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx" "Libretro" "Native games" "Main")
 
     # Check if there is a firmware update file

FunKey/package/FCEUX/Config.in

@@ -1,14 +0,0 @@
-config BR2_PACKAGE_FCEUX
-	bool "FCEUX"
-	default y
-	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_SDL_IMAGE
-	select BR2_PACKAGE_SDL_MIXER
-	select BR2_PACKAGE_SDL_TTF
-	select BR2_PACKAGE_ZLIB
-	help
-	  An open source NES Emulator for Windows and Unix that
-	  features solid emulation accuracy and state of the art tools
-	  for power users. For some reason casual gamers use it too.
-
-	  https://github.com/pingflood/fceux.git

FunKey/package/FCEUX/FCEUX.mk

@@ -1,56 +0,0 @@
-################################################################################
-#
-# FCEUX
-#
-################################################################################
-
-FCEUX_VERSION = fceux-FunKey-1.2.2
-FCEUX_SITE_METHOD = git
-FCEUX_SITE = https://github.com/FunKey-Project/fceux.git
-FCEUX_LICENSE = GPL-2.0
-FCEUX_LICENSE_FILES = COPYING
-
-FCEUX_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_ttf zlib
-
-FCEUX_CFLAGS = $(TARGET_CFLAGS) $(subst $\",,$(BR2_TARGET_OPTIMIZATION)) -mfloat-abi=hard -ffast-math -funsafe-math-optimizations
-
-FCEUX_CFLAGS += -ggdb -O3
-FCEUX_CFLAGS += -Wno-write-strings -Wno-sign-compare
-FCEUX_CFLAGS += -fomit-frame-pointer -fno-builtin -fno-common
-FCEUX_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
-FCEUX_CFLAGS +=  -DDINGUX \
-	-DLSB_FIRST \
-	-DPSS_STYLE=1 \
-	-DHAVE_ASPRINTF \
-	-DFRAMESKIP
-
-FCEUX_LDFLAGS += $(FCEUX_CFLAGS) \
-	-s -fprofile-generate -fprofile-dir=/home/retrofw/profile/fceux \
-	-fno-strict-aliasing 
-
-FCEUX_LIBS +=  $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
-FCEUX_LIBS += -lSDL -lSDL_image -lSDL_ttf -lpng  -lm -lz
-
-define FCEUX_BUILD_CMDS
-	(cd $(@D); \
-	make \
-	CFLAGS='$(FCEUX_CFLAGS)' \
-	LDFLAGS='$(FCEUX_LDFLAGS)' \
-	LIBS='$(FCEUX_LIBS)' \
-	CROSS_COMPILE=$(TARGET_CROSS) \
-	CHAINPREFIX='$(STAGING_DIR)/usr' \
-	)
-endef
-
-define FCEUX_INSTALL_TARGET_CMDS
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
-	$(INSTALL) -m 0755 $(@D)/fceux/fceux $(TARGET_DIR)/usr/games/fceux
-endef
-
-define FCEUX_CREATE_OPK
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators
-	$(HOST_DIR)/usr/bin/mksquashfs $(FCEUX_PKGDIR)/opk/nes $(TARGET_DIR)/usr/local/share/OPKs/Emulators/nes_fceux_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-endef
-FCEUX_POST_INSTALL_TARGET_HOOKS += FCEUX_CREATE_OPK
-
-$(eval $(generic-package))

FunKey/package/PCSX-ReARMed/Config.in

@@ -1,12 +0,0 @@
-config BR2_PACKAGE_PCSX_REARMED
-	bool "PCSX ReARMed"
-	default y
-	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_SDL_IMAGE
-	select BR2_PACKAGE_SDL_MIXER
-	select BR2_PACKAGE_SDL_TTF
-	select BR2_PACKAGE_ZLIB
-	help
-	  Yet another PCSX fork
-
-	  https://github.com/notaz/pcsx_rearmed.git

FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk

@@ -1,56 +0,0 @@
-################################################################################
-#
-# PCSX-ReARMed
-#
-################################################################################
-
-PCSX_REARMED_VERSION = v1.3-funkey-s
-PCSX_REARMED_SITE_METHOD = git
-PCSX_REARMED_SITE = https://github.com/DrUm78/pcsx_rearmed.git
-PCSX_REARMED_LICENSE = GPL-2.0
-PCSX_REARMED_LICENSE_FILES = COPYING
-
-PCSX_REARMED_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_ttf zlib
-
-PCSX_REARMED_CFLAGS = $(TARGET_CFLAGS) $(subst $\",,$(BR2_TARGET_OPTIMIZATION)) -mfloat-abi=hard -ffast-math -funsafe-math-optimizations
-
-ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-    PCSX_REARMED_CONF_OPTS += --enable-neon --gpu=neon
-endif
-
-PCSX_REARMED_CONF_OPTS += --sound-drivers=sdl
-PCSX_REARMED_CFLAGS += -ggdb -O3
-
-define PCSX_REARMED_CONFIGURE_CMDS
-	(cd $(@D); \
-	chmod +x configure; \
-	sed -i 's/sdl-config/$$SDL_CONFIG/g' configure; \
-	rm -f skin; \
-	CFLAGS='$(PCSX_REARMED_CFLAGS)' \
-	CROSS_COMPILE=$(TARGET_CROSS) \
-	LDFLAGS='-L$(TARGET_DIR)/usr/lib' \
-	SDL_CONFIG='$(STAGING_DIR)/usr/bin/sdl-config' \
-	./configure $(PCSX_REARMED_CONF_OPTS) \
-	)
-endef
-
-define PCSX_REARMED_BUILD_CMDS
-	(cd $(@D); \
-	make \
-	)
-endef
-
-PCSX_REARMED_GIT_SUBMODULES = YES
-
-define PCSX_REARMED_INSTALL_TARGET_CMDS
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
-	$(INSTALL) -m 0755 $(@D)/pcsx $(TARGET_DIR)/usr/games/pcsx
-endef
-
-define PCSX_REARMED_CREATE_OPK
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators
-	$(HOST_DIR)/usr/bin/mksquashfs $(PCSX_REARMED_PKGDIR)/opk/ps1 $(TARGET_DIR)/usr/local/share/OPKs/Emulators/ps1_pcsx_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-endef
-PCSX_REARMED_POST_INSTALL_TARGET_HOOKS += PCSX_REARMED_CREATE_OPK
-
-$(eval $(generic-package))

FunKey/package/PocketSNES/Config.in

@@ -1,12 +0,0 @@
-config BR2_PACKAGE_POCKETSNES
-	bool "PocketSNES"
-	default y
-	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_SDL_IMAGE
-	select BR2_PACKAGE_SDL_MIXER
-	select BR2_PACKAGE_SDL_TTF
-	select BR2_PACKAGE_ZLIB
-	help
-	  An open source Super NES Emulator.
-
-	  https://github.com/buzztiaan/PocketSNES

FunKey/package/PocketSNES/PocketSNES.mk

@@ -1,62 +0,0 @@
-################################################################################
-#
-# PocketSNES
-#
-################################################################################
-
-POCKETSNES_VERSION = v1.2.3-funkey-s
-POCKETSNES_SITE_METHOD = git
-POCKETSNES_SITE = https://github.com/DrUm78/PocketSNES.git
-POCKETSNES_LICENSE = GPL-2.0
-POCKETSNES_LICENSE_FILES = COPYING
-
-POCKETSNES_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_ttf zlib
-
-POCKETSNES_CFLAGS = $(TARGET_CFLAGS) $(subst $\",,$(BR2_TARGET_OPTIMIZATION)) -mfloat-abi=hard -ffast-math -funsafe-math-optimizations
-
-POCKETSNES_SDL_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
-POCKETSNES_SDL_LIBS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
-
-POCKETSNES_INCLUDE = -I pocketsnes \
-		-I sal/linux/include -I sal/include \
-		-I pocketsnes/include \
-		-I menu -I pocketsnes/linux -I pocketsnes/snes9x
-
-POCKETSNES_CFLAGS += -ggdb -O3
-POCKETSNES_CFLAGS += -fomit-frame-pointer -fomit-frame-pointer -fexpensive-optimizations
-POCKETSNES_CFLAGS += $(POCKETSNES_INCLUDE)
-POCKETSNES_CFLAGS += $(POCKETSNES_SDL_CFLAGS)
-POCKETSNES_CFLAGS += -DRC_OPTIMIZED -D__LINUX__ -D__DINGUX__ -DNO_ROM_BROWSER -DGCW_ZERO
-
-POCKETSNES_CXXFLAGS += $(POCKETSNES_INCLUDE)
-POCKETSNES_CXXFLAGS += -fno-exceptions -fno-rtti
-
-POCKETSNES_LDFLAGS += -s -fprofile-generate -fprofile-dir=/home/retrofw/profile/pocket_snes \
-	-fno-strict-aliasing 
-
-POCKETSNES_LDFLAGS +=  $(POCKETSNES_SDL_LIBS)
-POCKETSNES_LDFLAGS += -lgcc -lpthread -lSDL_image -lSDL_ttf -lpng  -lm -lz
-
-define POCKETSNES_BUILD_CMDS
-	(cd $(@D); \
-	make \
-	CFLAGS='$(POCKETSNES_CFLAGS)' \
-	CXXFLAGS='$(POCKETSNES_CXXFLAGS)' \
-	LDFLAGS='$(POCKETSNES_LDFLAGS)' \
-	CC='$(TARGET_CC)' \
-	CXX='$(TARGET_CXX)' \
-	)
-endef
-
-define POCKETSNES_INSTALL_TARGET_CMDS
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
-	$(INSTALL) -m 0755 $(@D)/psnes $(TARGET_DIR)/usr/games/psnes
-endef
-
-define POCKETSNES_CREATE_OPK
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators
-	$(HOST_DIR)/usr/bin/mksquashfs $(POCKETSNES_PKGDIR)/opk/snes $(TARGET_DIR)/usr/local/share/OPKs/Emulators/snes_pocketsnes_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-endef
-POCKETSNES_POST_INSTALL_TARGET_HOOKS += POCKETSNES_CREATE_OPK
-
-$(eval $(generic-package))

FunKey/package/clock/Config.in

@@ -5,5 +5,4 @@ config BR2_PACKAGE_CLOCK
 	help
 	  This is a simple app that sets the clock.
 
-
 	  https://github.com/gameblabla/clock_sdl_app

FunKey/package/gnuboy/Config.in

@@ -1,13 +0,0 @@
-config BR2_PACKAGE_GNUBOY
-	bool "gnuboy"
-	default y
-	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_SDL_IMAGE
-	select BR2_PACKAGE_SDL_MIXER
-	select BR2_PACKAGE_SDL_TTF
-	select BR2_PACKAGE_ZLIB
-	help
-	  Welcome to gnuboy, one of the few pieces of Free Software to emulate
-	  the Game Boy handheld game console.
-
-	  https://github.com/rofl0r/gnuboy

FunKey/package/gnuboy/gnuboy.mk

@@ -1,34 +0,0 @@
-################################################################################
-#
-# gnuboy
-#
-################################################################################
-
-GNUBOY_VERSION = v1.2.3-funkey-s
-GNUBOY_SITE_METHOD = git
-GNUBOY_SITE = https://github.com/DrUm78/gnuboy.git
-GNUBOY_LICENSE = GPL-2.0
-GNUBOY_LICENSE_FILES = COPYING
-
-GNUBOY_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_ttf zlib
-
-GNUBOY_CFLAGS = $(TARGET_CFLAGS) $(subst $\",,$(BR2_TARGET_OPTIMIZATION)) -mfloat-abi=hard -ffast-math -funsafe-math-optimizations
-
-GNUBOY_CFLAGS += -ggdb -O3
-
-GNUBOY_CONF_OPTS += CFLAGS="$(GNUBOY_CFLAGS)"
-GNUBOY_CONF_OPTS += --prefix=$(TARGET_DIR)/usr/local --bindir=$(TARGET_DIR)/usr/games
-GNUBOY_CONF_OPTS += --without-fb \
-		    --without-svgalib \
-		    --without-x \
-		    --with-sdl
-
-GNUBOY_CONF_ENV += SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
-
-define GNUBOY_CREATE_OPK
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators
-	$(HOST_DIR)/usr/bin/mksquashfs $(GNUBOY_PKGDIR)/opk/gb_gbc $(TARGET_DIR)/usr/local/share/OPKs/Emulators/gb_gbc_gnuboy_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-endef
-GNUBOY_POST_INSTALL_TARGET_HOOKS += GNUBOY_CREATE_OPK
-
-$(eval $(autotools-package))

FunKey/package/gpsp/Config.in

@@ -1,12 +0,0 @@
-config BR2_PACKAGE_GPSP
-	bool "gpsp"
-	default y
-	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_SDL_IMAGE
-	select BR2_PACKAGE_SDL_MIXER
-	select BR2_PACKAGE_SDL_TTF
-	select BR2_PACKAGE_ZLIB
-	help
-	  Gameboy Advance emulator for Playstation Portable
-
-	  https://github.com/FoxCunning/gpsp.git

FunKey/package/gpsp/gpsp.mk

@@ -1,49 +0,0 @@
-################################################################################
-#
-# gpsp
-#
-################################################################################
-
-GPSP_VERSION = v1.2.3-funkey-s
-GPSP_SITE_METHOD = git
-GPSP_SITE = https://github.com/DrUm78/gpsp.git
-GPSP_LICENSE = GPL-2.0
-GPSP_LICENSE_FILES = COPYING.DOC
-
-GPSP_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_ttf zlib
-
-GPSP_CFLAGS = $(TARGET_CFLAGS) $(subst $\",,$(BR2_TARGET_OPTIMIZATION)) -mfloat-abi=hard -ffast-math -funsafe-math-optimizations
-
-GPSP_SDL_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
-GPSP_SDL_LIBS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
-
-GPSP_CFLAGS += -ggdb -O3
-GPSP_CFLAGS += -DARM_ARCH -DCHIP_BUILD
-GPSP_CFLAGS += $(GPSP_SDL_CFLAGS)
-
-GPSP_LIBS += $(GPSP_SDL_LIBS)
-GPSP_LIBS += -lSDL_ttf -lSDL_image -ldl -lpthread -lz
-
-define GPSP_BUILD_CMDS
-	(cd $(@D)/chip; \
-	sed -i -e 's/-gcc/gcc/g' Makefile; \
-	make \
-	CROSS_COMPILE=$(TARGET_CROSS) \
-	CFLAGS='$(GPSP_CFLAGS)' \
-	LIBS='$(GPSP_LIBS)' \
-	)
-endef
-
-define GPSP_INSTALL_TARGET_CMDS
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
-	$(INSTALL) -m 0755 $(@D)/chip/gpsp $(TARGET_DIR)/usr/games/gpsp
-	$(INSTALL) -m 0644 $(@D)/game_config.txt $(TARGET_DIR)/usr/games/game_config.txt
-endef
-
-define GPSP_CREATE_OPK
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators
-	$(HOST_DIR)/usr/bin/mksquashfs $(GPSP_PKGDIR)/opk/gba $(TARGET_DIR)/usr/local/share/OPKs/Emulators/gba_gpsp_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-endef
-GPSP_POST_INSTALL_TARGET_HOOKS += GPSP_CREATE_OPK
-
-$(eval $(generic-package))

FunKey/package/mednafen/Config.in

@@ -1,12 +0,0 @@
-config BR2_PACKAGE_MEDNAFEN
-	bool "mednafen"
-	default y
-	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_SDL_IMAGE
-	select BR2_PACKAGE_SDL_MIXER
-	select BR2_PACKAGE_SDL_TTF
-	select BR2_PACKAGE_ZLIB
-	help
-	  The mednafen game engine.
-
-	  https://mednafen.github.io/

FunKey/package/mednafen/mednafen.mk

@@ -1,41 +0,0 @@
-################################################################################
-#
-# mednafen
-#
-################################################################################
-
-MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.2
-MEDNAFEN_SITE_METHOD = git
-MEDNAFEN_SITE = https://github.com/FunKey-Project/mednafen-git.git
-MEDNAFEN_LICENSE = GPL-2.0+
-MEDNAFEN_LICENSE_FILES = COPYING
-
-MEDNAFEN_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_ttf zlib
-
-MEDNAFEN_CFLAGS = $(TARGET_CFLAGS) $(subst $\",,$(BR2_TARGET_OPTIMIZATION)) -mfloat-abi=hard
-
-#MEDNAFEN_AUTORECONF = YES
-
-MEDNAFEN_CFLAGS += -ggdb -O3
-MEDNAFEN_CFLAGS += -DFUNKEY_FAST_BLIT
-
-#MEDNAFEN_LDFLAGS +=  -lSDL_ttf -lSDL_image
-
-MEDNAFEN_CONF_OPTS += CXXFLAGS="$(MEDNAFEN_CFLAGS)"
-#MEDNAFEN_CONF_OPTS += LDFLAGS="$(MEDNAFEN_LDFLAGS)"
-MEDNAFEN_CONF_OPTS += --prefix=/usr/local --bindir=/usr/games --without-libsndfile
-MEDNAFEN_CONF_OPTS += --disable-ss --disable-ssfplay --disable-fancy-scalers
-#MEDNAFEN_CONF_OPTS += --disable-nes --disable-gba --disable-psx --disable-snes 
-
-MEDNAFEN_CONF_ENV += SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
-
-define MEDNAFEN_CREATE_OPK
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators
-	$(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/lynx $(TARGET_DIR)/usr/local/share/OPKs/Emulators/lynx_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-	$(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/ngp $(TARGET_DIR)/usr/local/share/OPKs/Emulators/ngp_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-	$(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/pce $(TARGET_DIR)/usr/local/share/OPKs/Emulators/pce_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-	$(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/wonderswan $(TARGET_DIR)/usr/local/share/OPKs/Emulators/wonderswan_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-endef
-MEDNAFEN_POST_INSTALL_TARGET_HOOKS += MEDNAFEN_CREATE_OPK
-
-$(eval $(autotools-package))

FunKey/package/picoarch/Config.in

@@ -7,5 +7,4 @@ config BR2_PACKAGE_PICOARCH
 	help
 	  A Libretro frontend designed for small screens and low power
 
-
 	  https://git.crowdedwood.com/picoarch

FunKey/package/picoarch/opk/gb_gbc/gb_gbc.funkey-s.desktop

@@ -5,4 +5,4 @@ Icon=gb_gbc
 Exec=/usr/games/launchers/gb_launch.sh %f
 Categories=emulators
 SelectorDir=/mnt/Game Boy
-SelectorFilter=gb,GB,gbc,GBC
+SelectorFilter=gb,GB,gbc,GBC,zip,ZIP

FunKey/package/picoarch/opk/megadrive/megadrive.funkey-s.desktop

@@ -5,4 +5,4 @@ Icon=megadrive
 Exec=/usr/games/launchers/megadrive_launch.sh %f
 Categories=emulators
 SelectorDir=/mnt/Sega Genesis
-SelectorFilter=zip,ZIP,md,MD,bin,BIN,32x,32X,cue,CUE,cso,CSO,chd,CHD,smd,SMD,gg,GG,sg,SG
+SelectorFilter=zip,ZIP,md,MD,bin,BIN,32x,32X,cue,CUE,cso,CSO,chd,CHD,smd,SMD,gg,GG,sg,SG,sms,SMS

FunKey/package/picoarch/opk/pce/pce.funkey-s.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=PC-Engine
-Comment=PC-Engine CD-ROM emulator
+Comment=PC-Engine CD-ROM/SuperGrafX emulator
 Icon=pce
 Exec=/usr/games/launchers/pce_launch.sh %f
 Categories=emulators
 SelectorDir=/mnt/PCE-TurboGrafx
-SelectorFilter=zip,ZIP,pce,PCE,sgx,SGX,cue,CUE
+SelectorFilter=zip,ZIP,pce,PCE,sgx,SGX,cue,CUE,chd,CHD

FunKey/package/picoarch/picoarch.mk

@@ -43,7 +43,17 @@ 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
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/picoarch $(TARGET_DIR)/usr/local/share/OPKs/Libretro/picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/gb_gbc $(TARGET_DIR)/usr/local/share/OPKs/Libretro/gb_gbc_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/gba $(TARGET_DIR)/usr/local/share/OPKs/Libretro/gba_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/lynx $(TARGET_DIR)/usr/local/share/OPKs/Libretro/lynx_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/megadrive $(TARGET_DIR)/usr/local/share/OPKs/Libretro/megadrive_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/nes $(TARGET_DIR)/usr/local/share/OPKs/Libretro/nes_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/ngp $(TARGET_DIR)/usr/local/share/OPKs/Libretro/ngp_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/pce $(TARGET_DIR)/usr/local/share/OPKs/Libretro/pce_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/ps1 $(TARGET_DIR)/usr/local/share/OPKs/Libretro/ps1_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/snes $(TARGET_DIR)/usr/local/share/OPKs/Libretro/snes_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+	$(HOST_DIR)/usr/bin/mksquashfs $(PICOARCH_PKGDIR)/opk/wonderswan $(TARGET_DIR)/usr/local/share/OPKs/Libretro/wonderswan_picoarch_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
 endef
 PICOARCH_POST_INSTALL_TARGET_HOOKS += PICOARCH_CREATE_OPK
 

FunKey/package/picodrive/Config.in

@@ -1,17 +0,0 @@
-config BR2_PACKAGE_PICODRIVE
-	bool "picodrive"
-	default y
-	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_SDL_IMAGE
-	select BR2_PACKAGE_SDL_MIXER
-	select BR2_PACKAGE_SDL_TTF
-	select BR2_PACKAGE_ZLIB
-	help
-	This is yet another Megadrive / Genesis / Sega CD / Mega CD /
-	32X / SMS emulator, which was written having ARM-based
-	handheld devices in mind (such as smartphones and handheld
-	consoles like GP2X and Pandora), but also runs on non-ARM
-	little-endian hardware too.
-
-
-	  https://github.com/notaz/picodrive

FunKey/package/picodrive/picodrive.mk

@@ -1,53 +0,0 @@
-################################################################################
-#
-# picodrive
-#
-################################################################################
-
-PICODRIVE_VERSION = v1.4-funkey-s
-PICODRIVE_SITE_METHOD = git
-PICODRIVE_SITE = https://github.com/DrUm78/picodrive-funkey.git
-PICODRIVE_LICENSE = MAME
-PICODRIVE_LICENSE_FILES = COPYING
-
-PICODRIVE_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_ttf zlib
-
-PICODRIVE_CFLAGS = $(TARGET_CFLAGS) $(subst $\",,$(BR2_TARGET_OPTIMIZATION)) -mfloat-abi=hard -ffast-math -funsafe-math-optimizations
-
-PICODRIVE_CONF_OPTS += --platform=generic --sound-drivers=sdl
-PICODRIVE_CFLAGS += -ggdb -O3
-
-PICODRIVE_LIBS += -lSDL_image -lSDL_ttf
-
-define PICODRIVE_CONFIGURE_CMDS
-	(cd $(@D); \
-	chmod +x configure; \
-	sed -i -e 's/-mcpu/-mtune/g' configure; \
-	CFLAGS='$(PICODRIVE_CFLAGS)' \
-	CROSS_COMPILE=$(TARGET_CROSS) \
-	LDFLAGS='-L$(TARGET_DIR)/usr/lib' \
-	LDLIBS='$(PICODRIVE_LIBS)'\
-	./configure $(PICODRIVE_CONF_OPTS) \
-	)
-endef
-
-define PICODRIVE_BUILD_CMDS
-	(cd $(@D); \
-	make \
-	)
-endef
-
-PICODRIVE_GIT_SUBMODULES = YES
-
-define PICODRIVE_INSTALL_TARGET_CMDS
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games
-	$(INSTALL) -m 0755 $(@D)/PicoDrive $(TARGET_DIR)/usr/games/
-endef
-
-define PICODRIVE_CREATE_OPK
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Emulators
-	$(HOST_DIR)/usr/bin/mksquashfs $(PICODRIVE_PKGDIR)/opk/megadrive $(TARGET_DIR)/usr/local/share/OPKs/Emulators/megadrive_picodrive_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
-endef
-PICODRIVE_POST_INSTALL_TARGET_HOOKS += PICODRIVE_CREATE_OPK
-
-$(eval $(generic-package))

FunKey/package/st-sdl/Config.in

@@ -5,5 +5,4 @@ config BR2_PACKAGE_ST_SDL
 	help
 	  SDL Terminal for RS97
 
-
 	  https://github.com/jamesofarrell/st-sdl