From 21b88951a49c89d29dc55cc6881f90fcfb1eee94 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Mon, 25 May 2020 23:55:15 +0200 Subject: [PATCH] Added package gnuboy --- FunKey/Config.in | 1 + .../patches/gnuboy/0001-sdl-config.patch | 76 +++++++++++++++++++ FunKey/package/gnuboy/Config.in | 13 ++++ FunKey/package/gnuboy/gnuboy.mk | 46 +++++++++++ 4 files changed, 136 insertions(+) create mode 100644 FunKey/board/funkey/patches/gnuboy/0001-sdl-config.patch create mode 100644 FunKey/package/gnuboy/Config.in create mode 100644 FunKey/package/gnuboy/gnuboy.mk diff --git a/FunKey/Config.in b/FunKey/Config.in index 9741b4d..0dc6f19 100644 --- a/FunKey/Config.in +++ b/FunKey/Config.in @@ -3,3 +3,4 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/FunKey-GPIO-Mapping/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" diff --git a/FunKey/board/funkey/patches/gnuboy/0001-sdl-config.patch b/FunKey/board/funkey/patches/gnuboy/0001-sdl-config.patch new file mode 100644 index 0000000..75a92ba --- /dev/null +++ b/FunKey/board/funkey/patches/gnuboy/0001-sdl-config.patch @@ -0,0 +1,76 @@ + Makefile | 2 +- + Makefile.in | 2 +- + configure | 6 +++--- + configure.in | 6 +++--- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff -Naur a/configure b/configure +--- a/configure ++++ b/configure +@@ -2219,7 +2219,7 @@ + fi + done + +-LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib" ++#LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib" + + # Check whether --with-fb or --without-fb was given. + if test "${with_fb+set}" = set; then +@@ -2658,8 +2658,8 @@ + fi + + if test "$SDL_CONFIG" ; then +-SDL_LIBS="`sdl-config --libs` -lSDL_image -lSDL_ttf" +-SDL_CFLAGS="`sdl-config --cflags` -lSDL -lSDL_image -lSDL_ttf" ++SDL_LIBS="`$SDL_CONFIG --libs` -lSDL_image -lSDL_ttf" ++SDL_CFLAGS="`$SDL_CONFIG --cflags` -lSDL -lSDL_image -lSDL_ttf" + old_incs="$INCS" + INCS="$INCS $SDL_CFLAGS" + echo "$as_me:2662: checking for SDL_Init in -lSDL" >&5 +diff -Naur a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -21,7 +21,7 @@ + + + +-LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib" ++#LIBS="$LIBS -L/usr/local/lib -L/usr/X11R6/lib" + + + +@@ -79,8 +79,8 @@ + if test "$with_sdl" != "no" ; then + AC_CHECK_PROG(SDL_CONFIG, sdl-config, yes) + if test "$SDL_CONFIG" ; then +-SDL_LIBS="`sdl-config --libs`" +-SDL_CFLAGS="`sdl-config --cflags`" ++SDL_LIBS="`$SDL_CONFIG --libs`" ++SDL_CFLAGS="`$SDL_CONFIG --cflags`" + old_incs="$INCS" + INCS="$INCS $SDL_CFLAGS" + AC_CHECK_LIB(SDL, SDL_Init, [ +diff -Naur a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -18,7 +18,7 @@ + + SYS_DEFS = -DHAVE_CONFIG_H -DIS_LITTLE_ENDIAN -DIS_LINUX + SYS_OBJS = sys/nix/nix.o $(ASM_OBJS) +-SYS_INCS = -I/usr/local/include -I./sys/nix ++SYS_INCS = -I./sys/nix + + FB_OBJS = sys/linux/joy.o sys/oss/oss.o + FB_LIBS = +diff -Naur a/Makefile.in b/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in +@@ -18,7 +18,7 @@ + + SYS_DEFS = @DEFS@ @ENDIAN@ @ASM@ @SYS_DEFS@ + SYS_OBJS = sys/nix/nix.o $(ASM_OBJS) +-SYS_INCS = -I/usr/local/include @XINCS@ -I./sys/nix ++SYS_INCS = @XINCS@ -I./sys/nix + + FB_OBJS = @FB_OBJS@ @JOY@ @SOUND@ + FB_LIBS = diff --git a/FunKey/package/gnuboy/Config.in b/FunKey/package/gnuboy/Config.in new file mode 100644 index 0000000..c73ca9c --- /dev/null +++ b/FunKey/package/gnuboy/Config.in @@ -0,0 +1,13 @@ +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 diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk new file mode 100644 index 0000000..d91501e --- /dev/null +++ b/FunKey/package/gnuboy/gnuboy.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# gnunboy +# +################################################################################ + +GNUBOY_VERSION = e8468b924db16c3de06ba82e238ceec02df0f2fe +GNUBOY_SITE_METHOD = git +GNUBOY_SITE = ssh://git@fk/FunKey-Project/FunKey-Emulator-GNUBoy +GNUBOY_LICENSE = GPL-2.0 +GNUBOY_LICENSE_FILES = COPYING + +GNUBOY_DEPENDENCIES = sdl sdl_image sdl_mixer sdl_ttf zlib + +GNUBOY_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_ARM_CPU_ARMV7A),y) +GNUBOY_CFLAGS += -march=armv7-a +endif + +ifeq ($(BR2_GCC_TARGET_CPU),"cortex-a7") +GNUBOY_CFLAGS += -mtune=cortex-a7 +endif + +ifeq ($(BR2_GCC_TARGET_FLOAT_ABI),"hard") +GNUBOY_CFLAGS += -mfloat-abi=hard -ffast-math -funsafe-math-optimizations +else ifeq ($(BR2_GCC_TARGET_FLOAT_ABI),"soft") +GNUBOY_CFLAGS += -mfloat-abi=soft -ffast-math -funsafe-math-optimizations +endif + +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +GNUBOY_CFLAGS += -D__ARM_NEON__ -mfpu=neon -mvectorize-with-neon-quad +endif + +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" + +$(eval $(autotools-package))